diff --git a/app-wear-shared/shared-impl/build.gradle b/app-wear-shared/shared-impl/build.gradle
index f2c115b890..da83429250 100644
--- a/app-wear-shared/shared-impl/build.gradle
+++ b/app-wear-shared/shared-impl/build.gradle
@@ -21,5 +21,5 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
+    implementation project(':core:interfaces')
 }
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/PackageManagerExtension.kt b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/extensions/PackageManagerExtension.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/PackageManagerExtension.kt
rename to app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/extensions/PackageManagerExtension.kt
diff --git a/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/di/SharedImplModule.kt b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/di/SharedImplModule.kt
index 3bf15a91d9..f823e124f4 100644
--- a/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/di/SharedImplModule.kt
+++ b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/di/SharedImplModule.kt
@@ -4,10 +4,18 @@ import android.content.Context
 import androidx.preference.PreferenceManager
 import dagger.Module
 import dagger.Provides
+import info.nightscout.rx.AapsSchedulers
+import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.interfaces.L
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.impl.logging.AAPSLoggerProduction
 import info.nightscout.shared.impl.logging.LImpl
+import info.nightscout.shared.impl.rx.AapsSchedulersImpl
+import info.nightscout.shared.impl.rx.bus.RxBusImpl
 import info.nightscout.shared.impl.sharedPreferences.SPImplementation
 import info.nightscout.shared.sharedPreferences.SP
+import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import javax.inject.Singleton
 
 @Module(
@@ -23,4 +31,20 @@ open class SharedImplModule {
     @Provides
     @Singleton
     fun provideL(sp: SP): L = LImpl(sp)
+
+    @Provides
+    @Singleton
+    fun provideDateUtil(context: Context): DateUtil = DateUtilImpl(context)
+
+    @Provides
+    @Singleton
+    fun provideAAPSLogger(l: L): AAPSLogger = AAPSLoggerProduction(l)
+
+    @Provides
+    @Singleton
+    fun provideRxBus(aapsSchedulers: AapsSchedulers, aapsLogger: AAPSLogger): RxBus = RxBusImpl(aapsSchedulers, aapsLogger)
+
+    @Provides
+    @Singleton
+    internal fun provideSchedulers(): AapsSchedulers = AapsSchedulersImpl()
 }
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerProduction.kt b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/logging/AAPSLoggerProduction.kt
similarity index 96%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerProduction.kt
rename to app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/logging/AAPSLoggerProduction.kt
index 4a6bcd8900..7335f9c842 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerProduction.kt
+++ b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/logging/AAPSLoggerProduction.kt
@@ -1,6 +1,8 @@
-package info.nightscout.rx.logging
+package info.nightscout.shared.impl.logging
 
 import info.nightscout.rx.interfaces.L
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.rx.logging.LTag
 import org.slf4j.LoggerFactory
 
 /**
diff --git a/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/rx/AapsSchedulersImpl.kt b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/rx/AapsSchedulersImpl.kt
new file mode 100644
index 0000000000..a4f5c62847
--- /dev/null
+++ b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/rx/AapsSchedulersImpl.kt
@@ -0,0 +1,16 @@
+package info.nightscout.shared.impl.rx
+
+import info.nightscout.rx.AapsSchedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Scheduler
+import io.reactivex.rxjava3.schedulers.Schedulers
+import javax.inject.Singleton
+
+@Singleton
+class AapsSchedulersImpl : AapsSchedulers {
+
+    override val main: Scheduler = AndroidSchedulers.mainThread()
+    override val io: Scheduler = Schedulers.io()
+    override val cpu: Scheduler = Schedulers.computation()
+    override val newThread: Scheduler = Schedulers.newThread()
+}
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/rx/bus/RxBusImpl.kt
similarity index 77%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt
rename to app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/rx/bus/RxBusImpl.kt
index 438fad7ed9..6338303dd3 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/bus/RxBus.kt
+++ b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/impl/rx/bus/RxBusImpl.kt
@@ -1,7 +1,8 @@
-package info.nightscout.rx.bus
+package info.nightscout.shared.impl.rx.bus
 
 import info.nightscout.annotations.OpenForTesting
 import info.nightscout.rx.AapsSchedulers
+import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.Event
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
@@ -12,21 +13,21 @@ import javax.inject.Singleton
 
 @OpenForTesting
 @Singleton
-class RxBus @Inject constructor(
+class RxBusImpl @Inject constructor(
     val aapsSchedulers: AapsSchedulers,
     val aapsLogger: AAPSLogger
-) {
+) : RxBus {
 
     private val publisher = PublishSubject.create<Event>()
 
-    fun send(event: Event) {
+    override fun send(event: Event) {
         aapsLogger.debug(LTag.EVENTS, "Sending $event")
         publisher.onNext(event)
     }
 
     // Listen should return an Observable and not the publisher
     // Using ofType we filter only events that match that class type
-    fun <T : Any> toObservable(eventType: Class<T>): Observable<T> =
+    override fun <T : Any> toObservable(eventType: Class<T>): Observable<T> =
         publisher
             .subscribeOn(aapsSchedulers.io)
             .ofType(eventType)
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/DateUtil.kt b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/utils/DateUtilImpl.kt
similarity index 78%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/DateUtil.kt
rename to app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/utils/DateUtilImpl.kt
index 361a52b600..579c21e60c 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/DateUtil.kt
+++ b/app-wear-shared/shared-impl/src/main/java/info/nightscout/shared/utils/DateUtilImpl.kt
@@ -5,7 +5,7 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.collection.LongSparseArray
 import info.nightscout.annotations.OpenForTesting
-import info.nightscout.shared.R
+import info.nightscout.interfaces.R
 import info.nightscout.shared.SafeParse
 import info.nightscout.shared.interfaces.ResourceHelper
 import org.apache.commons.lang3.time.DateUtils.isSameDay
@@ -40,7 +40,7 @@ import kotlin.math.floor
  */
 @OpenForTesting
 @Singleton
-class DateUtil @Inject constructor(private val context: Context) {
+class DateUtilImpl @Inject constructor(private val context: Context) : DateUtil {
 
     /**
      * The date format in iso.
@@ -55,7 +55,7 @@ class DateUtil @Inject constructor(private val context: Context) {
      * @param isoDateString the iso date string
      * @return the date
      */
-    fun fromISODateString(isoDateString: String): Long {
+    override fun fromISODateString(isoDateString: String): Long {
         val parser = ISODateTimeFormat.dateTimeParser()
         val dateTime = DateTime.parse(isoDateString, parser)
         return dateTime.toDate().time
@@ -67,27 +67,27 @@ class DateUtil @Inject constructor(private val context: Context) {
      * @param date   the date obj
      * @return the iso-formatted date string
      */
-    fun toISOString(date: Long): String {
+    override fun toISOString(date: Long): String {
         val f: DateFormat = SimpleDateFormat(FORMAT_DATE_ISO_OUT, Locale.getDefault())
         f.timeZone = TimeZone.getTimeZone("UTC")
         return f.format(date)
     }
 
     @Suppress("SpellCheckingInspection")
-    fun toISOAsUTC(timestamp: Long): String {
+    override fun toISOAsUTC(timestamp: Long): String {
         val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'0000Z'", Locale.US)
         format.timeZone = TimeZone.getTimeZone("UTC")
         return format.format(timestamp)
     }
 
     @Suppress("SpellCheckingInspection")
-    fun toISONoZone(timestamp: Long): String {
+    override fun toISONoZone(timestamp: Long): String {
         val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)
         format.timeZone = TimeZone.getDefault()
         return format.format(timestamp)
     }
 
-    fun secondsOfTheDayToMilliseconds(seconds: Int): Long {
+    override fun secondsOfTheDayToMilliseconds(seconds: Int): Long {
         val calendar: Calendar = GregorianCalendar()
         calendar[Calendar.MONTH] = 0 // Set january to be sure we miss DST changing
         calendar[Calendar.HOUR_OF_DAY] = seconds / 60 / 60
@@ -96,7 +96,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         return calendar.timeInMillis
     }
 
-    fun toSeconds(hhColonMm: String): Int {
+    override fun toSeconds(hhColonMm: String): Int {
         val p = Pattern.compile("(\\d+):(\\d+)( a.m.| p.m.| AM| PM|AM|PM|)")
         val m = p.matcher(hhColonMm)
         var retVal = 0
@@ -108,12 +108,12 @@ class DateUtil @Inject constructor(private val context: Context) {
         return retVal
     }
 
-    fun dateString(mills: Long): String {
+    override fun dateString(mills: Long): String {
         val df = DateFormat.getDateInstance(DateFormat.SHORT)
         return df.format(mills)
     }
 
-    fun dateStringRelative(mills: Long, rh: ResourceHelper): String {
+    override fun dateStringRelative(mills: Long, rh: ResourceHelper): String {
         val df = DateFormat.getDateInstance(DateFormat.SHORT)
         val day = df.format(mills)
         val beginOfToday = beginOfDay(now())
@@ -133,7 +133,7 @@ class DateUtil @Inject constructor(private val context: Context) {
             }
     }
 
-    fun dateStringShort(mills: Long): String {
+    override fun dateStringShort(mills: Long): String {
         var format = "MM/dd"
         if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "dd/MM"
@@ -141,8 +141,8 @@ class DateUtil @Inject constructor(private val context: Context) {
         return DateTime(mills).toString(DateTimeFormat.forPattern(format))
     }
 
-    fun timeString(): String = timeString(now())
-    fun timeString(mills: Long): String {
+    override fun timeString(): String = timeString(now())
+    override fun timeString(mills: Long): String {
         var format = "hh:mma"
         if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "HH:mm"
@@ -150,16 +150,16 @@ class DateUtil @Inject constructor(private val context: Context) {
         return DateTime(mills).toString(DateTimeFormat.forPattern(format))
     }
 
-    fun secondString(): String = secondString(now())
-    fun secondString(mills: Long): String =
+    override fun secondString(): String = secondString(now())
+    override fun secondString(mills: Long): String =
         DateTime(mills).toString(DateTimeFormat.forPattern("ss"))
 
-    fun minuteString(): String = minuteString(now())
-    fun minuteString(mills: Long): String =
+    override fun minuteString(): String = minuteString(now())
+    override fun minuteString(mills: Long): String =
         DateTime(mills).toString(DateTimeFormat.forPattern("mm"))
 
-    fun hourString(): String = hourString(now())
-    fun hourString(mills: Long): String {
+    override fun hourString(): String = hourString(now())
+    override fun hourString(mills: Long): String {
         var format = "hh"
         if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "HH"
@@ -167,27 +167,27 @@ class DateUtil @Inject constructor(private val context: Context) {
         return DateTime(mills).toString(DateTimeFormat.forPattern(format))
     }
 
-    fun amPm(): String = amPm(now())
-    fun amPm(mills: Long): String =
+    override fun amPm(): String = amPm(now())
+    override fun amPm(mills: Long): String =
         DateTime(mills).toString(DateTimeFormat.forPattern("a"))
 
-    fun dayNameString(format: String = "E"): String = dayNameString(now(), format)
-    fun dayNameString(mills: Long, format: String = "E"): String =
+    override fun dayNameString(format: String): String = dayNameString(now(), format)
+    override fun dayNameString(mills: Long, format: String): String =
         DateTime(mills).toString(DateTimeFormat.forPattern(format))
 
-    fun dayString(): String = dayString(now())
-    fun dayString(mills: Long): String =
+    override fun dayString(): String = dayString(now())
+    override fun dayString(mills: Long): String =
         DateTime(mills).toString(DateTimeFormat.forPattern("dd"))
 
-    fun monthString(format: String = "MMM"): String = monthString(now(), format)
-    fun monthString(mills: Long, format: String = "MMM"): String =
+    override fun monthString(format: String): String = monthString(now(), format)
+    override fun monthString(mills: Long, format: String): String =
         DateTime(mills).toString(DateTimeFormat.forPattern(format))
 
-    fun weekString(): String = weekString(now())
-    fun weekString(mills: Long): String =
+    override fun weekString(): String = weekString(now())
+    override fun weekString(mills: Long): String =
         DateTime(mills).toString(DateTimeFormat.forPattern("ww"))
 
-    fun timeStringWithSeconds(mills: Long): String {
+    override fun timeStringWithSeconds(mills: Long): String {
         var format = "hh:mm:ssa"
         if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "HH:mm:ss"
@@ -195,46 +195,46 @@ class DateUtil @Inject constructor(private val context: Context) {
         return DateTime(mills).toString(DateTimeFormat.forPattern(format))
     }
 
-    fun dateAndTimeRangeString(start: Long, end: Long): String {
+    override fun dateAndTimeRangeString(start: Long, end: Long): String {
         return dateAndTimeString(start) + " - " + timeString(end)
     }
 
-    fun timeRangeString(start: Long, end: Long): String {
+    override fun timeRangeString(start: Long, end: Long): String {
         return timeString(start) + " - " + timeString(end)
     }
 
-    fun dateAndTimeString(mills: Long): String {
+    override fun dateAndTimeString(mills: Long): String {
         return if (mills == 0L) "" else dateString(mills) + " " + timeString(mills)
     }
 
-    fun dateAndTimeAndSecondsString(mills: Long): String {
+    override fun dateAndTimeAndSecondsString(mills: Long): String {
         return if (mills == 0L) "" else dateString(mills) + " " + timeStringWithSeconds(mills)
     }
 
-    fun minAgo(rh: ResourceHelper, time: Long?): String {
+    override fun minAgo(rh: ResourceHelper, time: Long?): String {
         if (time == null) return ""
         val minutes = ((now() - time) / 1000 / 60).toInt()
         return rh.gs(R.string.minago, minutes)
     }
 
-    fun minAgoShort(time: Long?): String {
+    override fun minAgoShort(time: Long?): String {
         if (time == null) return ""
         val minutes = ((time - now()) / 1000 / 60).toInt()
         return (if (minutes > 0) "+" else "") + minutes
     }
 
-    fun minAgoLong(rh: ResourceHelper, time: Long?): String {
+    override fun minAgoLong(rh: ResourceHelper, time: Long?): String {
         if (time == null) return ""
         val minutes = ((now() - time) / 1000 / 60).toInt()
         return rh.gs(R.string.minago_long, minutes)
     }
 
-    fun hourAgo(time: Long, rh: ResourceHelper): String {
+    override fun hourAgo(time: Long, rh: ResourceHelper): String {
         val hours = (now() - time) / 1000.0 / 60 / 60
         return rh.gs(R.string.hoursago, hours)
     }
 
-    fun dayAgo(time: Long, rh: ResourceHelper, round: Boolean = false): String {
+    override fun dayAgo(time: Long, rh: ResourceHelper, round: Boolean): String {
         var days = (now() - time) / 1000.0 / 60 / 60 / 24
         if (round) {
             return if (now() > time) {
@@ -251,7 +251,7 @@ class DateUtil @Inject constructor(private val context: Context) {
             rh.gs(R.string.in_days, days)
     }
 
-    fun beginOfDay(mills: Long): Long {
+    override fun beginOfDay(mills: Long): Long {
         val givenDate = Calendar.getInstance()
         givenDate.timeInMillis = mills
         givenDate[Calendar.HOUR_OF_DAY] = 0
@@ -261,7 +261,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         return givenDate.timeInMillis
     }
 
-    fun timeStringFromSeconds(seconds: Int): String {
+    override fun timeStringFromSeconds(seconds: Int): String {
         val cached = timeStrings[seconds.toLong()]
         if (cached != null) return cached
         val t = timeString(secondsOfTheDayToMilliseconds(seconds))
@@ -269,47 +269,47 @@ class DateUtil @Inject constructor(private val context: Context) {
         return t
     }
 
-    fun timeFrameString(timeInMillis: Long, rh: ResourceHelper): String {
+    override fun timeFrameString(timeInMillis: Long, rh: ResourceHelper): String {
         var remainingTimeMinutes = timeInMillis / (1000 * 60)
         val remainingTimeHours = remainingTimeMinutes / 60
         remainingTimeMinutes %= 60
         return "(" + (if (remainingTimeHours > 0) remainingTimeHours.toString() + rh.gs(R.string.shorthour) + " " else "") + remainingTimeMinutes + "')"
     }
 
-    fun sinceString(timestamp: Long, rh: ResourceHelper): String {
+    override fun sinceString(timestamp: Long, rh: ResourceHelper): String {
         return timeFrameString(System.currentTimeMillis() - timestamp, rh)
     }
 
-    fun untilString(timestamp: Long, rh: ResourceHelper): String {
+    override fun untilString(timestamp: Long, rh: ResourceHelper): String {
         return timeFrameString(timestamp - System.currentTimeMillis(), rh)
     }
 
-    fun now(): Long {
+    override fun now(): Long {
         return System.currentTimeMillis()
     }
 
-    fun nowWithoutMilliseconds(): Long {
+    override fun nowWithoutMilliseconds(): Long {
         var n = System.currentTimeMillis()
         n -= n % 1000
         return n
     }
 
-    fun isOlderThan(date: Long, minutes: Long): Boolean {
+    override fun isOlderThan(date: Long, minutes: Long): Boolean {
         val diff = now() - date
         return diff > T.mins(minutes).msecs()
     }
 
-    fun getTimeZoneOffsetMs(): Long {
+    override fun getTimeZoneOffsetMs(): Long {
         return GregorianCalendar().timeZone.rawOffset.toLong()
     }
 
-    fun getTimeZoneOffsetMinutes(timestamp: Long): Int {
+    override fun getTimeZoneOffsetMinutes(timestamp: Long): Int {
         return TimeZone.getDefault().getOffset(timestamp) / 60000
     }
 
-    fun isSameDay(timestamp1: Long, timestamp2: Long) = isSameDay(Date(timestamp1), Date(timestamp2))
+    override fun isSameDay(timestamp1: Long, timestamp2: Long) = isSameDay(Date(timestamp1), Date(timestamp2))
 
-    fun isSameDayGroup(timestamp1: Long, timestamp2: Long): Boolean {
+    override fun isSameDayGroup(timestamp1: Long, timestamp2: Long): Boolean {
         val now = now()
         if (now in (timestamp1 + 1) until timestamp2 || now in (timestamp2 + 1) until timestamp1)
             return false
@@ -317,7 +317,7 @@ class DateUtil @Inject constructor(private val context: Context) {
     }
 
     //Map:{DAYS=1, HOURS=3, MINUTES=46, SECONDS=40, MILLISECONDS=0, MICROSECONDS=0, NANOSECONDS=0}
-    fun computeDiff(date1: Long, date2: Long): Map<TimeUnit, Long> {
+    override fun computeDiff(date1: Long, date2: Long): Map<TimeUnit, Long> {
         val units: MutableList<TimeUnit> = ArrayList(EnumSet.allOf(TimeUnit::class.java))
         units.reverse()
         val result: MutableMap<TimeUnit, Long> = LinkedHashMap()
@@ -331,7 +331,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         return result
     }
 
-    fun age(milliseconds: Long, useShortText: Boolean, rh: ResourceHelper): String {
+    override fun age(milliseconds: Long, useShortText: Boolean, rh: ResourceHelper): String {
         val diff = computeDiff(0L, milliseconds)
         var days = " " + rh.gs(R.string.days) + " "
         var hours = " " + rh.gs(R.string.hours) + " "
@@ -348,7 +348,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         return result
     }
 
-    fun niceTimeScalar(time: Long, rh: ResourceHelper): String {
+    override fun niceTimeScalar(time: Long, rh: ResourceHelper): String {
         var t = time
         var unit = rh.gs(R.string.unit_second)
         t /= 1000
@@ -378,7 +378,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         return qs(t.toDouble(), 0) + " " + unit
     }
 
-    fun qs(x: Double, numDigits: Int): String {
+    override fun qs(x: Double, numDigits: Int): String {
         var digits = numDigits
         if (digits == -1) {
             digits = 0
@@ -411,7 +411,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         return thisDf?.format(x) ?: ""
     }
 
-    fun formatHHMM(timeAsSeconds: Int): String {
+    override fun formatHHMM(timeAsSeconds: Int): String {
         val hour = timeAsSeconds / 60 / 60
         val minutes = (timeAsSeconds - hour * 60 * 60) / 60
         val df = DecimalFormat("00")
@@ -419,7 +419,7 @@ class DateUtil @Inject constructor(private val context: Context) {
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
-    fun timeZoneByOffset(offsetInMilliseconds: Long): TimeZone =
+    override fun timeZoneByOffset(offsetInMilliseconds: Long): TimeZone =
         TimeZone.getTimeZone(
             if (offsetInMilliseconds == 0L) ZoneId.of("UTC")
             else ZoneId.getAvailableZoneIds()
@@ -430,7 +430,7 @@ class DateUtil @Inject constructor(private val context: Context) {
                 .firstOrNull() ?: ZoneId.of("UTC")
         )
 
-    fun timeStampToUtcDateMillis(timestamp: Long): Long {
+    override fun timeStampToUtcDateMillis(timestamp: Long): Long {
         val current = Calendar.getInstance().apply { timeInMillis = timestamp }
         return Calendar.getInstance().apply {
             set(Calendar.YEAR, current[Calendar.YEAR])
@@ -439,7 +439,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         }.timeInMillis
     }
 
-    fun mergeUtcDateToTimestamp(timestamp: Long, dateUtcMillis: Long): Long {
+    override fun mergeUtcDateToTimestamp(timestamp: Long, dateUtcMillis: Long): Long {
         val selected = Calendar.getInstance().apply { timeInMillis = dateUtcMillis }
         return Calendar.getInstance().apply {
             timeInMillis = timestamp
@@ -449,7 +449,7 @@ class DateUtil @Inject constructor(private val context: Context) {
         }.timeInMillis
     }
 
-    fun mergeHourMinuteToTimestamp(timestamp: Long, hour: Int, minute: Int, randomSecond: Boolean = false): Long {
+    override fun mergeHourMinuteToTimestamp(timestamp: Long, hour: Int, minute: Int, randomSecond: Boolean): Long {
         return Calendar.getInstance().apply {
             timeInMillis = timestamp
             set(Calendar.HOUR_OF_DAY, hour)
diff --git a/app-wear-shared/shared/src/main/res/drawable/background.xml b/app-wear-shared/shared-impl/src/main/res/drawable/background.xml
similarity index 66%
rename from app-wear-shared/shared/src/main/res/drawable/background.xml
rename to app-wear-shared/shared-impl/src/main/res/drawable/background.xml
index 76226923e6..e8f62fdfa3 100644
--- a/app-wear-shared/shared/src/main/res/drawable/background.xml
+++ b/app-wear-shared/shared-impl/src/main/res/drawable/background.xml
@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M0.103,0h24v24h-24z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M0.103,0h24v24h-24z" />
 </vector>
diff --git a/app-wear-shared/shared-impl/src/main/res/drawable/detailed_dial.xml b/app-wear-shared/shared-impl/src/main/res/drawable/detailed_dial.xml
new file mode 100644
index 0000000000..d3a62c944e
--- /dev/null
+++ b/app-wear-shared/shared-impl/src/main/res/drawable/detailed_dial.xml
@@ -0,0 +1,306 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="400dp"
+    android:height="400dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M10.744,0.074L10.885,1.416"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M13.113,22.599L13.254,23.942"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9.504,0.27L9.784,1.591"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M14.214,22.425L14.495,23.745"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8.29,0.595L8.708,1.88"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15.291,22.136L15.708,23.42"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7.118,1.046L7.667,2.279"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16.332,21.737L16.881,22.97"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M4.945,2.3L5.739,3.392"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18.26,20.623L19.053,21.716"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3.969,3.091L4.873,4.094"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19.126,19.922L20.029,20.925"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3.081,3.979L4.084,4.882"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19.914,19.133L20.917,20.037"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M2.291,4.955L3.383,5.749"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M20.616,18.267L21.708,19.061"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M1.036,7.128L2.27,7.677"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21.729,16.339L22.962,16.888"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0.586,8.3L1.871,8.718"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22.128,15.298L23.412,15.715"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0.261,9.514L1.582,9.794"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22.416,14.221L23.737,14.502"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0.065,10.754L1.408,10.895"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22.591,13.12L23.934,13.261"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0.065,13.263L1.408,13.122"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22.591,10.894L23.933,10.753"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0.262,14.503L1.582,14.223"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22.416,9.793L23.737,9.512"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0.587,15.717L1.871,15.299"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M22.128,8.716L23.412,8.299"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M1.037,16.889L2.271,16.34"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M21.728,7.676L22.962,7.126"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M2.291,19.062L3.384,18.268"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M20.615,5.747L21.707,4.954"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3.082,20.038L4.085,19.134"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19.913,4.881L20.917,3.978"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M3.97,20.926L4.874,19.923"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19.125,4.093L20.028,3.09"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M4.946,21.716L5.74,20.624"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M18.258,3.392L19.052,2.299"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M7.119,22.971L7.668,21.737"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M16.33,2.278L16.879,1.045"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M8.292,23.421L8.709,22.137"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15.29,1.879L15.707,0.595"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9.505,23.746L9.786,22.425"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M14.213,1.591L14.494,0.27"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M10.746,23.942L10.887,22.599"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M13.112,1.416L13.253,0.073"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.999,0.008L11.999,2.708"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.999,21.307L11.999,24.008"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M23.999,12L21.298,12"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.699,12L-0.001,12"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M5.999,1.616L7.349,3.954"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16.648,20.061L17.999,22.4"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M22.387,6.001L20.048,7.351"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3.941,16.651L1.602,18.001"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M1.606,6.008L3.945,7.358"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20.052,16.658L22.391,18.008"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17.992,1.612L16.642,3.95"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.342,20.057L5.992,22.396"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+</vector>
diff --git a/app-wear-shared/shared-impl/src/main/res/drawable/hour_hand.xml b/app-wear-shared/shared-impl/src/main/res/drawable/hour_hand.xml
new file mode 100644
index 0000000000..fc748e1b8f
--- /dev/null
+++ b/app-wear-shared/shared-impl/src/main/res/drawable/hour_hand.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="400dp"
+    android:height="400dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.999,4.906c-0.104,0 -0.188,0.084 -0.188,0.188V12c0,0.104 0.084,0.188 0.188,0.188c0.104,0 0.188,-0.084 0.188,-0.188V5.094C12.186,4.99 12.102,4.906 11.999,4.906zM11.999,12.094c-0.047,0 -0.086,-0.038 -0.086,-0.086s0.039,-0.086 0.086,-0.086c0.047,0 0.086,0.038 0.086,0.086S12.046,12.094 11.999,12.094z" />
+</vector>
diff --git a/app-wear-shared/shared-impl/src/main/res/drawable/minute_hand.xml b/app-wear-shared/shared-impl/src/main/res/drawable/minute_hand.xml
new file mode 100644
index 0000000000..8e11c2fa1d
--- /dev/null
+++ b/app-wear-shared/shared-impl/src/main/res/drawable/minute_hand.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="400dp"
+    android:height="400dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.999,1.406c-0.104,0 -0.188,0.084 -0.188,0.188V12c0,0.104 0.084,0.188 0.188,0.188c0.104,0 0.188,-0.084 0.188,-0.188V1.594C12.186,1.49 12.102,1.406 11.999,1.406zM11.999,12.094c-0.047,0 -0.086,-0.038 -0.086,-0.086s0.039,-0.086 0.086,-0.086c0.047,0 0.086,0.038 0.086,0.086S12.046,12.094 11.999,12.094z" />
+</vector>
diff --git a/app-wear-shared/shared-impl/src/main/res/drawable/second_hand.xml b/app-wear-shared/shared-impl/src/main/res/drawable/second_hand.xml
new file mode 100644
index 0000000000..e768022ba5
--- /dev/null
+++ b/app-wear-shared/shared-impl/src/main/res/drawable/second_hand.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="400dp"
+    android:height="400dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF1313"
+        android:pathData="M12.198,11.462v-0.237c0,-0.077 -0.05,-0.131 -0.114,-0.164V0.508c0,-0.047 -0.038,-0.086 -0.086,-0.086c-0.047,0 -0.086,0.038 -0.086,0.086v10.553c-0.063,0.033 -0.114,0.087 -0.114,0.164v0.238c-0.219,0.082 -0.376,0.29 -0.376,0.537s0.157,0.455 0.376,0.537v0.92c0,0.11 0.089,0.2 0.2,0.2s0.2,-0.089 0.2,-0.2v-0.919c0.221,-0.081 0.381,-0.289 0.381,-0.538S12.419,11.543 12.198,11.462zM11.999,12.094c-0.047,0 -0.086,-0.038 -0.086,-0.086s0.039,-0.086 0.086,-0.086c0.047,0 0.086,0.038 0.086,0.086S12.046,12.094 11.999,12.094z" />
+</vector>
diff --git a/app-wear-shared/shared-impl/src/main/res/drawable/simplified_dial.xml b/app-wear-shared/shared-impl/src/main/res/drawable/simplified_dial.xml
new file mode 100644
index 0000000000..aa440fe5ab
--- /dev/null
+++ b/app-wear-shared/shared-impl/src/main/res/drawable/simplified_dial.xml
@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="400dp"
+    android:height="400dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.999,0.008L11.999,2.708"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.999,21.307L11.999,24.008"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M23.999,12L21.298,12"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2.699,12L-0.001,12"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M5.999,1.616L7.349,3.954"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16.648,20.061L17.999,22.4"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M22.387,6.001L20.048,7.351"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3.941,16.651L1.602,18.001"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M1.606,6.008L3.945,7.358"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20.052,16.658L22.391,18.008"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17.992,1.612L16.642,3.95"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.342,20.057L5.992,22.396"
+        android:strokeWidth="0.1417"
+        android:strokeColor="#FFFFFF" />
+</vector>
diff --git a/app-wear-shared/shared/src/main/res/drawable/watchface_custom.png b/app-wear-shared/shared-impl/src/main/res/drawable/watchface_custom.png
similarity index 100%
rename from app-wear-shared/shared/src/main/res/drawable/watchface_custom.png
rename to app-wear-shared/shared-impl/src/main/res/drawable/watchface_custom.png
diff --git a/app-wear-shared/shared-tests/build.gradle b/app-wear-shared/shared-tests/build.gradle
index da77123e24..97a502c731 100644
--- a/app-wear-shared/shared-tests/build.gradle
+++ b/app-wear-shared/shared-tests/build.gradle
@@ -14,16 +14,17 @@ apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 
 android {
     namespace 'info.nightscout.sharedtests'
- }
+}
 
 dependencies {
     implementation project(':database:entities')
-    implementation project(':app-wear-shared:shared')
+    implementation project(':app-wear-shared:shared-impl')
     implementation project(':core:interfaces')
     implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':implementation')
 
+
     api "org.mockito:mockito-junit-jupiter:$mockito_version"
     api "org.mockito.kotlin:mockito-kotlin:5.1.0"
     api "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version"
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerTest.kt b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/AAPSLoggerTest.kt
similarity index 95%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerTest.kt
rename to app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/AAPSLoggerTest.kt
index 88142c93a8..562aa66403 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLoggerTest.kt
+++ b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/AAPSLoggerTest.kt
@@ -1,4 +1,7 @@
-package info.nightscout.rx.logging
+package info.nightscout.sharedtests
+
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.rx.logging.LTag
 
 /**
  * Created by adrian on 2019-12-27.
diff --git a/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBase.kt b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBase.kt
index 1e52c7fbea..dabbc8c6fa 100644
--- a/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBase.kt
+++ b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBase.kt
@@ -2,8 +2,9 @@ package info.nightscout.sharedtests
 
 import android.annotation.SuppressLint
 import info.nightscout.rx.AapsSchedulers
-import info.nightscout.rx.TestAapsSchedulers
-import info.nightscout.rx.logging.AAPSLoggerTest
+import info.nightscout.rx.bus.RxBus
+import info.nightscout.shared.impl.rx.bus.RxBusImpl
+import info.nightscout.sharedtests.rx.TestAapsSchedulers
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.ArgumentMatcher
@@ -20,11 +21,13 @@ open class TestBase {
 
     val aapsLogger = AAPSLoggerTest()
     val aapsSchedulers: AapsSchedulers = TestAapsSchedulers()
+    lateinit var rxBus: RxBus
 
     @BeforeEach
     fun setupLocale() {
         Locale.setDefault(Locale.ENGLISH)
         System.setProperty("disableFirebase", "true")
+        rxBus = RxBusImpl(aapsSchedulers, aapsLogger)
     }
 
     @SuppressLint("CheckResult")
diff --git a/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBaseWithProfile.kt b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBaseWithProfile.kt
index cb2ceb610f..67bb7a48e0 100644
--- a/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBaseWithProfile.kt
+++ b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/TestBaseWithProfile.kt
@@ -19,11 +19,11 @@ import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.profile.ProfileStore
 import info.nightscout.interfaces.utils.DecimalFormatter
 import info.nightscout.interfaces.utils.HardLimits
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ProfileUtil
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import org.json.JSONObject
 import org.junit.jupiter.api.BeforeEach
 import org.mockito.ArgumentMatchers.anyDouble
@@ -49,7 +49,6 @@ open class TestBaseWithProfile : TestBase() {
     lateinit var profileUtil: ProfileUtil
     lateinit var decimalFormatter: DecimalFormatter
     lateinit var hardLimits: HardLimits
-    val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     val profileInjector = HasAndroidInjector {
         AndroidInjector {
@@ -82,7 +81,7 @@ open class TestBaseWithProfile : TestBase() {
         invalidProfileJSON = "{\"dia\":\"1\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
             "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
             "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
-        dateUtil = Mockito.spy(DateUtil(context))
+        dateUtil = Mockito.spy(DateUtilImpl(context))
         decimalFormatter = DecimalFormatterImpl(rh)
         profileUtil = ProfileUtilImpl(sp, decimalFormatter)
         testPumpPlugin = TestPumpPlugin(profileInjector)
diff --git a/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/rx/TestAapsSchedulers.kt b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/rx/TestAapsSchedulers.kt
new file mode 100644
index 0000000000..e9b18431ce
--- /dev/null
+++ b/app-wear-shared/shared-tests/src/main/java/info/nightscout/sharedtests/rx/TestAapsSchedulers.kt
@@ -0,0 +1,17 @@
+package info.nightscout.sharedtests.rx
+
+import info.nightscout.rx.AapsSchedulers
+import io.reactivex.rxjava3.core.Scheduler
+import io.reactivex.rxjava3.schedulers.Schedulers
+
+/**
+ * Created by adrian on 12.04.20.
+ */
+
+class TestAapsSchedulers : AapsSchedulers {
+
+    override val main: Scheduler = Schedulers.trampoline()
+    override val io: Scheduler = Schedulers.trampoline()
+    override val cpu: Scheduler = Schedulers.trampoline()
+    override val newThread: Scheduler = Schedulers.trampoline()
+}
\ No newline at end of file
diff --git a/app-wear-shared/shared/.gitignore b/app-wear-shared/shared/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/app-wear-shared/shared/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/app-wear-shared/shared/build.gradle b/app-wear-shared/shared/build.gradle
deleted file mode 100644
index c97de505bb..0000000000
--- a/app-wear-shared/shared/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-kapt'
-    id 'kotlinx-serialization'
-    id 'kotlin-allopen'
-}
-
-apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
-apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
-
-android {
-
-    namespace 'info.nightscout.shared'
-    defaultConfig {
-        minSdkVersion 25  // for wear
-    }
-}
-
-dependencies {
-    api "androidx.preference:preference-ktx:$preferencektx_version"
-    api "net.danlew:android.joda:$joda_version"
-
-    api "com.google.dagger:dagger:$dagger_version"
-    api "com.google.dagger:dagger-android:$dagger_version"
-    api "com.google.dagger:dagger-android-support:$dagger_version"
-
-    //Logger
-    api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed
-    api 'com.github.tony19:logback-android:2.0.0'
-
-    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version"
-    api "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinx_serialization_version"
-    api "com.caverock:androidsvg:$caverock_androidsvg_version"
-    api "org.apache.commons:commons-lang3:$commonslang3_version"
-
-    //RxBus
-    api "io.reactivex.rxjava3:rxjava:$rxjava_version"
-    api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version"
-    api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
-}
\ No newline at end of file
diff --git a/app-wear-shared/shared/consumer-rules.pro b/app-wear-shared/shared/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app-wear-shared/shared/proguard-rules.pro b/app-wear-shared/shared/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/app-wear-shared/shared/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/AndroidManifest.xml b/app-wear-shared/shared/src/main/AndroidManifest.xml
deleted file mode 100644
index 44008a4332..0000000000
--- a/app-wear-shared/shared/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/AapsSchedulers.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/AapsSchedulers.kt
deleted file mode 100644
index 4377909f3d..0000000000
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/AapsSchedulers.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.rx
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Scheduler
-import io.reactivex.rxjava3.schedulers.Schedulers
-
-/**
- * Created by adrian on 12.04.20.
- */
-
-interface AapsSchedulers {
-    val main: Scheduler
-    val io: Scheduler
-    val cpu: Scheduler
-    val newThread: Scheduler
-}
-
-class DefaultAapsSchedulers : AapsSchedulers {
-    override val main: Scheduler = AndroidSchedulers.mainThread()
-    override val io: Scheduler = Schedulers.io()
-    override val cpu: Scheduler = Schedulers.computation()
-    override val newThread: Scheduler = Schedulers.newThread()
-}
-
-class TestAapsSchedulers : AapsSchedulers {
-    override val main: Scheduler = Schedulers.trampoline()
-    override val io: Scheduler = Schedulers.trampoline()
-    override val cpu: Scheduler = Schedulers.trampoline()
-    override val newThread: Scheduler = Schedulers.trampoline()
-}
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/di/RxModule.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/di/RxModule.kt
deleted file mode 100644
index 0e584cf5e7..0000000000
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/di/RxModule.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package info.nightscout.rx.di
-
-import dagger.Module
-import dagger.Provides
-import info.nightscout.rx.AapsSchedulers
-import info.nightscout.rx.DefaultAapsSchedulers
-import info.nightscout.rx.interfaces.L
-import info.nightscout.rx.logging.AAPSLogger
-import info.nightscout.rx.logging.AAPSLoggerProduction
-import javax.inject.Singleton
-
-@Module(
-    includes = [
-    ]
-)
-open class RxModule {
-
-    @Provides
-    @Singleton
-    internal fun provideSchedulers(): AapsSchedulers = DefaultAapsSchedulers()
-
-    @Provides
-    @Singleton
-    fun provideAAPSLogger(l: L): AAPSLogger = AAPSLoggerProduction(l)
-}
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/di/SharedModule.kt b/app-wear-shared/shared/src/main/java/info/nightscout/shared/di/SharedModule.kt
deleted file mode 100644
index 735de9f807..0000000000
--- a/app-wear-shared/shared/src/main/java/info/nightscout/shared/di/SharedModule.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package info.nightscout.shared.di
-
-import dagger.Module
-
-@Module(
-    includes = [
-    ]
-)
-open class SharedModule
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/res/drawable/detailed_dial.xml b/app-wear-shared/shared/src/main/res/drawable/detailed_dial.xml
deleted file mode 100644
index fa5c92bde2..0000000000
--- a/app-wear-shared/shared/src/main/res/drawable/detailed_dial.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<vector android:height="400dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="400dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="M10.744,0.074L10.885,1.416"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M13.113,22.599L13.254,23.942"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M9.504,0.27L9.784,1.591"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M14.214,22.425L14.495,23.745"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M8.29,0.595L8.708,1.88"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M15.291,22.136L15.708,23.42"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M7.118,1.046L7.667,2.279"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M16.332,21.737L16.881,22.97"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M4.945,2.3L5.739,3.392"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M18.26,20.623L19.053,21.716"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M3.969,3.091L4.873,4.094"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19.126,19.922L20.029,20.925"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M3.081,3.979L4.084,4.882"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19.914,19.133L20.917,20.037"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M2.291,4.955L3.383,5.749"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M20.616,18.267L21.708,19.061"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M1.036,7.128L2.27,7.677"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M21.729,16.339L22.962,16.888"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0.586,8.3L1.871,8.718"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M22.128,15.298L23.412,15.715"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0.261,9.514L1.582,9.794"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M22.416,14.221L23.737,14.502"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0.065,10.754L1.408,10.895"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M22.591,13.12L23.934,13.261"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0.065,13.263L1.408,13.122"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M22.591,10.894L23.933,10.753"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0.262,14.503L1.582,14.223"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M22.416,9.793L23.737,9.512"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0.587,15.717L1.871,15.299"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M22.128,8.716L23.412,8.299"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M1.037,16.889L2.271,16.34"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M21.728,7.676L22.962,7.126"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M2.291,19.062L3.384,18.268"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M20.615,5.747L21.707,4.954"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M3.082,20.038L4.085,19.134"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19.913,4.881L20.917,3.978"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M3.97,20.926L4.874,19.923"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19.125,4.093L20.028,3.09"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M4.946,21.716L5.74,20.624"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M18.258,3.392L19.052,2.299"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M7.119,22.971L7.668,21.737"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M16.33,2.278L16.879,1.045"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M8.292,23.421L8.709,22.137"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M15.29,1.879L15.707,0.595"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M9.505,23.746L9.786,22.425"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M14.213,1.591L14.494,0.27"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M10.746,23.942L10.887,22.599"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M13.112,1.416L13.253,0.073"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M11.999,0.008L11.999,2.708"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M11.999,21.307L11.999,24.008"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M23.999,12L21.298,12"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M2.699,12L-0.001,12"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M5.999,1.616L7.349,3.954"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M16.648,20.061L17.999,22.4"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M22.387,6.001L20.048,7.351"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M3.941,16.651L1.602,18.001"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M1.606,6.008L3.945,7.358"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M20.052,16.658L22.391,18.008"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M17.992,1.612L16.642,3.95"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M7.342,20.057L5.992,22.396"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-</vector>
diff --git a/app-wear-shared/shared/src/main/res/drawable/hour_hand.xml b/app-wear-shared/shared/src/main/res/drawable/hour_hand.xml
deleted file mode 100644
index c29364421b..0000000000
--- a/app-wear-shared/shared/src/main/res/drawable/hour_hand.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="400dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="400dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M11.999,4.906c-0.104,0 -0.188,0.084 -0.188,0.188V12c0,0.104 0.084,0.188 0.188,0.188c0.104,0 0.188,-0.084 0.188,-0.188V5.094C12.186,4.99 12.102,4.906 11.999,4.906zM11.999,12.094c-0.047,0 -0.086,-0.038 -0.086,-0.086s0.039,-0.086 0.086,-0.086c0.047,0 0.086,0.038 0.086,0.086S12.046,12.094 11.999,12.094z"/>
-</vector>
diff --git a/app-wear-shared/shared/src/main/res/drawable/minute_hand.xml b/app-wear-shared/shared/src/main/res/drawable/minute_hand.xml
deleted file mode 100644
index ae37534d34..0000000000
--- a/app-wear-shared/shared/src/main/res/drawable/minute_hand.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="400dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="400dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M11.999,1.406c-0.104,0 -0.188,0.084 -0.188,0.188V12c0,0.104 0.084,0.188 0.188,0.188c0.104,0 0.188,-0.084 0.188,-0.188V1.594C12.186,1.49 12.102,1.406 11.999,1.406zM11.999,12.094c-0.047,0 -0.086,-0.038 -0.086,-0.086s0.039,-0.086 0.086,-0.086c0.047,0 0.086,0.038 0.086,0.086S12.046,12.094 11.999,12.094z"/>
-</vector>
diff --git a/app-wear-shared/shared/src/main/res/drawable/second_hand.xml b/app-wear-shared/shared/src/main/res/drawable/second_hand.xml
deleted file mode 100644
index 96464ba7a8..0000000000
--- a/app-wear-shared/shared/src/main/res/drawable/second_hand.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="400dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="400dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF1313" android:pathData="M12.198,11.462v-0.237c0,-0.077 -0.05,-0.131 -0.114,-0.164V0.508c0,-0.047 -0.038,-0.086 -0.086,-0.086c-0.047,0 -0.086,0.038 -0.086,0.086v10.553c-0.063,0.033 -0.114,0.087 -0.114,0.164v0.238c-0.219,0.082 -0.376,0.29 -0.376,0.537s0.157,0.455 0.376,0.537v0.92c0,0.11 0.089,0.2 0.2,0.2s0.2,-0.089 0.2,-0.2v-0.919c0.221,-0.081 0.381,-0.289 0.381,-0.538S12.419,11.543 12.198,11.462zM11.999,12.094c-0.047,0 -0.086,-0.038 -0.086,-0.086s0.039,-0.086 0.086,-0.086c0.047,0 0.086,0.038 0.086,0.086S12.046,12.094 11.999,12.094z"/>
-</vector>
diff --git a/app-wear-shared/shared/src/main/res/drawable/simplified_dial.xml b/app-wear-shared/shared/src/main/res/drawable/simplified_dial.xml
deleted file mode 100644
index 63cca01bfb..0000000000
--- a/app-wear-shared/shared/src/main/res/drawable/simplified_dial.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<vector android:height="400dp" android:viewportHeight="24"
-    android:viewportWidth="24" android:width="400dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M11.999,0.008L11.999,2.708"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M11.999,21.307L11.999,24.008"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M23.999,12L21.298,12"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M2.699,12L-0.001,12"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M5.999,1.616L7.349,3.954"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M16.648,20.061L17.999,22.4"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M22.387,6.001L20.048,7.351"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M3.941,16.651L1.602,18.001"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M1.606,6.008L3.945,7.358"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M20.052,16.658L22.391,18.008"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M17.992,1.612L16.642,3.95"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-    <path android:fillColor="#FFFFFF"
-        android:pathData="M7.342,20.057L5.992,22.396"
-        android:strokeColor="#FFFFFF" android:strokeWidth="0.1417"/>
-</vector>
diff --git a/app-wear-shared/shared/src/main/res/values-af-rZA/strings.xml b/app-wear-shared/shared/src/main/res/values-af-rZA/strings.xml
deleted file mode 100644
index 6f9ad74f9e..0000000000
--- a/app-wear-shared/shared/src/main/res/values-af-rZA/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="shorthour">h</string>
-    <string name="days">dae</string>
-    <string name="hours">ure</string>
-    <string name="unit_second">sekonde</string>
-    <string name="unit_minute">minuut</string>
-    <string name="unit_hour">uur</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">week</string>
-    <string name="unit_seconds">sekondes</string>
-    <string name="unit_minutes">minute</string>
-    <string name="unit_hours">ure</string>
-    <string name="unit_days">dae</string>
-    <string name="unit_weeks">weke</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <!-- Rx -->
-    <string name="connecting_for">Koppel vir %1$d s</string>
-    <string name="handshaking">Handskudding</string>
-    <string name="connected">Gekoppel</string>
-    <string name="disconnecting">Ontkoppel</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-bg-rBG/strings.xml b/app-wear-shared/shared/src/main/res/values-bg-rBG/strings.xml
deleted file mode 100644
index e23a023f6b..0000000000
--- a/app-wear-shared/shared/src/main/res/values-bg-rBG/strings.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">преди %1$d мин</string>
-    <string name="minago_long">Преди %1$d минути</string>
-    <string name="hoursago">преди %1$.1f ч</string>
-    <string name="days_ago">преди %1$.1f дни</string>
-    <string name="days_ago_round">преди %1$.0f дни</string>
-    <string name="in_days">за %1$.0f дни</string>
-    <string name="in_days_round">за %1$.0f дни</string>
-    <string name="shorthour">ч</string>
-    <string name="days">дни</string>
-    <string name="hours">часа</string>
-    <string name="unit_second">секунда</string>
-    <string name="unit_minute">минута</string>
-    <string name="unit_hour">час</string>
-    <string name="unit_day">ден</string>
-    <string name="unit_week">седмица</string>
-    <string name="unit_seconds">секунди</string>
-    <string name="unit_minutes">минути</string>
-    <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="later_today">По-късно днес</string>
-    <string name="tomorrow">Утре</string>
-    <string name="today">Днес</string>
-    <string name="yesterday">Вчера</string>
-    <!-- Rx -->
-    <string name="connecting_for">Свързване %1$d сек</string>
-    <string name="handshaking">Сдвояване</string>
-    <string name="connected">Свързана</string>
-    <string name="disconnecting">Разкачане</string>
-    <string name="waiting_for_disconnection">Изчакване за разкачане</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Създадено: %1$s</string>
-    <string name="metadata_label_watchface_author">Автор: %1$s</string>
-    <string name="metadata_label_watchface_name">Име: %1$s</string>
-    <string name="metadata_wear_import_filename">Име на файла: %1$s</string>
-    <string name="metadata_label_plugin_version">Plugin версия: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Име: %1$s (%2$s)</string>
-    <string name="pref_show_iob">Покажи IOB</string>
-    <string name="pref_show_detailed_iob">Покажи подробен IOB</string>
-    <string name="pref_show_cob">Покажи COB</string>
-    <string name="pref_show_delta">Покажи Делта</string>
-    <string name="pref_show_detailed_delta">Показвай подробна делта</string>
-    <string name="pref_show_avgdelta">Покажи средна делта</string>
-    <string name="pref_show_phone_battery">Покажи батерия на телефон</string>
-    <string name="pref_show_rig_battery">Покажи батерия на устройство</string>
-    <string name="pref_show_basal_rate">Покажи базал</string>
-    <string name="pref_show_loop_status">Покажи Loop Статус</string>
-    <string name="pref_show_bg">Покажи КЗ</string>
-    <string name="pref_show_bgi">Покажи BGI</string>
-    <string name="pref_show_direction_arrow">Покажи делта стрелка</string>
-    <string name="pref_show_ago">Покажи \"преди\"</string>
-    <string name="default_custom_watchface_comment">Watchface по подразбиране, можете да изберете бутон ЕКСПОРТИРАНЕ НА WATCHFACE за създаване на шаблон</string>
-    <string name="wear_default_watchface">Watchface по подразбиране</string>
-    <string name="cwf_comment_background">Фоново изображение</string>
-    <string name="cwf_comment_chart">Графики (КЗ, базал, прогнозни криви...)</string>
-    <string name="cwf_comment_cover_chart">Изображение над графика и под текстови полета</string>
-    <string name="cwf_comment_freetext1">Свободен текст 1</string>
-    <string name="cwf_comment_freetext2">Свободен текст 2</string>
-    <string name="cwf_comment_freetext3">Свободен текст 3</string>
-    <string name="cwf_comment_freetext4">Свободен текст 4</string>
-    <string name="cwf_comment_iob1">IOB надпис или IOB Общо (при подробен IOB)</string>
-    <string name="cwf_comment_iob2">IOB Общо или (Bolus_IOB|Basal_IOB) при подробен IOB</string>
-    <string name="cwf_comment_cob1">COB надпис</string>
-    <string name="cwf_comment_cob2">COB стойност</string>
-    <string name="cwf_comment_delta">Краткоср. Δ</string>
-    <string name="cwf_comment_avg_delta">Средна делта (15мин)</string>
-    <string name="cwf_comment_uploader_battery">Батерия на телефона (%)</string>
-    <string name="cwf_comment_rig_battery">Global loop батерия (%)</string>
-    <string name="cwf_comment_basalRate">Базал</string>
-    <string name="cwf_comment_bgi">BGI стойност</string>
-    <string name="cwf_comment_time">Време (ЧЧ:MM или ЧЧ:MM:СС)</string>
-    <string name="cwf_comment_hour">Час (ЧЧ)</string>
-    <string name="cwf_comment_minute">Минути (MM)</string>
-    <string name="cwf_comment_second">Секунди (СС)</string>
-    <string name="cwf_comment_timePeriod">AM или PM</string>
-    <string name="cwf_comment_day_name">Ден от седмицата</string>
-    <string name="cwf_comment_day">Ден (ДД)</string>
-    <string name="cwf_comment_month">Месец (кратко)</string>
-    <string name="cwf_comment_loop">Loop статус и \"преди\"</string>
-    <string name="cwf_comment_direction">Делта стрелка</string>
-    <string name="cwf_comment_timestamp">Последно получена КЗ преди минути</string>
-    <string name="cwf_comment_sgv">КЗ стойност</string>
-    <string name="cwf_comment_cover_plate">Изображение над текст (циферблат...)</string>
-    <string name="cwf_comment_hour_hand">Изображение на стрелка за часове (Аналогов часовник)</string>
-    <string name="cwf_comment_minute_hand">Изображение на стрелка за минути (Аналогов часовник)</string>
-    <string name="cwf_comment_second_hand">Изображение на стрелка за секунди (Аналогов часовник)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ca-rES/strings.xml b/app-wear-shared/shared/src/main/res/values-ca-rES/strings.xml
deleted file mode 100644
index e2a9ff86bd..0000000000
--- a/app-wear-shared/shared/src/main/res/values-ca-rES/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">Fa %1$d m</string>
-    <string name="hoursago">Fa %1$.1f h</string>
-    <string name="shorthour">h</string>
-    <string name="days">dies</string>
-    <string name="hours">hores</string>
-    <string name="unit_second">segon</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">setmana</string>
-    <string name="unit_seconds">segons</string>
-    <string name="unit_minutes">minuts</string>
-    <string name="unit_hours">hores</string>
-    <string name="unit_days">dies</string>
-    <string name="unit_weeks">setmanes</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <!-- Rx -->
-    <string name="connecting_for">Connectant %1$d s</string>
-    <string name="handshaking">Establint comunicació</string>
-    <string name="connected">Connectat</string>
-    <string name="disconnecting">Desconnectant</string>
-    <string name="waiting_for_disconnection">S\'està esperant la desconnexió</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-cs-rCZ/strings.xml b/app-wear-shared/shared/src/main/res/values-cs-rCZ/strings.xml
deleted file mode 100644
index 487005d290..0000000000
--- a/app-wear-shared/shared/src/main/res/values-cs-rCZ/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">před %1$d min</string>
-    <string name="minago_long">před %1$d minutamí</string>
-    <string name="hoursago">před %1$.1f h</string>
-    <string name="days_ago">Před %1$.1f dny</string>
-    <string name="days_ago_round">Před %1$.0f dny</string>
-    <string name="in_days">za %1$.0f dní</string>
-    <string name="in_days_round">za %1$.0f dní</string>
-    <string name="shorthour">h</string>
-    <string name="days">dnů</string>
-    <string name="hours">hodin</string>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">hodina</string>
-    <string name="unit_day">den</string>
-    <string name="unit_week">týden</string>
-    <string name="unit_seconds">sekund</string>
-    <string name="unit_minutes">minut</string>
-    <string name="unit_hours">hodin</string>
-    <string name="unit_days">dní</string>
-    <string name="unit_weeks">týdnů</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Později během dneška</string>
-    <string name="tomorrow">Zítra</string>
-    <string name="today">Dnes</string>
-    <string name="yesterday">Včera</string>
-    <!-- Rx -->
-    <string name="connecting_for">Připojování %1$d sec</string>
-    <string name="handshaking">Navazování spojení</string>
-    <string name="connected">Připojeno</string>
-    <string name="disconnecting">Odpojuji</string>
-    <string name="waiting_for_disconnection">Čekám na odpojení</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Vytvořeno: %1$s</string>
-    <string name="metadata_label_watchface_author">Autor: %1$s</string>
-    <string name="metadata_label_watchface_name">Jméno %1$s</string>
-    <string name="metadata_wear_import_filename">Název souboru: %1$s</string>
-    <string name="metadata_label_plugin_version">Verze pluginu: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Jméno: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Informace: %1$s</string>
-    <string name="pref_show_iob">Zobrazit IOB</string>
-    <string name="pref_show_detailed_iob">Zobrazit detailní IOB</string>
-    <string name="pref_show_cob">Zobrazit COB</string>
-    <string name="pref_show_delta">Zobrazit deltu</string>
-    <string name="pref_show_detailed_delta">Zobrazit detailní deltu</string>
-    <string name="pref_show_avgdelta">Zobrazit průměrnou deltu</string>
-    <string name="pref_show_phone_battery">Zobrazit stav baterie telefonu</string>
-    <string name="pref_show_rig_battery">Zobrazit stav baterie dalších zařízení</string>
-    <string name="pref_show_basal_rate">Zobrazit bazál</string>
-    <string name="pref_show_loop_status">Zobrazit stav smyčky</string>
-    <string name="pref_show_bg">Zobrazit glykémii</string>
-    <string name="pref_show_bgi">Zobrazit BGI</string>
-    <string name="pref_show_direction_arrow">Zobrazit trendovou šipku</string>
-    <string name="pref_show_ago">Zobrazit aktualizováno před</string>
-    <string name="pref_show_week_number">Zobrazit číslo týdne</string>
-    <string name="default_custom_watchface_comment">Výchozí ciferník. Můžete kliknout na tlačítko EXPORTOVAT CIFERNÍK pro vygenerování šablony</string>
-    <string name="wear_default_watchface">Výchozí ciferník</string>
-    <string name="cwf_comment_background">Tapeta</string>
-    <string name="cwf_comment_chart">Grafy (glykémie, bazály, křivky předpovědí...)</string>
-    <string name="cwf_comment_cover_chart">Obrázek před grafem a za textovými poli</string>
-    <string name="cwf_comment_freetext1">Volný text 1</string>
-    <string name="cwf_comment_freetext2">Volný text 2</string>
-    <string name="cwf_comment_freetext3">Volný text 3</string>
-    <string name="cwf_comment_freetext4">Volný text 4</string>
-    <string name="cwf_comment_iob1">Štítek IOB nebo suma IOB při zapnutých detailech</string>
-    <string name="cwf_comment_iob2">Suma IOB nebo (Bolus_IOB|Basal_IOB) při zapnutých detailech</string>
-    <string name="cwf_comment_cob1">Štítek COB</string>
-    <string name="cwf_comment_cob2">Hodnota COB</string>
-    <string name="cwf_comment_delta">Krátkodobý průměr</string>
-    <string name="cwf_comment_avg_delta">Průměrný rozdíl glykémií (15min)</string>
-    <string name="cwf_comment_uploader_battery">Baterie telefonu (%)</string>
-    <string name="cwf_comment_rig_battery">Baterie smyčky (%)</string>
-    <string name="cwf_comment_basalRate">Bazální dávka</string>
-    <string name="cwf_comment_bgi">Hodnota BGI</string>
-    <string name="cwf_comment_time">Čas (HH:MM nebo HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Hodiny (HH)</string>
-    <string name="cwf_comment_minute">Minuty (MM)</string>
-    <string name="cwf_comment_second">Sekundy (SS)</string>
-    <string name="cwf_comment_timePeriod">AM nebo PM</string>
-    <string name="cwf_comment_day_name">Jméno dne v týdnu</string>
-    <string name="cwf_comment_day">Den (DD)</string>
-    <string name="cwf_comment_week_number">Číslo týdne (ww)</string>
-    <string name="cwf_comment_month">Název měsíce (krátký)</string>
-    <string name="cwf_comment_loop">Stav smyčky a čas</string>
-    <string name="cwf_comment_direction">Trendová šipka</string>
-    <string name="cwf_comment_timestamp">Před minutami pro poslední přijaté glykémie</string>
-    <string name="cwf_comment_sgv">Hodnota glykémie</string>
-    <string name="cwf_comment_cover_plate">Úvodní obrázek před textem (vytáčení...)</string>
-    <string name="cwf_comment_hour_hand">Obrázek hodinové ručičky (Analogové hodinky)</string>
-    <string name="cwf_comment_minute_hand">Obrázek minutové ručičky (Analogové hodinky)</string>
-    <string name="cwf_comment_second_hand">Obrázek druhé ručičky (Analogové hodinky)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-da-rDK/strings.xml b/app-wear-shared/shared/src/main/res/values-da-rDK/strings.xml
deleted file mode 100644
index c48f52c7d1..0000000000
--- a/app-wear-shared/shared/src/main/res/values-da-rDK/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min. siden</string>
-    <string name="minago_long">%1$d minutter siden</string>
-    <string name="hoursago">%1$.1f t siden</string>
-    <string name="days_ago">%1$.1f dage siden</string>
-    <string name="days_ago_round">%1$.0f dage siden</string>
-    <string name="in_days">om %1$.0f dage</string>
-    <string name="in_days_round">om %1$.0f dage</string>
-    <string name="shorthour">t</string>
-    <string name="days">dage</string>
-    <string name="hours">timer</string>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">time</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">uge</string>
-    <string name="unit_seconds">sekunder</string>
-    <string name="unit_minutes">minutter</string>
-    <string name="unit_hours">timer</string>
-    <string name="unit_days">dage</string>
-    <string name="unit_weeks">uger</string>
-    <string name="shortminute">min</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Senere i dag</string>
-    <string name="tomorrow">I morgen</string>
-    <string name="today">I dag</string>
-    <string name="yesterday">I går</string>
-    <!-- Rx -->
-    <string name="connecting_for">Opretter forbindelse i %1$d s</string>
-    <string name="handshaking">Forbindelse verificeres</string>
-    <string name="connected">Tilsuttet</string>
-    <string name="disconnecting">Afbryder</string>
-    <string name="waiting_for_disconnection">Venter på afbrydelse</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Oprettet den: %1$s</string>
-    <string name="metadata_label_watchface_author">Forfatter: %1$s</string>
-    <string name="metadata_label_watchface_name">Navn: %1$s</string>
-    <string name="metadata_wear_import_filename">Filnavn: %1$s</string>
-    <string name="metadata_label_plugin_version">Plugin version: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Navn: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Oplysning: %1$s</string>
-    <string name="pref_show_iob">Vis IOB</string>
-    <string name="pref_show_detailed_iob">Vis detaljeret IOB</string>
-    <string name="pref_show_cob">Vis COB</string>
-    <string name="pref_show_delta">Vis Delta</string>
-    <string name="pref_show_detailed_delta">Vis detaljeret Delta</string>
-    <string name="pref_show_avgdelta">Show GnsDelta</string>
-    <string name="pref_show_phone_battery">Vis Telefonbatteri</string>
-    <string name="pref_show_rig_battery">Vis Rig-batteri</string>
-    <string name="pref_show_basal_rate">Vis Basalrate</string>
-    <string name="pref_show_loop_status">Vis Loop-status</string>
-    <string name="pref_show_bg">Vis BS</string>
-    <string name="pref_show_bgi">Vis BSI</string>
-    <string name="pref_show_direction_arrow">Vis Retningspil</string>
-    <string name="pref_show_ago">Vis alder</string>
-    <string name="pref_show_week_number">Vis ugenummer</string>
-    <string name="default_custom_watchface_comment">Standard urskive, du kan klikke på EKSPORTÉR URSKIVE-knappen for at generere en skabelon</string>
-    <string name="wear_default_watchface">Standard Urskive</string>
-    <string name="cwf_comment_background">Baggrundsbillede</string>
-    <string name="cwf_comment_chart">Grafer (BS, basal, prognoselinjer...)</string>
-    <string name="cwf_comment_cover_chart">Billede foran graf og bag tekstfelter</string>
-    <string name="cwf_comment_freetext1">Fritekst 1</string>
-    <string name="cwf_comment_freetext2">Fri tekst 2</string>
-    <string name="cwf_comment_freetext3">Fri tekst 3</string>
-    <string name="cwf_comment_freetext4">Fri tekst 4</string>
-    <string name="cwf_comment_iob1">IOB-etiket eller IOB-sum, hvis givet</string>
-    <string name="cwf_comment_iob2">IOB-sum eller (Bolus_IOB|Basal_IOB) hvis givet</string>
-    <string name="cwf_comment_cob1">COB-etiket</string>
-    <string name="cwf_comment_cob2">COB-værdi</string>
-    <string name="cwf_comment_delta">Kort BG-delta</string>
-    <string name="cwf_comment_avg_delta">Gennemsnitlig BG-delta (15min)</string>
-    <string name="cwf_comment_uploader_battery">Telefonbatteri (%)</string>
-    <string name="cwf_comment_rig_battery">Globalt loop batteri (%)</string>
-    <string name="cwf_comment_basalRate">Basalrate</string>
-    <string name="cwf_comment_bgi">BGI-værdi</string>
-    <string name="cwf_comment_time">Tid (TT:MM eller TT:MM:SS)</string>
-    <string name="cwf_comment_hour">Time (TT)</string>
-    <string name="cwf_comment_minute">Minut (MM)</string>
-    <string name="cwf_comment_second">Sekund (SS)</string>
-    <string name="cwf_comment_timePeriod">AM eller PM</string>
-    <string name="cwf_comment_day_name">Navn på ugedag</string>
-    <string name="cwf_comment_day">Dag (DD)</string>
-    <string name="cwf_comment_week_number">Ugenummer (uu)</string>
-    <string name="cwf_comment_month">Måned navn (kort)</string>
-    <string name="cwf_comment_loop">Loop status og tid</string>
-    <string name="cwf_comment_direction">Retningspil</string>
-    <string name="cwf_comment_timestamp">Minutter siden sidst modtaget BS</string>
-    <string name="cwf_comment_sgv">BS-værdi</string>
-    <string name="cwf_comment_cover_plate">Dækbillede foran tekst (opkald...)</string>
-    <string name="cwf_comment_hour_hand">Billede af timeviser (Analogur)</string>
-    <string name="cwf_comment_minute_hand">Billede af minutviser (Analogur)</string>
-    <string name="cwf_comment_second_hand">Billede af sekundviser (Analogur)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-de-rDE/strings.xml b/app-wear-shared/shared/src/main/res/values-de-rDE/strings.xml
deleted file mode 100644
index 94321c069d..0000000000
--- a/app-wear-shared/shared/src/main/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <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="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">h</string>
-    <string name="days">Tage</string>
-    <string name="hours">Stunden</string>
-    <string name="unit_second">Sekunde</string>
-    <string name="unit_minute">Minute</string>
-    <string name="unit_hour">Stunde</string>
-    <string name="unit_day">Tag</string>
-    <string name="unit_week">Woche</string>
-    <string name="unit_seconds">Sekunden</string>
-    <string name="unit_minutes">Minuten</string>
-    <string name="unit_hours">Stunden</string>
-    <string name="unit_days">Tage</string>
-    <string name="unit_weeks">Wochen</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>
-    <!-- Rx -->
-    <string name="connecting_for">Verbindungsaufbau seit %1$d s</string>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Verbunden</string>
-    <string name="disconnecting">Verbindung wird getrennt</string>
-    <string name="waiting_for_disconnection">Warte auf Trennung der Verbindung</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Erstellt am: %1$s</string>
-    <string name="metadata_label_watchface_author">Autor: %1$s</string>
-    <string name="metadata_label_watchface_name">Name: %1$s</string>
-    <string name="metadata_wear_import_filename">Dateiname: %1$s</string>
-    <string name="metadata_label_plugin_version">Plugin-Version: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Name: %1$s (%2$s)</string>
-    <string name="pref_show_iob">IOB anzeigen</string>
-    <string name="pref_show_detailed_iob">Zeige detailliertes IOB</string>
-    <string name="pref_show_cob">COB anzeigen</string>
-    <string name="pref_show_delta">Abweichung anzeigen</string>
-    <string name="pref_show_detailed_delta">Zeige detailliertes Delta</string>
-    <string name="pref_show_avgdelta">Durchschnittl. Abweichung anzeigen</string>
-    <string name="pref_show_phone_battery">Akkustand Smartphone</string>
-    <string name="pref_show_rig_battery">Akkustand Rig</string>
-    <string name="pref_show_basal_rate">Basalrate anzeigen</string>
-    <string name="pref_show_loop_status">Loop Status anzeigen</string>
-    <string name="pref_show_bg">BZ anzeigen</string>
-    <string name="pref_show_bgi">Zeige BGI</string>
-    <string name="pref_show_direction_arrow">Trendpfeil anzeigen</string>
-    <string name="pref_show_ago">Min. seit letztem Wert</string>
-    <string name="default_custom_watchface_comment">Standard-Watchface, Du kannst auf den Knopf WATCHFACE exportieren drücken, um eine Vorlage zu generieren</string>
-    <string name="wear_default_watchface">Standard-Watchface</string>
-    <string name="cwf_comment_background">Hintergrundbild</string>
-    <string name="cwf_comment_chart">Diagramme (BG, Basal, Vorhersage...)</string>
-    <string name="cwf_comment_cover_chart">Bild vor Graph und hinter Textfeldern</string>
-    <string name="cwf_comment_freetext1">Freitextfeld 1</string>
-    <string name="cwf_comment_freetext2">Freitextfeld 2</string>
-    <string name="cwf_comment_freetext3">Freitextfeld 3</string>
-    <string name="cwf_comment_freetext4">Freitextfeld 4</string>
-    <string name="cwf_comment_iob1">IOB Bezeichnung oder IOB Sum wenn detailliert</string>
-    <string name="cwf_comment_iob2">IOB-Summe oder (Bolus_IOB|Basal_IOB) wenn detailliert</string>
-    <string name="cwf_comment_cob1">COB-Bezeichnung</string>
-    <string name="cwf_comment_cob2">COB-Wert</string>
-    <string name="cwf_comment_delta">Kurzes BG Delta</string>
-    <string name="cwf_comment_avg_delta">Durchschnittliches BG-Delta (15min)</string>
-    <string name="cwf_comment_uploader_battery">Telefon-Akku (%)</string>
-    <string name="cwf_comment_rig_battery">Globale Loop Akku (%)</string>
-    <string name="cwf_comment_basalRate">Basalrate</string>
-    <string name="cwf_comment_bgi">BGI-Wert</string>
-    <string name="cwf_comment_time">Uhrzeit (HH:MM oder HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Stunde (HH)</string>
-    <string name="cwf_comment_minute">Minuten (MM)</string>
-    <string name="cwf_comment_second">Sekunde (SS)</string>
-    <string name="cwf_comment_timePeriod">AM oder PM</string>
-    <string name="cwf_comment_day_name">Wochentagname</string>
-    <string name="cwf_comment_day">Tag (DD)</string>
-    <string name="cwf_comment_month">Monatsname (kurz)</string>
-    <string name="cwf_comment_loop">Loop-Status und Historie</string>
-    <string name="cwf_comment_direction">Richtungspfeil</string>
-    <string name="cwf_comment_timestamp">Minuten vor dem letzten erhaltenen BG</string>
-    <string name="cwf_comment_sgv">Blutzuckerwert</string>
-    <string name="cwf_comment_cover_plate">Titelbild vor dem Text (wählen...)</string>
-    <string name="cwf_comment_hour_hand">Bild des Stundenzeiger (Analog Uhr)</string>
-    <string name="cwf_comment_minute_hand">Bild des Minutenzeiger (Analog Uhr)</string>
-    <string name="cwf_comment_second_hand">Bild des Sekundenzeigers (Analog Uhr)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-el-rGR/strings.xml b/app-wear-shared/shared/src/main/res/values-el-rGR/strings.xml
deleted file mode 100644
index e8c20ac480..0000000000
--- a/app-wear-shared/shared/src/main/res/values-el-rGR/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d λ πριν</string>
-    <string name="minago_long">%1$d λεπτά πριν</string>
-    <string name="hoursago">%1$.1f ω πριν</string>
-    <string name="days_ago">%1$.1f ημέρες πριν</string>
-    <string name="days_ago_round">%1$.0f ημέρες πριν</string>
-    <string name="in_days">σε %1$.0f ημέρες</string>
-    <string name="in_days_round">σε %1$.0f ημέρες</string>
-    <string name="shorthour">h</string>
-    <string name="days">ημέρες</string>
-    <string name="hours">ώρες</string>
-    <string name="unit_second">δευτερόλεπτο</string>
-    <string name="unit_minute">λεπτό</string>
-    <string name="unit_hour">ώρα</string>
-    <string name="unit_day">ημέρα</string>
-    <string name="unit_week">εβδομάδα</string>
-    <string name="unit_seconds">δευτερόλεπτα</string>
-    <string name="unit_minutes">λεπτά</string>
-    <string name="unit_hours">ώρες</string>
-    <string name="unit_days">ημέρες</string>
-    <string name="unit_weeks">εβδομάδες</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">ημ</string>
-    <string name="later_today">Αργότερα σήμερα</string>
-    <string name="tomorrow">Αύριο</string>
-    <string name="today">Σήμερα</string>
-    <string name="yesterday">Χθες</string>
-    <!-- Rx -->
-    <string name="connecting_for">Σύνδεση για %1$d δευτερόλεπτα</string>
-    <string name="handshaking">Δημιουργία σύνδεσης</string>
-    <string name="connected">Συνδέθηκε</string>
-    <string name="disconnecting">Αποσυνδέεται</string>
-    <string name="waiting_for_disconnection">Αναμονή για αποσύνδεση</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Δημιουργήθηκε: %1$s</string>
-    <string name="metadata_label_watchface_author">Συντάκτης: %1$s</string>
-    <string name="metadata_label_watchface_name">Όνομα: %1$s</string>
-    <string name="metadata_wear_import_filename">Όνομα αρχείου: %1$s</string>
-    <string name="metadata_label_plugin_version">Έκδοση πρόσθετου: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Όνομα: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Πληροφορίες: %1$s</string>
-    <string name="pref_show_iob">Εμφάνιση IOB</string>
-    <string name="pref_show_detailed_iob">Εμφάνιση λεπτομερούς IOB</string>
-    <string name="pref_show_cob">Εμφάνιση COB</string>
-    <string name="pref_show_delta">Εμφάνιση Διαφοράς</string>
-    <string name="pref_show_detailed_delta">Εμφάνιση λεπτομερούς Διαφοράς</string>
-    <string name="pref_show_avgdelta">Εμφάνιση Μέσης Διαφοράς</string>
-    <string name="pref_show_phone_battery">Εμφάνιση Μπαταρίας Τηλεφώνου</string>
-    <string name="pref_show_rig_battery">Εμφάνιση Μπαταρίας Rig</string>
-    <string name="pref_show_basal_rate">Εμφάνιση Βασικού Ρυθμού</string>
-    <string name="pref_show_loop_status">Εμφάνιση Κατάστασης Κυκλώματος</string>
-    <string name="pref_show_bg">Εμφάνιση γλυκόζης αίματος</string>
-    <string name="pref_show_bgi">Εμφάνιση BGI</string>
-    <string name="pref_show_direction_arrow">Εμφάνιση Βέλους Κατεύθυνσης</string>
-    <string name="pref_show_ago">Εμφάνιση Πριν</string>
-    <string name="pref_show_week_number">Εμφάνιση αριθμού Εβδομάδας</string>
-    <string name="default_custom_watchface_comment">Προεπιλεγμένη πρόσοψη ρολογιού, μπορείτε να κάνετε κλικ στο κουμπί ΕΞΑΓΩΓΗ ΠΡΟΣΟΨΗΣ για να δημιουργήσετε ένα πρότυπο</string>
-    <string name="wear_default_watchface">Προεπιλεγμένη πρόσοψη ρολογιού</string>
-    <string name="cwf_comment_background">Εικόνα φόντου</string>
-    <string name="cwf_comment_chart">Γραφήματα (BG, βασικός, γραμμές πρόβλεψης...)</string>
-    <string name="cwf_comment_cover_chart">Εικόνα μπροστά από το γράφημα και πίσω από τα πεδία κειμένου</string>
-    <string name="cwf_comment_freetext1">Ελεύθερο κείμενο 1</string>
-    <string name="cwf_comment_freetext2">Ελεύθερο κείμενο 2</string>
-    <string name="cwf_comment_freetext3">Ελεύθερο κείμενο 3</string>
-    <string name="cwf_comment_freetext4">Ελεύθερο κείμενο 4</string>
-    <string name="cwf_comment_iob1">Ετικέτα IOB ή Άθροισμα IOB εάν είναι λεπτομερές</string>
-    <string name="cwf_comment_iob2">Άθροισμα IOB ή (Bolus_IOB|Basal_IOB) εάν είναι λεπτομερές</string>
-    <string name="cwf_comment_cob1">Ετικέτα COB</string>
-    <string name="cwf_comment_cob2">Τιμή COB</string>
-    <string name="cwf_comment_delta">Βραχυπρόθεσμη διαφορά BG</string>
-    <string name="cwf_comment_avg_delta">Μέση διαφορά BG (15λεπτά)</string>
-    <string name="cwf_comment_uploader_battery">Μπαταρία τηλεφώνου (%)</string>
-    <string name="cwf_comment_rig_battery">Μπαταρία συνολικού κυκλώματος (%)</string>
-    <string name="cwf_comment_basalRate">Βασικός Ρυθμός</string>
-    <string name="cwf_comment_bgi">Τιμή BGI</string>
-    <string name="cwf_comment_time">Ώρα (ΩΩ:ΛΛ ή ΩΩ:ΜΜ:ΣΣ)</string>
-    <string name="cwf_comment_hour">Ώρα (HH)</string>
-    <string name="cwf_comment_minute">Λεπτό (MM)</string>
-    <string name="cwf_comment_second">Δευτερόλεπτο (SS)</string>
-    <string name="cwf_comment_timePeriod">ΠΜ ή ΜΜ</string>
-    <string name="cwf_comment_day_name">Όνομα της ημέρας της εβδομάδας</string>
-    <string name="cwf_comment_day">Ημέρα (DD)</string>
-    <string name="cwf_comment_week_number">Αριθμός Εβδομάδας (ww)</string>
-    <string name="cwf_comment_month">Όνομα μήνα (σύντομο)</string>
-    <string name="cwf_comment_loop">Κατάσταση κυκλώματος και πριν</string>
-    <string name="cwf_comment_direction">Βέλος κατεύθυνσης</string>
-    <string name="cwf_comment_timestamp">Λεπτά πριν από την τελευταία λήψη BG</string>
-    <string name="cwf_comment_sgv">Τιμή γλυκόζης αίματος</string>
-    <string name="cwf_comment_cover_plate">Εικόνα εξωφύλλου μπροστά από το κείμενο (κλήσεις...)</string>
-    <string name="cwf_comment_hour_hand">Εικόνα ώρας χεριού (Αναλογικό ρολόι)</string>
-    <string name="cwf_comment_minute_hand">Εικόνα λεπτού χεριού (Αναλογικό ρολόι)</string>
-    <string name="cwf_comment_second_hand">Εικόνα δευτερολέπτου χεριού (Αναλογικό ρολόι)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml b/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml
deleted file mode 100644
index 612aa4de1c..0000000000
--- a/app-wear-shared/shared/src/main/res/values-es-rES/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">hace %1$d m</string>
-    <string name="minago_long">Hace %1$d minutos</string>
-    <string name="hoursago">hace %1$.1f h</string>
-    <string name="days_ago">Hace %1$.1f día</string>
-    <string name="days_ago_round">Hace %1$.0f días</string>
-    <string name="in_days">en %1$.0f días</string>
-    <string name="in_days_round">en %1$.0f días</string>
-    <string name="shorthour">h</string>
-    <string name="days">días</string>
-    <string name="hours">horas</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">día</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">días</string>
-    <string name="unit_weeks">semanas</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Más tarde hoy</string>
-    <string name="tomorrow">Mañana</string>
-    <string name="today">Hoy</string>
-    <string name="yesterday">Ayer</string>
-    <!-- Rx -->
-    <string name="connecting_for">Conectando durante %1$d s</string>
-    <string name="handshaking">Estableciendo comunicación</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnecting">Desconectando</string>
-    <string name="waiting_for_disconnection">Esperando la desconexión</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Creada: %1$s</string>
-    <string name="metadata_label_watchface_author">Autor: %1$s</string>
-    <string name="metadata_label_watchface_name">Nombre: %1$s</string>
-    <string name="metadata_wear_import_filename">Nombre del archivo: %1$s</string>
-    <string name="metadata_label_plugin_version">Versión del plugin: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Nombre: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Info: %1$s</string>
-    <string name="pref_show_iob">Mostrar IOB</string>
-    <string name="pref_show_detailed_iob">Mostrar IOB detallada</string>
-    <string name="pref_show_cob">Mostrar COB</string>
-    <string name="pref_show_delta">Mostrar delta</string>
-    <string name="pref_show_detailed_delta">Mostrar delta detallado</string>
-    <string name="pref_show_avgdelta">Mostrar delta promedio</string>
-    <string name="pref_show_phone_battery">Mostrar batería del teléfono</string>
-    <string name="pref_show_rig_battery">Mostrar batería global del bucle</string>
-    <string name="pref_show_basal_rate">Mostrar la tasa basal</string>
-    <string name="pref_show_loop_status">Mostrar estado del bucle</string>
-    <string name="pref_show_bg">Mostrar glucosa</string>
-    <string name="pref_show_bgi">Mostrar BGI (Índice de glucosa en sangre)</string>
-    <string name="pref_show_direction_arrow">Mostrar flecha de dirección</string>
-    <string name="pref_show_ago">Mostrar \"hace\"</string>
-    <string name="pref_show_week_number">Mostrar número de semana</string>
-    <string name="default_custom_watchface_comment">Esfera predeterminada, puedes hacer clic en el botón EXPORTAR ESFERA para generar una plantilla</string>
-    <string name="wear_default_watchface">Esfera por defecto</string>
-    <string name="cwf_comment_background">Imagen de fondo</string>
-    <string name="cwf_comment_chart">Gráficos (glucosa, basal, líneas de predicción...)</string>
-    <string name="cwf_comment_cover_chart">Imagen frente al gráfico y detrás de campos de texto</string>
-    <string name="cwf_comment_freetext1">Texto libre 1</string>
-    <string name="cwf_comment_freetext2">Texto libre 2</string>
-    <string name="cwf_comment_freetext3">Texto libre 3</string>
-    <string name="cwf_comment_freetext4">Texto libre 4</string>
-    <string name="cwf_comment_iob1">Etiqueta IOB o Suma IOB si es detallada</string>
-    <string name="cwf_comment_iob2">Suma de IOB o (Bolos_IOB|Basal_IOB) si se detalla</string>
-    <string name="cwf_comment_cob1">Etiqueta COB</string>
-    <string name="cwf_comment_cob2">Valor COB</string>
-    <string name="cwf_comment_delta">Delta corto de glucosa</string>
-    <string name="cwf_comment_avg_delta">Delta promedio de glucosa (15min)</string>
-    <string name="cwf_comment_uploader_battery">Batería del teléfono (%)</string>
-    <string name="cwf_comment_rig_battery">Batería global de bucle(%)</string>
-    <string name="cwf_comment_basalRate">Tasa Basal</string>
-    <string name="cwf_comment_bgi">Valor BGI</string>
-    <string name="cwf_comment_time">Tiempo (HH:MM o HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Hora (HH)</string>
-    <string name="cwf_comment_minute">Minuto (MM)</string>
-    <string name="cwf_comment_second">Segundo (SS)</string>
-    <string name="cwf_comment_timePeriod">AM o PM</string>
-    <string name="cwf_comment_day_name">Nombre del día de la semana</string>
-    <string name="cwf_comment_day">Día (DD)</string>
-    <string name="cwf_comment_week_number">Número de semana (ww)</string>
-    <string name="cwf_comment_month">Nombre del mes (corto)</string>
-    <string name="cwf_comment_loop">Estado del bucle y hace</string>
-    <string name="cwf_comment_direction">Flecha de dirección</string>
-    <string name="cwf_comment_timestamp">Minutos atrás del último valor de glucosa recibido</string>
-    <string name="cwf_comment_sgv">Valor de glucosa</string>
-    <string name="cwf_comment_cover_plate">Imagen de portada delante del texto (diales...)</string>
-    <string name="cwf_comment_hour_hand">Imagen de la aguja horaria (reloj analógico)</string>
-    <string name="cwf_comment_minute_hand">Imagen del minutero (reloj analógico)</string>
-    <string name="cwf_comment_second_hand">Imagen del segundero (reloj analógico)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml b/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml
deleted file mode 100644
index d5f9159194..0000000000
--- a/app-wear-shared/shared/src/main/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">il y a %1$d m</string>
-    <string name="minago_long">Il y a %1$d minutes</string>
-    <string name="hoursago">il y a %1$.1f h</string>
-    <string name="days_ago">Il y a %1$.1f jours</string>
-    <string name="days_ago_round">Il y a %1$.0f jours</string>
-    <string name="in_days">en %1$.0f jours</string>
-    <string name="in_days_round">en %1$.0f jours</string>
-    <string name="shorthour">h</string>
-    <string name="days">jours</string>
-    <string name="hours">heures</string>
-    <string name="unit_second">seconde</string>
-    <string name="unit_minute">minute</string>
-    <string name="unit_hour">heure</string>
-    <string name="unit_day">jour</string>
-    <string name="unit_week">semaine</string>
-    <string name="unit_seconds">secondes</string>
-    <string name="unit_minutes">minutes</string>
-    <string name="unit_hours">heures</string>
-    <string name="unit_days">jours</string>
-    <string name="unit_weeks">semaines</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">j</string>
-    <string name="later_today">Plus tard aujourd\'hui</string>
-    <string name="tomorrow">Demain</string>
-    <string name="today">Aujourd’hui</string>
-    <string name="yesterday">Hier</string>
-    <!-- Rx -->
-    <string name="connecting_for">Connexion en cours %1$ds</string>
-    <string name="handshaking">Connexion</string>
-    <string name="connected">Connectée</string>
-    <string name="disconnecting">Déconnexion en cours</string>
-    <string name="waiting_for_disconnection">Attente de déconnexion</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Créé le : %1$s</string>
-    <string name="metadata_label_watchface_author">Auteur : %1$s</string>
-    <string name="metadata_label_watchface_name">Nom : %1$s</string>
-    <string name="metadata_wear_import_filename">Nom du fichier : %1$s</string>
-    <string name="metadata_label_plugin_version">Version du plugin : %1$s</string>
-    <string name="metadata_label_watchface_name_version">Nom : %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Infos : %1$s</string>
-    <string name="pref_show_iob">Afficher IA</string>
-    <string name="pref_show_detailed_iob">Afficher IA détaillée</string>
-    <string name="pref_show_cob">Afficher GA</string>
-    <string name="pref_show_delta">Montrer le delta</string>
-    <string name="pref_show_detailed_delta">Afficher Delta Détaillé</string>
-    <string name="pref_show_avgdelta">Afficher le delta moyen</string>
-    <string name="pref_show_phone_battery">Afficher la batterie du téléphone</string>
-    <string name="pref_show_rig_battery">Afficher la batterie de la plateforme </string>
-    <string name="pref_show_basal_rate">Afficher Basale</string>
-    <string name="pref_show_loop_status">Afficher État Boucle</string>
-    <string name="pref_show_bg">Afficher Glycémie</string>
-    <string name="pref_show_bgi">Afficher IGly</string>
-    <string name="pref_show_direction_arrow">Afficher Flèche</string>
-    <string name="pref_show_ago">Afficher Min Passées</string>
-    <string name="pref_show_week_number">Afficher numéro semaine</string>
-    <string name="default_custom_watchface_comment">Cadran par défaut, vous pouvez cliquer sur le bouton EXPORTER WATCHFACE pour générer un modèle</string>
-    <string name="wear_default_watchface">Cadran par défaut</string>
-    <string name="cwf_comment_background">Image d\'arrière-plan</string>
-    <string name="cwf_comment_chart">Graphiques (Gly, basal, lignes de prédiction...)</string>
-    <string name="cwf_comment_cover_chart">Image devant le graphique et derrière les champs de texte</string>
-    <string name="cwf_comment_freetext1">Texte libre 1</string>
-    <string name="cwf_comment_freetext2">Texte libre 2</string>
-    <string name="cwf_comment_freetext3">Texte libre 3</string>
-    <string name="cwf_comment_freetext4">Texte libre 4</string>
-    <string name="cwf_comment_iob1">Libellé \"IA\" ou valeur IA globale si détaillé Ok</string>
-    <string name="cwf_comment_iob2">Valeur IA globale ou (IA_Bolus|IA_Basal) si détaillé Ok</string>
-    <string name="cwf_comment_cob1">Libellé \"GA\"</string>
-    <string name="cwf_comment_cob2">Valeur de GA</string>
-    <string name="cwf_comment_delta">Delta Glycémie (5min)</string>
-    <string name="cwf_comment_avg_delta">Delta glycémie moyen (15min)</string>
-    <string name="cwf_comment_uploader_battery">Batterie du téléphone (%)</string>
-    <string name="cwf_comment_rig_battery">Batterie de la boucle globale (%)</string>
-    <string name="cwf_comment_basalRate">Débit Basal</string>
-    <string name="cwf_comment_bgi">Valeur de IGly</string>
-    <string name="cwf_comment_time">Heure (HH:MM ou HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Heure (HH)</string>
-    <string name="cwf_comment_minute">Minute (MM)</string>
-    <string name="cwf_comment_second">Seconde (SS)</string>
-    <string name="cwf_comment_timePeriod">AM ou PM</string>
-    <string name="cwf_comment_day_name">Nom du jour de la semaine</string>
-    <string name="cwf_comment_day">Jour (JJ)</string>
-    <string name="cwf_comment_week_number">Numéro de semaine (ww)</string>
-    <string name="cwf_comment_month">Nom du mois (court)</string>
-    <string name="cwf_comment_loop">État de la boucle et délais</string>
-    <string name="cwf_comment_direction">Flèche de direction</string>
-    <string name="cwf_comment_timestamp">Minutes depuis la dernière Glycémie reçue</string>
-    <string name="cwf_comment_sgv">Valeur de Ia Gly</string>
-    <string name="cwf_comment_cover_plate">Image de couverture devant le texte (cadrans...)</string>
-    <string name="cwf_comment_hour_hand">Image de l\'aiģuille de l\'heure (Montre Analogique)</string>
-    <string name="cwf_comment_minute_hand">Image de l\'aiguille des minutes (Montre Analogique)</string>
-    <string name="cwf_comment_second_hand">Image de l\'aiguille des secondes (Montre Analogique)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ga-rIE/strings.xml b/app-wear-shared/shared/src/main/res/values-ga-rIE/strings.xml
deleted file mode 100644
index 7f4c422d88..0000000000
--- a/app-wear-shared/shared/src/main/res/values-ga-rIE/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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>
-    <!-- Rx -->
-    <string name="connecting_for">Ag nascadh le %1$d s</string>
-    <string name="connected">Nasctha</string>
-    <string name="disconnecting">Dícheangal</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml b/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml
deleted file mode 100644
index a098b3c42d..0000000000
--- a/app-wear-shared/shared/src/main/res/values-hr-rHR/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="days_ago">Prije %1$.1f dana</string>
-    <string name="days_ago_round">Prije %1$.0f dana</string>
-    <string name="today">Danas</string>
-    <!-- Rx -->
-    <string name="connecting_for">Povezivanje %1$d s</string>
-    <string name="handshaking">Povezivanje</string>
-    <string name="connected">Povezano</string>
-    <string name="disconnecting">Odspajanje</string>
-    <string name="waiting_for_disconnection">Čeka se prekid veze</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-hu-rHU/strings.xml b/app-wear-shared/shared/src/main/res/values-hu-rHU/strings.xml
deleted file mode 100644
index a30f9e054a..0000000000
--- a/app-wear-shared/shared/src/main/res/values-hu-rHU/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="shortminute">p</string>
-    <string name="shortday">n</string>
-    <!-- Rx -->
-    <string name="connected">Kapcsolódva</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml b/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml
deleted file mode 100644
index f6dc6021a6..0000000000
--- a/app-wear-shared/shared/src/main/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d m fa</string>
-    <string name="minago_long">%1$d minuti fa</string>
-    <string name="hoursago">%1$.1f h fa</string>
-    <string name="days_ago">%1$.1f giorni fa</string>
-    <string name="days_ago_round">%1$.0f giorni fa</string>
-    <string name="in_days">in %1$.0f giorni</string>
-    <string name="in_days_round">in %1$.0f giorni</string>
-    <string name="shorthour">h</string>
-    <string name="days">giorni</string>
-    <string name="hours">ore</string>
-    <string name="unit_second">secondi</string>
-    <string name="unit_minute">minuti</string>
-    <string name="unit_hour">ora</string>
-    <string name="unit_day">giorno</string>
-    <string name="unit_week">settimana</string>
-    <string name="unit_seconds">secondi</string>
-    <string name="unit_minutes">minuti</string>
-    <string name="unit_hours">ore</string>
-    <string name="unit_days">giorni</string>
-    <string name="unit_weeks">settimane</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Più tardì oggi</string>
-    <string name="tomorrow">Domani</string>
-    <string name="today">Oggi</string>
-    <string name="yesterday">Ieri</string>
-    <!-- Rx -->
-    <string name="connecting_for">In connessione per %1$d s</string>
-    <string name="handshaking">Connessione</string>
-    <string name="connected">Connesso</string>
-    <string name="disconnecting">Disconnessione</string>
-    <string name="waiting_for_disconnection">In attesa della disconnessione</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Creato: %1$s</string>
-    <string name="metadata_label_watchface_author">Autore: %1$s</string>
-    <string name="metadata_label_watchface_name">Nome: %1$s</string>
-    <string name="metadata_wear_import_filename">Nome file: %1$s</string>
-    <string name="metadata_label_plugin_version">Versione plugin: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Nome: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Info: %1$s</string>
-    <string name="pref_show_iob">Mostra IOB</string>
-    <string name="pref_show_detailed_iob">Mostra IOB dettagliato</string>
-    <string name="pref_show_cob">Mostra COB</string>
-    <string name="pref_show_delta">Mostra delta</string>
-    <string name="pref_show_detailed_delta">Mostra delta dettagliato</string>
-    <string name="pref_show_avgdelta">Mostra delta medio</string>
-    <string name="pref_show_phone_battery">Mostra batteria telefono</string>
-    <string name="pref_show_rig_battery">Mostra batteria rig</string>
-    <string name="pref_show_basal_rate">Mostra velocità basale</string>
-    <string name="pref_show_loop_status">Mostra stato loop</string>
-    <string name="pref_show_bg">Mostra BG</string>
-    <string name="pref_show_bgi">Mostra BGI</string>
-    <string name="pref_show_direction_arrow">Mostra frecce direzionali</string>
-    <string name="pref_show_ago">Mostra Indietro</string>
-    <string name="default_custom_watchface_comment">Watchface predefinita, puoi fare click sul tasto ESPORTA WATCHFACE per generare un template</string>
-    <string name="wear_default_watchface">Watchface predefinita</string>
-    <string name="cwf_comment_background">Immagine sfondo</string>
-    <string name="cwf_comment_chart">Grafici (BG, basale, linee di previsione...)</string>
-    <string name="cwf_comment_cover_chart">Immagine davanti al grafico e dietro i campi di testo</string>
-    <string name="cwf_comment_freetext1">Testo libero 1</string>
-    <string name="cwf_comment_freetext2">Testo libero 2</string>
-    <string name="cwf_comment_freetext3">Testo libero 3</string>
-    <string name="cwf_comment_freetext4">Testo libero 4</string>
-    <string name="cwf_comment_iob1">Etichetta IOB o somma IOB se in dettaglio</string>
-    <string name="cwf_comment_iob2">Somma IOB o (Bolo_IOB|Basale_IOB) se in dettaglio</string>
-    <string name="cwf_comment_cob1">Etichetta COB</string>
-    <string name="cwf_comment_cob2">Valore COB</string>
-    <string name="cwf_comment_delta">Delta BG breve</string>
-    <string name="cwf_comment_avg_delta">Delta BG medio (15min)</string>
-    <string name="cwf_comment_uploader_battery">Batteria telefono (%)</string>
-    <string name="cwf_comment_rig_battery">Batteria globale loop (%)</string>
-    <string name="cwf_comment_basalRate">Velocità basale</string>
-    <string name="cwf_comment_bgi">Valore BGI</string>
-    <string name="cwf_comment_time">Tempo (HH:MM o HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Ora (HH)</string>
-    <string name="cwf_comment_minute">Minuto (MM)</string>
-    <string name="cwf_comment_second">Secondo (SS)</string>
-    <string name="cwf_comment_timePeriod">AM o PM</string>
-    <string name="cwf_comment_day_name">Nome del giorno della settimana</string>
-    <string name="cwf_comment_day">Giorno (DD)</string>
-    <string name="cwf_comment_month">Nome del mese (breve)</string>
-    <string name="cwf_comment_loop">Stato loop e indietro</string>
-    <string name="cwf_comment_direction">Freccia direzionale</string>
-    <string name="cwf_comment_timestamp">Minuti addietro per l\'ultimo valore BG ricevuto</string>
-    <string name="cwf_comment_sgv">Valore BG</string>
-    <string name="cwf_comment_cover_plate">Immagine di copertina davanti al testo (quadranti...)</string>
-    <string name="cwf_comment_hour_hand">Immagine lancetta ore (orologio analogico)</string>
-    <string name="cwf_comment_minute_hand">Immagine lancetta minuti (orologio analogico)</string>
-    <string name="cwf_comment_second_hand">Immagine lancetta secondi (orologio analogico)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-iw-rIL/strings.xml b/app-wear-shared/shared/src/main/res/values-iw-rIL/strings.xml
deleted file mode 100644
index c1642ab32d..0000000000
--- a/app-wear-shared/shared/src/main/res/values-iw-rIL/strings.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">לפני %1$d דקות</string>
-    <string name="minago_long">לפני %1$d דקות</string>
-    <string name="hoursago">לפני %1$.1f שעות</string>
-    <string name="days_ago">לפני %1$.1f ימים</string>
-    <string name="days_ago_round">לפני %1$.0f ימים</string>
-    <string name="in_days">בעוד %1$.0f ימים</string>
-    <string name="in_days_round">בעוד %1$.0f ימים</string>
-    <string name="shorthour">ש\'</string>
-    <string name="days">ימים</string>
-    <string name="hours">שעות</string>
-    <string name="unit_second">שניה</string>
-    <string name="unit_minute">דקה</string>
-    <string name="unit_hour">שעה</string>
-    <string name="unit_day">יום</string>
-    <string name="unit_week">שבוע</string>
-    <string name="unit_seconds">שניות</string>
-    <string name="unit_minutes">דקות</string>
-    <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="later_today">מאוחר יותר היום</string>
-    <string name="tomorrow">מחר</string>
-    <string name="today">היום</string>
-    <string name="yesterday">אתמול</string>
-    <!-- Rx -->
-    <string name="connecting_for">חיבור אל %1$s</string>
-    <string name="handshaking">לוחץ יד</string>
-    <string name="connected">מחובר</string>
-    <string name="disconnecting">מתנתק</string>
-    <string name="waiting_for_disconnection">ממתין לניתוק</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">נוצר ב: %1$s</string>
-    <string name="metadata_label_watchface_author">יוצר/ת: %1$s</string>
-    <string name="metadata_label_watchface_name">שם: %1$s</string>
-    <string name="metadata_wear_import_filename">שם קובץ: %1$s</string>
-    <string name="metadata_label_plugin_version">גרסת פלאגין: %1$s</string>
-    <string name="metadata_label_watchface_name_version">שם: %1$s (%2$s)</string>
-    <string name="pref_show_iob">הצג אינסולין פעיל</string>
-    <string name="pref_show_detailed_iob">הצגת אינס\' פעיל מפורט</string>
-    <string name="pref_show_cob">הצג פח\' פעילות</string>
-    <string name="pref_show_delta">הצג דלתא</string>
-    <string name="pref_show_detailed_delta">הצג דלתא מפורטת</string>
-    <string name="pref_show_avgdelta">הצג דלתא ממוצעת</string>
-    <string name="pref_show_phone_battery">הצג את סוללת הטלפון</string>
-    <string name="pref_show_rig_battery">הצג סוללת ריג</string>
-    <string name="pref_show_basal_rate">הצג מינון בזאלי</string>
-    <string name="default_custom_watchface_comment">ברירת המחדל של פני השעון, ניתן ללחוץ על כפתור ייצוא פני שעון כדי ליצור תבנית</string>
-    <string name="wear_default_watchface">ברירת מחדל פני שעון</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ja-rJP/strings.xml b/app-wear-shared/shared/src/main/res/values-ja-rJP/strings.xml
deleted file mode 100644
index d78b6c6230..0000000000
--- a/app-wear-shared/shared/src/main/res/values-ja-rJP/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d 分前</string>
-    <string name="minago_long">%1$d 分前</string>
-    <string name="hoursago">%1$.1f 時間前</string>
-    <string name="days_ago">%1$.1f 日前</string>
-    <string name="days_ago_round">%1$.0f 日前</string>
-    <string name="in_days">in %1$.0f 日</string>
-    <string name="in_days_round">in %1$.0f 日</string>
-    <string name="shorthour">時</string>
-    <string name="days">日間</string>
-    <string name="hours">時間</string>
-    <string name="unit_second">秒</string>
-    <string name="unit_minute">分</string>
-    <string name="unit_hour">時</string>
-    <string name="unit_day">日</string>
-    <string name="unit_week">週</string>
-    <string name="unit_seconds">秒</string>
-    <string name="unit_minutes">分</string>
-    <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="later_today">今日中</string>
-    <string name="tomorrow">明日</string>
-    <string name="today">今日</string>
-    <string name="yesterday">昨日</string>
-    <!-- Rx -->
-    <string name="connecting_for">%1$d 秒間接続中</string>
-    <string name="handshaking">ハンドシェイク中です</string>
-    <string name="connected">接続されました</string>
-    <string name="disconnecting">切断中</string>
-    <string name="waiting_for_disconnection">切断待ち</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml b/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml
deleted file mode 100644
index 09e6124d50..0000000000
--- a/app-wear-shared/shared/src/main/res/values-ko-rKR/strings.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d 분 전</string>
-    <string name="minago_long">%1$d분 전</string>
-    <string name="hoursago">%1$.1f 시간 전</string>
-    <string name="days_ago">%1$.1f일 전</string>
-    <string name="days_ago_round">%1$.0f 일 전</string>
-    <string name="in_days">%1$.0f 일 이내에</string>
-    <string name="in_days_round">%1$.0f 일 이내에</string>
-    <string name="shorthour">시간</string>
-    <string name="days">일</string>
-    <string name="hours">시간</string>
-    <string name="unit_second">초</string>
-    <string name="unit_minute">분</string>
-    <string name="unit_hour">시</string>
-    <string name="unit_day">일</string>
-    <string name="unit_week">주</string>
-    <string name="unit_seconds">초</string>
-    <string name="unit_minutes">분</string>
-    <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="later_today">오늘 늦게</string>
-    <string name="tomorrow">내일</string>
-    <string name="today">오늘</string>
-    <string name="yesterday">어제</string>
-    <!-- Rx -->
-    <string name="connecting_for">%1$d 초 동안 연결중</string>
-    <string name="handshaking">통신 확인</string>
-    <string name="connected">연결됨</string>
-    <string name="disconnecting">연결끊기중</string>
-    <string name="waiting_for_disconnection">연결 해제 대기 중</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">생성 시간: %1$s</string>
-    <string name="metadata_label_watchface_author">작성자: %1$s</string>
-    <string name="metadata_label_watchface_name">이름: %1$s</string>
-    <string name="metadata_wear_import_filename">파일 이름: %1$s</string>
-    <string name="metadata_label_plugin_version">플러그인 버전: %1$s</string>
-    <string name="metadata_label_watchface_name_version">이름: %1$s (%2$s)</string>
-    <string name="pref_show_iob">IOB 표시</string>
-    <string name="pref_show_detailed_iob">IOB 자세한 표시</string>
-    <string name="pref_show_cob">COB 표시</string>
-    <string name="pref_show_delta">델타 표시하기</string>
-    <string name="pref_show_detailed_delta">자세한 델타 표시하기</string>
-    <string name="pref_show_avgdelta">평균 델타 표시하기</string>
-    <string name="pref_show_phone_battery">핸드폰 배터리 표시하기</string>
-    <string name="pref_show_rig_battery">리그 베터리 표시하기</string>
-    <string name="pref_show_basal_rate">Basal 값 표시하기</string>
-    <string name="pref_show_loop_status">루프 상태 표시하기</string>
-    <string name="pref_show_bg">BG 표시하기</string>
-    <string name="pref_show_bgi">BGI 표시하기</string>
-    <string name="pref_show_direction_arrow">화살표 표시하기</string>
-    <string name="pref_show_ago">이전 표시하기</string>
-    <string name="default_custom_watchface_comment">기본 시계, 워치페이스 내보내기 버튼을 클릭하여 템플릿을 생성할 수 있습니다.</string>
-    <string name="wear_default_watchface">기본 워치페이스</string>
-    <string name="cwf_comment_background">배경화면 이미지</string>
-    <string name="cwf_comment_chart">그래픽 (혈당, basal, 예측 선...)</string>
-    <string name="cwf_comment_cover_chart">그래프 앞 그리고 문자 필드 뒤 이미지</string>
-    <string name="cwf_comment_freetext1">무료 문자 1</string>
-    <string name="cwf_comment_freetext2">무료 문자 2</string>
-    <string name="cwf_comment_freetext3">무료 문자 3</string>
-    <string name="cwf_comment_freetext4">무료 문자 4</string>
-    <string name="cwf_comment_iob1">자세한 경우 IOB 레이블 또는 IOB 합계</string>
-    <string name="cwf_comment_iob2">자세한 경우 IOB 합계 또는 (Bolus_IOB|Basal_IOB)</string>
-    <string name="cwf_comment_cob1">COB 레이블</string>
-    <string name="cwf_comment_cob2">COB 값</string>
-    <string name="cwf_comment_delta">단기 BG 델타</string>
-    <string name="cwf_comment_avg_delta">평균 BG 델타 (15분)</string>
-    <string name="cwf_comment_uploader_battery">핸드폰 베터리 (%)</string>
-    <string name="cwf_comment_rig_battery">글로벌 루프 베터리 (%)</string>
-    <string name="cwf_comment_basalRate">Basal양</string>
-    <string name="cwf_comment_bgi">BGI 값</string>
-    <string name="cwf_comment_time">시간 (HH:MM 또는 HH:MM:SS)</string>
-    <string name="cwf_comment_hour">시간 (HH)</string>
-    <string name="cwf_comment_minute">분 (MM)</string>
-    <string name="cwf_comment_second">초 (SS)</string>
-    <string name="cwf_comment_timePeriod">오전 또는 오후</string>
-    <string name="cwf_comment_day_name">요일</string>
-    <string name="cwf_comment_day">일 (DD)</string>
-    <string name="cwf_comment_month">월명 (짧게)</string>
-    <string name="cwf_comment_loop">루프 상태 및 이전</string>
-    <string name="cwf_comment_direction">방향 화살표</string>
-    <string name="cwf_comment_timestamp">몇 분 전에 마지막으로 받은 BG</string>
-    <string name="cwf_comment_sgv">BG 값</string>
-    <string name="cwf_comment_cover_plate">문자 앞의 표지 이미지 (다이얼...)</string>
-    <string name="cwf_comment_hour_hand">시침 이미지 (아날로그 시계)</string>
-    <string name="cwf_comment_minute_hand">분침 이미지 (아날로그 시계)</string>
-    <string name="cwf_comment_second_hand">초침 이미지 (아날로그 시계)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml b/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml
deleted file mode 100644
index 70fcce1325..0000000000
--- a/app-wear-shared/shared/src/main/res/values-lt-rLT/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">prieš %1$d min.</string>
-    <string name="minago_long">Prieš %1$d min.</string>
-    <string name="hoursago">Prieš %1$.1f val.</string>
-    <string name="days_ago">Prieš %1$s d.</string>
-    <string name="days_ago_round">Prieš %1$.0f d.</string>
-    <string name="in_days">Po %1$.0f d.</string>
-    <string name="in_days_round">Po %1$.0f d.</string>
-    <string name="shorthour">val.</string>
-    <string name="days">d.</string>
-    <string name="hours">val.</string>
-    <string name="unit_second">sek.</string>
-    <string name="unit_minute">min.</string>
-    <string name="unit_hour">val.</string>
-    <string name="unit_day">d.</string>
-    <string name="unit_week">sav.</string>
-    <string name="unit_seconds">sekundės</string>
-    <string name="unit_minutes"> min.</string>
-    <string name="unit_hours">val.</string>
-    <string name="unit_days">d.</string>
-    <string name="unit_weeks">savaičių</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Šiandien vėliau</string>
-    <string name="tomorrow">Rytoj</string>
-    <string name="today">Šiandien</string>
-    <string name="yesterday">Vakar</string>
-    <!-- Rx -->
-    <string name="connecting_for">Jungiamasi %1$d s</string>
-    <string name="handshaking">Ryšio užmezgimas</string>
-    <string name="connected">Prisijungta</string>
-    <string name="disconnecting">Atsijungiama</string>
-    <string name="waiting_for_disconnection">Laukiama atsijungimo</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Sukurta: %1$s</string>
-    <string name="metadata_label_watchface_author">Autorius: %1$s</string>
-    <string name="metadata_label_watchface_name">Vardas: %1$s</string>
-    <string name="metadata_wear_import_filename">Failo pavadinimas: %1$s</string>
-    <string name="metadata_label_plugin_version">Įskiepio versija: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Pavadinimas: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Info: %1$s</string>
-    <string name="pref_show_iob">Rodyti AIO</string>
-    <string name="pref_show_detailed_iob">Rodyti detalų AIO</string>
-    <string name="pref_show_cob">Rodyti AAO</string>
-    <string name="pref_show_delta">Rodyti pokytį</string>
-    <string name="pref_show_detailed_delta">Rodyti glikemijos pokyčius detaliai</string>
-    <string name="pref_show_avgdelta">Rodyti vidutinį pokytį</string>
-    <string name="pref_show_phone_battery">Rodyti telefono bateriją</string>
-    <string name="pref_show_rig_battery">Rodyti įrenginio bateriją</string>
-    <string name="pref_show_basal_rate">Rodyti valandinę bazę</string>
-    <string name="pref_show_loop_status">Rodyti Ciklo statusą</string>
-    <string name="pref_show_bg">Rodyti KG</string>
-    <string name="pref_show_bgi">Rodyti GĮ</string>
-    <string name="pref_show_direction_arrow">Rodyti krypties rodyklę</string>
-    <string name="pref_show_ago">Laikas nuo pask. vertės</string>
-    <string name="pref_show_week_number">Rodyti savaitės numerį</string>
-    <string name="default_custom_watchface_comment">Numatytasis ekranas. Paspaudus EKSPORTUOTI, bus sukurtas ruošinys</string>
-    <string name="wear_default_watchface">Numatytasis ekranas</string>
-    <string name="cwf_comment_background">Fono paveiksliukas</string>
-    <string name="cwf_comment_chart">Grafikai (glikemija, bazė, prognozės...)</string>
-    <string name="cwf_comment_cover_chart">Paveiksliukas už teksto ir prieš grafiką</string>
-    <string name="cwf_comment_freetext1">Laisvas tekstas 1</string>
-    <string name="cwf_comment_freetext2">Laisvas tekstas 2</string>
-    <string name="cwf_comment_freetext3">Laisvas tekstas 3</string>
-    <string name="cwf_comment_freetext4">Laisvas tekstas 4</string>
-    <string name="cwf_comment_iob1">Sudėtinis arba detalus AIO</string>
-    <string name="cwf_comment_iob2">Sudėtinis arba detalus (Boluso_AIO|Bazės_AIO) AIO</string>
-    <string name="cwf_comment_cob1">AAO žyma</string>
-    <string name="cwf_comment_cob2">AAO vertė</string>
-    <string name="cwf_comment_delta">Trumpo laikotarpio pokytis</string>
-    <string name="cwf_comment_avg_delta">Vidutinis pokytis (15 min)</string>
-    <string name="cwf_comment_uploader_battery">Telefono baterija (%)</string>
-    <string name="cwf_comment_rig_battery">Baterija (%)</string>
-    <string name="cwf_comment_basalRate">Bazė</string>
-    <string name="cwf_comment_bgi">KGI vertė</string>
-    <string name="cwf_comment_time">Laikas (val:min arba val:min:sek)</string>
-    <string name="cwf_comment_hour">Val.</string>
-    <string name="cwf_comment_minute">Min.</string>
-    <string name="cwf_comment_second">Sek.</string>
-    <string name="cwf_comment_timePeriod">AM ar PM</string>
-    <string name="cwf_comment_day_name">Savaitės diena</string>
-    <string name="cwf_comment_day">Diena (d.)</string>
-    <string name="cwf_comment_week_number">Savaitės numeris</string>
-    <string name="cwf_comment_month">Mėnuo (sutrump.)</string>
-    <string name="cwf_comment_loop">Ciklo būsena</string>
-    <string name="cwf_comment_direction">Tendencijos rodyklė</string>
-    <string name="cwf_comment_timestamp">Prieš kiek minučių nuskaityta glikemija</string>
-    <string name="cwf_comment_sgv">Glikemija</string>
-    <string name="cwf_comment_cover_plate">Paveiksliukas prieš tekstą (skambučius...)</string>
-    <string name="cwf_comment_hour_hand">Analoginio laikrodžio valandinė rodyklė</string>
-    <string name="cwf_comment_minute_hand">Analoginio laikrodžio minutinė rodyklė</string>
-    <string name="cwf_comment_second_hand">Analoginio laikrodžio sekundinė rodyklė</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml b/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml
deleted file mode 100644
index ecf4281832..0000000000
--- a/app-wear-shared/shared/src/main/res/values-nl-rNL/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d m geleden</string>
-    <string name="minago_long">%1$d minuten geleden</string>
-    <string name="hoursago">%1$.1f uur geleden</string>
-    <string name="days_ago">%1$.1f dagen geleden</string>
-    <string name="days_ago_round">%1$.0f dagen geleden</string>
-    <string name="in_days">over %1$.0f dagen</string>
-    <string name="in_days_round">binnen %1$.0f dagen</string>
-    <string name="shorthour">u</string>
-    <string name="days">dagen</string>
-    <string name="hours">uren</string>
-    <string name="unit_second">seconde</string>
-    <string name="unit_minute">minuut</string>
-    <string name="unit_hour">uur</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">week</string>
-    <string name="unit_seconds">seconden</string>
-    <string name="unit_minutes">minuten</string>
-    <string name="unit_hours">uren</string>
-    <string name="unit_days">dagen</string>
-    <string name="unit_weeks">weken</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Later vandaag</string>
-    <string name="tomorrow">Morgen</string>
-    <string name="today">Vandaag</string>
-    <string name="yesterday">Gisteren</string>
-    <!-- Rx -->
-    <string name="connecting_for">Verbonden gedurende %1$d s</string>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Verbonden</string>
-    <string name="disconnecting">Verbinding aan het verbreken</string>
-    <string name="waiting_for_disconnection">Wachten op het loskoppelen</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Gemaakt op: %1$s</string>
-    <string name="metadata_label_watchface_author">Auteur: %1$s</string>
-    <string name="metadata_label_watchface_name">Naam: %1$s</string>
-    <string name="metadata_wear_import_filename">Bestandsnaam: %1$s</string>
-    <string name="metadata_label_plugin_version">Plugin versie: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Naam: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Info: %1$s</string>
-    <string name="pref_show_iob">Toon IOB</string>
-    <string name="pref_show_detailed_iob">Toon gedetailleerde IOB</string>
-    <string name="pref_show_cob">Toon COB</string>
-    <string name="pref_show_delta">Toon Delta</string>
-    <string name="pref_show_detailed_delta">Toon gedetailleerde Delta</string>
-    <string name="pref_show_avgdelta">Toon gemiddelde delta</string>
-    <string name="pref_show_phone_battery">Toon Telefoon Batterij</string>
-    <string name="pref_show_rig_battery">Toon Rig batterij</string>
-    <string name="pref_show_basal_rate">Toon basaalstand</string>
-    <string name="pref_show_loop_status">Toon Loop Status</string>
-    <string name="pref_show_bg">Toon BG</string>
-    <string name="pref_show_bgi">Toon BGI</string>
-    <string name="pref_show_direction_arrow">Toon richtingspijl</string>
-    <string name="pref_show_ago">Toon tijd geleden</string>
-    <string name="pref_show_week_number">Weeknummer weergeven</string>
-    <string name="default_custom_watchface_comment">Standaard watchface, u kunt op de EXPORT WATCHFACE knop klikken om een sjabloon te genereren</string>
-    <string name="wear_default_watchface">Standaard watchface</string>
-    <string name="cwf_comment_background">Achtergrondafbeelding</string>
-    <string name="cwf_comment_chart">Grafieken (BG, basaal, voorspellingslijnen...)</string>
-    <string name="cwf_comment_cover_chart">Afbeelding voor de grafiek en achter tekstvelden</string>
-    <string name="cwf_comment_freetext1">Vrije tekst 1</string>
-    <string name="cwf_comment_freetext2">Vrije tekst 2</string>
-    <string name="cwf_comment_freetext3">Vrije tekst 3</string>
-    <string name="cwf_comment_freetext4">Vrije tekst 4</string>
-    <string name="cwf_comment_iob1">IOB label of IOB totaal indien gedetailleerd</string>
-    <string name="cwf_comment_iob2">IOB totaal of (Bolus_IOB|Basal_IOB) indien gedetailleerd</string>
-    <string name="cwf_comment_cob1">COB label</string>
-    <string name="cwf_comment_cob2">COB waarde</string>
-    <string name="cwf_comment_delta">Korte BG delta</string>
-    <string name="cwf_comment_avg_delta">Gemiddelde BG delta (15min)</string>
-    <string name="cwf_comment_uploader_battery">Batterij Telefoon (%)</string>
-    <string name="cwf_comment_rig_battery">Globale loop batterij (%)</string>
-    <string name="cwf_comment_basalRate">Basaal stand</string>
-    <string name="cwf_comment_bgi">BGI waarde</string>
-    <string name="cwf_comment_time">Tijd (UU:MM of UU:MM:SS)</string>
-    <string name="cwf_comment_hour">Uur (UU)</string>
-    <string name="cwf_comment_minute">Minuut (MM)</string>
-    <string name="cwf_comment_second">Seconde (SS)</string>
-    <string name="cwf_comment_timePeriod">AM of PM</string>
-    <string name="cwf_comment_day_name">Naam van de dag van de week</string>
-    <string name="cwf_comment_day">Dag (DD)</string>
-    <string name="cwf_comment_week_number">Weeknummer (ww)</string>
-    <string name="cwf_comment_month">Maand (kort)</string>
-    <string name="cwf_comment_loop">Loop status en tijd geleden</string>
-    <string name="cwf_comment_direction">Richtingspijl</string>
-    <string name="cwf_comment_timestamp">Minuten geleden voor laatst ontvangen BG</string>
-    <string name="cwf_comment_sgv">BG waarde</string>
-    <string name="cwf_comment_cover_plate">Masker afbeelding over tekst (bijv. uren indicators)</string>
-    <string name="cwf_comment_hour_hand">Afbeelding van uren wijzer (analoog horloge)</string>
-    <string name="cwf_comment_minute_hand">Afbeelding van minuut wijzer (analoog horloge)</string>
-    <string name="cwf_comment_second_hand">Afbeelding van seconde wijzer (analoog horloge)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml b/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml
deleted file mode 100644
index a6024c111f..0000000000
--- a/app-wear-shared/shared/src/main/res/values-no-rNO/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min siden</string>
-    <string name="minago_long">%1$d minutter siden</string>
-    <string name="hoursago">%1$.1f timer siden</string>
-    <string name="days_ago">%1$.1f dager siden</string>
-    <string name="days_ago_round">%1$.0f dager siden</string>
-    <string name="in_days">om %1$.0f dager</string>
-    <string name="in_days_round">om %1$.0f dager</string>
-    <string name="shorthour">t</string>
-    <string name="days">dager</string>
-    <string name="hours">timer</string>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minutt</string>
-    <string name="unit_hour">time</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">uke</string>
-    <string name="unit_seconds">sekunder</string>
-    <string name="unit_minutes">minutter</string>
-    <string name="unit_hours">timer</string>
-    <string name="unit_days">dager</string>
-    <string name="unit_weeks">uker</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Senere i dag</string>
-    <string name="tomorrow">I morgen</string>
-    <string name="today">Idag</string>
-    <string name="yesterday">I går</string>
-    <!-- Rx -->
-    <string name="connecting_for">Tilkobler i %1$d sek</string>
-    <string name="handshaking">Tilkobling verifiseres</string>
-    <string name="connected">Tilkoblet</string>
-    <string name="disconnecting">Frakobler</string>
-    <string name="waiting_for_disconnection">Venter på frakobling</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Opprettet: %1$s</string>
-    <string name="metadata_label_watchface_author">Laget av: %1$s</string>
-    <string name="metadata_label_watchface_name">Navn: %1$s</string>
-    <string name="metadata_wear_import_filename">Filnavn: %1$s</string>
-    <string name="metadata_label_plugin_version">Plugin-versjon: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Navn: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Info: %1$s</string>
-    <string name="pref_show_iob">Vis IOB</string>
-    <string name="pref_show_detailed_iob">Vis detaljert IOB</string>
-    <string name="pref_show_cob">Vis COB</string>
-    <string name="pref_show_delta">Vis Delta</string>
-    <string name="pref_show_detailed_delta">Vis detaljert Delta</string>
-    <string name="pref_show_avgdelta">Vis Gj. snitt Delta</string>
-    <string name="pref_show_phone_battery">Vis telefonbatteri</string>
-    <string name="pref_show_rig_battery">Vis riggens batteri</string>
-    <string name="pref_show_basal_rate">Vis basalrate</string>
-    <string name="pref_show_loop_status">Vis loop status</string>
-    <string name="pref_show_bg">Vis BS</string>
-    <string name="pref_show_bgi">Vis BS</string>
-    <string name="pref_show_direction_arrow">Vis retningspil</string>
-    <string name="pref_show_ago">Vis tid siden</string>
-    <string name="pref_show_week_number">Vis ukenummer</string>
-    <string name="default_custom_watchface_comment">Standard klokkebakgrunn, du kan klikke på EKSPORTER KLOKKEBAKGRUNN for å lage en mal</string>
-    <string name="wear_default_watchface">Standard klokkebakgrunn</string>
-    <string name="cwf_comment_background">Bakgrunnsbilde</string>
-    <string name="cwf_comment_chart">Grafer (BS, basal, prediksjonslinjer...)</string>
-    <string name="cwf_comment_cover_chart">Bilde foran grafer og bak tekstfelter</string>
-    <string name="cwf_comment_freetext1">Fritekst 1</string>
-    <string name="cwf_comment_freetext2">Fritekst 2</string>
-    <string name="cwf_comment_freetext3">Fritekst 3</string>
-    <string name="cwf_comment_freetext4">Fritekst 4</string>
-    <string name="cwf_comment_iob1">IOB-merkelapp eller IOB-sum hvis angitt</string>
-    <string name="cwf_comment_iob2">IOB-sum eller (Bolus_IOB|Basal_IOB) hvis angitt</string>
-    <string name="cwf_comment_cob1">COB etikett</string>
-    <string name="cwf_comment_cob2">COB verdi</string>
-    <string name="cwf_comment_delta">Kort BS-endring</string>
-    <string name="cwf_comment_avg_delta">Gj.snitt BS-endring (15min)</string>
-    <string name="cwf_comment_uploader_battery">Telefonbatteri (%)</string>
-    <string name="cwf_comment_rig_battery">Rig-batteri (%)</string>
-    <string name="cwf_comment_basalRate">Basalrate</string>
-    <string name="cwf_comment_bgi">BGI verdi</string>
-    <string name="cwf_comment_time">Tid (TT:MM eller TT:MM:SS)</string>
-    <string name="cwf_comment_hour">Time (TT)</string>
-    <string name="cwf_comment_minute">Minutt (MM)</string>
-    <string name="cwf_comment_second">Sekund (SS)</string>
-    <string name="cwf_comment_timePeriod">AM eller PM</string>
-    <string name="cwf_comment_day_name">Navn på ukedag</string>
-    <string name="cwf_comment_day">Dag (DD)</string>
-    <string name="cwf_comment_week_number">Ukenummer (ww)</string>
-    <string name="cwf_comment_month">Navn på måned (kort)</string>
-    <string name="cwf_comment_loop">Loop-status og tid siden</string>
-    <string name="cwf_comment_direction">Retningspil</string>
-    <string name="cwf_comment_timestamp">Minutter siden BS sist ble mottatt</string>
-    <string name="cwf_comment_sgv">BS-verdi</string>
-    <string name="cwf_comment_cover_plate">Bilde foran tekst (urvisere...)</string>
-    <string name="cwf_comment_hour_hand">Bilde av timeviser (analog klokke)</string>
-    <string name="cwf_comment_minute_hand">Bilde av minuttviser (analog klokke)</string>
-    <string name="cwf_comment_second_hand">Bilde av sekundviser (analog klokke)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml b/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml
deleted file mode 100644
index dc43538e87..0000000000
--- a/app-wear-shared/shared/src/main/res/values-pl-rPL/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min temu</string>
-    <string name="minago_long">%1$d minut temu</string>
-    <string name="hoursago">%1$.1f godz. temu</string>
-    <string name="days_ago">%1$.1f dni temu</string>
-    <string name="days_ago_round">%1$.0f dni temu</string>
-    <string name="in_days">za %1$.0f dni</string>
-    <string name="in_days_round">za %1$.0f dni</string>
-    <string name="shorthour">h</string>
-    <string name="days">dni</string>
-    <string name="hours">godzin</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minuta</string>
-    <string name="unit_hour">godzina</string>
-    <string name="unit_day">dzień</string>
-    <string name="unit_week">tydzień</string>
-    <string name="unit_seconds">sekund</string>
-    <string name="unit_minutes">minut</string>
-    <string name="unit_hours">godzin</string>
-    <string name="unit_days">dni</string>
-    <string name="unit_weeks">tygodni</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Dzisiaj, później</string>
-    <string name="tomorrow">Jutro</string>
-    <string name="today">Dziś</string>
-    <string name="yesterday">Wczoraj</string>
-    <!-- Rx -->
-    <string name="connecting_for">Łączenie przez %1$d s</string>
-    <string name="handshaking">Nawiązywanie połączenia</string>
-    <string name="connected">Połączono</string>
-    <string name="disconnecting">Rozłączanie</string>
-    <string name="waiting_for_disconnection">Oczekiwanie na rozłączenie</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Utworzono: %1$s</string>
-    <string name="metadata_label_watchface_author">Autor: %1$s</string>
-    <string name="metadata_label_watchface_name">Nazwa: %1$s</string>
-    <string name="metadata_wear_import_filename">Nazwa pliku: %1$s</string>
-    <string name="metadata_label_plugin_version">Wersja wtyczki: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Nazwa: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Info: %1$s</string>
-    <string name="pref_show_iob">Pokaż IOB</string>
-    <string name="pref_show_detailed_iob">Pokaż szczegółowe IOB</string>
-    <string name="pref_show_cob">Pokaż COB</string>
-    <string name="pref_show_delta">Pokaż Deltę</string>
-    <string name="pref_show_detailed_delta">Pokaż szczegółowo Deltę</string>
-    <string name="pref_show_avgdelta">Pokaż Śr. Deltę</string>
-    <string name="pref_show_phone_battery">Pokaż Baterię Telefonu</string>
-    <string name="pref_show_rig_battery">Pokaż Baterię Zestawu</string>
-    <string name="pref_show_basal_rate">Pokaż Dawkę Bazową</string>
-    <string name="pref_show_loop_status">Pokaż Status Pętli</string>
-    <string name="pref_show_bg">Pokaż glikemię</string>
-    <string name="pref_show_bgi">Pokaż BGI</string>
-    <string name="pref_show_direction_arrow">Pokaż Strzałkę Trendu</string>
-    <string name="pref_show_ago">Pokaż Aktualność</string>
-    <string name="pref_show_week_number">Pokaż numer tygodnia</string>
-    <string name="default_custom_watchface_comment">Domyślna tarcza, możesz kliknąć na EXPORTUJ TARCZĘ aby wygenerować szablon</string>
-    <string name="wear_default_watchface">Domyślna Tarcza</string>
-    <string name="cwf_comment_background">Obraz w tle</string>
-    <string name="cwf_comment_chart">Wykresy (glikemia, baza, prognozy...)</string>
-    <string name="cwf_comment_cover_chart">Obraz przed wykresem i za polami tekstowymi</string>
-    <string name="cwf_comment_freetext1">Wolne pole tekstowe 1</string>
-    <string name="cwf_comment_freetext2">Wolne pole tekstowe 2</string>
-    <string name="cwf_comment_freetext3">Wolne pole tekstowe 3</string>
-    <string name="cwf_comment_freetext4">Wolne pole tekstowe 4</string>
-    <string name="cwf_comment_iob1">Etykieta IOB lub suma IOB przy szczegółowym IOB</string>
-    <string name="cwf_comment_iob2">Suma IOB lub (Bolus_IOB|Basal_IOB) jeśli szczegółowo</string>
-    <string name="cwf_comment_cob1">Etykieta COB</string>
-    <string name="cwf_comment_cob2">Wartość COB</string>
-    <string name="cwf_comment_delta">Krótka delta glikemii</string>
-    <string name="cwf_comment_avg_delta">Średnia delta glikemii (15min)</string>
-    <string name="cwf_comment_uploader_battery">Bateria telefonu (%)</string>
-    <string name="cwf_comment_rig_battery">Globalna bateria pętli (%)</string>
-    <string name="cwf_comment_basalRate">Wartości bazy</string>
-    <string name="cwf_comment_bgi">Wartość BGI</string>
-    <string name="cwf_comment_time">Czas (HH:MM or HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Godzina (HH)</string>
-    <string name="cwf_comment_minute">Minuta (MM)</string>
-    <string name="cwf_comment_second">Sekunda (SS)</string>
-    <string name="cwf_comment_timePeriod">AM lub PM</string>
-    <string name="cwf_comment_day_name">Nazwa dnia tygodnia</string>
-    <string name="cwf_comment_day">Dzień (DD)</string>
-    <string name="cwf_comment_week_number">Numer tygodnia (ww)</string>
-    <string name="cwf_comment_month">Nazwa miesiąca (krótka)</string>
-    <string name="cwf_comment_loop">Status pętli i aktualność</string>
-    <string name="cwf_comment_direction">Strzałka trendu</string>
-    <string name="cwf_comment_timestamp">Minut od ostatniego otrzymania glikemii</string>
-    <string name="cwf_comment_sgv">Wartość glikemii</string>
-    <string name="cwf_comment_cover_plate">Obraz nakładki przed tekstem (tarcze...)</string>
-    <string name="cwf_comment_hour_hand">Obraz lub wskazówka godzinowa (Tarcza Analogowa)</string>
-    <string name="cwf_comment_minute_hand">Obraz lub wskazówka minutowa (Tarcza Analogowa)</string>
-    <string name="cwf_comment_second_hand">Obraz lub wskazówka sekundowa (Tarcza Analogowa)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml b/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 9f5d4585a4..0000000000
--- a/app-wear-shared/shared/src/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min atrás</string>
-    <string name="minago_long">%1$d minutos atrás</string>
-    <string name="hoursago">%1$.1fh atrás</string>
-    <string name="days_ago">%1$d dias atrás</string>
-    <string name="days_ago_round">%1$.0f dias atrás</string>
-    <string name="in_days">em %1$.0f dias</string>
-    <string name="in_days_round">em %1$.0f dias</string>
-    <string name="shorthour">h</string>
-    <string name="days">dias</string>
-    <string name="hours">horas</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">dias</string>
-    <string name="unit_weeks">semanas</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Hoje, Mais tarde</string>
-    <string name="tomorrow">Amanhã</string>
-    <string name="today">Hoje</string>
-    <string name="yesterday">Ontem</string>
-    <!-- Rx -->
-    <string name="connecting_for">Conectando para %1$d</string>
-    <string name="handshaking">Cumprimento</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnecting">A desligar</string>
-    <string name="waiting_for_disconnection">Aguardando a desconexão</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Criado por %1$s</string>
-    <string name="metadata_label_watchface_author">Autor: %1$s</string>
-    <string name="metadata_label_watchface_name">Nome: %1$s</string>
-    <string name="metadata_wear_import_filename">Nome do arquivo: %1$s</string>
-    <string name="metadata_label_plugin_version">Versão do plugin: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Nome: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Informações: %1$s</string>
-    <string name="pref_show_iob">Mostrar IA</string>
-    <string name="pref_show_detailed_iob">Mostrar detalhes da IA</string>
-    <string name="pref_show_cob">Mostrar CA</string>
-    <string name="pref_show_delta">Mostrar Delta</string>
-    <string name="pref_show_detailed_delta">Mostrar Delta detalho</string>
-    <string name="pref_show_avgdelta">Mostrar média de delta</string>
-    <string name="pref_show_phone_battery">Mostrar bateria do telefone</string>
-    <string name="pref_show_rig_battery">Mostrar bateria de rig</string>
-    <string name="pref_show_basal_rate">Mostrar Taxa Basal</string>
-    <string name="pref_show_loop_status">Mostrar Status do Loop</string>
-    <string name="pref_show_bg">Mostrar glicemia</string>
-    <string name="pref_show_bgi">Mostrar BGI</string>
-    <string name="pref_show_direction_arrow">Mostrar seta de tendência</string>
-    <string name="pref_show_ago">Exibir atrás</string>
-    <string name="default_custom_watchface_comment">Watchface padrão, você pode clicar no botão EXPORTAR WATCHFACE para gerar um modelo</string>
-    <string name="wear_default_watchface">Watchface padrão</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml b/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 6d5a05175a..0000000000
--- a/app-wear-shared/shared/src/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d m atrás</string>
-    <string name="minago_long">%%1$d minutos atrás</string>
-    <string name="hoursago">%1$.1f h atrás</string>
-    <string name="days_ago">%1$.1f dias atrás</string>
-    <string name="days_ago_round">%1$.0f dias atrás</string>
-    <string name="in_days">em %1$.0f dias</string>
-    <string name="in_days_round">em %1$.0f dias</string>
-    <string name="shorthour">h</string>
-    <string name="days">dias</string>
-    <string name="hours">horas</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">dias</string>
-    <string name="unit_weeks">semanas</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Hoje mais tarde</string>
-    <string name="tomorrow">Amanhã</string>
-    <string name="today">Hoje</string>
-    <string name="yesterday">Ontem</string>
-    <!-- Rx -->
-    <string name="connecting_for">A ligar durante %1$d s</string>
-    <string name="handshaking">Cumprimento</string>
-    <string name="connected">Ligado</string>
-    <string name="disconnecting">A desconectar</string>
-    <string name="waiting_for_disconnection">A aguardar a desconexão</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Criado em: %1$s</string>
-    <string name="metadata_label_watchface_author">Autor: %1$s</string>
-    <string name="metadata_label_watchface_name">Nome: %1$s</string>
-    <string name="metadata_wear_import_filename">Nome do ficheiro: %1$s</string>
-    <string name="metadata_label_plugin_version">Versão do plugin: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Nome: %1$s (%2$s)</string>
-    <string name="pref_show_iob">Mostrar IA</string>
-    <string name="pref_show_detailed_iob">Mostrar IA detalhada</string>
-    <string name="pref_show_cob">Mostrar HCA</string>
-    <string name="pref_show_delta">Mostrar Delta</string>
-    <string name="pref_show_detailed_delta">Mostrar Delta detalhado</string>
-    <string name="pref_show_avgdelta">Mostrar Delta Médio</string>
-    <string name="pref_show_phone_battery">Mostrar Bateria Telefone</string>
-    <string name="pref_show_rig_battery">Mostrar Bateria Equipamento</string>
-    <string name="pref_show_basal_rate">Mostrar Taxa Basal</string>
-    <string name="pref_show_loop_status">Mostrar Estado Loop</string>
-    <string name="pref_show_bg">Mostrar glicemia</string>
-    <string name="pref_show_bgi">Mostrar IG</string>
-    <string name="pref_show_direction_arrow">Mostrar Seta Direcção</string>
-    <string name="pref_show_ago">Mostrar Atrás</string>
-    <string name="default_custom_watchface_comment">Watchface padrão, pode clicar no botão EXPORTAR WATCHFACE para gerar um modelo</string>
-    <string name="wear_default_watchface">Watchface padrão</string>
-    <string name="cwf_comment_background">Imagem de fundo</string>
-    <string name="cwf_comment_chart">Gráficos (GLIC, basal, linhas de previsão...)</string>
-    <string name="cwf_comment_cover_chart">Imagem na frente do gráfico e atrás dos campos de texto</string>
-    <string name="cwf_comment_freetext1">Texto livre 1</string>
-    <string name="cwf_comment_freetext2">Texto livre 2</string>
-    <string name="cwf_comment_freetext3">Texto livre 3</string>
-    <string name="cwf_comment_freetext4">Texto livre 4</string>
-    <string name="cwf_comment_iob1">Etiqueta de IA ou Soma IA se detalhada</string>
-    <string name="cwf_comment_iob2">Soma IA ou (Bolus_IA|Basal_IA) se detalhada</string>
-    <string name="cwf_comment_cob1">Etiqueta HCA</string>
-    <string name="cwf_comment_cob2">valor HCA</string>
-    <string name="cwf_comment_delta">Delta curto da glicemia</string>
-    <string name="cwf_comment_avg_delta">Delta da glicemia média (15min)</string>
-    <string name="cwf_comment_uploader_battery">Bateria do telefone (%)</string>
-    <string name="cwf_comment_rig_battery">Bateria do loop (%)</string>
-    <string name="cwf_comment_basalRate">Taxa Basal</string>
-    <string name="cwf_comment_bgi">Valor de IG</string>
-    <string name="cwf_comment_time">Horário (HH:MM ou HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Hora (HH)</string>
-    <string name="cwf_comment_minute">Minuto (MM)</string>
-    <string name="cwf_comment_second">Segundo (SS)</string>
-    <string name="cwf_comment_timePeriod">AM ou PM</string>
-    <string name="cwf_comment_day_name">Nome do Dia da Semana</string>
-    <string name="cwf_comment_day">Dia (DD)</string>
-    <string name="cwf_comment_month">Nome do Mês (curto)</string>
-    <string name="cwf_comment_direction">Seta de direção</string>
-    <string name="cwf_comment_timestamp">Minutos desde a recepção do último valor de GLIC</string>
-    <string name="cwf_comment_sgv">Valor de GLIC</string>
-    <string name="cwf_comment_cover_plate">Imagem da capa na frente do texto</string>
-    <string name="cwf_comment_hour_hand">Imagem do ponteiro das horas (Relógio Analógico)</string>
-    <string name="cwf_comment_minute_hand">Imagem do ponteiro dos minutos (Relógio Analógico)</string>
-    <string name="cwf_comment_second_hand">Imagem do ponteiro dos segundos (Relógio Analógico)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ro-rRO/strings.xml b/app-wear-shared/shared/src/main/res/values-ro-rRO/strings.xml
deleted file mode 100644
index 10ce7af4ed..0000000000
--- a/app-wear-shared/shared/src/main/res/values-ro-rRO/strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d min în urmă</string>
-    <string name="hoursago">%1$.1f ore în urmă</string>
-    <string name="shorthour">h</string>
-    <string name="days">zile</string>
-    <string name="hours">ore</string>
-    <string name="unit_second">secundă</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">oră</string>
-    <string name="unit_day">zi</string>
-    <string name="unit_week">săptămână</string>
-    <string name="unit_seconds">secunde</string>
-    <string name="unit_minutes">minute</string>
-    <string name="unit_hours">ore</string>
-    <string name="unit_days">zile</string>
-    <string name="unit_weeks">săptămâni</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">z</string>
-    <!-- Rx -->
-    <string name="connecting_for">Conectat de %1$d s</string>
-    <string name="handshaking">Împerechere</string>
-    <string name="connected">Conectat</string>
-    <string name="disconnecting">Se deconectează</string>
-    <string name="waiting_for_disconnection">Se așteaptă deconectarea</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml b/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml
deleted file mode 100644
index c2a98e4c23..0000000000
--- a/app-wear-shared/shared/src/main/res/values-ru-rRU/strings.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d мин. назад</string>
-    <string name="minago_long">%1$d минут назад</string>
-    <string name="hoursago">%1$.1fч. назад</string>
-    <string name="days_ago">%1$s дн назад</string>
-    <string name="days_ago_round">%1$s дн назад</string>
-    <string name="in_days">через %1$.0f дн</string>
-    <string name="in_days_round">через %1$.0f дн</string>
-    <string name="shorthour">ч</string>
-    <string name="days">дн</string>
-    <string name="hours">час</string>
-    <string name="unit_second">сек</string>
-    <string name="unit_minute">мин</string>
-    <string name="unit_hour">час</string>
-    <string name="unit_day">дн</string>
-    <string name="unit_week">нед</string>
-    <string name="unit_seconds">сек</string>
-    <string name="unit_minutes">мин</string>
-    <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="later_today">Позднее сегодня</string>
-    <string name="tomorrow">Завтра</string>
-    <string name="today">Cегодня</string>
-    <string name="yesterday">Вчера</string>
-    <!-- Rx -->
-    <string name="connecting_for">Связь установлена за %1$d сек</string>
-    <string name="handshaking">Подтверждение связи</string>
-    <string name="connected">соединение установлено</string>
-    <string name="disconnecting">разъединение</string>
-    <string name="waiting_for_disconnection">Ожидание разъединения</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Создано: %1$s</string>
-    <string name="metadata_label_watchface_author">Автор: %1$s</string>
-    <string name="metadata_label_watchface_name">Название: %1$s</string>
-    <string name="metadata_wear_import_filename">Имя файла: %1$s</string>
-    <string name="metadata_label_plugin_version">Версия плагина: %1$s</string>
-    <string name="metadata_label_watchface_infos">Информация: %1$s</string>
-    <string name="pref_show_iob">Отображать IOB</string>
-    <string name="pref_show_detailed_iob">Отображать IOB подробно</string>
-    <string name="pref_show_cob">Отображать COB</string>
-    <string name="pref_show_delta">Отображать дельту</string>
-    <string name="pref_show_detailed_delta">Отображать дельту подробно</string>
-    <string name="pref_show_avgdelta">Отображать усредненную дельту</string>
-    <string name="pref_show_phone_battery">Отображать заряд телефона</string>
-    <string name="pref_show_rig_battery">Отображать заряд батареи системы</string>
-    <string name="pref_show_basal_rate">Отображать базал</string>
-    <string name="pref_show_loop_status">Отображать состояние цикла</string>
-    <string name="pref_show_bg">Отображать ГК</string>
-    <string name="pref_show_bgi">Отображать BGI (ГКИ)</string>
-    <string name="pref_show_direction_arrow">Отображать стрелку тренда</string>
-    <string name="default_custom_watchface_comment">Циферблат по умолчанию, вы можете нажать на EXPORT WATCHFACE чтобы создать шаблон</string>
-    <string name="wear_default_watchface">Циферблат по умолчанию</string>
-    <string name="cwf_comment_background">Фоновое изображение</string>
-    <string name="cwf_comment_chart">Графики (ГК, базал, линии прогнозов...)</string>
-    <string name="cwf_comment_iob1">Метка IOB, или общего IOB для подробного отображения</string>
-    <string name="cwf_comment_iob2">Общий IOB, или (IOB_болюса|IOB_базы) для подробного отображения</string>
-    <string name="cwf_comment_cob1">Метка COB</string>
-    <string name="cwf_comment_cob2">Значение COB</string>
-    <string name="cwf_comment_delta">Краткая дельта ГК</string>
-    <string name="cwf_comment_avg_delta">Средняя дельта ГК (15 мин)</string>
-    <string name="cwf_comment_uploader_battery">Заряд телефона (%)</string>
-    <string name="cwf_comment_rig_battery">Заряд системы ИПЖ (%)</string>
-    <string name="cwf_comment_basalRate">Базальная скорость</string>
-    <string name="cwf_comment_bgi">Значение ГКИ</string>
-    <string name="cwf_comment_time">Время (ЧЧ:ММ или ЧЧ:ММ:СС)</string>
-    <string name="cwf_comment_hour">Часы (ЧЧ)</string>
-    <string name="cwf_comment_minute">Минуты (ММ)</string>
-    <string name="cwf_comment_second">Секунды (СС)</string>
-    <string name="cwf_comment_timePeriod">AM или PM</string>
-    <string name="cwf_comment_day_name">Название дня недели</string>
-    <string name="cwf_comment_day">Число (ДД)</string>
-    <string name="cwf_comment_month">Название месяца (краткое)</string>
-    <string name="cwf_comment_direction">Стрелка тренда</string>
-    <string name="cwf_comment_timestamp">Минут с последнего чтения ГК</string>
-    <string name="cwf_comment_sgv">Значение ГК</string>
-    <string name="cwf_comment_hour_hand">Изображение для часовой стрелки (Аналоговые часы)</string>
-    <string name="cwf_comment_minute_hand">Изображение для минутной стрелки (Аналоговые часы)</string>
-    <string name="cwf_comment_second_hand">Изображение для секундной стрелки (Аналоговые часы)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml b/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml
deleted file mode 100644
index 150cfd10f9..0000000000
--- a/app-wear-shared/shared/src/main/res/values-sk-rSK/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">pred %1$d min</string>
-    <string name="minago_long">pred %1$d minútami</string>
-    <string name="hoursago">pred %1$.1f h</string>
-    <string name="days_ago">Pred %1$.1f dňami</string>
-    <string name="days_ago_round">Pred %1$.0f dňami</string>
-    <string name="in_days">za %1$.0f dní</string>
-    <string name="in_days_round">za %1$.0f dní</string>
-    <string name="shorthour">h</string>
-    <string name="days">dní</string>
-    <string name="hours">hodín</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minúta</string>
-    <string name="unit_hour">hodina</string>
-    <string name="unit_day">deň</string>
-    <string name="unit_week">týždeň</string>
-    <string name="unit_seconds">sekúnd</string>
-    <string name="unit_minutes">minút</string>
-    <string name="unit_hours">hodín</string>
-    <string name="unit_days">dní</string>
-    <string name="unit_weeks">týždňov</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Neskôr počas dňa</string>
-    <string name="tomorrow">Zajtra</string>
-    <string name="today">Dnes</string>
-    <string name="yesterday">včera</string>
-    <!-- Rx -->
-    <string name="connecting_for">Pripájanie %1$d sek</string>
-    <string name="handshaking">Overovanie</string>
-    <string name="connected">Pripojené</string>
-    <string name="disconnecting">Odpájanie</string>
-    <string name="waiting_for_disconnection">Čakám na odpojenie</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Vytvorené: %1$s</string>
-    <string name="metadata_label_watchface_author">Autor: %1$s</string>
-    <string name="metadata_label_watchface_name">Meno: %1$s</string>
-    <string name="metadata_wear_import_filename">Názov súboru: %1$s</string>
-    <string name="metadata_label_plugin_version">Verzia pluginu: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Meno: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Informácie: %1$s</string>
-    <string name="pref_show_iob">Zobraziť IOB</string>
-    <string name="pref_show_detailed_iob">Zobraziť detailný IOB</string>
-    <string name="pref_show_cob">Zobraziť COB</string>
-    <string name="pref_show_delta">Zobraziť odchýlku</string>
-    <string name="pref_show_detailed_delta">Zobraziť detailnú odchylku</string>
-    <string name="pref_show_avgdelta">Zobraziť priemernú odchýlku</string>
-    <string name="pref_show_phone_battery">Zobraziť stav batérie telefónu</string>
-    <string name="pref_show_rig_battery">Zobrazovať stav batérie ďalších zariadení</string>
-    <string name="pref_show_basal_rate">Zobraziť bazál</string>
-    <string name="pref_show_loop_status">Zobraziť stav uzavretého okruhu</string>
-    <string name="pref_show_bg">Zobraziť glykémiu</string>
-    <string name="pref_show_bgi">Zobraziť BGI</string>
-    <string name="pref_show_direction_arrow">Zobraziť trendovú šípku</string>
-    <string name="pref_show_ago">Zobraziť aktualizované pred</string>
-    <string name="pref_show_week_number">Zobraziť číslo týždňa</string>
-    <string name="default_custom_watchface_comment">Predvolený ciferník. Môžete kliknúť na tlačítko EXPORTOVAŤ CIFERNÍK pre vygenerovanie šablóny</string>
-    <string name="wear_default_watchface">Predvolený ciferník</string>
-    <string name="cwf_comment_background">Obrázok pozadia</string>
-    <string name="cwf_comment_chart">Grafy (glykémie, bazály, krivky predpovedí...)</string>
-    <string name="cwf_comment_cover_chart">Obrázok pred grafom a za textovými poliami</string>
-    <string name="cwf_comment_freetext1">Voľný text 1</string>
-    <string name="cwf_comment_freetext2">Voľný text 2</string>
-    <string name="cwf_comment_freetext3">Voľný text 3</string>
-    <string name="cwf_comment_freetext4">Voľný text 4</string>
-    <string name="cwf_comment_iob1">Štítok IOB alebo suma IOB pri zapnutých detailoch</string>
-    <string name="cwf_comment_iob2">Suma IOB alebo (Bolus_IOB|Basal_IOB) pri zapnutých detailoch</string>
-    <string name="cwf_comment_cob1">Štítok COB</string>
-    <string name="cwf_comment_cob2">Hodnota COB</string>
-    <string name="cwf_comment_delta">Krátkodobý priemer</string>
-    <string name="cwf_comment_avg_delta">Priemerný rozdiel glykémií (15min)</string>
-    <string name="cwf_comment_uploader_battery">Batéria telefónu (%)</string>
-    <string name="cwf_comment_rig_battery">Batéria uzavretého okruhu (%)</string>
-    <string name="cwf_comment_basalRate">Bazálna dávka</string>
-    <string name="cwf_comment_bgi">Hodnota BGI</string>
-    <string name="cwf_comment_time">Čas (HH:MM alebo HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Hodiny (HH)</string>
-    <string name="cwf_comment_minute">Minúty (MM)</string>
-    <string name="cwf_comment_second">Sekundy (SS)</string>
-    <string name="cwf_comment_timePeriod">AM alebo PM</string>
-    <string name="cwf_comment_day_name">Meno dňa v týždni</string>
-    <string name="cwf_comment_day">Deň (DD)</string>
-    <string name="cwf_comment_week_number">Číslo týždňa (ww)</string>
-    <string name="cwf_comment_month">Názov mesiaca (krátky)</string>
-    <string name="cwf_comment_loop">Stav uzavretého okruhu a čas</string>
-    <string name="cwf_comment_direction">Trendová šípka</string>
-    <string name="cwf_comment_timestamp">Pred minútami pre poslednú prijatú glykémiu</string>
-    <string name="cwf_comment_sgv">Hodnota glykémie</string>
-    <string name="cwf_comment_cover_plate">Úvodný obrázok pred textom (číselníky...)</string>
-    <string name="cwf_comment_hour_hand">Obrázok hodinovej ručičky (Analógové hodinky)</string>
-    <string name="cwf_comment_minute_hand">Obrázok minútovej ručičky (Analógové hodinky)</string>
-    <string name="cwf_comment_second_hand">Obrázok sekundovej ručičky (Analógové hodinky)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml b/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml
deleted file mode 100644
index dc0f7891d7..0000000000
--- a/app-wear-shared/shared/src/main/res/values-sr-rCS/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <!-- Rx -->
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml b/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml
deleted file mode 100644
index 5ad7b03058..0000000000
--- a/app-wear-shared/shared/src/main/res/values-sv-rSE/strings.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="hoursago">%1$.1f tim sedan</string>
-    <string name="days_ago">%1$.1f dagar sedan</string>
-    <string name="days_ago_round">%1$.0f dagar sedan</string>
-    <string name="in_days">om %1$.0f dagar</string>
-    <string name="in_days_round">om %1$.0f dagar</string>
-    <string name="shorthour">h</string>
-    <string name="days">dagar</string>
-    <string name="hours">timmar</string>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">timme</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">vecka</string>
-    <string name="unit_seconds">sekunder</string>
-    <string name="unit_minutes">minuter</string>
-    <string name="unit_hours">timmar</string>
-    <string name="unit_days">dagar</string>
-    <string name="unit_weeks">veckor</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Senare idag</string>
-    <string name="tomorrow">Imorgon</string>
-    <string name="today">Idag</string>
-    <string name="yesterday">Igår</string>
-    <!-- Rx -->
-    <string name="connecting_for">Ansluter (%1$d s)</string>
-    <string name="handshaking">Anslutningen verifieras</string>
-    <string name="connected">Ansluten</string>
-    <string name="disconnecting">Kopplar från</string>
-    <string name="waiting_for_disconnection">Väntar på frånkoppling</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Skapad den: %1$s</string>
-    <string name="metadata_label_watchface_author">Skapad av: %1$s</string>
-    <string name="metadata_label_watchface_name">Namn: %1$s</string>
-    <string name="metadata_wear_import_filename">Filnamn: %1$s</string>
-    <string name="metadata_label_plugin_version">Plugin-version: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Namn: %1$s (%2$s)</string>
-    <string name="pref_show_iob">Visa IOB</string>
-    <string name="pref_show_detailed_iob">Visa detaljerad IOB</string>
-    <string name="pref_show_cob">Visa COB</string>
-    <string name="pref_show_delta">Visa delta</string>
-    <string name="pref_show_detailed_delta">Visa detaljerad delta</string>
-    <string name="pref_show_avgdelta">Visa genomsnittlig delta</string>
-    <string name="pref_show_phone_battery">Visa telefonens batterinivå</string>
-    <string name="pref_show_rig_battery">Visa riggens batterinivå</string>
-    <string name="pref_show_basal_rate">Visa basaldos</string>
-    <string name="pref_show_loop_status">Visa loop-status</string>
-    <string name="pref_show_bg">Visa BG</string>
-    <string name="pref_show_bgi">Visa BGI</string>
-    <string name="pref_show_direction_arrow">Visa riktningspil</string>
-    <string name="pref_show_ago">Visa tid sedan</string>
-    <string name="default_custom_watchface_comment">Standard-urtavla - du kan klicka på EXPORTERA URTAVLA för att generera en mall</string>
-    <string name="wear_default_watchface">Standard-urtavla</string>
-    <string name="cwf_comment_background">Bakgrundsbild</string>
-    <string name="cwf_comment_chart">Grafer (BG, basal, prognoslinjer...)</string>
-    <string name="cwf_comment_cover_chart">Bild framför graf och bakom textfält</string>
-    <string name="cwf_comment_freetext1">Fritext 1</string>
-    <string name="cwf_comment_freetext2">Fritext 2</string>
-    <string name="cwf_comment_freetext3">Fritext 3</string>
-    <string name="cwf_comment_freetext4">Fritext 4</string>
-    <string name="cwf_comment_iob1">IOB-etikett. Total IOB om detaljerad</string>
-    <string name="cwf_comment_iob2">Total IOB. (Bolus_IOB|Basal_IOB) om detaljerad</string>
-    <string name="cwf_comment_cob1">COB-etikett</string>
-    <string name="cwf_comment_cob2">COB-värde</string>
-    <string name="cwf_comment_delta">Kort BG-delta</string>
-    <string name="cwf_comment_avg_delta">Genomsnittligt BG-delta (15min)</string>
-    <string name="cwf_comment_uploader_battery">Telefonens batterinivå (%)</string>
-    <string name="cwf_comment_rig_battery">Globalt loop-batteri (%)</string>
-    <string name="cwf_comment_basalRate">Basaldos</string>
-    <string name="cwf_comment_bgi">BGI-värde</string>
-    <string name="cwf_comment_time">Tid (HH:MM eller HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Timme (HH)</string>
-    <string name="cwf_comment_minute">Minut (MM)</string>
-    <string name="cwf_comment_second">Sekund (SS)</string>
-    <string name="cwf_comment_timePeriod">AM eller PM</string>
-    <string name="cwf_comment_day_name">Namn på veckodagen</string>
-    <string name="cwf_comment_day">Dag (DD)</string>
-    <string name="cwf_comment_month">Månadens namn (kort)</string>
-    <string name="cwf_comment_loop">Loop status och tid</string>
-    <string name="cwf_comment_direction">Visa riktningspil</string>
-    <string name="cwf_comment_timestamp">Minuter sedan senast mottaget BG</string>
-    <string name="cwf_comment_sgv">BG-värde</string>
-    <string name="cwf_comment_cover_plate">Omslagsbild framför text (visare...)</string>
-    <string name="cwf_comment_hour_hand">Bild för timvisare (analog klocka)</string>
-    <string name="cwf_comment_minute_hand">Bild för minutvisare (analog klocka)</string>
-    <string name="cwf_comment_second_hand">Bild för sekundvisare (analog klocka)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml b/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml
deleted file mode 100644
index 0b16af5b0d..0000000000
--- a/app-wear-shared/shared/src/main/res/values-tr-rTR/strings.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d dak önce</string>
-    <string name="minago_long">%1$d dakika önce</string>
-    <string name="hoursago">%1$.1f s önce</string>
-    <string name="days_ago">%1$.1f gün önce</string>
-    <string name="days_ago_round">%1$.0f gün önce</string>
-    <string name="in_days">%1$.0f gün içinde</string>
-    <string name="in_days_round">%1$.0f gün içinde</string>
-    <string name="shorthour">s</string>
-    <string name="days">gün</string>
-    <string name="hours">saat</string>
-    <string name="unit_second">saniye</string>
-    <string name="unit_minute">dakika</string>
-    <string name="unit_hour">saat</string>
-    <string name="unit_day">gün</string>
-    <string name="unit_week">hafta</string>
-    <string name="unit_seconds">saniye</string>
-    <string name="unit_minutes">dakika</string>
-    <string name="unit_hours">saat</string>
-    <string name="unit_days">gün</string>
-    <string name="unit_weeks">hafta</string>
-    <string name="shortminute">d</string>
-    <string name="shortday">g</string>
-    <string name="later_today">Bugünden sonra</string>
-    <string name="tomorrow">Yarın</string>
-    <string name="today">Bugün</string>
-    <string name="yesterday">Dün</string>
-    <!-- Rx -->
-    <string name="connecting_for">%1$d bağlanıyor</string>
-    <string name="handshaking">Bağlandı</string>
-    <string name="connected">Bağlandı</string>
-    <string name="disconnecting">Bağlantı kesiliyor</string>
-    <string name="waiting_for_disconnection">Bağlantının kesilmesi bekleniyor</string>
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Oluşturuldu: %1$s</string>
-    <string name="metadata_label_watchface_author">Yetki: %1$s</string>
-    <string name="metadata_label_watchface_name">İsim: %1$s</string>
-    <string name="metadata_wear_import_filename">Dosya adı: %1$s</string>
-    <string name="metadata_label_plugin_version">Eklenti sürümü: %1$s</string>
-    <string name="metadata_label_watchface_name_version">İsim: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Bilgi: %1$s</string>
-    <string name="pref_show_iob">AİNS Göster</string>
-    <string name="pref_show_detailed_iob">Detalı AİNS göster</string>
-    <string name="pref_show_cob">AKRB göster</string>
-    <string name="pref_show_delta">Deltayı göster</string>
-    <string name="pref_show_detailed_delta">Detaylı Delta göster</string>
-    <string name="pref_show_avgdelta">OrtDelta\'yı Göster</string>
-    <string name="pref_show_phone_battery">Telefon Pilini Göster</string>
-    <string name="pref_show_rig_battery">Teçhizat Pilini Göster</string>
-    <string name="pref_show_basal_rate">Bazal Oranı Göster</string>
-    <string name="pref_show_loop_status">Döngü Durumunu Göster</string>
-    <string name="pref_show_bg">KŞ\'ni göster</string>
-    <string name="pref_show_bgi">KŞ Etkisi Göster</string>
-    <string name="pref_show_direction_arrow">Yön Oku Göster</string>
-    <string name="pref_show_ago">Önce Göster</string>
-    <string name="pref_show_week_number">Hafta sayısını göster</string>
-    <string name="default_custom_watchface_comment">Varsayılan saat arayüzü; bir şablon oluşturmak için SAAT ARAYÜZÜNÜ DIŞA AKTAR butonuna tıklayabilirsiniz</string>
-    <string name="wear_default_watchface">Varsayılan saat arayüzü</string>
-    <string name="cwf_comment_background">Arka plan görüntüsü</string>
-    <string name="cwf_comment_chart">Grafik (KŞ, bazal, tahmin çizgileri...)</string>
-    <string name="cwf_comment_cover_chart">Grafiğin önündeki ve metin alanlarının arkasındaki resim</string>
-    <string name="cwf_comment_freetext1">Serbest metin 1</string>
-    <string name="cwf_comment_freetext2">Serbest metin 2</string>
-    <string name="cwf_comment_freetext3">Serbest metin 3</string>
-    <string name="cwf_comment_freetext4">Serbest metin 4</string>
-    <string name="cwf_comment_iob1">Ayrıntılıysa AİNS etiketi veya AİNS Toplamı</string>
-    <string name="cwf_comment_iob2">AİNS Toplamı veya ayrıntılıysa (Bolus_AİNS|Basal_AİNS)</string>
-    <string name="cwf_comment_cob1">AKRB etiketi</string>
-    <string name="cwf_comment_cob2">AKRB değeri</string>
-    <string name="cwf_comment_delta">Kısa KŞ delta</string>
-    <string name="cwf_comment_avg_delta">Ortalama KŞ delta (15dk)</string>
-    <string name="cwf_comment_uploader_battery">Telefon pili (%)</string>
-    <string name="cwf_comment_rig_battery">Global döngü pili (%)</string>
-    <string name="cwf_comment_basalRate">Bazal Oranı</string>
-    <string name="cwf_comment_bgi">KŞ etkisi değeri</string>
-    <string name="cwf_comment_time">Saat (SS:DD veya SS:DD:SS)</string>
-    <string name="cwf_comment_hour">Saat (SS)</string>
-    <string name="cwf_comment_minute">Dakika (DD)</string>
-    <string name="cwf_comment_second">Saniye (SS)</string>
-    <string name="cwf_comment_timePeriod">AM veya PM</string>
-    <string name="cwf_comment_day_name">Haftanın gününün adı</string>
-    <string name="cwf_comment_day">Gün (GG)</string>
-    <string name="cwf_comment_week_number">Hafta sayısı</string>
-    <string name="cwf_comment_month">Ay adı (kısa)</string>
-    <string name="cwf_comment_loop">Döngü durumu ve öncesi</string>
-    <string name="cwf_comment_direction">Yön Okları</string>
-    <string name="cwf_comment_timestamp">Birkaç dakika önce son alınan KŞ</string>
-    <string name="cwf_comment_sgv">KŞ değeri</string>
-    <string name="cwf_comment_cover_plate">Metnin önündeki kapak resmi (kadranlar...)</string>
-    <string name="cwf_comment_hour_hand">Akrep şekli (Analog Saat)</string>
-    <string name="cwf_comment_minute_hand">Yelkovan şekli (Analog Saat)</string>
-    <string name="cwf_comment_second_hand">Saniye şekli (Analog Saat)</string>
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-uk-rUA/strings.xml b/app-wear-shared/shared/src/main/res/values-uk-rUA/strings.xml
deleted file mode 100644
index dc0f7891d7..0000000000
--- a/app-wear-shared/shared/src/main/res/values-uk-rUA/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <!-- Rx -->
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml b/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 484f6371f1..0000000000
--- a/app-wear-shared/shared/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    DateUtil-->
-    <string name="minago">%1$d 分钟前</string>
-    <string name="minago_long">%1$d 分钟前</string>
-    <string name="hoursago">%1$.1f 小时前</string>
-    <string name="days_ago">%1$.1f 天前</string>
-    <string name="days_ago_round">%1$.0f 天前</string>
-    <string name="in_days">在 %1$.0f 天内</string>
-    <string name="in_days_round">在 %1$.0f 天内</string>
-    <string name="shorthour">h</string>
-    <string name="days">天</string>
-    <string name="hours">小时</string>
-    <string name="unit_second">秒</string>
-    <string name="unit_minute">分钟</string>
-    <string name="unit_hour">小时</string>
-    <string name="unit_day">天</string>
-    <string name="unit_week">周</string>
-    <string name="unit_seconds">秒</string>
-    <string name="unit_minutes">分钟</string>
-    <string name="unit_hours">小时</string>
-    <string name="unit_days">天</string>
-    <string name="unit_weeks">周</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">今天稍后</string>
-    <string name="tomorrow">明天</string>
-    <string name="today">今天</string>
-    <string name="yesterday">昨天</string>
-    <!-- Rx -->
-    <string name="connecting_for">正在连接 %1$d s</string>
-    <string name="handshaking">握手</string>
-    <string name="connected">已连接</string>
-    <string name="disconnecting">正在断开连接</string>
-    <string name="waiting_for_disconnection">正在等待连接</string>
-    <!-- Custom Watchface -->
-</resources>
diff --git a/app-wear-shared/shared/src/main/res/values/strings.xml b/app-wear-shared/shared/src/main/res/values/strings.xml
deleted file mode 100644
index 6198eb283a..0000000000
--- a/app-wear-shared/shared/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="key_insulin_button_increment_1" translatable="false">insulin_button_increment_1</string>
-    <string name="key_insulin_button_increment_2" translatable="false">insulin_button_increment_2</string>
-    <string name="key_insulin_button_increment_3" translatable="false">insulin_button_increment_3</string>
-
-    <!--    DateUtil-->
-    <string name="minago">%1$d m ago</string>
-    <string name="minago_long">%1$d minutes ago</string>
-    <string name="hoursago">%1$.1f h ago</string>
-    <string name="days_ago">%1$.1f days ago</string>
-    <string name="days_ago_round">%1$.0f days ago</string>
-    <string name="in_days">in %1$.0f days</string>
-    <string name="in_days_round">in %1$.0f days</string>
-    <string name="shorthour">h</string>
-    <string name="days">days</string>
-    <string name="hours">hours</string>
-    <string name="unit_second">second</string>
-    <string name="unit_minute">minute</string>
-    <string name="unit_hour">hour</string>
-    <string name="unit_day">day</string>
-    <string name="unit_week">week</string>
-    <string name="unit_seconds">seconds</string>
-    <string name="unit_minutes">minutes</string>
-    <string name="unit_hours">hours</string>
-    <string name="unit_days">days</string>
-    <string name="unit_weeks">weeks</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
-    <string name="later_today">Later today</string>
-    <string name="tomorrow">Tomorrow</string>
-    <string name="today">Today</string>
-    <string name="yesterday">Yesterday</string>
-
-    <!-- Rx -->
-    <string name="connecting_for">Connecting for %1$d s</string>
-    <string name="handshaking">Handshaking</string>
-    <string name="connected">Connected</string>
-    <string name="disconnecting">Disconnecting</string>
-    <string name="waiting_for_disconnection">Waiting for disconnection</string>
-
-    <!-- Custom Watchface -->
-    <string name="metadata_label_watchface_created_at">Created at: %1$s</string>
-    <string name="metadata_label_watchface_author">Author: %1$s</string>
-    <string name="metadata_label_watchface_name">Name: %1$s</string>
-    <string name="metadata_wear_import_filename">File name: %1$s</string>
-    <string name="metadata_label_plugin_version">Plugin version: %1$s</string>
-    <string name="metadata_label_watchface_name_version">Name: %1$s (%2$s)</string>
-    <string name="metadata_label_watchface_infos">Info: %1$s</string>
-    <string name="metadata_label_watchface_authorization" translatable="false">%1$s</string>
-    <string name="pref_show_iob">Show IOB</string>
-    <string name="pref_show_detailed_iob">Show detailed IOB</string>
-    <string name="pref_show_cob">Show COB</string>
-    <string name="pref_show_delta">Show Delta</string>
-    <string name="pref_show_detailed_delta">Show detailed Delta</string>
-    <string name="pref_show_avgdelta">Show AvgDelta</string>
-    <string name="pref_show_phone_battery">Show Phone Battery</string>
-    <string name="pref_show_rig_battery">Show Rig Battery</string>
-    <string name="pref_show_basal_rate">Show Basal Rate</string>
-    <string name="pref_show_loop_status">Show Loop Status</string>
-    <string name="pref_show_bg">Show BG</string>
-    <string name="pref_show_bgi">Show BGI</string>
-    <string name="pref_show_direction_arrow">Show Direction Arrow</string>
-    <string name="pref_show_ago">Show Ago</string>
-    <string name="pref_show_week_number">Show Week number</string>
-    <string name="default_custom_watchface_comment">Default watchface, you can click on EXPORT WATCHFACE button to generate a template</string>
-    <string name="wear_default_watchface">Default Watchface</string>
-    <string name="cwf_comment_background">Background image</string>
-    <string name="cwf_comment_chart">Graphs (BG, basal, prediction lines...)</string>
-    <string name="cwf_comment_cover_chart">Image in front of graph and behind text fields</string>
-    <string name="cwf_comment_freetext1">Free text 1</string>
-    <string name="cwf_comment_freetext2">Free text 2</string>
-    <string name="cwf_comment_freetext3">Free text 3</string>
-    <string name="cwf_comment_freetext4">Free text 4</string>
-    <string name="cwf_comment_iob1">IOB label or IOB Sum if detailed</string>
-    <string name="cwf_comment_iob2">IOB Sum or (Bolus_IOB|Basal_IOB) if detailed</string>
-    <string name="cwf_comment_cob1">COB label</string>
-    <string name="cwf_comment_cob2">COB value</string>
-    <string name="cwf_comment_delta">Short BG delta</string>
-    <string name="cwf_comment_avg_delta">Average BG delta (15min)</string>
-    <string name="cwf_comment_uploader_battery">Phone battery (%)</string>
-    <string name="cwf_comment_rig_battery">Global loop battery (%)</string>
-    <string name="cwf_comment_basalRate">Basal Rate</string>
-    <string name="cwf_comment_bgi">BGI value</string>
-    <string name="cwf_comment_time">Time (HH:MM or HH:MM:SS)</string>
-    <string name="cwf_comment_hour">Hour (HH)</string>
-    <string name="cwf_comment_minute">Minute (MM)</string>
-    <string name="cwf_comment_second">Second (SS)</string>
-    <string name="cwf_comment_timePeriod">AM or PM</string>
-    <string name="cwf_comment_day_name">Name of day of the week</string>
-    <string name="cwf_comment_day">Day (DD)</string>
-    <string name="cwf_comment_week_number">Week number (ww)</string>
-    <string name="cwf_comment_month">Month name (short)</string>
-    <string name="cwf_comment_loop">Loop status and ago</string>
-    <string name="cwf_comment_direction">Direction arrow</string>
-    <string name="cwf_comment_timestamp">Mintutes ago for last received BG</string>
-    <string name="cwf_comment_sgv">BG value</string>
-    <string name="cwf_comment_cover_plate">Cover image in front of text (dials…)</string>
-    <string name="cwf_comment_hour_hand">Image of hour hand (Analog Watch)</string>
-    <string name="cwf_comment_minute_hand">Image of minute hand (Analog Watch)</string>
-    <string name="cwf_comment_second_hand">Image of second hand (Analog Watch)</string>
-
-</resources>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 98fb131cb4..78739798b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -181,7 +181,6 @@ dependencies {
     // in order to use internet's versions you'd need to enable Jetifier again
     // https://github.com/nightscout/graphview.git
     // https://github.com/nightscout/iconify.git
-    implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
     implementation project(':core:main')
     implementation project(':core:graphview')
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
index 43ff3c41e7..24135997a4 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
@@ -1,102 +1,98 @@
 package info.nightscout.androidaps
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import org.junit.runner.RunWith
-
-@LargeTest
-@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//@RunWith(AndroidJUnit4::class)
 class RealPumpTest {
-/*
-    companion object {
-        const val R_PASSWORD = 1234
-        const val R_SERIAL = "PBB00013LR_P"
-    }
-
-    private val validProfile = "{\"dia\":\"6\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"10\"},{\"time\":\"2:00\",\"value\":\"11\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
-
-    @Inject lateinit var pump : info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-    @Inject lateinit var randomBgPlugin :RandomBgPlugin
-    @Inject lateinit var localProfilePlugin: LocalProfilePlugin
-    @Inject lateinit var profileFunction: ProfileFunction
-    @Inject lateinit var insulinOrefUltraRapidActingPlugin: InsulinOrefUltraRapidActingPlugin
-    @Inject lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
-    @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
-    @Inject lateinit var loopPlugin: LoopPlugin
-    @Inject lateinit var actionsPlugin: ActionsPlugin
-    @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Inject lateinit var objectivesPlugin: ObjectivesPlugin
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Inject lateinit var sp: SP
-
-    @Rule
-    @JvmField
-    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
-
-    @Rule
-    @JvmField
-    var mGrantPermissionRule: GrantPermissionRule =
-        GrantPermissionRule.grant(
-            android.Manifest.permission.ACCESS_FINE_LOCATION,
-            android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-            android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-        )
-
-    @Before
-    fun clear() {
-        sp.clear()
-        sp.putBoolean(R.string.key_setupwizard_processed, true)
-        sp.putString(R.string.key_aps_mode, "closed")
-        MainApp.getDbHelper().resetDatabases()
-        MainApp.devBranch = false
-    }
-
-    private fun preparePlugins() {
-        // Source
-        configBuilderPlugin.performPluginSwitch(randomBgPlugin,true, PluginType.BGSOURCE)
-        // Profile
-        configBuilderPlugin.performPluginSwitch(localProfilePlugin, true, PluginType.PROFILE)
-        val profile = Profile(JSONObject(validProfile), Constants.MGDL)
-        Assert.assertTrue(profile.isValid("Test"))
-        localProfilePlugin.profiles.clear()
-        localProfilePlugin.numOfProfiles = 0
-        val singleProfile = LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, profile, "TestProfile")
-        localProfilePlugin.addProfile(singleProfile)
-        val profileSwitch = profileFunction.prepareProfileSwitch(localProfilePlugin.createProfileStore(), "TestProfile", 0, 100, 0, dateUtil._now())
-        treatmentsPlugin.addToHistoryProfileSwitch(profileSwitch)
-        // Insulin
-        configBuilderPlugin.performPluginSwitch(insulinOrefUltraRapidActingPlugin, true, PluginType.INSULIN)
-        // Pump
-        sp.putInt(R.string.key_danar_password, R_PASSWORD)
-        sp.putString(R.string.key_danar_bt_name, R_SERIAL)
-        configBuilderPlugin.performPluginSwitch((pump as PluginBase), true, PluginType.PUMP)
-        // Sensitivity
-        configBuilderPlugin.performPluginSwitch(sensitivityOref1Plugin, true, PluginType.SENSITIVITY)
-        // APS
-        configBuilderPlugin.performPluginSwitch(openAPSSMBPlugin, true, PluginType.APS)
-        configBuilderPlugin.performPluginSwitch(loopPlugin, true, PluginType.LOOP)
-
-        // Enable common
-        configBuilderPlugin.performPluginSwitch(actionsPlugin, true, )
-
-        // Disable unneeded
-        MainApp.getPluginsList().remove(objectivesPlugin)
-    }
-
-    @Test
-    fun doTest() {
-        Assert.assertTrue(isRunningTest())
-        preparePlugins()
-
-        while (!pump.isInitialized) {
-            //log.debug("Waiting for initialization")
-            SystemClock.sleep(1000)
+    /*
+        companion object {
+            const val R_PASSWORD = 1234
+            const val R_SERIAL = "PBB00013LR_P"
         }
 
-        while (true) {
-            //log.debug("Tick")
-            SystemClock.sleep(1000)
+        private val validProfile = "{\"dia\":\"6\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"10\"},{\"time\":\"2:00\",\"value\":\"11\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
+
+        @Inject lateinit var pump : info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+        @Inject lateinit var randomBgPlugin :RandomBgPlugin
+        @Inject lateinit var localProfilePlugin: LocalProfilePlugin
+        @Inject lateinit var profileFunction: ProfileFunction
+        @Inject lateinit var insulinOrefUltraRapidActingPlugin: InsulinOrefUltraRapidActingPlugin
+        @Inject lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
+        @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
+        @Inject lateinit var loopPlugin: LoopPlugin
+        @Inject lateinit var actionsPlugin: ActionsPlugin
+        @Inject lateinit var configBuilderPlugin: ConfigBuilderPlugin
+        @Inject lateinit var objectivesPlugin: ObjectivesPlugin
+        @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+        @Inject lateinit var sp: SP
+
+        @Rule
+        @JvmField
+        var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+
+        @Rule
+        @JvmField
+        var mGrantPermissionRule: GrantPermissionRule =
+            GrantPermissionRule.grant(
+                android.Manifest.permission.ACCESS_FINE_LOCATION,
+                android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+                android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+            )
+
+        @Before
+        fun clear() {
+            sp.clear()
+            sp.putBoolean(R.string.key_setupwizard_processed, true)
+            sp.putString(R.string.key_aps_mode, "closed")
+            MainApp.getDbHelper().resetDatabases()
+            MainApp.devBranch = false
         }
-    }
- */
+
+        private fun preparePlugins() {
+            // Source
+            configBuilderPlugin.performPluginSwitch(randomBgPlugin,true, PluginType.BGSOURCE)
+            // Profile
+            configBuilderPlugin.performPluginSwitch(localProfilePlugin, true, PluginType.PROFILE)
+            val profile = Profile(JSONObject(validProfile), GlucoseUnit.MGDL.asText)
+            Assert.assertTrue(profile.isValid("Test"))
+            localProfilePlugin.profiles.clear()
+            localProfilePlugin.numOfProfiles = 0
+            val singleProfile = LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, profile, "TestProfile")
+            localProfilePlugin.addProfile(singleProfile)
+            val profileSwitch = profileFunction.prepareProfileSwitch(localProfilePlugin.createProfileStore(), "TestProfile", 0, 100, 0, dateUtil._now())
+            treatmentsPlugin.addToHistoryProfileSwitch(profileSwitch)
+            // Insulin
+            configBuilderPlugin.performPluginSwitch(insulinOrefUltraRapidActingPlugin, true, PluginType.INSULIN)
+            // Pump
+            sp.putInt(R.string.key_danar_password, R_PASSWORD)
+            sp.putString(R.string.key_danar_bt_name, R_SERIAL)
+            configBuilderPlugin.performPluginSwitch((pump as PluginBase), true, PluginType.PUMP)
+            // Sensitivity
+            configBuilderPlugin.performPluginSwitch(sensitivityOref1Plugin, true, PluginType.SENSITIVITY)
+            // APS
+            configBuilderPlugin.performPluginSwitch(openAPSSMBPlugin, true, PluginType.APS)
+            configBuilderPlugin.performPluginSwitch(loopPlugin, true, PluginType.LOOP)
+
+            // Enable common
+            configBuilderPlugin.performPluginSwitch(actionsPlugin, true, )
+
+            // Disable unneeded
+            MainApp.getPluginsList().remove(objectivesPlugin)
+        }
+
+        @Test
+        fun doTest() {
+            Assert.assertTrue(isRunningTest())
+            preparePlugins()
+
+            while (!pump.isInitialized) {
+                //log.debug("Waiting for initialization")
+                SystemClock.sleep(1000)
+            }
+
+            while (true) {
+                //log.debug("Tick")
+                SystemClock.sleep(1000)
+            }
+        }
+     */
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
index ba6a794cab..933c6c2936 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/SetupWizardActivityTest.kt
@@ -1,195 +1,191 @@
 package info.nightscout.androidaps
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import org.junit.runner.RunWith
-
-@LargeTest
-@RunWith(AndroidJUnit4::class)
+//@LargeTest
+//@RunWith(AndroidJUnit4::class)
 class SetupWizardActivityTest {
-/*
-    @Rule
-    @JvmField
-    var mActivityTestRule = ActivityTestRule(SetupWizardActivity::class.java)
+    /*
+        @Rule
+        @JvmField
+        var mActivityTestRule = ActivityTestRule(SetupWizardActivity::class.java)
 
-    @Rule
-    @JvmField
-    var mGrantPermissionRule: GrantPermissionRule =
-        GrantPermissionRule.grant(
-            android.Manifest.permission.ACCESS_FINE_LOCATION,
-            android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
-            android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-        )
+        @Rule
+        @JvmField
+        var mGrantPermissionRule: GrantPermissionRule =
+            GrantPermissionRule.grant(
+                android.Manifest.permission.ACCESS_FINE_LOCATION,
+                android.Manifest.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,
+                android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+            )
 
-    @Before
-    fun clear() {
-        sp.clear()
-    }
-/*
-
-To run from command line
-gradlew connectedFullDebugAndroidTest
-
-do not run when your production phone is connected !!!
-
-do this before for running in emulator
-adb shell settings put global window_animation_scale 0 &
-adb shell settings put global transition_animation_scale 0 &
-adb shell settings put global animator_duration_scale 0 &
- */
-
-    @Test
-    fun setupWizardActivityTest() {
-        sp.clear()
-        Assert.assertTrue(isRunningTest())
-        // Welcome page
-        onView(withId(R.id.next_button)).perform(click())
-        // Language selection
-        onView(withText("English")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Agreement page
-        onView(withText("I UNDERSTAND AND AGREE")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Location permission
-        var askButton = onView(withText("Ask for permission"))
-        if (askButton.isDisplayed()) {
-            askButton.perform(scrollTo(), click())
-            onView(withId(R.id.next_button)).waitAndPerform(click())
+        @Before
+        fun clear() {
+            sp.clear()
         }
-        // Store permission
-        askButton = onView(withText("Ask for permission"))
-        if (askButton.isDisplayed()) {
-            askButton.perform(scrollTo(), click())
-            onView(withText("OK")).perform(click())
+    /*
+
+    To run from command line
+    gradlew connectedFullDebugAndroidTest
+
+    do not run when your production phone is connected !!!
+
+    do this before for running in emulator
+    adb shell settings put global window_animation_scale 0 &
+    adb shell settings put global transition_animation_scale 0 &
+    adb shell settings put global animator_duration_scale 0 &
+     */
+
+        @Test
+        fun setupWizardActivityTest() {
+            sp.clear()
+            Assert.assertTrue(isRunningTest())
+            // Welcome page
+            onView(withId(R.id.next_button)).perform(click())
+            // Language selection
+            onView(withText("English")).perform(scrollTo(), click())
             onView(withId(R.id.next_button)).waitAndPerform(click())
-        }
-        // Import settings : skip of found
-        askButton = onView(withText("IMPORT SETTINGS"))
-        if (askButton.isDisplayed()) {
+            // Agreement page
+            onView(withText("I UNDERSTAND AND AGREE")).perform(scrollTo(), click())
             onView(withId(R.id.next_button)).waitAndPerform(click())
-        }
-        // Units selection
-        onView(withText("mmol/L")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).perform(click())
-        // Display target selection
-        onView(withText("4.2")).perform(scrollTo(), ViewActions.replaceText("5"))
-        onView(withText("10.0")).perform(scrollTo(), ViewActions.replaceText("11"))
-        onView(withId(R.id.next_button)).perform(click())
-        // NSClient
-        onView(withId(R.id.next_button)).perform(click())
-        // Age selection
-        onView(withText("Adult")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Insulin selection
-        onView(withText("Ultra-Rapid Oref")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // BG source selection
-        onView(withText("Random BG")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Profile selection
-        onView(withText("Local Profile")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Local profile - DIA
-        onView(withTagValue(Matchers.`is`("LP_DIA"))).perform(scrollTo(), ViewActions.replaceText("6.0"))
-        // Local profile - IC
-        onView(withId(R.id.ic_tab)).perform(scrollTo(), click())
-        onView(Matchers.allOf(withTagValue(Matchers.`is`("IC-1-0")), isDisplayed()))
-            .perform(ViewActions.replaceText("2"), ViewActions.closeSoftKeyboard())
-        // Local profile - ISF
-        onView(withId(R.id.isf_tab)).perform(scrollTo(), click())
-        onView(Matchers.allOf(withTagValue(Matchers.`is`("ISF-1-0")), isDisplayed()))
-            .perform(ViewActions.replaceText("3"), ViewActions.closeSoftKeyboard())
-        // Local profile - BAS
-        onView(withId(R.id.basal_tab)).perform(scrollTo(), click())
-        onView(childAtPosition(Matchers.allOf(withId(R.id.localprofile_basal), childAtPosition(withClassName(Matchers.`is`("android.widget.LinearLayout")), 6)), 2))
-            .perform(scrollTo(), click())
-        onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-0")), isDisplayed()))
-            .perform(ViewActions.replaceText("1.1"), ViewActions.closeSoftKeyboard())
-        onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-1")), isDisplayed()))
-            .perform(ViewActions.replaceText("1.2"), ViewActions.closeSoftKeyboard())
-        onView(Matchers.allOf(withId(R.id.timelistedit_time), childAtPosition(childAtPosition(withId(R.id.localprofile_basal), 2), 0)))
-            .perform(scrollTo(), click())
-        onData(Matchers.anything()).inAdapterView(childAtPosition(withClassName(Matchers.`is`("android.widget.PopupWindow\$PopupBackgroundView")), 0)).atPosition(13)
-            .perform(click())
-        // Local profile - TARGET
-        onView(withId(R.id.target_tab)).perform(scrollTo(), click())
-        onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-1-0")), isDisplayed()))
-            .perform(ViewActions.replaceText("6"), ViewActions.closeSoftKeyboard())
-        onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-2-0")), isDisplayed()))
-            .perform(ViewActions.replaceText("6.5"), ViewActions.closeSoftKeyboard())
-        onView(withText("Save")).perform(scrollTo(), click())
-        onView(Matchers.allOf(withId(R.id.localprofile_profileswitch), isDisplayed()))
-            .perform(scrollTo(), click())
-        onView(allOf(withId(R.id.ok), isDisplayed())).perform(click())
-        // confirm dialog
-        //onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
-        clickOkInDialog()
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Profile switch
-        askButton = onView(withText("Do Profile Switch"))
-        if (askButton.isDisplayed()) {
-            askButton.perform(scrollTo(), click())
+            // Location permission
+            var askButton = onView(withText("Ask for permission"))
+            if (askButton.isDisplayed()) {
+                askButton.perform(scrollTo(), click())
+                onView(withId(R.id.next_button)).waitAndPerform(click())
+            }
+            // Store permission
+            askButton = onView(withText("Ask for permission"))
+            if (askButton.isDisplayed()) {
+                askButton.perform(scrollTo(), click())
+                onView(withText("OK")).perform(click())
+                onView(withId(R.id.next_button)).waitAndPerform(click())
+            }
+            // Import settings : skip of found
+            askButton = onView(withText("IMPORT SETTINGS"))
+            if (askButton.isDisplayed()) {
+                onView(withId(R.id.next_button)).waitAndPerform(click())
+            }
+            // Units selection
+            onView(withText("mmol/L")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).perform(click())
+            // Display target selection
+            onView(withText("4.2")).perform(scrollTo(), ViewActions.replaceText("5"))
+            onView(withText("10.0")).perform(scrollTo(), ViewActions.replaceText("11"))
+            onView(withId(R.id.next_button)).perform(click())
+            // NSClient
+            onView(withId(R.id.next_button)).perform(click())
+            // Age selection
+            onView(withText("Adult")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // Insulin selection
+            onView(withText("Ultra-Rapid Oref")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // BG source selection
+            onView(withText("Random BG")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // Profile selection
+            onView(withText("Local Profile")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // Local profile - DIA
+            onView(withTagValue(Matchers.`is`("LP_DIA"))).perform(scrollTo(), ViewActions.replaceText("6.0"))
+            // Local profile - IC
+            onView(withId(R.id.ic_tab)).perform(scrollTo(), click())
+            onView(Matchers.allOf(withTagValue(Matchers.`is`("IC-1-0")), isDisplayed()))
+                .perform(ViewActions.replaceText("2"), ViewActions.closeSoftKeyboard())
+            // Local profile - ISF
+            onView(withId(R.id.isf_tab)).perform(scrollTo(), click())
+            onView(Matchers.allOf(withTagValue(Matchers.`is`("ISF-1-0")), isDisplayed()))
+                .perform(ViewActions.replaceText("3"), ViewActions.closeSoftKeyboard())
+            // Local profile - BAS
+            onView(withId(R.id.basal_tab)).perform(scrollTo(), click())
+            onView(childAtPosition(Matchers.allOf(withId(R.id.localprofile_basal), childAtPosition(withClassName(Matchers.`is`("android.widget.LinearLayout")), 6)), 2))
+                .perform(scrollTo(), click())
+            onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-0")), isDisplayed()))
+                .perform(ViewActions.replaceText("1.1"), ViewActions.closeSoftKeyboard())
+            onView(Matchers.allOf(withTagValue(Matchers.`is`("BASAL-1-1")), isDisplayed()))
+                .perform(ViewActions.replaceText("1.2"), ViewActions.closeSoftKeyboard())
+            onView(Matchers.allOf(withId(R.id.timelistedit_time), childAtPosition(childAtPosition(withId(R.id.localprofile_basal), 2), 0)))
+                .perform(scrollTo(), click())
+            onData(Matchers.anything()).inAdapterView(childAtPosition(withClassName(Matchers.`is`("android.widget.PopupWindow\$PopupBackgroundView")), 0)).atPosition(13)
+                .perform(click())
+            // Local profile - TARGET
+            onView(withId(R.id.target_tab)).perform(scrollTo(), click())
+            onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-1-0")), isDisplayed()))
+                .perform(ViewActions.replaceText("6"), ViewActions.closeSoftKeyboard())
+            onView(Matchers.allOf(withTagValue(Matchers.`is`("TARGET-2-0")), isDisplayed()))
+                .perform(ViewActions.replaceText("6.5"), ViewActions.closeSoftKeyboard())
+            onView(withText("Save")).perform(scrollTo(), click())
+            onView(Matchers.allOf(withId(R.id.localprofile_profileswitch), isDisplayed()))
+                .perform(scrollTo(), click())
             onView(allOf(withId(R.id.ok), isDisplayed())).perform(click())
-            // onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
+            // confirm dialog
+            //onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
             clickOkInDialog()
-            while (ProfileFunctions.getInstance().profile == null) SystemClock.sleep(100)
             onView(withId(R.id.next_button)).waitAndPerform(click())
-        }
-        // Pump
-        onView(withText("Virtual Pump")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // APS
-        onView(withText("OpenAPS SMB")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Open Closed Loop
-        onView(withText("Closed Loop")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Loop
-        askButton = onView(withText("Enable loop"))
-        if (askButton.isDisplayed()) {
-            askButton.perform(scrollTo(), click())
-            onView(withId(R.id.next_button)).waitAndPerform(click())
-        }
-        // Sensitivity
-        onView(withText("Sensitivity Oref1")).perform(scrollTo(), click())
-        onView(withId(R.id.next_button)).waitAndPerform(click())
-        // Objectives
-        onView(allOf(withText("Start"), isDisplayed())).perform(scrollTo(), click())
-        onView(withId(R.id.finish_button)).waitAndPerform(click())
-
-        // Verify settings
-        Assert.assertEquals(Constants.MMOL, ProfileFunctions.getSystemUnits())
-        Assert.assertEquals(17.0, HardLimits.maxBolus(), 0.0001) // Adult
-        Assert.assertTrue(RandomBgPlugin.isEnabled(PluginType.BGSOURCE))
-        Assert.assertTrue(LocalProfilePlugin.isEnabled(PluginType.PROFILE))
-        val p = ProfileFunctions.getInstance().profile
-        Assert.assertNotNull(p)
-        Assert.assertEquals(2.0, p!!.ic, 0.0001)
-        Assert.assertEquals(3.0 * Constants.MMOLL_TO_MGDL, p.isfMgdl, 0.0001)
-        Assert.assertEquals(1.1, p.getBasalTimeFromMidnight(0), 0.0001)
-        Assert.assertEquals(6.0 * Constants.MMOLL_TO_MGDL, p.targetLowMgdl, 0.0001)
-        Assert.assertTrue(VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP))
-        Assert.assertTrue(OpenAPSSMBPlugin.getPlugin().isEnabled())
-        Assert.assertTrue(LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
-        Assert.assertTrue(SensitivityOref1Plugin.getPlugin().isEnabled(PluginType.SENSITIVITY))
-        Assert.assertTrue(ObjectivesPlugin.objectives[0].isStarted)
-    }
-
-    private fun childAtPosition(
-        parentMatcher: Matcher<View>, position: Int): Matcher<View> {
-
-        return object : TypeSafeMatcher<View>() {
-            override fun describeTo(description: Description) {
-                description.appendText("Child at position $position in parent ")
-                parentMatcher.describeTo(description)
+            // Profile switch
+            askButton = onView(withText("Do Profile Switch"))
+            if (askButton.isDisplayed()) {
+                askButton.perform(scrollTo(), click())
+                onView(allOf(withId(R.id.ok), isDisplayed())).perform(click())
+                // onView(Matchers.allOf(withText("OK"), isDisplayed())).perform(click()) not working on real phone
+                clickOkInDialog()
+                while (ProfileFunctions.getInstance().profile == null) SystemClock.sleep(100)
+                onView(withId(R.id.next_button)).waitAndPerform(click())
             }
+            // Pump
+            onView(withText("Virtual Pump")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // APS
+            onView(withText("OpenAPS SMB")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // Open Closed Loop
+            onView(withText("Closed Loop")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // Loop
+            askButton = onView(withText("Enable loop"))
+            if (askButton.isDisplayed()) {
+                askButton.perform(scrollTo(), click())
+                onView(withId(R.id.next_button)).waitAndPerform(click())
+            }
+            // Sensitivity
+            onView(withText("Sensitivity Oref1")).perform(scrollTo(), click())
+            onView(withId(R.id.next_button)).waitAndPerform(click())
+            // Objectives
+            onView(allOf(withText("Start"), isDisplayed())).perform(scrollTo(), click())
+            onView(withId(R.id.finish_button)).waitAndPerform(click())
 
-            public override fun matchesSafely(view: View): Boolean {
-                val parent = view.parent
-                return parent is ViewGroup && parentMatcher.matches(parent)
-                    && view == parent.getChildAt(position)
+            // Verify settings
+            Assert.assertEquals(GlucoseUnit.MMOL.asText, ProfileFunctions.getSystemUnits())
+            Assert.assertEquals(17.0, HardLimits.maxBolus(), 0.0001) // Adult
+            Assert.assertTrue(RandomBgPlugin.isEnabled(PluginType.BGSOURCE))
+            Assert.assertTrue(LocalProfilePlugin.isEnabled(PluginType.PROFILE))
+            val p = ProfileFunctions.getInstance().profile
+            Assert.assertNotNull(p)
+            Assert.assertEquals(2.0, p!!.ic, 0.0001)
+            Assert.assertEquals(3.0 * Constants.MMOLL_TO_MGDL, p.isfMgdl, 0.0001)
+            Assert.assertEquals(1.1, p.getBasalTimeFromMidnight(0), 0.0001)
+            Assert.assertEquals(6.0 * Constants.MMOLL_TO_MGDL, p.targetLowMgdl, 0.0001)
+            Assert.assertTrue(VirtualPumpPlugin.getPlugin().isEnabled(PluginType.PUMP))
+            Assert.assertTrue(OpenAPSSMBPlugin.getPlugin().isEnabled())
+            Assert.assertTrue(LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
+            Assert.assertTrue(SensitivityOref1Plugin.getPlugin().isEnabled(PluginType.SENSITIVITY))
+            Assert.assertTrue(ObjectivesPlugin.objectives[0].isStarted)
+        }
+
+        private fun childAtPosition(
+            parentMatcher: Matcher<View>, position: Int): Matcher<View> {
+
+            return object : TypeSafeMatcher<View>() {
+                override fun describeTo(description: Description) {
+                    description.appendText("Child at position $position in parent ")
+                    parentMatcher.describeTo(description)
+                }
+
+                public override fun matchesSafely(view: View): Boolean {
+                    val parent = view.parent
+                    return parent is ViewGroup && parentMatcher.matches(parent)
+                        && view == parent.getChildAt(position)
+                }
             }
         }
-    }
- */
+     */
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 9adbcafd07..468547aa58 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -52,11 +52,10 @@ import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.maintenance.PrefFileListProvider
 import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.protection.ProtectionCheck
 import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
@@ -96,7 +95,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var iconsProvider: IconsProvider
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var signatureVerifierPlugin: SignatureVerifierPlugin
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var profileFunction: ProfileFunction
@@ -283,7 +282,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
     private fun start() {
         binding.splash.visibility = View.GONE
         //Check here if loop plugin is disabled. Else check via constraints
-        if (!(loop as PluginBase).isEnabled()) versionCheckerUtils.triggerCheckVersion()
+        if (!loop.isEnabled()) versionCheckerUtils.triggerCheckVersion()
         setUserStats()
         setupViews()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
index 67b544ed75..3c3e6b1a9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt
@@ -38,6 +38,7 @@ import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
+import info.nightscout.plugins.aps.utils.StaticInjector
 import info.nightscout.plugins.general.overview.notifications.NotificationStore
 import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
 import info.nightscout.rx.logging.AAPSLogger
@@ -77,7 +78,7 @@ class MainApp : DaggerApplication() {
     @Inject lateinit var compatDBHelper: CompatDBHelper
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var dateUtil: DateUtil
-    @Suppress("unused") @Inject lateinit var staticInjector: info.nightscout.plugins.aps.utils.StaticInjector// TODO avoid , here fake only to initialize
+    @Suppress("unused") @Inject lateinit var staticInjector: StaticInjector// TODO avoid , here fake only to initialize
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var uiInteraction: UiInteraction
     @Inject lateinit var notificationStore: NotificationStore
diff --git a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
index f96fd72374..26e84713c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt
@@ -8,7 +8,6 @@ import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.insight.di.InsightDatabaseModule
 import info.nightscout.androidaps.insight.di.InsightModule
-import info.nightscout.plugins.sync.di.OpenHumansModule
 import info.nightscout.androidaps.plugins.pump.common.di.RileyLinkModule
 import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchModule
 import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
@@ -24,6 +23,7 @@ import info.nightscout.insulin.di.InsulinModule
 import info.nightscout.plugins.aps.di.ApsModule
 import info.nightscout.plugins.constraints.di.PluginsConstraintsModule
 import info.nightscout.plugins.di.PluginsModule
+import info.nightscout.plugins.sync.di.OpenHumansModule
 import info.nightscout.plugins.sync.di.SyncModule
 import info.nightscout.pump.combo.di.ComboModule
 import info.nightscout.pump.combov2.di.ComboV2Module
@@ -31,11 +31,9 @@ import info.nightscout.pump.common.di.PumpCommonModule
 import info.nightscout.pump.dana.di.DanaHistoryModule
 import info.nightscout.pump.dana.di.DanaModule
 import info.nightscout.pump.danars.di.DanaRSModule
-import info.nightscout.pump.medtrum.di.MedtrumModule
 import info.nightscout.pump.diaconn.di.DiaconnG8Module
+import info.nightscout.pump.medtrum.di.MedtrumModule
 import info.nightscout.pump.virtual.di.VirtualPumpModule
-import info.nightscout.rx.di.RxModule
-import info.nightscout.shared.di.SharedModule
 import info.nightscout.shared.impl.di.SharedImplModule
 import info.nightscout.source.di.SourceModule
 import info.nightscout.ui.di.UiModule
@@ -62,8 +60,6 @@ import javax.inject.Singleton
         InsulinModule::class,
         OpenHumansModule::class,
         PluginsModule::class,
-        RxModule::class,
-        SharedModule::class,
         SharedImplModule::class,
         UiModule::class,
         ValidatorsModule::class,
diff --git a/app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt
deleted file mode 100644
index 200b83579f..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/di/ServicesModule.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package info.nightscout.androidaps.di
-
diff --git a/app/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt
index be9f2417c5..c49b5b8f0d 100644
--- a/app/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt
+++ b/app/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt
@@ -9,8 +9,7 @@ import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.ApsMode
 import info.nightscout.interfaces.Config
-import info.nightscout.sdk.interfaces.RunningConfiguration
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -21,7 +20,7 @@ import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.pump.virtual.VirtualPumpPlugin
-import info.nightscout.rx.bus.RxBus
+import info.nightscout.sdk.interfaces.RunningConfiguration
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
@@ -34,8 +33,7 @@ import org.mockito.Mockito.`when`
 class LoopPluginTest : TestBase() {
 
     @Mock lateinit var sp: SP
-    private val rxBus: RxBus = RxBus(aapsSchedulers, aapsLogger)
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var context: Context
diff --git a/app/src/test/java/info/nightscout/plugins/configBuilder/ConfigBuilderPluginTest.kt b/app/src/test/java/info/nightscout/plugins/configBuilder/ConfigBuilderPluginTest.kt
index 3013ce8090..3061e18835 100644
--- a/app/src/test/java/info/nightscout/plugins/configBuilder/ConfigBuilderPluginTest.kt
+++ b/app/src/test/java/info/nightscout/plugins/configBuilder/ConfigBuilderPluginTest.kt
@@ -8,7 +8,6 @@ import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.protection.ProtectionCheck
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.ui.UiInteraction
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.sharedtests.TestBase
@@ -37,6 +36,6 @@ class ConfigBuilderPluginTest : TestBase() {
 
     @BeforeEach
     fun prepareMock() {
-        configBuilderPlugin = ConfigBuilderPlugin(injector, aapsLogger, rh, sp, RxBus(aapsSchedulers, aapsLogger), activePlugin, uel, pumpSync, protectionCheck, uiInteraction)
+        configBuilderPlugin = ConfigBuilderPlugin(injector, aapsLogger, rh, sp, rxBus, activePlugin, uel, pumpSync, protectionCheck, uiInteraction)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerTest.kt
index ad5bac6590..627ff00b5e 100644
--- a/app/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerTest.kt
@@ -9,13 +9,14 @@ import info.nightscout.androidaps.insight.database.InsightDatabase
 import info.nightscout.androidaps.insight.database.InsightDatabaseDao
 import info.nightscout.androidaps.insight.database.InsightDbHelper
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
 import info.nightscout.interfaces.ApsMode
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
 import info.nightscout.interfaces.constraints.Objectives
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.maintenance.PrefFileListProvider
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginType
@@ -74,7 +75,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
     private lateinit var danaPump: DanaPump
     private lateinit var insightDbHelper: InsightDbHelper
-    private lateinit var constraintChecker: ConstraintsImpl
+    private lateinit var constraintChecker: ConstraintsCheckerImpl
     private lateinit var safetyPlugin: SafetyPlugin
     private lateinit var objectivesPlugin: ObjectivesPlugin
     private lateinit var comboPlugin: ComboPlugin
@@ -94,6 +95,9 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
             if (it is PumpEnactResult) {
                 it.context = context
             }
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
         }
     }
 
@@ -134,7 +138,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         `when`(sp.getString(R.string.key_danar_bt_name, "")).thenReturn("")
 
         //SafetyPlugin
-        constraintChecker = ConstraintsImpl(activePlugin)
+        constraintChecker = ConstraintsCheckerImpl(activePlugin, injector)
 
         val glucoseStatusProvider = GlucoseStatusProviderImpl(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter)
 
@@ -226,7 +230,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         constraintsPluginsList.add(insightPlugin)
         constraintsPluginsList.add(openAPSAMAPlugin)
         constraintsPluginsList.add(openAPSSMBPlugin)
-        `when`(activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)).thenReturn(constraintsPluginsList)
+        `when`(activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)).thenReturn(constraintsPluginsList)
         objectivesPlugin.onStart()
     }
 
@@ -268,7 +272,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         val c = constraintChecker.isAutosensModeEnabled()
         assertThat(c.reasonList).hasSize(2) // Safety & Objectives
         assertThat(c.mostLimitedReasonList).hasSize(2) // Safety & Objectives
-        assertThat( c.value()).isFalse()
+        assertThat(c.value()).isFalse()
     }
 
     // Safety
@@ -278,7 +282,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         val c = constraintChecker.isAdvancedFilteringEnabled()
         assertThat(c.reasonList).hasSize(1) // Safety
         assertThat(c.mostLimitedReasonList).hasSize(1) // Safety
-        assertThat( c.value()).isFalse()
+        assertThat(c.value()).isFalse()
     }
 
     // SMB should limit
@@ -286,7 +290,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     fun isSuperBolusEnabledTest() {
         openAPSSMBPlugin.setPluginEnabled(PluginType.APS, true)
         val c = constraintChecker.isSuperBolusEnabled()
-        assertThat( c.value()).isFalse() // SMB should limit
+        assertThat(c.value()).isFalse() // SMB should limit
     }
 
     // Safety & Objectives
@@ -296,11 +300,11 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         objectivesPlugin.objectives[Objectives.SMB_OBJECTIVE].startedOn = 0
         `when`(sp.getBoolean(info.nightscout.plugins.aps.R.string.key_use_smb, false)).thenReturn(false)
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.OPEN.name)
-//        `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(Constraint(true))
+//        `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(ConstraintObject(true))
         val c = constraintChecker.isSMBModeEnabled()
         assertThat(c.reasonList).hasSize(3) // 2x Safety & Objectives
         assertThat(c.mostLimitedReasonList).hasSize(3) // 2x Safety & Objectives
-        assertThat( c.value()).isFalse()
+        assertThat(c.value()).isFalse()
     }
 
     // applyBasalConstraints tests
@@ -326,9 +330,9 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
         // Apply all limits
         val d = constraintChecker.getMaxBasalAllowed(validProfile)
-        assertThat( d.value()).isWithin( 0.01).of(0.8)
+        assertThat(d.value()).isWithin(0.01).of(0.8)
         assertThat(d.reasonList).hasSize(3)
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit")
     }
 
     @Test
@@ -355,7 +359,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         val i = constraintChecker.getMaxBasalPercentAllowed(validProfile)
         assertThat(i.value()).isEqualTo(200)
         assertThat(i.reasonList).hasSize(6)
-        assertThat(i.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting max percent rate to 200% because of pump limit")
+        assertThat(i.getMostLimitedReasons()).isEqualTo("Safety: Limiting max percent rate to 200% because of pump limit")
     }
 
     // applyBolusConstraints tests
@@ -380,9 +384,9 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
         // Apply all limits
         val d = constraintChecker.getMaxBolusAllowed()
-        assertThat( d.value()).isWithin( 0.01).of(3.0)
+        assertThat(d.value()).isWithin(0.01).of(3.0)
         assertThat(d.reasonList).hasSize(4) // 2x Safety & RS & R
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting bolus to 3.0 U because of max value in preferences")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("Safety: Limiting bolus to 3.0 U because of max value in preferences")
     }
 
     // applyCarbsConstraints tests
@@ -395,7 +399,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         val i = constraintChecker.getMaxCarbsAllowed()
         assertThat(i.value()).isEqualTo(48)
         assertThat(i.reasonList).hasSize(1)
-        assertThat(i.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting carbs to 48 g because of max value in preferences")
+        assertThat(i.getMostLimitedReasons()).isEqualTo("Safety: Limiting carbs to 48 g because of max value in preferences")
     }
 
     // applyMaxIOBConstraints tests
@@ -410,9 +414,9 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
         // Apply all limits
         val d = constraintChecker.getMaxIOBAllowed()
-        assertThat( d.value()).isWithin( 0.01).of(1.5)
+        assertThat(d.value()).isWithin(0.01).of(1.5)
         assertThat(d.reasonList).hasSize(2)
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("OpenAPSAMA: Limiting IOB to 1.5 U because of max value in preferences")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("OpenAPSAMA: Limiting IOB to 1.5 U because of max value in preferences")
     }
 
     @Test
@@ -426,8 +430,8 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
         // Apply all limits
         val d = constraintChecker.getMaxIOBAllowed()
-        assertThat( d.value()).isWithin( 0.01).of(3.0)
+        assertThat(d.value()).isWithin(0.01).of(3.0)
         assertThat(d.reasonList).hasSize(2)
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("OpenAPSSMB: Limiting IOB to 3.0 U because of max value in preferences")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("OpenAPSSMB: Limiting IOB to 3.0 U because of max value in preferences")
     }
 }
diff --git a/app/src/test/java/info/nightscout/plugins/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/plugins/safety/SafetyPluginTest.kt
index 56e88846d8..d473e1c789 100644
--- a/app/src/test/java/info/nightscout/plugins/safety/SafetyPluginTest.kt
+++ b/app/src/test/java/info/nightscout/plugins/safety/SafetyPluginTest.kt
@@ -3,12 +3,12 @@ package info.nightscout.plugins.safety
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.ApsMode
-import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profiling.Profiler
@@ -29,7 +29,7 @@ import org.mockito.Mockito.`when`
 
 class SafetyPluginTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var glimpPlugin: GlimpPlugin
     @Mock lateinit var profiler: Profiler
@@ -43,7 +43,13 @@ class SafetyPluginTest : TestBaseWithProfile() {
     private lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
     private lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
 
-    private val injector = HasAndroidInjector { AndroidInjector { } }
+    private val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
     private val pumpDescription = PumpDescription()
 
     @BeforeEach
@@ -86,9 +92,8 @@ class SafetyPluginTest : TestBaseWithProfile() {
     @Test
     fun pumpDescriptionShouldLimitLoopInvocation() {
         pumpDescription.isTempBasalCapable = false
-        var c = Constraint(true)
-        c = safetyPlugin.isLoopInvocationAllowed(c)
-        assertThat(c.getReasons(aapsLogger)).isEqualTo("Safety: Pump is not temp basal capable")
+        val c = safetyPlugin.isLoopInvocationAllowed(ConstraintObject(true, injector))
+        assertThat(c.getReasons()).isEqualTo("Safety: Pump is not temp basal capable")
         assertThat(c.value()).isFalse()
     }
 
@@ -96,47 +101,42 @@ class SafetyPluginTest : TestBaseWithProfile() {
     fun disabledEngineeringModeShouldLimitClosedLoop() {
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.CLOSED.name)
         `when`(config.isEngineeringModeOrRelease()).thenReturn(false)
-        var c = Constraint(true)
-        c = safetyPlugin.isClosedLoopAllowed(c)
-        assertThat(c.getReasons(aapsLogger)).contains("Running dev version. Closed loop is disabled.")
+        val c = safetyPlugin.isClosedLoopAllowed(ConstraintObject(true, injector))
+        assertThat(c.getReasons()).contains("Running dev version. Closed loop is disabled.")
         assertThat(c.value()).isFalse()
     }
 
     @Test
     fun setOpenLoopInPreferencesShouldLimitClosedLoop() {
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.OPEN.name)
-        var c = Constraint(true)
-        c = safetyPlugin.isClosedLoopAllowed(c)
-        assertThat(c.getReasons(aapsLogger)).contains("Closed loop mode disabled in preferences")
+        val c = safetyPlugin.isClosedLoopAllowed(ConstraintObject(true, injector))
+        assertThat(c.getReasons()).contains("Closed loop mode disabled in preferences")
         assertThat(c.value()).isFalse()
     }
 
     @Test
     fun notEnabledSMBInPreferencesDisablesSMB() {
         `when`(sp.getBoolean(info.nightscout.plugins.aps.R.string.key_use_smb, false)).thenReturn(false)
-        `when`(constraintChecker.isClosedLoopAllowed(anyObject())).thenReturn(Constraint(true))
-        var c = Constraint(true)
-        c = openAPSSMBPlugin.isSMBModeEnabled(c)
-        assertThat(c.getReasons(aapsLogger)).contains("SMB disabled in preferences")
+        `when`(constraintChecker.isClosedLoopAllowed(anyObject())).thenReturn(ConstraintObject(true, injector))
+        val c = openAPSSMBPlugin.isSMBModeEnabled(ConstraintObject(true, injector))
+        assertThat(c.getReasons()).contains("SMB disabled in preferences")
         assertThat(c.value()).isFalse()
     }
 
     @Test
     fun openLoopPreventsSMB() {
         `when`(sp.getBoolean(info.nightscout.plugins.aps.R.string.key_use_smb, false)).thenReturn(true)
-        `when`(constraintChecker.isClosedLoopAllowed(anyObject())).thenReturn(Constraint(false))
-        var c = Constraint(true)
-        c = safetyPlugin.isSMBModeEnabled(c)
-        assertThat(c.getReasons(aapsLogger)).contains("SMB not allowed in open loop mode")
+        `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(ConstraintObject(false, injector))
+        val c = safetyPlugin.isSMBModeEnabled(ConstraintObject(true, injector))
+        assertThat(c.getReasons()).contains("SMB not allowed in open loop mode")
         assertThat(c.value()).isFalse()
     }
 
     @Test
     fun bgSourceShouldPreventSMBAlways() {
         `when`(activePlugin.activeBgSource).thenReturn(glimpPlugin)
-        var c = Constraint(true)
-        c = safetyPlugin.isAdvancedFilteringEnabled(c)
-        assertThat(c.getReasons(aapsLogger)).isEqualTo("Safety: SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
+        val c = safetyPlugin.isAdvancedFilteringEnabled(ConstraintObject(true, injector))
+        assertThat(c.getReasons()).isEqualTo("Safety: SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering")
         assertThat(c.value()).isFalse()
     }
 
@@ -146,24 +146,26 @@ class SafetyPluginTest : TestBaseWithProfile() {
         `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0)
         `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0)
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child")
-        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        val c = ConstraintObject(Double.MAX_VALUE, injector)
         safetyPlugin.applyBasalConstraints(c, validProfile)
         assertThat(c.value()).isWithin(0.01).of(2.0)
-        assertThat(c.getReasons(aapsLogger)).isEqualTo(
+        assertThat(c.getReasons()).isEqualTo(
             """
     Safety: Limiting max basal rate to 2.00 U/h because of hard limit
-    """.trimIndent())
-        assertThat(c.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting max basal rate to 2.00 U/h because of hard limit")
+    """.trimIndent()
+        )
+        assertThat(c.getMostLimitedReasons()).isEqualTo("Safety: Limiting max basal rate to 2.00 U/h because of hard limit")
     }
 
     @Test
     fun doNotAllowNegativeBasalRate() {
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child")
-        val d = Constraint(-0.5)
+        val d = ConstraintObject(-0.5, injector)
         safetyPlugin.applyBasalConstraints(d, validProfile)
         assertThat(d.value()).isWithin(0.01).of(0.0)
-        assertThat(d.getReasons(aapsLogger)).isEqualTo(
-        "Safety: Limiting max basal rate to 0.00 U/h because of it must be positive value")
+        assertThat(d.getReasons()).isEqualTo(
+            "Safety: Limiting max basal rate to 0.00 U/h because of it must be positive value"
+        )
     }
 
     @Test
@@ -173,19 +175,20 @@ class SafetyPluginTest : TestBaseWithProfile() {
         `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0)
         `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0)
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child")
-        val i = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        val i = ConstraintObject(Int.MAX_VALUE, injector)
         safetyPlugin.applyBasalPercentConstraints(i, validProfile)
         assertThat(i.value()).isEqualTo(200)
-        assertThat(i.getReasons(aapsLogger)).isEqualTo(
+        assertThat(i.getReasons()).isEqualTo(
             """
-Safety: Percent rate 1111111% recalculated to 11111.11 U/h with current basal 1.00 U/h
+Safety: Percent rate 2147483647% recalculated to 21474836.47 U/h with current basal 1.00 U/h
 Safety: Limiting max basal rate to 2.00 U/h because of hard limit
 Safety: Limiting max percent rate to 200% because of pump limit
 Safety: Limiting max basal rate to 500.00 U/h because of pump limit
     """.trimIndent()
         )
-        assertThat(i.getMostLimitedReasons(aapsLogger)).isEqualTo(
-        "Safety: Limiting max percent rate to 200% because of pump limit")
+        assertThat(i.getMostLimitedReasons()).isEqualTo(
+            "Safety: Limiting max percent rate to 200% because of pump limit"
+        )
     }
 
     @Test
@@ -196,57 +199,58 @@ Safety: Limiting max basal rate to 500.00 U/h because of pump limit
         `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0)
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child")
         openAPSSMBPlugin.setPluginEnabled(PluginType.APS, true)
-        val i = Constraint(Constants.REALLYHIGHBASALRATE)
+        val i = ConstraintObject(Double.MAX_VALUE, injector)
         openAPSSMBPlugin.applyBasalConstraints(i, validProfile)
         assertThat(i.value()).isWithin(0.01).of(1.0)
-        assertThat(i.getReasons(aapsLogger)).isEqualTo(
+        assertThat(i.getReasons()).isEqualTo(
             """
             OpenAPSSMB: Limiting max basal rate to 1.00 U/h because of max value in preferences
             OpenAPSSMB: Limiting max basal rate to 4.00 U/h because of max basal multiplier
             OpenAPSSMB: Limiting max basal rate to 3.00 U/h because of max daily basal multiplier
-            """.trimIndent())
-        assertThat(i.getMostLimitedReasons(aapsLogger)).isEqualTo("OpenAPSSMB: Limiting max basal rate to 1.00 U/h because of max value in preferences")
+            """.trimIndent()
+        )
+        assertThat(i.getMostLimitedReasons()).isEqualTo("OpenAPSSMB: Limiting max basal rate to 1.00 U/h because of max value in preferences")
     }
 
     @Test
     fun doNotAllowNegativePercentBasalRate() {
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child")
-        val i = Constraint(-22)
+        val i = ConstraintObject(-22, injector)
         safetyPlugin.applyBasalPercentConstraints(i, validProfile)
         assertThat(i.value()).isEqualTo(0)
-        assertThat(i.getReasons(aapsLogger)).isEqualTo(
+        assertThat(i.getReasons()).isEqualTo(
             """
     Safety: Percent rate -22% recalculated to -0.22 U/h with current basal 1.00 U/h
     Safety: Limiting max basal rate to 0.00 U/h because of it must be positive value
     Safety: Limiting max percent rate to 0% because of pump limit
-    """.trimIndent())
-        assertThat(i.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting max percent rate to 0% because of pump limit")
+    """.trimIndent()
+        )
+        assertThat(i.getMostLimitedReasons()).isEqualTo("Safety: Limiting max percent rate to 0% because of pump limit")
     }
 
     @Test
     fun bolusAmountShouldBeLimited() {
         `when`(sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0)).thenReturn(3.0)
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child")
-        var d = Constraint(Constants.REALLYHIGHBOLUS)
-        d = safetyPlugin.applyBolusConstraints(d)
+        val d = safetyPlugin.applyBolusConstraints(ConstraintObject(Double.MAX_VALUE, injector))
         assertThat(d.value()).isWithin(0.01).of(3.0)
-        assertThat(d.getReasons(aapsLogger)).isEqualTo(
+        assertThat(d.getReasons()).isEqualTo(
             """
     Safety: Limiting bolus to 3.0 U because of max value in preferences
     Safety: Limiting bolus to 5.0 U because of hard limit
-    """.trimIndent())
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting bolus to 3.0 U because of max value in preferences")
+    """.trimIndent()
+        )
+        assertThat(d.getMostLimitedReasons()).isEqualTo("Safety: Limiting bolus to 3.0 U because of max value in preferences")
     }
 
     @Test
     fun doNotAllowNegativeBolusAmount() {
         `when`(sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0)).thenReturn(3.0)
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child")
-        var d = Constraint(-22.0)
-        d = safetyPlugin.applyBolusConstraints(d)
+        val d = safetyPlugin.applyBolusConstraints(ConstraintObject(-22.0, injector))
         assertThat(d.value()).isWithin(0.01).of(0.0)
-        assertThat(d.getReasons(aapsLogger)).isEqualTo("Safety: Limiting bolus to 0.0 U because of it must be positive value")
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting bolus to 0.0 U because of it must be positive value")
+        assertThat(d.getReasons()).isEqualTo("Safety: Limiting bolus to 0.0 U because of it must be positive value")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("Safety: Limiting bolus to 0.0 U because of it must be positive value")
     }
 
     @Test
@@ -255,15 +259,15 @@ Safety: Limiting max basal rate to 500.00 U/h because of pump limit
         `when`(sp.getInt(info.nightscout.core.utils.R.string.key_treatmentssafety_maxcarbs, 48)).thenReturn(48)
 
         // Negative carbs not allowed
-        var i = Constraint(-22)
+        var i: Constraint<Int> = ConstraintObject(-22, injector)
         safetyPlugin.applyCarbsConstraints(i)
         assertThat(i.value()).isEqualTo(0)
-        assertThat(i.getReasons(aapsLogger)).isEqualTo("Safety: Limiting carbs to 0 g because of it must be positive value")
+        assertThat(i.getReasons()).isEqualTo("Safety: Limiting carbs to 0 g because of it must be positive value")
 
         // Apply all limits
-        i = safetyPlugin.applyCarbsConstraints(Constraint(Constants.REALLYHIGHCARBS))
+        i = safetyPlugin.applyCarbsConstraints(ConstraintObject(Int.MAX_VALUE, injector))
         assertThat(i.value()).isEqualTo(48)
-        assertThat(i.getReasons(aapsLogger)).isEqualTo("Safety: Limiting carbs to 48 g because of max value in preferences")
+        assertThat(i.getReasons()).isEqualTo("Safety: Limiting carbs to 48 g because of max value in preferences")
     }
 
     @Test
@@ -278,24 +282,24 @@ Safety: Limiting max basal rate to 500.00 U/h because of pump limit
         `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("teenage")
 
         // Apply all limits
-        var d = Constraint(Constants.REALLYHIGHIOB)
+        var d: Constraint<Double> = ConstraintObject(Double.MAX_VALUE, injector)
         d = safetyPlugin.applyMaxIOBConstraints(d)
         assertThat(d.value()).isWithin(0.01).of(HardLimits.MAX_IOB_LGS)
-        assertThat(d.getReasons(aapsLogger)).isEqualTo("Safety: Limiting IOB to 0.0 U because of Low Glucose Suspend")
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("Safety: Limiting IOB to 0.0 U because of Low Glucose Suspend")
+        assertThat(d.getReasons()).isEqualTo("Safety: Limiting IOB to 0.0 U because of Low Glucose Suspend")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("Safety: Limiting IOB to 0.0 U because of Low Glucose Suspend")
 
         // Apply all limits
-        d = Constraint(Constants.REALLYHIGHIOB)
+        d = ConstraintObject(Double.MAX_VALUE, injector)
         val a = openAPSAMAPlugin.applyMaxIOBConstraints(d)
         assertThat(a.value()).isWithin(0.01).of(1.5)
-        assertThat(d.getReasons(aapsLogger)).isEqualTo("OpenAPSAMA: Limiting IOB to 1.5 U because of max value in preferences\nOpenAPSAMA: Limiting IOB to 7.0 U because of hard limit")
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("OpenAPSAMA: Limiting IOB to 1.5 U because of max value in preferences")
+        assertThat(d.getReasons()).isEqualTo("OpenAPSAMA: Limiting IOB to 1.5 U because of max value in preferences\nOpenAPSAMA: Limiting IOB to 7.0 U because of hard limit")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("OpenAPSAMA: Limiting IOB to 1.5 U because of max value in preferences")
 
         // Apply all limits
-        d = Constraint(Constants.REALLYHIGHIOB)
+        d = ConstraintObject(Double.MAX_VALUE, injector)
         val s = openAPSSMBPlugin.applyMaxIOBConstraints(d)
         assertThat(s.value()).isWithin(0.01).of(3.0)
-        assertThat(d.getReasons(aapsLogger)).isEqualTo("OpenAPSSMB: Limiting IOB to 3.0 U because of max value in preferences\nOpenAPSSMB: Limiting IOB to 22.0 U because of hard limit")
-        assertThat(d.getMostLimitedReasons(aapsLogger)).isEqualTo("OpenAPSSMB: Limiting IOB to 3.0 U because of max value in preferences")
+        assertThat(d.getReasons()).isEqualTo("OpenAPSSMB: Limiting IOB to 3.0 U because of max value in preferences\nOpenAPSSMB: Limiting IOB to 22.0 U because of hard limit")
+        assertThat(d.getMostLimitedReasons()).isEqualTo("OpenAPSSMB: Limiting IOB to 3.0 U because of max value in preferences")
     }
 }
diff --git a/core/interfaces/build.gradle b/core/interfaces/build.gradle
index 4cd1087543..3cc11c5d58 100644
--- a/core/interfaces/build.gradle
+++ b/core/interfaces/build.gradle
@@ -9,32 +9,44 @@ plugins {
 
 apply from: "${project.rootDir}/core/main/android_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
+apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
+apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 
 android {
 
     namespace 'info.nightscout.interfaces'
+    defaultConfig {
+        minSdkVersion 25  // for wear
+    }
 }
 
 dependencies {
-    // I don't like this low level dependency but it helps
-    // to move more code to interface module
-    // database module is compiled longer anyway
-    // (ResourceHelper, AAPSLogger interface)
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
- //   implementation project(':core:ns-sdk')
 
     api "androidx.appcompat:appcompat:$appcompat_version"
+    api "androidx.preference:preference-ktx:$preferencektx_version"
+    api "net.danlew:android.joda:$joda_version"
+
 
-    // Dagger
     api "com.google.dagger:dagger:$dagger_version"
     api "com.google.dagger:dagger-android:$dagger_version"
+    api "com.google.dagger:dagger-android-support:$dagger_version"
+
+    //Logger
+    api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed
+    api 'com.github.tony19:logback-android:2.0.0'
+
+    api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version"
+    api "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinx_serialization_version"
+    api "com.caverock:androidsvg:$caverock_androidsvg_version"
+    api "org.apache.commons:commons-lang3:$commonslang3_version"
+
+    //RxBus
+    api "io.reactivex.rxjava3:rxjava:$rxjava_version"
+    api "io.reactivex.rxjava3:rxkotlin:$rxkotlin_version"
+    api "io.reactivex.rxjava3:rxandroid:$rxandroid_version"
 
     // WorkerClasses
     api "androidx.work:work-runtime-ktx:$work_version"
-}
-
-allOpen {
-    // allows mocking for classes w/o directly opening them for release builds
-    annotation 'info.nightscout.interfaces.annotations.InterfacesOpenForTesting'
 }
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/debug/java/info/nightscout/annotations/OpenForTesting.kt b/core/interfaces/src/debug/java/info/nightscout/annotations/OpenForTesting.kt
similarity index 100%
rename from app-wear-shared/shared/src/debug/java/info/nightscout/annotations/OpenForTesting.kt
rename to core/interfaces/src/debug/java/info/nightscout/annotations/OpenForTesting.kt
diff --git a/core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt b/core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
deleted file mode 100644
index e7e07b1a4b..0000000000
--- a/core/interfaces/src/debug/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package info.nightscout.interfaces.annotations
-
-/**
- * This is the actual annotation that makes the class open. Don't use it directly, only through [InterfacesOpenForTesting]
- * which has a NOOP replacement in production.
- */
-@Target(AnnotationTarget.ANNOTATION_CLASS)
-annotation class InterfacesOpenClass
-
-/**
- * Annotate a class with [InterfacesOpenForTesting] if it should be extendable for testing.
- */
-@InterfacesOpenClass
-@Target(AnnotationTarget.CLASS)
-annotation class InterfacesOpenForTesting
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt
index fccdfcbc8f..bd006368ed 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/Constants.kt
@@ -5,16 +5,9 @@ package info.nightscout.interfaces
  */
 object Constants {
 
-    const val MGDL = "mg/dl" // This is Nightscout's representation
-    const val MMOL = "mmol"
     const val MMOLL_TO_MGDL = 18.0 // 18.0182;
     const val MGDL_TO_MMOLL = 1 / MMOLL_TO_MGDL
     const val defaultDIA = 5.0
-    const val REALLYHIGHBASALRATE = 1111111.0
-    const val REALLYHIGHPERCENTBASALRATE = 1111111
-    const val REALLYHIGHBOLUS = 1111111.0
-    const val REALLYHIGHCARBS = 1111111
-    const val REALLYHIGHIOB = 1111111.0
     const val notificationID = 556677
 
     // SMS COMMUNICATOR
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/GlucoseUnit.kt
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt
index a332b9328d..e508da3fef 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraint.kt
@@ -1,115 +1,18 @@
 package info.nightscout.interfaces.constraints
 
-import info.nightscout.rx.logging.AAPSLogger
-import info.nightscout.rx.logging.LTag
-
-class Constraint<T : Comparable<T>>(private var value: T) {
-
-    private var originalValue: T
-    private val reasons: MutableList<String> = ArrayList()
-    private val mostLimiting: MutableList<String> = ArrayList()
-    fun value(): T {
-        return value
-    }
-
-    fun originalValue(): T {
-        return originalValue
-    }
-
-    fun set(aapsLogger: AAPSLogger, value: T): Constraint<T> {
-        this.value = value
-        originalValue = value
-        aapsLogger.debug(LTag.CONSTRAINTS, "Setting value $value")
-        return this
-    }
-
-    fun set(aapsLogger: AAPSLogger, value: T, reason: String, from: Any): Constraint<T> {
-        aapsLogger.debug(LTag.CONSTRAINTS, "Setting value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
-        this.value = value
-        addReason(reason, from)
-        addMostLimingReason(reason, from)
-        return this
-    }
-
-    fun setIfDifferent(aapsLogger: AAPSLogger, value: T, reason: String, from: Any): Constraint<T> {
-        if (this.value != value) {
-            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of different value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
-            this.value = value
-            addReason(reason, from)
-            addMostLimingReason(reason, from)
-        }
-        return this
-    }
-
-    fun setIfSmaller(aapsLogger: AAPSLogger, value: T, reason: String, from: Any): Constraint<T> {
-        if (value < this.value) {
-            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of smaller value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
-            this.value = value
-            mostLimiting.clear()
-            addMostLimingReason(reason, from)
-        }
-        if (value < originalValue) {
-            addReason(reason, from)
-        }
-        return this
-    }
-
-    fun setIfGreater(aapsLogger: AAPSLogger, value: T, reason: String, from: Any): Constraint<T> {
-        if (value > this.value) {
-            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of greater value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
-            this.value = value
-            mostLimiting.clear()
-            addMostLimingReason(reason, from)
-        }
-        if (value > originalValue) {
-            addReason(reason, from)
-        }
-        return this
-    }
-
-    private fun translateFrom(from: Any): String {
-        return from.javaClass.simpleName.replace("Plugin", "")
-    }
-
-    fun addReason(reason: String, from: Any) {
-        reasons.add(translateFrom(from) + ": " + reason)
-    }
-
-    private fun addMostLimingReason(reason: String, from: Any) {
-        mostLimiting.add(translateFrom(from) + ": " + reason)
-    }
-
-    fun getReasons(aapsLogger: AAPSLogger): String {
-        val sb = StringBuilder()
-        for ((count, r) in reasons.withIndex()) {
-            if (count != 0) sb.append("\n")
-            sb.append(r)
-        }
-        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting original value: $originalValue to $value. Reason: $sb")
-        return sb.toString()
-    }
+interface Constraint<T : Comparable<T>> {
 
+    fun value(): T
+    fun originalValue(): T
+    fun set(value: T): Constraint<T>
+    fun set(value: T, reason: String, from: Any): Constraint<T>
+    fun setIfDifferent(value: T, reason: String, from: Any): Constraint<T>
+    fun setIfSmaller(value: T, reason: String, from: Any): Constraint<T>
+    fun setIfGreater(value: T, reason: String, from: Any): Constraint<T>
+    fun addReason(reason: String, from: Any)
+    fun getReasons(): String
     val reasonList: List<String>
-        get() = reasons
-
-    fun getMostLimitedReasons(aapsLogger: AAPSLogger): String {
-        val sb = StringBuilder()
-        for ((count, r) in mostLimiting.withIndex()) {
-            if (count != 0) sb.append("\n")
-            sb.append(r)
-        }
-        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting original value: $originalValue to $value. Reason: $sb")
-        return sb.toString()
-    }
-
+    fun getMostLimitedReasons(): String
     val mostLimitedReasonList: List<String>
-        get() = mostLimiting
-
-    fun copyReasons(another: Constraint<*>) {
-        reasons.addAll(another.reasonList)
-    }
-
-    init {
-        originalValue = value
-    }
+    fun copyReasons(another: Constraint<*>)
 }
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
deleted file mode 100644
index c7ed46d688..0000000000
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/Constraints.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.interfaces.constraints
-
-import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.profile.Profile
-
-/**
- * Constraints interface
- *
- * Every function has a param from previous chained call
- * Function can limit the value even more and add another reason of restriction
- *
- * see [info.nightscout.plugins.constraints.ConstraintsImpl]
- * which iterates over all registered plugins with [Constraints] implemented
- *
- * @return updated parameter
- */
-interface Constraints {
-
-    fun isLoopInvocationAllowed(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isClosedLoopAllowed(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isLgsAllowed(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isAutosensModeEnabled(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isSMBModeEnabled(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isDynIsfModeEnabled(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isUAMEnabled(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isAdvancedFilteringEnabled(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isSuperBolusEnabled(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun isAutomationEnabled(value: Constraint<Boolean> = Constraint(true)): Constraint<Boolean> = value
-    fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> = absoluteRate
-    fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> = percentRate
-    fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> = insulin
-    fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> = insulin
-    fun applyCarbsConstraints(carbs: Constraint<Int>): Constraint<Int> = carbs
-    fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> = maxIob
-
-    /*
-     * Determine max values by walking through all constraints
-     */
-    fun getMaxBasalAllowed(profile: Profile): Constraint<Double> =
-        applyBasalConstraints(Constraint(Constants.REALLYHIGHBASALRATE), profile)
-
-    fun getMaxBasalPercentAllowed(profile: Profile): Constraint<Int> =
-        applyBasalPercentConstraints(Constraint(Constants.REALLYHIGHPERCENTBASALRATE), profile)
-
-    fun getMaxBolusAllowed(): Constraint<Double> =
-        applyBolusConstraints(Constraint(Constants.REALLYHIGHBOLUS))
-
-    fun getMaxExtendedBolusAllowed(): Constraint<Double> =
-        applyExtendedBolusConstraints(Constraint(Constants.REALLYHIGHBOLUS))
-
-    fun getMaxCarbsAllowed(): Constraint<Int> =
-        applyCarbsConstraints(Constraint(Constants.REALLYHIGHCARBS))
-
-    fun getMaxIOBAllowed(): Constraint<Double> =
-        applyMaxIOBConstraints(Constraint(Constants.REALLYHIGHIOB))
-
-
-}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/ConstraintsChecker.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/ConstraintsChecker.kt
new file mode 100644
index 0000000000..c1f3dde85d
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/ConstraintsChecker.kt
@@ -0,0 +1,36 @@
+package info.nightscout.interfaces.constraints
+
+import info.nightscout.interfaces.profile.Profile
+
+/**
+ * Constraints interface
+ *
+ * Every function has a param from previous chained call
+ * Function can limit the value even more and add another reason of restriction
+ *
+ * see [info.nightscout.plugins.constraints.ConstraintsCheckerImpl]
+ * which iterates over all registered plugins with [ConstraintsChecker] implemented
+ */
+interface ConstraintsChecker : PluginConstraints {
+
+    fun isLoopInvocationAllowed(): Constraint<Boolean>
+    fun isClosedLoopAllowed(): Constraint<Boolean>
+    fun isLgsAllowed(): Constraint<Boolean>
+    fun isAutosensModeEnabled(): Constraint<Boolean>
+    fun isSMBModeEnabled(): Constraint<Boolean>
+    fun isDynIsfModeEnabled(): Constraint<Boolean>
+    fun isUAMEnabled(): Constraint<Boolean>
+    fun isAdvancedFilteringEnabled(): Constraint<Boolean>
+    fun isSuperBolusEnabled(): Constraint<Boolean>
+    fun isAutomationEnabled(): Constraint<Boolean>
+
+    /*
+     * Determine max values by walking through all constraints
+     */
+    fun getMaxBasalAllowed(profile: Profile): Constraint<Double>
+    fun getMaxBasalPercentAllowed(profile: Profile): Constraint<Int>
+    fun getMaxBolusAllowed(): Constraint<Double>
+    fun getMaxExtendedBolusAllowed(): Constraint<Double>
+    fun getMaxCarbsAllowed(): Constraint<Int>
+    fun getMaxIOBAllowed(): Constraint<Double>
+}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/PluginConstraints.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/PluginConstraints.kt
new file mode 100644
index 0000000000..abc4cb45e3
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/constraints/PluginConstraints.kt
@@ -0,0 +1,28 @@
+package info.nightscout.interfaces.constraints
+
+import info.nightscout.interfaces.profile.Profile
+
+/**
+ * PluginConstraints interface
+ *
+ * Allows to every plugin implement own constraints
+ */
+interface PluginConstraints {
+
+    fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isLgsAllowed(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isDynIsfModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isAdvancedFilteringEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isSuperBolusEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun isAutomationEnabled(value: Constraint<Boolean>): Constraint<Boolean> = value
+    fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> = absoluteRate
+    fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> = percentRate
+    fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> = insulin
+    fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> = insulin
+    fun applyCarbsConstraints(carbs: Constraint<Int>): Constraint<Int> = carbs
+    fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> = maxIob
+}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt
index 35c70f8d5f..4a52fefcec 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/iob/CobInfo.kt
@@ -1,4 +1,4 @@
 package info.nightscout.interfaces.iob
 
 /** All COB up to now, including carbs not yet processed by IobCob calculation.  */
-class CobInfo(val timestamp: Long, val displayCob: Double?, val futureCarbs: Double)
\ No newline at end of file
+data class CobInfo(val timestamp: Long, val displayCob: Double?, val futureCarbs: Double)
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt
index be39876b5a..3eb2d74945 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/notifications/NotificationUserMessage.kt
@@ -1,6 +1,6 @@
 package info.nightscout.interfaces.notifications
 
-class NotificationUserMessage  (text :String): Notification() {
+class NotificationUserMessage(text: String) : Notification() {
 
     init {
         var hash = text.hashCode()
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
index af5418d15c..166f009c0d 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
@@ -1,8 +1,8 @@
 package info.nightscout.interfaces.plugin
 
-import info.nightscout.interfaces.annotations.InterfacesOpenForTesting
+import info.nightscout.annotations.OpenForTesting
 
-@InterfacesOpenForTesting
+@OpenForTesting
 class PluginDescription {
 
     var mainType = PluginType.GENERAL
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt
index a699169598..ae5484cf6d 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/smsCommunicator/SmsCommunicator.kt
@@ -5,4 +5,5 @@ interface SmsCommunicator {
     var messages: ArrayList<Sms>
     fun sendNotificationToAllNumbers(text: String): Boolean
     fun sendSMS(sms: Sms): Boolean
+    fun isEnabled(): Boolean
 }
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt
index 0261306094..964c59e550 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/userEntry/ValueWithUnitMapper.kt
@@ -4,6 +4,7 @@ import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
 
 sealed class ValueWithUnitMapper {          //I use a sealed class because of StringResource that contains a listOf as second parameter
 
@@ -79,12 +80,9 @@ sealed class ValueWithUnitMapper {          //I use a sealed class because of St
 
     companion object {
 
-        const val MGDL = Constants.MGDL
-        const val MMOL = Constants.MMOL
-
         fun fromGlucoseUnit(value: Double, string: String): ValueWithUnitMapper? = when (string) {
-            MGDL, "mgdl"   -> Mgdl(value)
-            MMOL, "mmol/l" -> Mmoll(value)
+            GlucoseUnit.MGDL.asText, "mgdl"   -> Mgdl(value)
+            GlucoseUnit.MMOL.asText, "mmol/l" -> Mmoll(value)
             else           -> null
         }
     }
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt
rename to core/interfaces/src/main/java/info/nightscout/interfaces/utils/DecimalFormatter.kt
diff --git a/core/interfaces/src/main/java/info/nightscout/rx/AapsSchedulers.kt b/core/interfaces/src/main/java/info/nightscout/rx/AapsSchedulers.kt
new file mode 100644
index 0000000000..af6f4f1cda
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/rx/AapsSchedulers.kt
@@ -0,0 +1,15 @@
+package info.nightscout.rx
+
+import io.reactivex.rxjava3.core.Scheduler
+
+/**
+ * Created by adrian on 12.04.20.
+ */
+
+interface AapsSchedulers {
+
+    val main: Scheduler
+    val io: Scheduler
+    val cpu: Scheduler
+    val newThread: Scheduler
+}
\ No newline at end of file
diff --git a/core/interfaces/src/main/java/info/nightscout/rx/bus/RxBus.kt b/core/interfaces/src/main/java/info/nightscout/rx/bus/RxBus.kt
new file mode 100644
index 0000000000..e2649036c5
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/rx/bus/RxBus.kt
@@ -0,0 +1,13 @@
+package info.nightscout.rx.bus
+
+import info.nightscout.rx.events.Event
+import io.reactivex.rxjava3.core.Observable
+
+interface RxBus {
+
+    fun send(event: Event)
+
+    // Listen should return an Observable and not the publisher
+    // Using ofType we filter only events that match that class type
+    fun <T : Any> toObservable(eventType: Class<T>): Observable<T>
+}
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/Event.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/Event.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/Event.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/Event.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAcceptOpenLoopChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppExit.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAppExit.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppExit.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAppExit.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAppInitialized.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventAutosensCalculationFinished.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBTChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventBTChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBTChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventBTChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventBucketedDataCreated.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventChargingState.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventChargingState.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventChargingState.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventChargingState.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventConfigBuilderChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomActionsChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventCustomCalculationFinished.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDanaRSyncStatus.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDeviceStatusChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDiaconnG8PumpLogReset.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissBolusProgressIfRunning.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventDismissNotification.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventEffectiveProfileSwitchChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventExtendedBolusChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventInitializationChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventLocalProfileChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoop.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventLoop.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoop.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventLoop.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventLoopUpdateGui.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileDataToWear.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventMobileToWear.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientNewLog.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNSClientRestart.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNetworkChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewBG.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNewBG.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewBG.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNewBG.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNewHistoryData.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNewOpenLoopNotification.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventNtpStatus.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventOfflineChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventOverviewBolusProgress.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventPreferenceChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileStoreChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventProfileSwitchChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
similarity index 97%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
index 0cf7a63171..84160e7b5d 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
+++ b/core/interfaces/src/main/java/info/nightscout/rx/events/EventPumpStatusChanged.kt
@@ -1,7 +1,7 @@
 package info.nightscout.rx.events
 
 import android.content.Context
-import info.nightscout.shared.R
+import info.nightscout.interfaces.R
 
 class EventPumpStatusChanged : EventStatus {
 
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventQueueChanged.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventRebuildTabs.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshButtonState.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventRefreshOverview.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventSWRLStatus.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventSWSyncStatus.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventSWUpdate.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventScale.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventScale.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventScale.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventScale.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventStatus.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventStatus.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventStatus.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventStatus.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTempBasalChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTempTargetChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventThemeSwitch.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTherapyEventChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventTreatmentChange.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateGui.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewCalcProgress.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewGraph.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewIobCob.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventUpdateOverviewSensitivity.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearCwfExported.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearDataToMobile.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearToMobile.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventWearUpdateGui.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt b/core/interfaces/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/events/EventXdripNewLog.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/L.kt b/core/interfaces/src/main/java/info/nightscout/rx/interfaces/L.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/L.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/interfaces/L.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/LogElement.kt b/core/interfaces/src/main/java/info/nightscout/rx/interfaces/LogElement.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/interfaces/LogElement.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/interfaces/LogElement.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt b/core/interfaces/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/logging/AAPSLogger.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/BundleLogger.kt b/core/interfaces/src/main/java/info/nightscout/rx/logging/BundleLogger.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/BundleLogger.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/logging/BundleLogger.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt b/core/interfaces/src/main/java/info/nightscout/rx/logging/LTag.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/logging/LTag.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/logging/LTag.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt b/core/interfaces/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt
similarity index 99%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt
index dc659d29f5..a7f56a4e01 100644
--- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt
+++ b/core/interfaces/src/main/java/info/nightscout/rx/weardata/CustomWatchfaceFormat.kt
@@ -8,7 +8,7 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.PictureDrawable
 import androidx.annotation.StringRes
 import com.caverock.androidsvg.SVG
-import info.nightscout.shared.R
+import info.nightscout.interfaces.R
 import kotlinx.serialization.Serializable
 import org.json.JSONObject
 import java.io.BufferedOutputStream
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt b/core/interfaces/src/main/java/info/nightscout/rx/weardata/EventData.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/rx/weardata/EventData.kt
rename to core/interfaces/src/main/java/info/nightscout/rx/weardata/EventData.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/SafeParse.kt b/core/interfaces/src/main/java/info/nightscout/shared/SafeParse.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/SafeParse.kt
rename to core/interfaces/src/main/java/info/nightscout/shared/SafeParse.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/UIUtils.kt b/core/interfaces/src/main/java/info/nightscout/shared/extensions/UIUtils.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/extensions/UIUtils.kt
rename to core/interfaces/src/main/java/info/nightscout/shared/extensions/UIUtils.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt b/core/interfaces/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt
rename to core/interfaces/src/main/java/info/nightscout/shared/interfaces/ProfileUtil.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt b/core/interfaces/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt
rename to core/interfaces/src/main/java/info/nightscout/shared/interfaces/ResourceHelper.kt
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt b/core/interfaces/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt
rename to core/interfaces/src/main/java/info/nightscout/shared/sharedPreferences/SP.kt
diff --git a/core/interfaces/src/main/java/info/nightscout/shared/utils/DateUtil.kt b/core/interfaces/src/main/java/info/nightscout/shared/utils/DateUtil.kt
new file mode 100644
index 0000000000..41afa1adb2
--- /dev/null
+++ b/core/interfaces/src/main/java/info/nightscout/shared/utils/DateUtil.kt
@@ -0,0 +1,92 @@
+package info.nightscout.shared.utils
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import info.nightscout.shared.interfaces.ResourceHelper
+import java.util.TimeZone
+import java.util.concurrent.TimeUnit
+
+/**
+ * The Class DateUtil. A simple wrapper around SimpleDateFormat to ease the handling of iso date string &lt;-&gt; date obj
+ * with TZ
+ */
+interface DateUtil {
+
+    /**
+     * Takes in an ISO date string of the following format:
+     * yyyy-mm-ddThh:mm:ss.ms+HoMo
+     *
+     * @param isoDateString the iso date string
+     * @return the date
+     */
+    fun fromISODateString(isoDateString: String): Long
+
+    /**
+     * Render date
+     *
+     * @param date   the date obj
+     * @return the iso-formatted date string
+     */
+    fun toISOString(date: Long): String
+    fun toISOAsUTC(timestamp: Long): String
+    fun toISONoZone(timestamp: Long): String
+    fun secondsOfTheDayToMilliseconds(seconds: Int): Long
+    fun toSeconds(hhColonMm: String): Int
+    fun dateString(mills: Long): String
+    fun dateStringRelative(mills: Long, rh: ResourceHelper): String
+    fun dateStringShort(mills: Long): String
+    fun timeString(): String
+    fun timeString(mills: Long): String
+    fun secondString(): String
+    fun secondString(mills: Long): String
+    fun minuteString(): String
+    fun minuteString(mills: Long): String
+    fun hourString(): String
+    fun hourString(mills: Long): String
+    fun amPm(): String
+    fun amPm(mills: Long): String
+    fun dayNameString(format: String = "E"): String
+    fun dayNameString(mills: Long, format: String = "E"): String
+    fun dayString(): String = dayString(now())
+    fun dayString(mills: Long): String
+    fun monthString(format: String = "MMM"): String
+    fun monthString(mills: Long, format: String = "MMM"): String
+    fun weekString(): String
+    fun weekString(mills: Long): String
+    fun timeStringWithSeconds(mills: Long): String
+    fun dateAndTimeRangeString(start: Long, end: Long): String
+    fun timeRangeString(start: Long, end: Long): String
+    fun dateAndTimeString(mills: Long): String
+    fun dateAndTimeAndSecondsString(mills: Long): String
+    fun minAgo(rh: ResourceHelper, time: Long?): String
+    fun minAgoShort(time: Long?): String
+    fun minAgoLong(rh: ResourceHelper, time: Long?): String
+    fun hourAgo(time: Long, rh: ResourceHelper): String
+    fun dayAgo(time: Long, rh: ResourceHelper, round: Boolean = false): String
+    fun beginOfDay(mills: Long): Long
+    fun timeStringFromSeconds(seconds: Int): String
+    fun timeFrameString(timeInMillis: Long, rh: ResourceHelper): String
+    fun sinceString(timestamp: Long, rh: ResourceHelper): String
+    fun untilString(timestamp: Long, rh: ResourceHelper): String
+    fun now(): Long
+    fun nowWithoutMilliseconds(): Long
+    fun isOlderThan(date: Long, minutes: Long): Boolean
+    fun getTimeZoneOffsetMs(): Long
+    fun getTimeZoneOffsetMinutes(timestamp: Long): Int
+    fun isSameDay(timestamp1: Long, timestamp2: Long): Boolean
+
+    fun isSameDayGroup(timestamp1: Long, timestamp2: Long): Boolean
+
+    //Map:{DAYS=1, HOURS=3, MINUTES=46, SECONDS=40, MILLISECONDS=0, MICROSECONDS=0, NANOSECONDS=0}
+    fun computeDiff(date1: Long, date2: Long): Map<TimeUnit, Long>
+    fun age(milliseconds: Long, useShortText: Boolean, rh: ResourceHelper): String
+    fun niceTimeScalar(time: Long, rh: ResourceHelper): String
+    fun qs(x: Double, numDigits: Int): String
+    fun formatHHMM(timeAsSeconds: Int): String
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun timeZoneByOffset(offsetInMilliseconds: Long): TimeZone
+    fun timeStampToUtcDateMillis(timestamp: Long): Long
+    fun mergeUtcDateToTimestamp(timestamp: Long, dateUtcMillis: Long): Long
+    fun mergeHourMinuteToTimestamp(timestamp: Long, hour: Int, minute: Int, randomSecond: Boolean = false): Long
+}
diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/T.kt b/core/interfaces/src/main/java/info/nightscout/shared/utils/T.kt
similarity index 100%
rename from app-wear-shared/shared/src/main/java/info/nightscout/shared/utils/T.kt
rename to core/interfaces/src/main/java/info/nightscout/shared/utils/T.kt
diff --git a/core/interfaces/src/main/res/values/strings.xml b/core/interfaces/src/main/res/values/strings.xml
index 983f5ad355..25af997279 100644
--- a/core/interfaces/src/main/res/values/strings.xml
+++ b/core/interfaces/src/main/res/values/strings.xml
@@ -3,4 +3,104 @@
     <!-- PumpPluginBase -->
     <string name="pump_driver_changed" comment="26 characters max for translation">Pump driver changed.</string>
 
+    <string name="key_insulin_button_increment_1" translatable="false">insulin_button_increment_1</string>
+    <string name="key_insulin_button_increment_2" translatable="false">insulin_button_increment_2</string>
+    <string name="key_insulin_button_increment_3" translatable="false">insulin_button_increment_3</string>
+
+    <!--    DateUtil-->
+    <string name="minago">%1$d m ago</string>
+    <string name="minago_long">%1$d minutes ago</string>
+    <string name="hoursago">%1$.1f h ago</string>
+    <string name="days_ago">%1$.1f days ago</string>
+    <string name="days_ago_round">%1$.0f days ago</string>
+    <string name="in_days">in %1$.0f days</string>
+    <string name="in_days_round">in %1$.0f days</string>
+    <string name="shorthour">h</string>
+    <string name="days">days</string>
+    <string name="hours">hours</string>
+    <string name="unit_second">second</string>
+    <string name="unit_minute">minute</string>
+    <string name="unit_hour">hour</string>
+    <string name="unit_day">day</string>
+    <string name="unit_week">week</string>
+    <string name="unit_seconds">seconds</string>
+    <string name="unit_minutes">minutes</string>
+    <string name="unit_hours">hours</string>
+    <string name="unit_days">days</string>
+    <string name="unit_weeks">weeks</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
+    <string name="later_today">Later today</string>
+    <string name="tomorrow">Tomorrow</string>
+    <string name="today">Today</string>
+    <string name="yesterday">Yesterday</string>
+
+    <!-- Rx -->
+    <string name="connecting_for">Connecting for %1$d s</string>
+    <string name="handshaking">Handshaking</string>
+    <string name="connected">Connected</string>
+    <string name="disconnecting">Disconnecting</string>
+    <string name="waiting_for_disconnection">Waiting for disconnection</string>
+
+    <!-- Custom Watchface -->
+    <string name="metadata_label_watchface_created_at">Created at: %1$s</string>
+    <string name="metadata_label_watchface_author">Author: %1$s</string>
+    <string name="metadata_label_watchface_name">Name: %1$s</string>
+    <string name="metadata_wear_import_filename">File name: %1$s</string>
+    <string name="metadata_label_plugin_version">Plugin version: %1$s</string>
+    <string name="metadata_label_watchface_name_version">Name: %1$s (%2$s)</string>
+    <string name="metadata_label_watchface_infos">Info: %1$s</string>
+    <string name="metadata_label_watchface_authorization" translatable="false">%1$s</string>
+    <string name="pref_show_iob">Show IOB</string>
+    <string name="pref_show_detailed_iob">Show detailed IOB</string>
+    <string name="pref_show_cob">Show COB</string>
+    <string name="pref_show_delta">Show Delta</string>
+    <string name="pref_show_detailed_delta">Show detailed Delta</string>
+    <string name="pref_show_avgdelta">Show AvgDelta</string>
+    <string name="pref_show_phone_battery">Show Phone Battery</string>
+    <string name="pref_show_rig_battery">Show Rig Battery</string>
+    <string name="pref_show_basal_rate">Show Basal Rate</string>
+    <string name="pref_show_loop_status">Show Loop Status</string>
+    <string name="pref_show_bg">Show BG</string>
+    <string name="pref_show_bgi">Show BGI</string>
+    <string name="pref_show_direction_arrow">Show Direction Arrow</string>
+    <string name="pref_show_ago">Show Ago</string>
+    <string name="pref_show_week_number">Show Week number</string>
+    <string name="default_custom_watchface_comment">Default watchface, you can click on EXPORT WATCHFACE button to generate a template</string>
+    <string name="wear_default_watchface">Default Watchface</string>
+    <string name="cwf_comment_background">Background image</string>
+    <string name="cwf_comment_chart">Graphs (BG, basal, prediction lines...)</string>
+    <string name="cwf_comment_cover_chart">Image in front of graph and behind text fields</string>
+    <string name="cwf_comment_freetext1">Free text 1</string>
+    <string name="cwf_comment_freetext2">Free text 2</string>
+    <string name="cwf_comment_freetext3">Free text 3</string>
+    <string name="cwf_comment_freetext4">Free text 4</string>
+    <string name="cwf_comment_iob1">IOB label or IOB Sum if detailed</string>
+    <string name="cwf_comment_iob2">IOB Sum or (Bolus_IOB|Basal_IOB) if detailed</string>
+    <string name="cwf_comment_cob1">COB label</string>
+    <string name="cwf_comment_cob2">COB value</string>
+    <string name="cwf_comment_delta">Short BG delta</string>
+    <string name="cwf_comment_avg_delta">Average BG delta (15min)</string>
+    <string name="cwf_comment_uploader_battery">Phone battery (%)</string>
+    <string name="cwf_comment_rig_battery">Global loop battery (%)</string>
+    <string name="cwf_comment_basalRate">Basal Rate</string>
+    <string name="cwf_comment_bgi">BGI value</string>
+    <string name="cwf_comment_time">Time (HH:MM or HH:MM:SS)</string>
+    <string name="cwf_comment_hour">Hour (HH)</string>
+    <string name="cwf_comment_minute">Minute (MM)</string>
+    <string name="cwf_comment_second">Second (SS)</string>
+    <string name="cwf_comment_timePeriod">AM or PM</string>
+    <string name="cwf_comment_day_name">Name of day of the week</string>
+    <string name="cwf_comment_day">Day (DD)</string>
+    <string name="cwf_comment_week_number">Week number (ww)</string>
+    <string name="cwf_comment_month">Month name (short)</string>
+    <string name="cwf_comment_loop">Loop status and ago</string>
+    <string name="cwf_comment_direction">Direction arrow</string>
+    <string name="cwf_comment_timestamp">Mintutes ago for last received BG</string>
+    <string name="cwf_comment_sgv">BG value</string>
+    <string name="cwf_comment_cover_plate">Cover image in front of text (dials…)</string>
+    <string name="cwf_comment_hour_hand">Image of hour hand (Analog Watch)</string>
+    <string name="cwf_comment_minute_hand">Image of minute hand (Analog Watch)</string>
+    <string name="cwf_comment_second_hand">Image of second hand (Analog Watch)</string>
+
 </resources>
diff --git a/app-wear-shared/shared/src/main/res/values/wear_paths.xml b/core/interfaces/src/main/res/values/wear_paths.xml
similarity index 100%
rename from app-wear-shared/shared/src/main/res/values/wear_paths.xml
rename to core/interfaces/src/main/res/values/wear_paths.xml
diff --git a/app-wear-shared/shared/src/release/java/info/nightscout/annotations/OpenForTesting.kt b/core/interfaces/src/release/java/info/nightscout/annotations/OpenForTesting.kt
similarity index 100%
rename from app-wear-shared/shared/src/release/java/info/nightscout/annotations/OpenForTesting.kt
rename to core/interfaces/src/release/java/info/nightscout/annotations/OpenForTesting.kt
diff --git a/core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt b/core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
deleted file mode 100644
index 9f92faa1f7..0000000000
--- a/core/interfaces/src/release/java/info/nightscout/interfaces/annotations/InterfacesOpenForTesting.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package info.nightscout.interfaces.annotations
-
-/**
- * Annotate a class with InterfacesOpenForTestingif it should be extendable for testing.
- * In production the class remains final.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class InterfacesOpenForTesting
\ No newline at end of file
diff --git a/app-wear-shared/shared/src/test/java/info/nightscout/rx/RxSchedulerRule.kt b/core/interfaces/src/test/java/info/nightscout/rx/RxSchedulerRule.kt
similarity index 100%
rename from app-wear-shared/shared/src/test/java/info/nightscout/rx/RxSchedulerRule.kt
rename to core/interfaces/src/test/java/info/nightscout/rx/RxSchedulerRule.kt
diff --git a/app-wear-shared/shared/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt b/core/interfaces/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt
similarity index 100%
rename from app-wear-shared/shared/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt
rename to core/interfaces/src/test/java/info/nightscout/rx/weardata/EventDataTest.kt
diff --git a/app-wear-shared/shared/src/test/java/info/nightscout/shared/SafeParseTest.kt b/core/interfaces/src/test/java/info/nightscout/shared/SafeParseTest.kt
similarity index 100%
rename from app-wear-shared/shared/src/test/java/info/nightscout/shared/SafeParseTest.kt
rename to core/interfaces/src/test/java/info/nightscout/shared/SafeParseTest.kt
diff --git a/core/main/build.gradle b/core/main/build.gradle
index cc5c7b7392..95c63acdde 100644
--- a/core/main/build.gradle
+++ b/core/main/build.gradle
@@ -13,7 +13,6 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
 apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':core:graphview')
     implementation project(':core:interfaces')
@@ -21,6 +20,7 @@ dependencies {
     implementation project(':core:utils')
 
     testImplementation project(':app-wear-shared:shared-tests')
+    testImplementation project(':app-wear-shared:shared-impl')
 
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
diff --git a/core/main/src/main/java/info/nightscout/core/constraints/ConstraintObject.kt b/core/main/src/main/java/info/nightscout/core/constraints/ConstraintObject.kt
new file mode 100644
index 0000000000..afda3ffa62
--- /dev/null
+++ b/core/main/src/main/java/info/nightscout/core/constraints/ConstraintObject.kt
@@ -0,0 +1,121 @@
+package info.nightscout.core.constraints
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.rx.logging.LTag
+import javax.inject.Inject
+
+class ConstraintObject<T : Comparable<T>>(private var value: T, injector: HasAndroidInjector) : Constraint<T> {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+
+    private var originalValue: T
+    private val reasons: MutableList<String> = ArrayList()
+    private val mostLimiting: MutableList<String> = ArrayList()
+    override fun value(): T {
+        return value
+    }
+
+    override fun originalValue(): T {
+        return originalValue
+    }
+
+    override fun set(value: T): Constraint<T> {
+        this.value = value
+        originalValue = value
+        aapsLogger.debug(LTag.CONSTRAINTS, "Setting value $value")
+        return this
+    }
+
+    override fun set(value: T, reason: String, from: Any): Constraint<T> {
+        aapsLogger.debug(LTag.CONSTRAINTS, "Setting value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
+        this.value = value
+        addReason(reason, from)
+        addMostLimingReason(reason, from)
+        return this
+    }
+
+    override fun setIfDifferent(value: T, reason: String, from: Any): Constraint<T> {
+        if (this.value != value) {
+            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of different value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
+            this.value = value
+            addReason(reason, from)
+            addMostLimingReason(reason, from)
+        }
+        return this
+    }
+
+    override fun setIfSmaller(value: T, reason: String, from: Any): Constraint<T> {
+        if (value < this.value) {
+            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of smaller value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
+            this.value = value
+            mostLimiting.clear()
+            addMostLimingReason(reason, from)
+        }
+        if (value < originalValue) {
+            addReason(reason, from)
+        }
+        return this
+    }
+
+    override fun setIfGreater(value: T, reason: String, from: Any): Constraint<T> {
+        if (value > this.value) {
+            aapsLogger.debug(LTag.CONSTRAINTS, "Setting because of greater value " + this.value + " -> " + value + " (" + reason + ")[" + translateFrom(from) + "]")
+            this.value = value
+            mostLimiting.clear()
+            addMostLimingReason(reason, from)
+        }
+        if (value > originalValue) {
+            addReason(reason, from)
+        }
+        return this
+    }
+
+    private fun translateFrom(from: Any): String {
+        return from.javaClass.simpleName.replace("Plugin", "")
+    }
+
+    override fun addReason(reason: String, from: Any) {
+        reasons.add(translateFrom(from) + ": " + reason)
+    }
+
+    private fun addMostLimingReason(reason: String, from: Any) {
+        mostLimiting.add(translateFrom(from) + ": " + reason)
+    }
+
+    override fun getReasons(): String {
+        val sb = StringBuilder()
+        for ((count, r) in reasons.withIndex()) {
+            if (count != 0) sb.append("\n")
+            sb.append(r)
+        }
+        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting original value: $originalValue to $value. Reason: $sb")
+        return sb.toString()
+    }
+
+    override val reasonList: List<String>
+        get() = reasons
+
+    override fun getMostLimitedReasons(): String {
+        val sb = StringBuilder()
+        for ((count, r) in mostLimiting.withIndex()) {
+            if (count != 0) sb.append("\n")
+            sb.append(r)
+        }
+        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting original value: $originalValue to $value. Reason: $sb")
+        return sb.toString()
+    }
+
+    override val mostLimitedReasonList: List<String>
+        get() = mostLimiting
+
+    override fun copyReasons(another: Constraint<*>) {
+        reasons.addAll(another.reasonList)
+    }
+
+    init {
+        injector.androidInjector().inject(this)
+        originalValue = value
+    }
+}
\ No newline at end of file
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt
index 6588a0d24e..339ffa097e 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt
+++ b/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt
@@ -19,7 +19,7 @@ class EffectiveProfileSwitchDataPoint(
         get() = "" +
             (if (data.originalPercentage != 100) "${data.originalPercentage}%" else "") +
             (if (data.originalPercentage != 100 && data.originalTimeshift != 0L) "," else "") +
-            (if (data.originalTimeshift != 0L) (T.msecs(data.originalTimeshift).hours().toString() + rh.gs(info.nightscout.shared.R.string.shorthour)) else "")
+            (if (data.originalTimeshift != 0L) (T.msecs(data.originalTimeshift).hours().toString() + rh.gs(info.nightscout.interfaces.R.string.shorthour)) else "")
     override val duration = 0L
     override val shape = PointsWithLabelGraphSeries.Shape.PROFILE
     override val size = 2f
diff --git a/core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt
index 2d5e6bc024..2bbb05206b 100644
--- a/core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt
+++ b/core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt
@@ -50,7 +50,7 @@ class TherapyEventDataPoint(
             }
     override val paintStyle: Paint.Style = Paint.Style.FILL // not used
 
-    override val size get() = if (rh.gb(info.nightscout.shared.R.bool.isTablet)) 12.0f else 10.0f
+    override val size get() = if (rh.gb(info.nightscout.core.ui.R.bool.isTablet)) 12.0f else 10.0f
     override fun color(context: Context?): Int {
         return when (data.type) {
             TherapyEvent.Type.ANNOUNCEMENT          -> rh.gac(context, info.nightscout.core.ui.R.attr.notificationAnnouncement)
diff --git a/core/utils/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt b/core/main/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt
similarity index 99%
rename from core/utils/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt
rename to core/main/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt
index fc79710d7f..856d2309ee 100644
--- a/core/utils/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt
+++ b/core/main/src/main/java/info/nightscout/core/utils/ActionModeHelper.kt
@@ -8,6 +8,7 @@ import android.view.MenuItem
 import androidx.core.view.MenuCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import info.nightscout.core.main.R
 import info.nightscout.shared.interfaces.ResourceHelper
 
 class ActionModeHelper<T>(val rh: ResourceHelper, val activity: FragmentActivity?, val fragment: Fragment?) {
diff --git a/core/utils/src/main/java/info/nightscout/core/utils/CryptoUtil.kt b/core/main/src/main/java/info/nightscout/core/utils/CryptoUtil.kt
similarity index 99%
rename from core/utils/src/main/java/info/nightscout/core/utils/CryptoUtil.kt
rename to core/main/src/main/java/info/nightscout/core/utils/CryptoUtil.kt
index d8a44d6c9f..c2dfaca653 100644
--- a/core/utils/src/main/java/info/nightscout/core/utils/CryptoUtil.kt
+++ b/core/main/src/main/java/info/nightscout/core/utils/CryptoUtil.kt
@@ -23,6 +23,7 @@ class CryptoUtil @Inject constructor(
 ) {
 
     companion object {
+
         private const val IV_LENGTH_BYTE = 12
         private const val TAG_LENGTH_BIT = 128
         private const val AES_KEY_SIZE_BIT = 256
diff --git a/core/utils/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt b/core/main/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt
similarity index 100%
rename from core/utils/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt
rename to core/main/src/main/java/info/nightscout/core/utils/extensions/HtmlString.kt
diff --git a/core/utils/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt b/core/main/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt
similarity index 100%
rename from core/utils/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt
rename to core/main/src/main/java/info/nightscout/core/utils/extensions/JSONObjectExt.kt
diff --git a/core/utils/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt b/core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
similarity index 100%
rename from core/utils/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
rename to core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
diff --git a/core/utils/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt b/core/main/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt
similarity index 100%
rename from core/utils/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt
rename to core/main/src/main/java/info/nightscout/core/utils/worker/LoggingWorker.kt
diff --git a/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt b/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
index 3c925fe15b..4bba468c45 100644
--- a/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
+++ b/core/main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.text.Spanned
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.highValueToUnitsToString
 import info.nightscout.core.extensions.lowValueToUnitsToString
 import info.nightscout.core.iob.round
@@ -19,15 +20,13 @@ import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.automation.Automation
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.iob.GlucoseStatus
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.pump.DetailedBolusInfo
@@ -63,7 +62,7 @@ class BolusWizard @Inject constructor(
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var profileUtil: ProfileUtil
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var loop: Loop
@@ -273,7 +272,7 @@ class BolusWizard @Inject constructor(
         val bolusStep = activePlugin.activePump.pumpDescription.bolusStep
         calculatedTotalInsulin = Round.roundTo(calculatedTotalInsulin, bolusStep)
 
-        insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(calculatedTotalInsulin)).value()
+        insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(calculatedTotalInsulin, injector)).value()
 
         aapsLogger.debug(this.toString())
         return this
@@ -455,7 +454,7 @@ class BolusWizard @Inject constructor(
             if (insulinAfterConstraints > 0 || carbs > 0) {
                 if (useSuperBolus) {
                     uel.log(Action.SUPERBOLUS_TBR, Sources.WizardDialog)
-                    if ((loop as PluginBase).isEnabled()) {
+                    if (loop.isEnabled()) {
                         loop.goToZeroTemp(2 * 60, profile, OfflineEvent.Reason.SUPER_BOLUS)
                         rxBus.send(EventRefreshOverview("WizardDialog"))
                     }
diff --git a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt b/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
index eeb936de5d..ff0d7ff78f 100644
--- a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
+++ b/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
@@ -13,7 +13,6 @@ import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.iob.IobCobCalculator
-import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.rx.logging.AAPSLogger
@@ -141,7 +140,7 @@ class QuickWizardEntry @Inject constructor(private val injector: HasAndroidInjec
         if (useSuperBolus() == YES && sp.getBoolean(info.nightscout.core.utils.R.string.key_usesuperbolus, false)) {
             superBolus = true
         }
-        if ((loop as PluginBase).isEnabled() && loop.isSuperBolus) superBolus = false
+        if (loop.isEnabled() && loop.isSuperBolus) superBolus = false
         // Trend
         val glucoseStatus = glucoseStatusProvider.glucoseStatusData
         var trend = false
diff --git a/core/utils/src/main/res/drawable/ic_sort.xml b/core/main/src/main/res/drawable/ic_sort.xml
similarity index 100%
rename from core/utils/src/main/res/drawable/ic_sort.xml
rename to core/main/src/main/res/drawable/ic_sort.xml
diff --git a/core/utils/src/main/res/drawable/ic_trash.xml b/core/main/src/main/res/drawable/ic_trash.xml
similarity index 100%
rename from core/utils/src/main/res/drawable/ic_trash.xml
rename to core/main/src/main/res/drawable/ic_trash.xml
diff --git a/core/utils/src/main/res/menu/menu_actions.xml b/core/main/src/main/res/menu/menu_actions.xml
similarity index 100%
rename from core/utils/src/main/res/menu/menu_actions.xml
rename to core/main/src/main/res/menu/menu_actions.xml
diff --git a/core/utils/src/main/res/menu/menu_delete_selection.xml b/core/main/src/main/res/menu/menu_delete_selection.xml
similarity index 100%
rename from core/utils/src/main/res/menu/menu_delete_selection.xml
rename to core/main/src/main/res/menu/menu_delete_selection.xml
diff --git a/core/main/src/main/res/values/strings.xml b/core/main/src/main/res/values/strings.xml
index cf363cea0c..f77b9c1073 100644
--- a/core/main/src/main/res/values/strings.xml
+++ b/core/main/src/main/res/values/strings.xml
@@ -2,4 +2,9 @@
 <resources>
     <string name="format_carbs">%1$d g</string>
 
+    <string name="count_selected">%1$d selected</string>
+    <string name="remove_items">Remove Items</string>
+    <string name="sort_items">Sort Items</string>
+    <string name="remove_selected_items">Remove Selected Items</string>
+    <string name="sort_label">Sort</string>
 </resources>
\ No newline at end of file
diff --git a/core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt b/core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt
index 77589bd104..e961021203 100644
--- a/core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt
+++ b/core/main/src/test/java/info/nightscout/core/data/ConstraintTest.kt
@@ -1,6 +1,8 @@
 package info.nightscout.core.data
 
-import info.nightscout.interfaces.constraints.Constraint
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.sharedtests.TestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
@@ -11,41 +13,49 @@ import org.junit.jupiter.api.Test
  */
 class ConstraintTest : TestBase() {
 
+    private val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun doTests() {
-        val b = Constraint(true)
+        val b = ConstraintObject(true, injector)
         Assertions.assertEquals(true, b.value())
-        Assertions.assertEquals("", b.getReasons(aapsLogger))
-        Assertions.assertEquals("", b.getMostLimitedReasons(aapsLogger))
-        b.set(aapsLogger, false)
+        Assertions.assertEquals("", b.getReasons())
+        Assertions.assertEquals("", b.getMostLimitedReasons())
+        b.set(false)
         Assertions.assertEquals(false, b.value())
-        Assertions.assertEquals("", b.getReasons(aapsLogger))
-        Assertions.assertEquals("", b.getMostLimitedReasons(aapsLogger))
-        b.set(aapsLogger, true, "Set true", this)
+        Assertions.assertEquals("", b.getReasons())
+        Assertions.assertEquals("", b.getMostLimitedReasons())
+        b.set(true, "Set true", this)
         Assertions.assertEquals(true, b.value())
-        Assertions.assertEquals("ConstraintTest: Set true", b.getReasons(aapsLogger))
-        Assertions.assertEquals("ConstraintTest: Set true", b.getMostLimitedReasons(aapsLogger))
-        b.set(aapsLogger, false, "Set false", this)
+        Assertions.assertEquals("ConstraintTest: Set true", b.getReasons())
+        Assertions.assertEquals("ConstraintTest: Set true", b.getMostLimitedReasons())
+        b.set(false, "Set false", this)
         Assertions.assertEquals(false, b.value())
-        Assertions.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getReasons(aapsLogger))
-        Assertions.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getMostLimitedReasons(aapsLogger))
-        val d = Constraint(10.0)
-        d.set(aapsLogger, 5.0, "Set 5d", this)
+        Assertions.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getReasons())
+        Assertions.assertEquals("ConstraintTest: Set true\nConstraintTest: Set false", b.getMostLimitedReasons())
+        val d = ConstraintObject(10.0, injector)
+        d.set(5.0, "Set 5d", this)
         Assertions.assertEquals(5.0, d.value(), 0.01)
-        Assertions.assertEquals("ConstraintTest: Set 5d", d.getReasons(aapsLogger))
-        Assertions.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons(aapsLogger))
-        d.setIfSmaller(aapsLogger, 6.0, "Set 6d", this)
+        Assertions.assertEquals("ConstraintTest: Set 5d", d.getReasons())
+        Assertions.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons())
+        d.setIfSmaller(6.0, "Set 6d", this)
         Assertions.assertEquals(5.0, d.value(), 0.01)
-        Assertions.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d", d.getReasons(aapsLogger))
-        Assertions.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons(aapsLogger))
-        d.setIfSmaller(aapsLogger, 4.0, "Set 4d", this)
+        Assertions.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d", d.getReasons())
+        Assertions.assertEquals("ConstraintTest: Set 5d", d.getMostLimitedReasons())
+        d.setIfSmaller(4.0, "Set 4d", this)
         Assertions.assertEquals(4.0, d.value(), 0.01)
-        Assertions.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d", d.getReasons(aapsLogger))
-        Assertions.assertEquals("ConstraintTest: Set 4d", d.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d", d.getReasons())
+        Assertions.assertEquals("ConstraintTest: Set 4d", d.getMostLimitedReasons())
         Assertions.assertEquals(10.0, d.originalValue(), 0.01)
-        d.setIfDifferent(aapsLogger, 7.0, "Set 7d", this)
+        d.setIfDifferent(7.0, "Set 7d", this)
         Assertions.assertEquals(7.0, d.value(), 0.01)
-        Assertions.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getReasons(aapsLogger))
-        Assertions.assertEquals("ConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("ConstraintTest: Set 5d\nConstraintTest: Set 6d\nConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getReasons())
+        Assertions.assertEquals("ConstraintTest: Set 4d\nConstraintTest: Set 7d", d.getMostLimitedReasons())
         Assertions.assertEquals(10.0, d.originalValue(), 0.01)
     }
 
diff --git a/core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt b/core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt
index dd32259395..8067daef2a 100644
--- a/core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt
+++ b/core/main/src/test/java/info/nightscout/core/data/IobTotalTest.kt
@@ -9,6 +9,7 @@ import info.nightscout.core.iob.plus
 import info.nightscout.core.iob.round
 import info.nightscout.interfaces.iob.IobTotal
 import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import info.nightscout.sharedtests.TestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
@@ -25,7 +26,7 @@ class IobTotalTest : TestBase() {
 
     @BeforeEach
     fun prepare() {
-        dateUtil = DateUtil(context)
+        dateUtil = DateUtilImpl(context)
         now = dateUtil.now()
     }
 
diff --git a/core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt b/core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt
index c26357af2e..100f5fac12 100644
--- a/core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt
+++ b/core/main/src/test/java/info/nightscout/core/data/ProfileTest.kt
@@ -7,11 +7,10 @@ import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.utils.HardLimits
-import info.nightscout.rx.TestAapsSchedulers
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import info.nightscout.sharedtests.HardLimitsMock
 import info.nightscout.sharedtests.TestBase
 import info.nightscout.sharedtests.TestPumpPlugin
@@ -37,7 +36,6 @@ class ProfileTest : TestBase() {
     @Mock lateinit var sp: SP
 
     private lateinit var hardLimits: HardLimits
-    private lateinit var rxBus: RxBus
     private lateinit var dateUtil: DateUtil
     private lateinit var testPumpPlugin: TestPumpPlugin
 
@@ -59,8 +57,7 @@ class ProfileTest : TestBase() {
     @BeforeEach
     fun prepare() {
         testPumpPlugin = TestPumpPlugin { AndroidInjector { } }
-        dateUtil = DateUtil(context)
-        rxBus = RxBus(TestAapsSchedulers(), aapsLogger)
+        dateUtil = DateUtilImpl(context)
         hardLimits = HardLimitsMock(sp, rh)
         `when`(activePluginProvider.activePump).thenReturn(testPumpPlugin)
         `when`(rh.gs(info.nightscout.core.ui.R.string.profile_per_unit)).thenReturn("/U")
diff --git a/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt b/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt
index e8707962c1..fb3258894e 100644
--- a/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt
+++ b/core/main/src/test/java/info/nightscout/core/utils/DateUtilTest.kt
@@ -3,13 +3,13 @@ package info.nightscout.core.utils
 import android.content.Context
 import com.google.common.truth.Truth.assertThat
 import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import info.nightscout.shared.utils.T
 import info.nightscout.sharedtests.TestBase
-import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import java.util.Date
@@ -41,45 +41,45 @@ class DateUtilTest : TestBase() {
 
     @Test
     fun fromISODateStringTest() {
-        Assertions.assertEquals(1511124634417L, DateUtil(context).fromISODateString("2017-11-19T22:50:34.417+0200"))
-        Assertions.assertEquals(1511124634000L, DateUtil(context).fromISODateString("2017-11-19T22:50:34+0200"))
-        Assertions.assertEquals(1512317365000L, DateUtil(context).fromISODateString("2017-12-03T16:09:25.000Z"))
-        Assertions.assertEquals(1513902750000L, DateUtil(context).fromISODateString("2017-12-22T00:32:30Z"))
+        Assertions.assertEquals(1511124634417L, DateUtilImpl(context).fromISODateString("2017-11-19T22:50:34.417+0200"))
+        Assertions.assertEquals(1511124634000L, DateUtilImpl(context).fromISODateString("2017-11-19T22:50:34+0200"))
+        Assertions.assertEquals(1512317365000L, DateUtilImpl(context).fromISODateString("2017-12-03T16:09:25.000Z"))
+        Assertions.assertEquals(1513902750000L, DateUtilImpl(context).fromISODateString("2017-12-22T00:32:30Z"))
     }
 
     @Test
     fun toISOStringTest() {
-        Assertions.assertEquals("2017-12-22T00:32:30.000Z", DateUtil(context).toISOString(1513902750000L))
+        Assertions.assertEquals("2017-12-22T00:32:30.000Z", DateUtilImpl(context).toISOString(1513902750000L))
     }
 
     @Test fun secondsOfTheDayToMillisecondsTest() {
-        Assertions.assertTrue(Date(DateUtil(context).secondsOfTheDayToMilliseconds((T.hours(1).secs() + T.mins(1).secs() + 1).toInt())).toString().contains("01:01:00"))
+        Assertions.assertTrue(Date(DateUtilImpl(context).secondsOfTheDayToMilliseconds((T.hours(1).secs() + T.mins(1).secs() + 1).toInt())).toString().contains("01:01:00"))
     }
 
     @Test fun toSecondsTest() {
-        Assertions.assertEquals(3600, DateUtil(context).toSeconds("01:00").toLong())
-        Assertions.assertEquals(3600, DateUtil(context).toSeconds("01:00 a.m.").toLong())
-        Assertions.assertEquals(3600, DateUtil(context).toSeconds("01:00 AM").toLong())
+        Assertions.assertEquals(3600, DateUtilImpl(context).toSeconds("01:00").toLong())
+        Assertions.assertEquals(3600, DateUtilImpl(context).toSeconds("01:00 a.m.").toLong())
+        Assertions.assertEquals(3600, DateUtilImpl(context).toSeconds("01:00 AM").toLong())
     }
 
     @Test fun dateStringTest() {
-        assertThat(DateUtil(context).dateString(1513902750000L)).contains("22")
+        assertThat(DateUtilImpl(context).dateString(1513902750000L)).contains("22")
     }
 
     @Test fun timeStringTest() {
-        Assertions.assertTrue(DateUtil(context).timeString(1513902750000L).contains("32"))
+        Assertions.assertTrue(DateUtilImpl(context).timeString(1513902750000L).contains("32"))
     }
 
     @Test fun dateAndTimeStringTest() {
-        assertThat(DateUtil(context).dateAndTimeString(1513902750000L)).contains("22")
-        assertThat(DateUtil(context).dateAndTimeString(1513902750000L)).contains("32")
+        assertThat(DateUtilImpl(context).dateAndTimeString(1513902750000L)).contains("22")
+        assertThat(DateUtilImpl(context).dateAndTimeString(1513902750000L)).contains("32")
     }
 
     @Test fun dateAndTimeRangeStringTest() {
-        assertThat(DateUtil(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("22")
-        assertThat(DateUtil(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("32")
-        assertThat(DateUtil(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("22")
-        assertThat(DateUtil(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("32")
+        assertThat(DateUtilImpl(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("22")
+        assertThat(DateUtilImpl(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("32")
+        assertThat(DateUtilImpl(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("22")
+        assertThat(DateUtilImpl(context).dateAndTimeRangeString(1513902750000L, 1513902750000L)).contains("32")
     }
 
     /*
@@ -89,7 +89,7 @@ class DateUtilTest : TestBase() {
     }
     */
     @Test fun timeFrameStringTest() {
-        `when`(rh.gs(info.nightscout.shared.R.string.shorthour)).thenReturn("h")
-        Assertions.assertEquals("(1h 1')", DateUtil(context).timeFrameString(T.hours(1).msecs() + T.mins(1).msecs(), rh))
+        `when`(rh.gs(info.nightscout.interfaces.R.string.shorthour)).thenReturn("h")
+        Assertions.assertEquals("(1h 1')", DateUtilImpl(context).timeFrameString(T.hours(1).msecs() + T.mins(1).msecs(), rh))
     }
 }
diff --git a/core/main/test_dependencies.gradle b/core/main/test_dependencies.gradle
index b4f8cf5370..04c57f1f70 100644
--- a/core/main/test_dependencies.gradle
+++ b/core/main/test_dependencies.gradle
@@ -12,6 +12,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "androidx.test.ext:junit-ktx:$androidx_junit_version"
     androidTestImplementation "androidx.test:rules:$androidx_rules_version"
+    androidTestImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version"
 
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
diff --git a/app-wear-shared/shared/src/main/res/values-sw600dp/layout.xml b/core/ui/src/main/res/values-sw600dp/layout.xml
similarity index 100%
rename from app-wear-shared/shared/src/main/res/values-sw600dp/layout.xml
rename to core/ui/src/main/res/values-sw600dp/layout.xml
diff --git a/app-wear-shared/shared/src/main/res/values/layout.xml b/core/ui/src/main/res/values/layout.xml
similarity index 100%
rename from app-wear-shared/shared/src/main/res/values/layout.xml
rename to core/ui/src/main/res/values/layout.xml
diff --git a/core/utils/build.gradle b/core/utils/build.gradle
index 510fda7ba3..6ef6d4a957 100644
--- a/core/utils/build.gradle
+++ b/core/utils/build.gradle
@@ -18,7 +18,10 @@ android {
 
 dependencies {
 
-    implementation project(':app-wear-shared:shared')
+    api "com.google.dagger:dagger-android:$dagger_version"
+    api "com.google.dagger:dagger-android-support:$dagger_version"
+
+    api "net.danlew:android.joda:$joda_version"
 
     //Firebase
     api platform('com.google.firebase:firebase-bom:32.3.1')
diff --git a/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt b/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt
index 83649bb3fb..ada8a89f39 100644
--- a/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt
+++ b/core/utils/src/main/java/info/nightscout/core/utils/receivers/DataWorkerStorage.kt
@@ -2,11 +2,11 @@ package info.nightscout.core.utils.receivers
 
 import android.content.Context
 import android.os.Bundle
+import androidx.annotation.OpenForTesting
 import androidx.work.Data
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
-import info.nightscout.annotations.OpenForTesting
 import org.json.JSONArray
 import org.json.JSONObject
 import javax.inject.Inject
diff --git a/core/utils/src/main/res/values-af-rZA/strings.xml b/core/utils/src/main/res/values-af-rZA/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-af-rZA/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-bg-rBG/strings.xml b/core/utils/src/main/res/values-bg-rBG/strings.xml
deleted file mode 100644
index 055832ff21..0000000000
--- a/core/utils/src/main/res/values-bg-rBG/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d избрано</string>
-    <string name="remove_items">Премахни артикули</string>
-    <string name="sort_items">Подреди артикули</string>
-    <string name="remove_selected_items">Премахнете избраните елементи</string>
-    <string name="sort_label">Сортирай</string>
-</resources>
diff --git a/core/utils/src/main/res/values-ca-rES/strings.xml b/core/utils/src/main/res/values-ca-rES/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-ca-rES/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-cs-rCZ/strings.xml b/core/utils/src/main/res/values-cs-rCZ/strings.xml
deleted file mode 100644
index 32aff04aef..0000000000
--- a/core/utils/src/main/res/values-cs-rCZ/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">Vybráno: %1$d</string>
-    <string name="remove_items">Odebrat položky</string>
-    <string name="sort_items">Seřadit položky</string>
-    <string name="remove_selected_items">Odebrat vybrané položky</string>
-    <string name="sort_label">Seřadit</string>
-</resources>
diff --git a/core/utils/src/main/res/values-da-rDK/strings.xml b/core/utils/src/main/res/values-da-rDK/strings.xml
deleted file mode 100644
index e042c690b2..0000000000
--- a/core/utils/src/main/res/values-da-rDK/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d valgt</string>
-    <string name="remove_items">Fjern Emner</string>
-    <string name="sort_items">Sortér Emner</string>
-    <string name="remove_selected_items">Fjern valgte emner</string>
-    <string name="sort_label">Sortér</string>
-</resources>
diff --git a/core/utils/src/main/res/values-de-rDE/strings.xml b/core/utils/src/main/res/values-de-rDE/strings.xml
deleted file mode 100644
index 9dee92e75d..0000000000
--- a/core/utils/src/main/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d ausgewählt</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="sort_label">Sortieren</string>
-</resources>
diff --git a/core/utils/src/main/res/values-el-rGR/strings.xml b/core/utils/src/main/res/values-el-rGR/strings.xml
deleted file mode 100644
index 763ea6bd89..0000000000
--- a/core/utils/src/main/res/values-el-rGR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">Επιλέχθηκε %1$d</string>
-    <string name="remove_items">Αφαίρεση Στοιχείων</string>
-    <string name="sort_items">Ταξινόμηση Στοιχείων</string>
-    <string name="remove_selected_items">Αφαίρεση Επιλεγμένων Στοιχείων</string>
-    <string name="sort_label">Ταξινόμηση</string>
-</resources>
diff --git a/core/utils/src/main/res/values-es-rES/strings.xml b/core/utils/src/main/res/values-es-rES/strings.xml
deleted file mode 100644
index 51cc673ea7..0000000000
--- a/core/utils/src/main/res/values-es-rES/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d seleccionado</string>
-    <string name="remove_items">Eliminar elementos</string>
-    <string name="sort_items">Ordenar elementos</string>
-    <string name="remove_selected_items">Eliminar elementos seleccionados</string>
-    <string name="sort_label">Ordenar</string>
-</resources>
diff --git a/core/utils/src/main/res/values-fr-rFR/strings.xml b/core/utils/src/main/res/values-fr-rFR/strings.xml
deleted file mode 100644
index 43e2479768..0000000000
--- a/core/utils/src/main/res/values-fr-rFR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d séléctionné(s)</string>
-    <string name="remove_items">Supprimer les éléments</string>
-    <string name="sort_items">Trier les éléments</string>
-    <string name="remove_selected_items">Supprimer les éléments sélectionnés</string>
-    <string name="sort_label">Trier</string>
-</resources>
diff --git a/core/utils/src/main/res/values-ga-rIE/strings.xml b/core/utils/src/main/res/values-ga-rIE/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-ga-rIE/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-hr-rHR/strings.xml b/core/utils/src/main/res/values-hr-rHR/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-hr-rHR/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-hu-rHU/strings.xml b/core/utils/src/main/res/values-hu-rHU/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-hu-rHU/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-it-rIT/strings.xml b/core/utils/src/main/res/values-it-rIT/strings.xml
deleted file mode 100644
index 7f0600516d..0000000000
--- a/core/utils/src/main/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d selezionati</string>
-    <string name="remove_items">Rimuovi elementi</string>
-    <string name="sort_items">Ordina elementi</string>
-    <string name="remove_selected_items">Rimuovi elementi selezionati</string>
-    <string name="sort_label">Ordina</string>
-</resources>
diff --git a/core/utils/src/main/res/values-iw-rIL/strings.xml b/core/utils/src/main/res/values-iw-rIL/strings.xml
deleted file mode 100644
index c59cf26f89..0000000000
--- a/core/utils/src/main/res/values-iw-rIL/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d נבחרו</string>
-    <string name="remove_items">פריטים שהוסרו</string>
-    <string name="sort_items">מיין פריטים</string>
-    <string name="remove_selected_items">הסר פריטים נבחרים</string>
-    <string name="sort_label">מיין</string>
-</resources>
diff --git a/core/utils/src/main/res/values-ja-rJP/strings.xml b/core/utils/src/main/res/values-ja-rJP/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-ja-rJP/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-ko-rKR/strings.xml b/core/utils/src/main/res/values-ko-rKR/strings.xml
deleted file mode 100644
index 3ec59ea4e0..0000000000
--- a/core/utils/src/main/res/values-ko-rKR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d 선택됨</string>
-    <string name="remove_items">항목 제거하기</string>
-    <string name="sort_items">항목 분류하기</string>
-    <string name="remove_selected_items">선택된 항목 제거하기</string>
-    <string name="sort_label">분류</string>
-</resources>
diff --git a/core/utils/src/main/res/values-lt-rLT/strings.xml b/core/utils/src/main/res/values-lt-rLT/strings.xml
deleted file mode 100644
index 4bda3c08d1..0000000000
--- a/core/utils/src/main/res/values-lt-rLT/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d pasirinkta</string>
-    <string name="remove_items">Pašalinti elementus</string>
-    <string name="sort_items">Rūšiuoti elementus</string>
-    <string name="remove_selected_items">Pašalinti pasirinktus elementus</string>
-    <string name="sort_label">Rūšiuoti</string>
-</resources>
diff --git a/core/utils/src/main/res/values-nl-rNL/strings.xml b/core/utils/src/main/res/values-nl-rNL/strings.xml
deleted file mode 100644
index 4132f90084..0000000000
--- a/core/utils/src/main/res/values-nl-rNL/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d geselecteerd</string>
-    <string name="remove_items">Items verwijderen</string>
-    <string name="sort_items">Sorteer items</string>
-    <string name="remove_selected_items">Verwijder geselecteerde items</string>
-    <string name="sort_label">Sorteren</string>
-</resources>
diff --git a/core/utils/src/main/res/values-no-rNO/strings.xml b/core/utils/src/main/res/values-no-rNO/strings.xml
deleted file mode 100644
index 4ce3dd56a6..0000000000
--- a/core/utils/src/main/res/values-no-rNO/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d valgt</string>
-    <string name="remove_items">Slett elementer</string>
-    <string name="sort_items">Sorter elementer</string>
-    <string name="remove_selected_items">Slett valgte elementer</string>
-    <string name="sort_label">Sorter</string>
-</resources>
diff --git a/core/utils/src/main/res/values-pl-rPL/strings.xml b/core/utils/src/main/res/values-pl-rPL/strings.xml
deleted file mode 100644
index fa05f69045..0000000000
--- a/core/utils/src/main/res/values-pl-rPL/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">Wybrany %1$d</string>
-    <string name="remove_items">Usuń pozycje</string>
-    <string name="sort_items">Sortuj pozycje</string>
-    <string name="remove_selected_items">Usuń zaznaczone pozycje</string>
-    <string name="sort_label">Sortuj</string>
-</resources>
diff --git a/core/utils/src/main/res/values-pt-rBR/strings.xml b/core/utils/src/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 8759ee512a..0000000000
--- a/core/utils/src/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">Selecionado %1$d</string>
-    <string name="remove_items">Remover itens</string>
-    <string name="sort_items">Ordenar Itens</string>
-    <string name="remove_selected_items">Remover itens selecionados</string>
-    <string name="sort_label">Ordenar</string>
-</resources>
diff --git a/core/utils/src/main/res/values-pt-rPT/strings.xml b/core/utils/src/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 607a8d88f2..0000000000
--- a/core/utils/src/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d selecionados</string>
-    <string name="remove_items">Remover itens</string>
-    <string name="sort_items">Ordenar itens</string>
-    <string name="remove_selected_items">Remover itens selecionados</string>
-    <string name="sort_label">Ordenar</string>
-</resources>
diff --git a/core/utils/src/main/res/values-ro-rRO/strings.xml b/core/utils/src/main/res/values-ro-rRO/strings.xml
deleted file mode 100644
index 06b7aac6f5..0000000000
--- a/core/utils/src/main/res/values-ro-rRO/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="sort_label">Sortează</string>
-</resources>
diff --git a/core/utils/src/main/res/values-ru-rRU/strings.xml b/core/utils/src/main/res/values-ru-rRU/strings.xml
deleted file mode 100644
index bc6a581292..0000000000
--- a/core/utils/src/main/res/values-ru-rRU/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">Выбрано: %1$d</string>
-    <string name="remove_items">Удалить элементы</string>
-    <string name="sort_items">Сортировать элементы</string>
-    <string name="remove_selected_items">Удалить выбранные элементы</string>
-    <string name="sort_label">Сортировать</string>
-</resources>
diff --git a/core/utils/src/main/res/values-sk-rSK/strings.xml b/core/utils/src/main/res/values-sk-rSK/strings.xml
deleted file mode 100644
index 12d8e52129..0000000000
--- a/core/utils/src/main/res/values-sk-rSK/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d vybraných</string>
-    <string name="remove_items">Odstrániť položky</string>
-    <string name="sort_items">Zoradiť položky</string>
-    <string name="remove_selected_items">Odstrániť vybrané položky</string>
-    <string name="sort_label">Zoradiť</string>
-</resources>
diff --git a/core/utils/src/main/res/values-sr-rCS/strings.xml b/core/utils/src/main/res/values-sr-rCS/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-sr-rCS/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-sv-rSE/strings.xml b/core/utils/src/main/res/values-sv-rSE/strings.xml
deleted file mode 100644
index b009e2f499..0000000000
--- a/core/utils/src/main/res/values-sv-rSE/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d valt</string>
-    <string name="remove_items">Ta bort objekt</string>
-    <string name="sort_items">Sortera objekt</string>
-    <string name="remove_selected_items">Ta bort valda objekt</string>
-    <string name="sort_label">Sortera</string>
-</resources>
diff --git a/core/utils/src/main/res/values-tr-rTR/strings.xml b/core/utils/src/main/res/values-tr-rTR/strings.xml
deleted file mode 100644
index cd3a6d5e1d..0000000000
--- a/core/utils/src/main/res/values-tr-rTR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d seçildi</string>
-    <string name="remove_items">Öğeleri kaldır</string>
-    <string name="sort_items">Öğeleri Sırala</string>
-    <string name="remove_selected_items">Seçilen öğeleri kaldır</string>
-    <string name="sort_label">Sırala</string>
-</resources>
diff --git a/core/utils/src/main/res/values-uk-rUA/strings.xml b/core/utils/src/main/res/values-uk-rUA/strings.xml
deleted file mode 100644
index 3ea04e700d..0000000000
--- a/core/utils/src/main/res/values-uk-rUA/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
diff --git a/core/utils/src/main/res/values-zh-rCN/strings.xml b/core/utils/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index b32b881107..0000000000
--- a/core/utils/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">已选中 %1$d 项</string>
-    <string name="remove_items">删除项目</string>
-    <string name="sort_items">项目排序</string>
-    <string name="remove_selected_items">删除选中项</string>
-    <string name="sort_label">排序</string>
-</resources>
diff --git a/core/utils/src/main/res/values/strings.xml b/core/utils/src/main/res/values/strings.xml
deleted file mode 100644
index 246de562c5..0000000000
--- a/core/utils/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="count_selected">%1$d selected</string>
-    <string name="remove_items">Remove Items</string>
-    <string name="sort_items">Sort Items</string>
-    <string name="remove_selected_items">Remove Selected Items</string>
-    <string name="sort_label">Sort</string>
-
-</resources>
\ No newline at end of file
diff --git a/core/validators/build.gradle b/core/validators/build.gradle
index b864f8f969..a0233c2a1c 100644
--- a/core/validators/build.gradle
+++ b/core/validators/build.gradle
@@ -16,6 +16,7 @@ android {
 
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
+    implementation project(':core:interfaces')
+    implementation project(':app-wear-shared:shared-impl')
     api "com.google.android.material:material:$material_version"
 }
\ No newline at end of file
diff --git a/crowdin.yml b/crowdin.yml
index 34356aa616..b5640c7a63 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -41,8 +41,6 @@ files:
     translation: /core/main/src/main/res/values-%android_code%/strings.xml
   - source: /core/interfaces/src/main/res/values/strings.xml
     translation: /core/interfaces/src/main/res/values-%android_code%/strings.xml
-  - source: /core/utils/src/main/res/values/strings.xml
-    translation: /core/utils/src/main/res/values-%android_code%/strings.xml
   - source: /core/ui/src/main/res/values/protection.xml
     translation: /core/ui/src/main/res/values-%android_code%/protection.xml
   - source: /core/validators/src/main/res/values/validator.xml
diff --git a/database/entities/build.gradle b/database/entities/build.gradle
index 918416feb0..e951e0cbdd 100644
--- a/database/entities/build.gradle
+++ b/database/entities/build.gradle
@@ -12,6 +12,9 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
 android {
 
     namespace 'info.nightscout.database.entities'
+    defaultConfig {
+        minSdkVersion 25  // for wear
+    }
 
     buildFeatures {
         buildConfig = false
diff --git a/implementation/build.gradle b/implementation/build.gradle
index 177a3b439f..51b6af396d 100644
--- a/implementation/build.gradle
+++ b/implementation/build.gradle
@@ -15,7 +15,6 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:main')
diff --git a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt
index 6d6fa99f61..9188069b78 100644
--- a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt
@@ -107,10 +107,10 @@ class TranslatorImpl @Inject internal constructor(
 
     override fun translate(units: ValueWithUnit?): String = when (units) {
         is ValueWithUnit.Gram        -> rh.gs(info.nightscout.core.ui.R.string.shortgram)
-        is ValueWithUnit.Hour        -> rh.gs(info.nightscout.shared.R.string.shorthour)
+        is ValueWithUnit.Hour        -> rh.gs(info.nightscout.interfaces.R.string.shorthour)
         is ValueWithUnit.Insulin     -> rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname)
         is ValueWithUnit.Mgdl        -> rh.gs(info.nightscout.core.ui.R.string.mgdl)
-        is ValueWithUnit.Minute      -> rh.gs(info.nightscout.shared.R.string.shortminute)
+        is ValueWithUnit.Minute      -> rh.gs(info.nightscout.interfaces.R.string.shortminute)
         is ValueWithUnit.Mmoll       -> rh.gs(info.nightscout.core.ui.R.string.mmol)
         is ValueWithUnit.Percent     -> rh.gs(info.nightscout.core.ui.R.string.shortpercent)
         is ValueWithUnit.UnitPerHour -> rh.gs(info.nightscout.core.ui.R.string.profile_ins_units_per_hour)
diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
index 008fee161b..5614ccb986 100644
--- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt
@@ -8,7 +8,6 @@ import info.nightscout.database.entities.ProfileSwitch
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertOrUpdateProfileSwitch
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.nsclient.ProcessedDeviceStatusData
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -143,7 +142,7 @@ class ProfileFunctionImpl @Inject constructor(
     }
 
     override fun getUnits(): GlucoseUnit =
-        if (sp.getString(info.nightscout.core.utils.R.string.key_units, Constants.MGDL) == Constants.MGDL) GlucoseUnit.MGDL
+        if (sp.getString(info.nightscout.core.utils.R.string.key_units, GlucoseUnit.MGDL.asText) == GlucoseUnit.MGDL.asText) GlucoseUnit.MGDL
         else GlucoseUnit.MMOL
 
     override fun buildProfileSwitch(profileStore: ProfileStore, profileName: String, durationInMinutes: Int, percentage: Int, timeShiftInHours: Int, timestamp: Long): ProfileSwitch? {
diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
index e66580353d..0a5fedafdd 100644
--- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
@@ -9,6 +9,7 @@ import android.text.Spanned
 import androidx.appcompat.app.AppCompatActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.annotations.OpenForTesting
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.extensions.getCustomizedName
 import info.nightscout.core.profile.ProfileSealed
@@ -42,8 +43,7 @@ import info.nightscout.implementation.queue.commands.CommandTempBasalPercent
 import info.nightscout.implementation.queue.commands.CommandUpdateTime
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -85,7 +85,7 @@ class CommandQueueImplementation @Inject constructor(
     private val rxBus: RxBus,
     private val aapsSchedulers: AapsSchedulers,
     private val rh: ResourceHelper,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val profileFunction: ProfileFunction,
     private val activePlugin: ActivePlugin,
     private val context: Context,
@@ -310,8 +310,8 @@ class CommandQueueImplementation @Inject constructor(
             removeAll(type)
         }
         // apply constraints
-        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
-        detailedBolusInfo.carbs = constraintChecker.applyCarbsConstraints(Constraint(detailedBolusInfo.carbs.toInt())).value().toDouble()
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(ConstraintObject(detailedBolusInfo.insulin, injector)).value()
+        detailedBolusInfo.carbs = constraintChecker.applyCarbsConstraints(ConstraintObject(detailedBolusInfo.carbs.toInt(), injector)).value().toDouble()
         // add new command to queue
         if (detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB) {
             add(CommandSMBBolus(injector, detailedBolusInfo, callback))
@@ -368,7 +368,7 @@ class CommandQueueImplementation @Inject constructor(
         }
         // remove all unfinished
         removeAll(CommandType.TEMPBASAL)
-        val rateAfterConstraints = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val rateAfterConstraints = constraintChecker.applyBasalConstraints(ConstraintObject(absoluteRate, injector), profile).value()
         // add new command to queue
         add(CommandTempBasalAbsolute(injector, rateAfterConstraints, durationInMinutes, enforceNew, profile, tbrType, callback))
         notifyAboutNewCommand()
@@ -383,7 +383,7 @@ class CommandQueueImplementation @Inject constructor(
         }
         // remove all unfinished
         removeAll(CommandType.TEMPBASAL)
-        val percentAfterConstraints = constraintChecker.applyBasalPercentConstraints(Constraint(percent), profile).value()
+        val percentAfterConstraints = constraintChecker.applyBasalPercentConstraints(ConstraintObject(percent, injector), profile).value()
         // add new command to queue
         add(CommandTempBasalPercent(injector, percentAfterConstraints, durationInMinutes, enforceNew, profile, tbrType, callback))
         notifyAboutNewCommand()
@@ -396,7 +396,7 @@ class CommandQueueImplementation @Inject constructor(
             callback?.result(executingNowError())?.run()
             return false
         }
-        val rateAfterConstraints = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        val rateAfterConstraints = constraintChecker.applyExtendedBolusConstraints(ConstraintObject(insulin, injector)).value()
         // remove all unfinished
         removeAll(CommandType.EXTENDEDBOLUS)
         // add new command to queue
diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt
index 1167b0a127..eae3887c20 100644
--- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt
@@ -5,7 +5,6 @@ import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.pump.PumpEnactResult
 import info.nightscout.interfaces.queue.Callback
@@ -42,7 +41,7 @@ class CommandSetProfile constructor(
         // Send SMS notification if ProfileSwitch is coming from NS
         val profileSwitch = repository.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet()
         if (profileSwitch is ValueWrapper.Existing && r.enacted && hasNsId && !config.NSCLIENT) {
-            if ((smsCommunicator as PluginBase).isEnabled())
+            if (smsCommunicator.isEnabled())
                 smsCommunicator.sendNotificationToAllNumbers(rh.gs(info.nightscout.core.ui.R.string.profile_set_ok))
         }
     }
diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt
index 62d24e8825..145a9b240b 100644
--- a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt
@@ -93,7 +93,7 @@ class ResourceHelperImpl @Inject constructor(var context: Context, private val f
         return (dp * scale + 0.5f).toInt()
     }
 
-    override fun shortTextMode(): Boolean = !gb(info.nightscout.shared.R.bool.isTablet)
+    override fun shortTextMode(): Boolean = !gb(info.nightscout.core.ui.R.bool.isTablet)
 
     override fun gac(context: Context?, attributeId: Int): Int =
         (ContextThemeWrapper(context ?: this.context, info.nightscout.core.ui.R.style.AppTheme)).getThemeColor(attributeId)
diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt
index bd68592865..8b6ca19cdf 100644
--- a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt
@@ -164,7 +164,7 @@ class TddCalculatorImpl @Inject constructor(
             }
             todayTdd?.let {
                 layout.addView(TextView(context).apply {
-                    text = rh.gs(info.nightscout.shared.R.string.today)
+                    text = rh.gs(info.nightscout.interfaces.R.string.today)
                     setTypeface(typeface, Typeface.BOLD)
                     gravity = Gravity.CENTER_HORIZONTAL
                     setTextAppearance(android.R.style.TextAppearance_Material_Medium)
diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt
index b57ebe56ee..4eed035b41 100644
--- a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt
@@ -69,7 +69,7 @@ class TirImpl(override val date: Long, override val lowThreshold: Double, overri
             val lp = TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT, 1f)
             row.layoutParams = TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT)
             row.gravity = Gravity.CENTER_HORIZONTAL
-            row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.shared.R.string.days) })
+            row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.interfaces.R.string.days) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, belowPct()) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, inRangePct()) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, abovePct()) })
diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
index 85f711a224..ce57b0bdc2 100644
--- a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt
@@ -54,7 +54,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i
         if ((total.isNaN() || bolusAmount.isNaN() || basalAmount.isNaN() || carbs.isNaN()).not()) {
             row.layoutParams = TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT)
             row.gravity = Gravity.CENTER_HORIZONTAL
-            row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.shared.R.string.days) })
+            row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = "%02d".format(days) + " " + rh.gs(info.nightscout.interfaces.R.string.days) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, total) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, bolusAmount) })
             row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, basalAmount) })
diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt
index 6a2c4fe9d1..00ac6dd1c7 100644
--- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt
@@ -170,8 +170,8 @@ class UserEntryPresentationHelperImpl @Inject constructor(
         csvString(info.nightscout.core.ui.R.string.insulin_unit_shortname),
         csvString(info.nightscout.core.ui.R.string.profile_ins_units_per_hour),
         csvString(info.nightscout.core.ui.R.string.shortpercent),
-        csvString(info.nightscout.shared.R.string.shorthour),
-        csvString(info.nightscout.shared.R.string.shortminute),
+        csvString(info.nightscout.interfaces.R.string.shorthour),
+        csvString(info.nightscout.interfaces.R.string.shortminute),
         csvString(info.nightscout.core.ui.R.string.ue_none)
     ) + "\n"
 
diff --git a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
index 8d96814e6e..fa0cbfbcf4 100644
--- a/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/iob/GlucoseStatusTest.kt
@@ -94,7 +94,7 @@ class GlucoseStatusTest : TestBaseWithProfile() {
     @Test fun returnOldDataIfAllowed() {
         Mockito.`when`(autosensDataStore.getBucketedDataTableCopy()).thenReturn(generateOldBgData())
         val glucoseStatus: GlucoseStatus? = GlucoseStatusProviderImpl(aapsLogger, iobCobCalculatorPlugin, dateUtil, decimalFormatter).getGlucoseStatusData(true)
-        assertThat(glucoseStatus).isNull()
+        assertThat(glucoseStatus).isNotNull()
     }
 
     @Test fun averageShouldNotFailOnEmptyArray() {
diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt
index 1d5f831bfe..dd3aff2fdc 100644
--- a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt
@@ -6,6 +6,7 @@ import android.os.Handler
 import android.os.PowerManager
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.Bolus
@@ -17,8 +18,7 @@ import info.nightscout.implementation.queue.commands.CommandLoadHistory
 import info.nightscout.implementation.queue.commands.CommandTempBasalPercent
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.ProfileFunction
@@ -50,7 +50,7 @@ import java.util.Calendar
 
 class CommandQueueImplementationTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var powerManager: PowerManager
     @Mock lateinit var repository: AppRepository
     @Mock lateinit var uiInteraction: UiInteraction
@@ -63,7 +63,7 @@ class CommandQueueImplementationTest : TestBaseWithProfile() {
         rxBus: RxBus,
         aapsSchedulers: AapsSchedulers,
         rh: ResourceHelper,
-        constraintChecker: Constraints,
+        constraintChecker: ConstraintsChecker,
         profileFunction: ProfileFunction,
         activePlugin: ActivePlugin,
         context: Context,
@@ -88,6 +88,9 @@ class CommandQueueImplementationTest : TestBaseWithProfile() {
 
     private val injector = HasAndroidInjector {
         AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
             if (it is Command) {
                 it.aapsLogger = aapsLogger
                 it.rh = rh
@@ -140,14 +143,14 @@ class CommandQueueImplementationTest : TestBaseWithProfile() {
         )
         `when`(profileFunction.getProfile()).thenReturn(validProfile)
 
-        val bolusConstraint = Constraint(0.0)
+        val bolusConstraint = ConstraintObject(0.0, injector)
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(bolusConstraint)
         `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(bolusConstraint)
-        val carbsConstraint = Constraint(0)
+        val carbsConstraint = ConstraintObject(0, injector)
         `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(carbsConstraint)
-        val rateConstraint = Constraint(0.0)
+        val rateConstraint = ConstraintObject(0.0, injector)
         `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(rateConstraint)
-        val percentageConstraint = Constraint(0)
+        val percentageConstraint = ConstraintObject(0, injector)
         `when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(percentageConstraint)
         `when`(rh.gs(info.nightscout.core.ui.R.string.connectiontimedout)).thenReturn("Connection timed out")
         `when`(rh.gs(info.nightscout.core.ui.R.string.format_insulin_units)).thenReturn("%1\$.2f U")
diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt
index d0d131d27f..f765930172 100644
--- a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt
@@ -5,11 +5,11 @@ import android.content.Context
 import android.os.PowerManager
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.queue.commands.CommandTempBasalAbsolute
 import info.nightscout.interfaces.AndroidPermission
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.pump.defs.PumpDescription
@@ -25,7 +25,7 @@ import org.mockito.Mockito
 
 class QueueThreadTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var powerManager: PowerManager
     @Mock lateinit var repository: AppRepository
     @Mock lateinit var androidPermission: AndroidPermission
@@ -34,6 +34,9 @@ class QueueThreadTest : TestBaseWithProfile() {
 
     private val injector = HasAndroidInjector {
         AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
             if (it is Command) {
                 it.aapsLogger = aapsLogger
                 it.rh = rh
@@ -64,14 +67,14 @@ class QueueThreadTest : TestBaseWithProfile() {
         Mockito.`when`(context.getSystemService(Context.POWER_SERVICE)).thenReturn(powerManager)
         Mockito.`when`(profileFunction.getProfile()).thenReturn(validProfile)
 
-        val bolusConstraint = Constraint(0.0)
+        val bolusConstraint = ConstraintObject(0.0, injector)
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(bolusConstraint)
         Mockito.`when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(bolusConstraint)
-        val carbsConstraint = Constraint(0)
+        val carbsConstraint = ConstraintObject(0, injector)
         Mockito.`when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(carbsConstraint)
-        val rateConstraint = Constraint(0.0)
+        val rateConstraint = ConstraintObject(0.0, injector)
         Mockito.`when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(rateConstraint)
-        val percentageConstraint = Constraint(0)
+        val percentageConstraint = ConstraintObject(0, injector)
         Mockito.`when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject()))
             .thenReturn(percentageConstraint)
         Mockito.`when`(rh.gs(ArgumentMatchers.eq(info.nightscout.core.ui.R.string.temp_basal_absolute), anyObject(), anyObject())).thenReturn("TEMP BASAL %1\$.2f U/h %2\$d min")
diff --git a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt b/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt
index 707134a5ab..1435c70843 100644
--- a/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt
+++ b/implementation/src/test/java/info/nightscout/implementation/wizard/BolusWizardTest.kt
@@ -8,12 +8,11 @@ import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
 import info.nightscout.interfaces.aps.AutosensDataStore
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.IobTotal
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.pump.defs.PumpDescription
 import info.nightscout.interfaces.queue.CommandQueue
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.sharedtests.TestBaseWithProfile
 import org.junit.jupiter.api.Test
 import org.mockito.Mock
@@ -24,7 +23,7 @@ class BolusWizardTest : TestBaseWithProfile() {
 
     private val pumpBolusStep = 0.1
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var loop: Loop
     @Mock lateinit var autosensDataStore: AutosensDataStore
@@ -34,7 +33,7 @@ class BolusWizardTest : TestBaseWithProfile() {
             if (it is BolusWizard) {
                 it.aapsLogger = aapsLogger
                 it.rh = rh
-                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
+                it.rxBus = rxBus
                 it.profileFunction = profileFunction
                 it.constraintChecker = constraintChecker
                 it.activePlugin = activePlugin
@@ -113,7 +112,7 @@ class BolusWizardTest : TestBaseWithProfile() {
                 useAlarm = false
             )
         val bolusForBg54 = bw.calculatedTotalInsulin
-        assertThat(bolusForBg54).isWithin( 0.01).of(bolusForBg42)
+        assertThat(bolusForBg54).isWithin(0.01).of(bolusForBg42)
     }
 
     @Test
diff --git a/insight/build.gradle b/insight/build.gradle
index 10c064743f..78ebd94579 100644
--- a/insight/build.gradle
+++ b/insight/build.gradle
@@ -30,7 +30,6 @@ dependencies {
     implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
-    implementation project(':app-wear-shared:shared')
     implementation project(':pump:pump-common')
 
     api "androidx.room:room-ktx:$room_version"
diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 07064764eb..cf0392107d 100644
--- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -221,7 +221,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
                 string = info.nightscout.core.ui.R.string.connecting;
                 break;
             case CONNECTED:
-                string = info.nightscout.shared.R.string.connected;
+                string = info.nightscout.interfaces.R.string.connected;
                 break;
             case RECOVERING:
                 string = R.string.recovering;
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 60f7e05443..34c5314473 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
@@ -103,7 +103,7 @@ import info.nightscout.androidaps.plugins.pump.insight.utils.ParameterBlockUtil;
 import info.nightscout.core.events.EventNewNotification;
 import info.nightscout.interfaces.Config;
 import info.nightscout.interfaces.constraints.Constraint;
-import info.nightscout.interfaces.constraints.Constraints;
+import info.nightscout.interfaces.constraints.PluginConstraints;
 import info.nightscout.interfaces.notifications.Notification;
 import info.nightscout.interfaces.plugin.OwnDatabasePlugin;
 import info.nightscout.interfaces.plugin.PluginDescription;
@@ -134,9 +134,10 @@ import info.nightscout.shared.utils.DateUtil;
 import info.nightscout.shared.utils.T;
 
 @Singleton
-public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, Constraints, OwnDatabasePlugin,
+public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, PluginConstraints, OwnDatabasePlugin,
         InsightConnectionService.StateCallback {
 
+    public static final String ALERT_CHANNEL_ID = "AAPS-InsightAlert";
     private final AAPSLogger aapsLogger;
     private final RxBus rxBus;
     private final ResourceHelper rh;
@@ -148,13 +149,12 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight,
     private final InsightDbHelper insightDbHelper;
     private final PumpSync pumpSync;
     private final InsightDatabase insightDatabase;
-
-    public static final String ALERT_CHANNEL_ID = "AAPS-InsightAlert";
-
     private final PumpDescription pumpDescription;
+    private final Object $bolusLock = new Object[0];
+    public double lastBolusAmount = 0;
+    public long lastBolusTimestamp = 0L;
     private InsightAlertService alertService;
     private InsightConnectionService connectionService;
-    private long timeOffset;
     private final ServiceConnection serviceConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName name, IBinder binder) {
@@ -174,8 +174,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight,
             connectionService = null;
         }
     };
-
-    private final Object $bolusLock = new Object[0];
+    private long timeOffset;
     private int bolusID;
     private boolean bolusCancelled;
     private BasalProfile activeBasalProfile;
@@ -192,8 +191,6 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight,
     private List<ActiveBolus> activeBoluses;
     private boolean statusLoaded;
     private TBROverNotificationBlock tbrOverNotificationBlock;
-    public double lastBolusAmount = 0;
-    public long lastBolusTimestamp = 0L;
 
     @Inject
     public LocalInsightPlugin(
@@ -1589,22 +1586,22 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight,
 
     @NonNull @Override
     public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
-        percentRate.setIfGreater(getAapsLogger(), 0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().getMaxTempPercent(), rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this);
+        percentRate.setIfGreater(0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this);
+        percentRate.setIfSmaller(getPumpDescription().getMaxTempPercent(), rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this);
         return percentRate;
     }
 
     @NonNull @Override
     public Constraint<Double> applyBolusConstraints(@NonNull Constraint<Double> insulin) {
         if (!limitsFetched) return insulin;
-        insulin.setIfSmaller(getAapsLogger(), maximumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, maximumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this);
+        insulin.setIfSmaller(maximumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, maximumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this);
         if (insulin.value() < minimumBolusAmount) {
 
             //TODO: Add function to Constraints or use different approach
             // This only works if the interface of the InsightPlugin is called last.
             // If not, another constraint could theoretically set the value between 0 and minimumBolusAmount
 
-            insulin.set(getAapsLogger(), 0d, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, minimumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this);
+            insulin.set(0d, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, minimumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this);
         }
         return insulin;
     }
diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle
index 633891e71c..e24cfbe42a 100644
--- a/plugins/aps/build.gradle
+++ b/plugins/aps/build.gradle
@@ -15,7 +15,6 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:main')
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt
index c630615858..3ad966c702 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt
@@ -9,7 +9,7 @@ import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.aps.APSResult
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.iob.IobTotal
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -34,7 +34,7 @@ import kotlin.math.max
 open class APSResultObject @Inject constructor(val injector: HasAndroidInjector) : APSResult {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var sp: SP
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var iobCobCalculator: IobCobCalculator
@@ -74,12 +74,12 @@ open class APSResultObject @Inject constructor(val injector: HasAndroidInjector)
         val pump = activePlugin.activePump
         if (isChangeRequested) {
             // rate
-            var ret: String = if (rate == 0.0 && duration == 0) "${rh.gs(info.nightscout.core.ui.R.string.cancel_temp)} "
-            else if (rate == -1.0) "${rh.gs(info.nightscout.core.ui.R.string.let_temp_basal_run)}\n"
-            else if (usePercent) "${rh.gs(info.nightscout.core.ui.R.string.rate)}: ${decimalFormatter.to2Decimal(percent.toDouble())}% (${decimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0)} U/h) " +
-                "${rh.gs(info.nightscout.core.ui.R.string.duration)}: ${decimalFormatter.to2Decimal(duration.toDouble())} min "
-            else "${rh.gs(info.nightscout.core.ui.R.string.rate)}: ${decimalFormatter.to2Decimal(rate)} U/h (${decimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100)}%) " +
-                "${rh.gs(info.nightscout.core.ui.R.string.duration)}: ${decimalFormatter.to2Decimal(duration.toDouble())} min "
+            var ret: String = if (rate == 0.0 && duration == 0) "${rh.gs(R.string.cancel_temp)} "
+            else if (rate == -1.0) "${rh.gs(R.string.let_temp_basal_run)}\n"
+            else if (usePercent) "${rh.gs(R.string.rate)}: ${decimalFormatter.to2Decimal(percent.toDouble())}% (${decimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0)} U/h) " +
+                "${rh.gs(R.string.duration)}: ${decimalFormatter.to2Decimal(duration.toDouble())} min "
+            else "${rh.gs(R.string.rate)}: ${decimalFormatter.to2Decimal(rate)} U/h (${decimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100)}%) " +
+                "${rh.gs(R.string.duration)}: ${decimalFormatter.to2Decimal(duration.toDouble())} min "
             // smb
             if (smb != 0.0) ret += "SMB: ${decimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump.pumpDescription.bolusStep)} "
             if (isCarbsRequired) {
@@ -92,7 +92,7 @@ open class APSResultObject @Inject constructor(val injector: HasAndroidInjector)
         }
         return if (isCarbsRequired) {
             carbsRequiredText
-        } else rh.gs(info.nightscout.core.ui.R.string.nochangerequested)
+        } else rh.gs(R.string.nochangerequested)
     }
 
     override fun toSpanned(): Spanned {
@@ -100,17 +100,17 @@ open class APSResultObject @Inject constructor(val injector: HasAndroidInjector)
         if (isChangeRequested) {
             // rate
             var ret: String =
-                if (rate == 0.0 && duration == 0) rh.gs(info.nightscout.core.ui.R.string.cancel_temp) + "<br>" else if (rate == -1.0) rh.gs(info.nightscout.core.ui.R.string.let_temp_basal_run) + "<br>" else if (usePercent) "<b>" + rh.gs(
-                    info.nightscout.core.ui.R.string.rate
+                if (rate == 0.0 && duration == 0) rh.gs(R.string.cancel_temp) + "<br>" else if (rate == -1.0) rh.gs(R.string.let_temp_basal_run) + "<br>" else if (usePercent) "<b>" + rh.gs(
+                    R.string.rate
                 ) + "</b>: " + decimalFormatter.to2Decimal(
                     percent.toDouble()
                 ) + "% " +
                     "(" + decimalFormatter.to2Decimal(percent * pump.baseBasalRate / 100.0) + " U/h)<br>" +
-                    "<b>" + rh.gs(info.nightscout.core.ui.R.string.duration) + "</b>: " + decimalFormatter.to2Decimal(duration.toDouble()) + " min<br>" else "<b>" + rh.gs(info.nightscout.core.ui.R.string.rate) + "</b>: " + decimalFormatter.to2Decimal(
+                    "<b>" + rh.gs(R.string.duration) + "</b>: " + decimalFormatter.to2Decimal(duration.toDouble()) + " min<br>" else "<b>" + rh.gs(R.string.rate) + "</b>: " + decimalFormatter.to2Decimal(
                     rate
                 ) + " U/h " +
                     "(" + decimalFormatter.to2Decimal(rate / pump.baseBasalRate * 100.0) + "%) <br>" +
-                    "<b>" + rh.gs(info.nightscout.core.ui.R.string.duration) + "</b>: " + decimalFormatter.to2Decimal(duration.toDouble()) + " min<br>"
+                    "<b>" + rh.gs(R.string.duration) + "</b>: " + decimalFormatter.to2Decimal(duration.toDouble()) + " min<br>"
 
             // smb
             if (smb != 0.0) ret += "<b>" + "SMB" + "</b>: " + decimalFormatter.toPumpSupportedBolus(smb, activePlugin.activePump.pumpDescription.bolusStep) + "<br>"
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt
index 568819f482..81c6df8f15 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt
@@ -150,7 +150,7 @@ class OpenAPSFragment : DaggerFragment(), MenuProvider {
             binding.mealdata.text = jsonFormatter.format(determineBasalAdapter.mealDataParam)
             binding.scriptdebugdata.text = determineBasalAdapter.scriptDebug.replace("\\s+".toRegex(), " ")
             openAPSPlugin.lastAPSResult?.inputConstraints?.let {
-                binding.constraints.text = it.getReasons(aapsLogger)
+                binding.constraints.text = it.getReasons()
             }
         }
         if (openAPSPlugin.lastAPSRun != 0L) {
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt
index 031f100c20..1cd172046e 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt
@@ -12,12 +12,13 @@ import android.view.ViewGroup
 import androidx.core.view.MenuCompat
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
+import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.pump.toHtml
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.utils.DecimalFormatter
 import info.nightscout.plugins.aps.R
 import info.nightscout.plugins.aps.databinding.LoopFragmentBinding
@@ -44,6 +45,7 @@ class LoopFragment : DaggerFragment(), MenuProvider {
     @Inject lateinit var loop: Loop
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var decimalFormatter: DecimalFormatter
+    @Inject lateinit var injector: HasAndroidInjector
 
     @Suppress("PrivatePropertyName")
     private val ID_MENU_RUN = 501
@@ -150,12 +152,12 @@ class LoopFragment : DaggerFragment(), MenuProvider {
 
             var constraints =
                 it.constraintsProcessed?.let { constraintsProcessed ->
-                    val allConstraints = Constraint(0.0)
+                    val allConstraints = ConstraintObject(0.0, injector)
                     constraintsProcessed.rateConstraint?.let { rateConstraint -> allConstraints.copyReasons(rateConstraint) }
                     constraintsProcessed.smbConstraint?.let { smbConstraint -> allConstraints.copyReasons(smbConstraint) }
-                    allConstraints.getMostLimitedReasons(aapsLogger)
+                    allConstraints.getMostLimitedReasons()
                 } ?: ""
-            constraints += loop.closedLoopEnabled?.getReasons(aapsLogger) ?: ""
+            constraints += loop.closedLoopEnabled?.getReasons() ?: ""
             binding.constraints.text = constraints
             binding.swipeRefresh.isRefreshing = false
         }
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
index 660b9b92e1..787938d90a 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
@@ -14,6 +14,7 @@ import android.os.SystemClock
 import androidx.core.app.NotificationCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.annotations.OpenForTesting
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.core.extensions.convertedToPercent
@@ -36,7 +37,7 @@ import info.nightscout.interfaces.aps.APSResult
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.aps.Loop.LastRun
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.notifications.Notification
@@ -91,7 +92,7 @@ class LoopPlugin @Inject constructor(
     private val rxBus: RxBus,
     private val sp: SP,
     private val config: Config,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val context: Context,
@@ -230,7 +231,7 @@ class LoopPlugin @Inject constructor(
             if (!loopEnabled.value()) {
                 val message = """
                     ${rh.gs(info.nightscout.core.ui.R.string.loop_disabled)}
-                    ${loopEnabled.getReasons(aapsLogger)}
+                    ${loopEnabled.getReasons()}
                     """.trimIndent()
                 aapsLogger.debug(LTag.APS, message)
                 rxBus.send(EventLoopSetLastRunGui(message))
@@ -274,11 +275,11 @@ class LoopPlugin @Inject constructor(
 
             // check rate for constraints
             val resultAfterConstraints = apsResult.newAndClone(injector)
-            resultAfterConstraints.rateConstraint = Constraint(resultAfterConstraints.rate)
+            resultAfterConstraints.rateConstraint = ConstraintObject(resultAfterConstraints.rate, injector)
             resultAfterConstraints.rate = constraintChecker.applyBasalConstraints(resultAfterConstraints.rateConstraint!!, profile).value()
-            resultAfterConstraints.percentConstraint = Constraint(resultAfterConstraints.percent)
+            resultAfterConstraints.percentConstraint = ConstraintObject(resultAfterConstraints.percent, injector)
             resultAfterConstraints.percent = constraintChecker.applyBasalPercentConstraints(resultAfterConstraints.percentConstraint!!, profile).value()
-            resultAfterConstraints.smbConstraint = Constraint(resultAfterConstraints.smb)
+            resultAfterConstraints.smbConstraint = ConstraintObject(resultAfterConstraints.smb, injector)
             resultAfterConstraints.smb = constraintChecker.applyBolusConstraints(resultAfterConstraints.smbConstraint!!).value()
 
             // safety check for multiple SMBs
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
index 99f56f187d..4ae6517b9c 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
@@ -7,7 +7,7 @@ import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.aps.SMBDefaults
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatus
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.iob.IobTotal
@@ -43,7 +43,7 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
     private val injector: HasAndroidInjector
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculator: IobCobCalculator
@@ -107,7 +107,8 @@ class DetermineBasalAdapterAMAJS internal constructor(scriptReader: ScriptReader
                     makeParam(profile, rhino, scope),
                     makeParam(autosensData, rhino, scope),
                     makeParam(mealData, rhino, scope),
-                    setTempBasalFunctionsObj)
+                    setTempBasalFunctionsObj
+                )
                 val jsResult = determineBasalObj.call(rhino, scope, scope, params) as NativeObject
                 scriptDebug = LoggerCallback.scriptDebug
 
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
index 61af8fa1b6..ae7e8192c3 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
@@ -3,6 +3,7 @@ package info.nightscout.plugins.aps.openAPSAMA
 import android.content.Context
 import dagger.android.HasAndroidInjector
 import info.nightscout.annotations.OpenForTesting
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.target
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.core.utils.fabric.FabricPrivacy
@@ -12,7 +13,8 @@ import info.nightscout.interfaces.aps.APS
 import info.nightscout.interfaces.aps.AutosensResult
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -46,7 +48,7 @@ class OpenAPSAMAPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val rxBus: RxBus,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     private val context: Context,
@@ -69,7 +71,7 @@ class OpenAPSAMAPlugin @Inject constructor(
         .preferencesId(R.xml.pref_openapsama)
         .description(R.string.description_ama),
     aapsLogger, rh, injector
-), APS, Constraints {
+), APS, PluginConstraints {
 
     // last values
     override var lastAPSRun: Long = 0
@@ -114,7 +116,7 @@ class OpenAPSAMAPlugin @Inject constructor(
             aapsLogger.debug(LTag.APS, rh.gs(R.string.openapsma_no_glucose_data))
             return
         }
-        val inputConstraints = Constraint(0.0) // fake. only for collecting all results
+        val inputConstraints = ConstraintObject(0.0, injector) // fake. only for collecting all results
         val maxBasal = constraintChecker.getMaxBasalAllowed(profile).also {
             inputConstraints.copyReasons(it)
         }.value()
@@ -237,8 +239,8 @@ class OpenAPSAMAPlugin @Inject constructor(
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         if (isEnabled()) {
             val maxIobPref: Double = sp.getDouble(R.string.key_openapsma_max_iob, 1.5)
-            maxIob.setIfSmaller(aapsLogger, maxIobPref, rh.gs(R.string.limiting_iob, maxIobPref, rh.gs(R.string.maxvalueinpreferences)), this)
-            maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobAMA(), rh.gs(R.string.limiting_iob, hardLimits.maxIobAMA(), rh.gs(R.string.hardlimit)), this)
+            maxIob.setIfSmaller(maxIobPref, rh.gs(R.string.limiting_iob, maxIobPref, rh.gs(R.string.maxvalueinpreferences)), this)
+            maxIob.setIfSmaller(hardLimits.maxIobAMA(), rh.gs(R.string.limiting_iob, hardLimits.maxIobAMA(), rh.gs(R.string.hardlimit)), this)
         }
         return maxIob
     }
@@ -250,27 +252,26 @@ class OpenAPSAMAPlugin @Inject constructor(
                 maxBasal = profile.getMaxDailyBasal()
                 absoluteRate.addReason(rh.gs(R.string.increasing_max_basal), this)
             }
-            absoluteRate.setIfSmaller(aapsLogger, maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this)
+            absoluteRate.setIfSmaller(maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this)
 
             // Check percentRate but absolute rate too, because we know real current basal in pump
             val maxBasalMultiplier = sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)
             val maxFromBasalMultiplier = floor(maxBasalMultiplier * profile.getBasal() * 100) / 100
             absoluteRate.setIfSmaller(
-                aapsLogger,
                 maxFromBasalMultiplier,
                 rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromBasalMultiplier, rh.gs(R.string.max_basal_multiplier)),
                 this
             )
             val maxBasalFromDaily = sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)
             val maxFromDaily = floor(profile.getMaxDailyBasal() * maxBasalFromDaily * 100) / 100
-            absoluteRate.setIfSmaller(aapsLogger, maxFromDaily, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this)
+            absoluteRate.setIfSmaller(maxFromDaily, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this)
         }
         return absoluteRate
     }
 
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val enabled = sp.getBoolean(R.string.key_openapsama_use_autosens, false)
-        if (!enabled) value.set(aapsLogger, false, rh.gs(R.string.autosens_disabled_in_preferences), this)
+        if (!enabled) value.set(false, rh.gs(R.string.autosens_disabled_in_preferences), this)
         return value
     }
 }
\ No newline at end of file
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
index 89c7e6f9ba..bc15d9ccde 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
@@ -7,7 +7,7 @@ import info.nightscout.core.extensions.plannedRemainingMinutes
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.aps.SMBDefaults
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatus
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.iob.IobTotal
@@ -42,7 +42,7 @@ import javax.inject.Inject
 class DetermineBasalAdapterSMBJS internal constructor(private val scriptReader: ScriptReader, private val injector: HasAndroidInjector) : DetermineBasalAdapter {
 
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculator: IobCobCalculator
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
index 5d528e4b5d..8c93012f07 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.target
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.database.ValueWrapper
@@ -14,7 +15,8 @@ import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -44,7 +46,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     private val rxBus: RxBus,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     rh: ResourceHelper,
     private val profileFunction: ProfileFunction,
     val context: Context,
@@ -69,7 +71,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
         .description(R.string.description_smb)
         .setDefault(),
     aapsLogger, rh, injector
-), APS, Constraints {
+), APS, PluginConstraints {
 
     // DynamicISF specific
     var tdd1D: Double? = null
@@ -77,7 +79,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
     var tddLast24H: Double? = null
     var tddLast4H: Double? = null
     var tddLast8to4H: Double? = null
-    var dynIsfEnabled: Constraint<Boolean> = Constraint(false)
+    var dynIsfEnabled: Constraint<Boolean> = ConstraintObject(false, injector)
 
     // last values
     override var lastAPSRun: Long = 0
@@ -129,7 +131,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
             return
         }
 
-        val inputConstraints = Constraint(0.0) // fake. only for collecting all results
+        val inputConstraints = ConstraintObject(0.0, injector) // fake. only for collecting all results
         val maxBasal = constraintChecker.getMaxBasalAllowed(profile).also {
             inputConstraints.copyReasons(it)
         }.value()
@@ -207,19 +209,19 @@ open class OpenAPSSMBPlugin @Inject constructor(
         val iobArray = iobCobCalculator.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget)
         profiler.log(LTag.APS, "calculateIobArrayInDia()", startPart)
         startPart = System.currentTimeMillis()
-        val smbAllowed = Constraint(!tempBasalFallback).also {
+        val smbAllowed = ConstraintObject(!tempBasalFallback, injector).also {
             constraintChecker.isSMBModeEnabled(it)
             inputConstraints.copyReasons(it)
         }
-        val advancedFiltering = Constraint(!tempBasalFallback).also {
+        val advancedFiltering = ConstraintObject(!tempBasalFallback, injector).also {
             constraintChecker.isAdvancedFilteringEnabled(it)
             inputConstraints.copyReasons(it)
         }
-        val uam = Constraint(true).also {
+        val uam = ConstraintObject(true, injector).also {
             constraintChecker.isUAMEnabled(it)
             inputConstraints.copyReasons(it)
         }
-        dynIsfEnabled = Constraint(true).also {
+        dynIsfEnabled = ConstraintObject(true, injector).also {
             constraintChecker.isDynIsfModeEnabled(it)
             inputConstraints.copyReasons(it)
         }
@@ -239,12 +241,12 @@ open class OpenAPSSMBPlugin @Inject constructor(
 
         if (tdd1D == null || tdd7D == null || tddLast4H == null || tddLast8to4H == null || tddLast24H == null) {
             inputConstraints.copyReasons(
-                Constraint(false).also {
-                    it.set(aapsLogger, false, rh.gs(R.string.fallback_smb_no_tdd), this)
+                ConstraintObject(false, injector).also {
+                    it.set(false, rh.gs(R.string.fallback_smb_no_tdd), this)
                 }
             )
             inputConstraints.copyReasons(
-                Constraint(false).apply { set(aapsLogger, true, "tdd1D=$tdd1D tdd7D=$tdd7D tddLast4H=$tddLast4H tddLast8to4H=$tddLast8to4H tddLast24H=$tddLast24H", this) }
+                ConstraintObject(false, injector).apply { set(true, "tdd1D=$tdd1D tdd7D=$tdd7D tddLast4H=$tddLast4H tddLast8to4H=$tddLast8to4H tddLast24H=$tddLast24H", this) }
             )
         }
 
@@ -293,15 +295,15 @@ open class OpenAPSSMBPlugin @Inject constructor(
     }
 
     override fun isSuperBolusEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        value.set(aapsLogger, false)
+        value.set(false)
         return value
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         if (isEnabled()) {
             val maxIobPref: Double = sp.getDouble(R.string.key_openapssmb_max_iob, 3.0)
-            maxIob.setIfSmaller(aapsLogger, maxIobPref, rh.gs(R.string.limiting_iob, maxIobPref, rh.gs(R.string.maxvalueinpreferences)), this)
-            maxIob.setIfSmaller(aapsLogger, hardLimits.maxIobSMB(), rh.gs(R.string.limiting_iob, hardLimits.maxIobSMB(), rh.gs(R.string.hardlimit)), this)
+            maxIob.setIfSmaller(maxIobPref, rh.gs(R.string.limiting_iob, maxIobPref, rh.gs(R.string.maxvalueinpreferences)), this)
+            maxIob.setIfSmaller(hardLimits.maxIobSMB(), rh.gs(R.string.limiting_iob, hardLimits.maxIobSMB(), rh.gs(R.string.hardlimit)), this)
         }
         return maxIob
     }
@@ -313,39 +315,38 @@ open class OpenAPSSMBPlugin @Inject constructor(
                 maxBasal = profile.getMaxDailyBasal()
                 absoluteRate.addReason(rh.gs(R.string.increasing_max_basal), this)
             }
-            absoluteRate.setIfSmaller(aapsLogger, maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this)
+            absoluteRate.setIfSmaller(maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this)
 
             // Check percentRate but absolute rate too, because we know real current basal in pump
             val maxBasalMultiplier = sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0)
             val maxFromBasalMultiplier = floor(maxBasalMultiplier * profile.getBasal() * 100) / 100
             absoluteRate.setIfSmaller(
-                aapsLogger,
                 maxFromBasalMultiplier,
                 rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromBasalMultiplier, rh.gs(R.string.max_basal_multiplier)),
                 this
             )
             val maxBasalFromDaily = sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0)
             val maxFromDaily = floor(profile.getMaxDailyBasal() * maxBasalFromDaily * 100) / 100
-            absoluteRate.setIfSmaller(aapsLogger, maxFromDaily, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this)
+            absoluteRate.setIfSmaller(maxFromDaily, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this)
         }
         return absoluteRate
     }
 
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val enabled = sp.getBoolean(R.string.key_use_smb, false)
-        if (!enabled) value.set(aapsLogger, false, rh.gs(R.string.smb_disabled_in_preferences), this)
+        if (!enabled) value.set(false, rh.gs(R.string.smb_disabled_in_preferences), this)
         return value
     }
 
     override fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val enabled = sp.getBoolean(R.string.key_use_uam, false)
-        if (!enabled) value.set(aapsLogger, false, rh.gs(R.string.uam_disabled_in_preferences), this)
+        if (!enabled) value.set(false, rh.gs(R.string.uam_disabled_in_preferences), this)
         return value
     }
 
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val enabled = sp.getBoolean(R.string.key_openapsama_use_autosens, false)
-        if (!enabled) value.set(aapsLogger, false, rh.gs(R.string.autosens_disabled_in_preferences), this)
+        if (!enabled) value.set(false, rh.gs(R.string.autosens_disabled_in_preferences), this)
         return value
     }
 
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
index 2b83d11856..9ade4e2cde 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
@@ -6,7 +6,7 @@ import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -32,7 +32,7 @@ class OpenAPSSMBDynamicISFPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     rxBus: RxBus,
-    constraintChecker: Constraints,
+    constraintChecker: ConstraintsChecker,
     rh: ResourceHelper,
     profileFunction: ProfileFunction,
     context: Context,
diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt
index 422da5253c..43e34c3038 100644
--- a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt
+++ b/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/APSResultTest.kt
@@ -2,12 +2,14 @@ package info.nightscout.plugins.aps.loop
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.utils.JsonHelper.safeGetDouble
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.interfaces.aps.APSResult
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.pump.defs.PumpType
+import info.nightscout.plugins.aps.APSResultObject
 import info.nightscout.sharedtests.TestBaseWithProfile
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
@@ -18,11 +20,17 @@ import org.mockito.Mockito.`when`
 
 class APSResultTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraints: Constraints
+    @Mock lateinit var constraintsChecker: ConstraintsChecker
 
-    private val injector = HasAndroidInjector { AndroidInjector { } }
+    private val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
 
-    private var closedLoopEnabled = Constraint(false)
+    private lateinit var closedLoopEnabled: Constraint<Boolean>
 
     private fun APSResult.percent(percent: Int): APSResult {
         this.percent = percent
@@ -52,10 +60,10 @@ class APSResultTest : TestBaseWithProfile() {
     @Test
     fun changeRequestedTest() {
 
-        val apsResult = info.nightscout.plugins.aps.APSResultObject { AndroidInjector { } }
+        val apsResult = APSResultObject { AndroidInjector { } }
             .also {
                 it.aapsLogger = aapsLogger
-                it.constraintChecker = constraints
+                it.constraintChecker = constraintsChecker
                 it.sp = sp
                 it.activePlugin = activePlugin
                 it.iobCobCalculator = iobCobCalculator
@@ -70,7 +78,7 @@ class APSResultTest : TestBaseWithProfile() {
         apsResult.usePercent(true)
 
         // closed loop mode return original request
-        closedLoopEnabled.set(aapsLogger, true)
+        closedLoopEnabled.set(true)
         `when`(iobCobCalculator.getTempBasalIncludingConvertedExtended(ArgumentMatchers.anyLong())).thenReturn(null)
         apsResult.tempBasalRequested(false)
         Assertions.assertEquals(false, apsResult.isChangeRequested)
@@ -78,7 +86,7 @@ class APSResultTest : TestBaseWithProfile() {
         Assertions.assertEquals(true, apsResult.isChangeRequested)
 
         // open loop
-        closedLoopEnabled.set(aapsLogger, false)
+        closedLoopEnabled.set(false)
         // no change requested
         `when`(iobCobCalculator.getTempBasalIncludingConvertedExtended(ArgumentMatchers.anyLong())).thenReturn(null)
         apsResult.tempBasalRequested(false)
@@ -184,7 +192,7 @@ class APSResultTest : TestBaseWithProfile() {
         apsResult.usePercent(false)
 
         // open loop
-        closedLoopEnabled.set(aapsLogger, false)
+        closedLoopEnabled.set(false)
         // request 100% when no temp is running
         `when`(iobCobCalculator.getTempBasalIncludingConvertedExtended(ArgumentMatchers.anyLong())).thenReturn(null)
         apsResult.tempBasalRequested(true).rate(1.0).duration(30)
@@ -293,10 +301,10 @@ class APSResultTest : TestBaseWithProfile() {
     }
 
     @Test fun cloneTest() {
-        val apsResult = info.nightscout.plugins.aps.APSResultObject { AndroidInjector { } }
+        val apsResult = APSResultObject(injector)
             .also {
                 it.aapsLogger = aapsLogger
-                it.constraintChecker = constraints
+                it.constraintChecker = constraintsChecker
                 it.sp = sp
                 it.activePlugin = activePlugin
                 it.iobCobCalculator = iobCobCalculator
@@ -309,11 +317,11 @@ class APSResultTest : TestBaseWithProfile() {
     }
 
     @Test fun jsonTest() {
-        closedLoopEnabled.set(aapsLogger, true)
-        val apsResult = info.nightscout.plugins.aps.APSResultObject { AndroidInjector { } }
+        closedLoopEnabled.set(true)
+        val apsResult = APSResultObject(injector)
             .also {
                 it.aapsLogger = aapsLogger
-                it.constraintChecker = constraints
+                it.constraintChecker = constraintsChecker
                 it.sp = sp
                 it.activePlugin = activePlugin
                 it.iobCobCalculator = iobCobCalculator
@@ -328,7 +336,8 @@ class APSResultTest : TestBaseWithProfile() {
 
     @BeforeEach
     fun prepare() {
-        `when`(constraints.isClosedLoopAllowed(anyObject())).thenReturn(closedLoopEnabled)
+        closedLoopEnabled = ConstraintObject(false, injector)
+        `when`(constraintsChecker.isClosedLoopAllowed()).thenReturn(closedLoopEnabled)
         `when`(sp.getDouble(ArgumentMatchers.anyInt(), ArgumentMatchers.anyDouble())).thenReturn(30.0)
         `when`(profileFunction.getProfile()).thenReturn(validProfile)
     }
diff --git a/plugins/automation/build.gradle b/plugins/automation/build.gradle
index c41a3d430d..94a09517e0 100644
--- a/plugins/automation/build.gradle
+++ b/plugins/automation/build.gradle
@@ -17,16 +17,16 @@ android {
 
 dependencies {
     implementation project(':core:graphview')
+    implementation project(':core:interfaces')
     implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':app-wear-shared:shared')
-    implementation project(':core:interfaces')
 
     testImplementation project(':app-wear-shared:shared-tests')
+    testImplementation project(':app-wear-shared:shared-impl')
     testImplementation project(':implementation')
     testImplementation project(':plugins:main')
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
index 725788bebb..7d2c20da06 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
@@ -49,7 +49,7 @@ import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.automation.Automation
 import info.nightscout.interfaces.automation.AutomationEvent
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
@@ -87,7 +87,7 @@ class AutomationPlugin @Inject constructor(
     private val fabricPrivacy: FabricPrivacy,
     private val loop: Loop,
     private val rxBus: RxBus,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     aapsLogger: AAPSLogger,
     private val aapsSchedulers: AapsSchedulers,
     private val config: Config,
@@ -244,7 +244,7 @@ class AutomationPlugin @Inject constructor(
         }
         val enabled = constraintChecker.isAutomationEnabled()
         if (!enabled.value()) {
-            executionLog.add(enabled.getMostLimitedReasons(aapsLogger))
+            executionLog.add(enabled.getMostLimitedReasons())
             rxBus.send(EventAutomationUpdateGui())
             commonEventsEnabled = false
         }
@@ -413,7 +413,7 @@ class AutomationPlugin @Inject constructor(
     }
 
     /**
-     * Generate reminder via [info.nightscout.interfaces.utils.TimerUtil]
+     * Generate reminder via [info.nightscout.automation.ui.TimerUtil]
      *
      * @param seconds seconds to the future
      */
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt
index d39ff2f888..ee6301043d 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt
@@ -30,7 +30,7 @@ class ActionLoopDisable(injector: HasAndroidInjector) : Action(injector) {
     @DrawableRes override fun icon(): Int = R.drawable.ic_stop_24dp
 
     override fun doAction(callback: Callback) {
-        if ((loopPlugin as PluginBase).isEnabled()) {
+        if (loopPlugin.isEnabled()) {
             (loopPlugin as PluginBase).setPluginEnabled(PluginType.LOOP, false)
             configBuilder.storeSettings("ActionLoopDisable")
             uel.log(UserEntry.Action.LOOP_DISABLED, Sources.Automation, title)
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt
index 5caad06cad..30617bdd49 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt
@@ -28,7 +28,7 @@ class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) {
     @DrawableRes override fun icon(): Int = R.drawable.ic_play_circle_outline_24dp
 
     override fun doAction(callback: Callback) {
-        if (!(loopPlugin as PluginBase).isEnabled()) {
+        if (!loopPlugin.isEnabled()) {
             (loopPlugin as PluginBase).setPluginEnabled(PluginType.LOOP, true)
             configBuilder.storeSettings("ActionLoopEnable")
             rxBus.send(EventRefreshOverview("ActionLoopEnable"))
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt
index da2f074488..336fde4e47 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt
@@ -101,7 +101,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
 
     override fun fromJSON(data: String): Action {
         val o = JSONObject(data)
-        value.units = GlucoseUnit.fromText(JsonHelper.safeGetString(o, "units", Constants.MGDL))
+        value.units = GlucoseUnit.fromText(JsonHelper.safeGetString(o, "units", GlucoseUnit.MGDL.asText))
         value.value = safeGetDouble(o, "value")
         duration.setMinutes(JsonHelper.safeGetInt(o, "durationInMinutes"))
         return this
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt
index 9076b3980e..d6aff68e4c 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt
@@ -10,7 +10,6 @@ import info.nightscout.automation.elements.LabelWithElement
 import info.nightscout.automation.elements.LayoutBuilder
 import info.nightscout.automation.elements.StaticLabel
 import info.nightscout.core.utils.JsonHelper
-import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.rx.logging.LTag
 import org.json.JSONObject
@@ -71,7 +70,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun fromJSON(data: String): Trigger {
         val d = JSONObject(data)
-        bg.setUnits(GlucoseUnit.fromText(JsonHelper.safeGetString(d, "units", Constants.MGDL)))
+        bg.setUnits(GlucoseUnit.fromText(JsonHelper.safeGetString(d, "units", GlucoseUnit.MGDL.asText)))
         bg.value = JsonHelper.safeGetDouble(d, "bg")
         comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
         return this
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt
index d784811c5b..2b0c75b3b2 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt
@@ -83,7 +83,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
         LayoutBuilder()
             .add(StaticLabel(rh, R.string.lastboluslabel, this))
             .add(comparator)
-            .add(LabelWithElement(rh, rh.gs(R.string.lastboluslabel) + ": ", rh.gs(info.nightscout.shared.R.string.unit_minutes), minutesAgo))
+            .add(LabelWithElement(rh, rh.gs(R.string.lastboluslabel) + ": ", rh.gs(info.nightscout.interfaces.R.string.unit_minutes), minutesAgo))
             .build(root)
     }
 }
\ No newline at end of file
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt
index 6f0ed7966c..bbcfba28e8 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt
@@ -94,7 +94,7 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun fromJSON(data: String): Trigger {
         val d = JSONObject(data)
-        units = GlucoseUnit.fromText(JsonHelper.safeGetString(d, "units", Constants.MGDL))
+        units = GlucoseUnit.fromText(JsonHelper.safeGetString(d, "units", GlucoseUnit.MGDL.asText))
         val type = DeltaType.valueOf(JsonHelper.safeGetString(d, "deltaType", ""))
         val value = JsonHelper.safeGetDouble(d, "value")
         delta =
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt
index 763219fcb1..6942b5a870 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt
@@ -68,7 +68,7 @@ class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) {
 
     override fun fromJSON(data: String): Trigger {
         val d = JSONObject(data)
-        ttValue.setUnits(GlucoseUnit.fromText(JsonHelper.safeGetString(d, "units", Constants.MGDL)))
+        ttValue.setUnits(GlucoseUnit.fromText(JsonHelper.safeGetString(d, "units", GlucoseUnit.MGDL.asText)))
         ttValue.value = JsonHelper.safeGetDouble(d, "tt")
         comparator.setValue(Comparator.Compare.valueOf(JsonHelper.safeGetString(d, "comparator")!!))
         return this
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt
index 195baece55..84e723e73d 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt
@@ -10,7 +10,6 @@ import info.nightscout.automation.triggers.TriggerConnectorTest
 import info.nightscout.automation.triggers.TriggerDummy
 import info.nightscout.interfaces.ConfigBuilder
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.sharedtests.TestBase
 import org.json.JSONObject
@@ -36,7 +35,7 @@ class AutomationEventTest : TestBase() {
                 it.loopPlugin = loopPlugin
                 it.rh = rh
                 it.configBuilder = configBuilder
-                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
+                it.rxBus = rxBus
             }
         }
     }
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt
index c598d29860..a5d6a4a35d 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt
@@ -10,13 +10,13 @@ import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.ProfileFunction
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import info.nightscout.sharedtests.TestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
@@ -32,8 +32,7 @@ class BolusTimerImplTest : TestBase() {
     @Mock lateinit var sp: SP
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var loop: Loop
-    @Mock lateinit var rxBus: RxBus
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var config: Config
     @Mock lateinit var locationServiceHelper: LocationServiceHelper
     @Mock lateinit var activePlugin: ActivePlugin
@@ -49,16 +48,17 @@ class BolusTimerImplTest : TestBase() {
         }
     }
     private lateinit var dateUtil: DateUtil
-
     private lateinit var automationPlugin: AutomationPlugin
 
     @BeforeEach
     fun init() {
         Mockito.`when`(rh.gs(anyInt())).thenReturn("")
         Mockito.`when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL)
-        dateUtil = DateUtil(context)
-        automationPlugin = AutomationPlugin(injector, rh, context, sp, fabricPrivacy, loop, rxBus, constraintChecker, aapsLogger, aapsSchedulers, config, locationServiceHelper, dateUtil,
-                                            activePlugin, timerUtil)
+        dateUtil = DateUtilImpl(context)
+        automationPlugin = AutomationPlugin(
+            injector, rh, context, sp, fabricPrivacy, loop, rxBus, constraintChecker, aapsLogger, aapsSchedulers, config, locationServiceHelper, dateUtil,
+            activePlugin, timerUtil
+        )
     }
 
     @Test
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt
index ab6416eb4d..4d4ca8d8c3 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt
@@ -10,13 +10,13 @@ import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.ProfileFunction
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import info.nightscout.sharedtests.TestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
@@ -33,8 +33,7 @@ class CarbTimerImplTest : TestBase() {
     @Mock lateinit var sp: SP
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var loop: Loop
-    @Mock lateinit var rxBus: RxBus
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var config: Config
     @Mock lateinit var locationServiceHelper: LocationServiceHelper
     @Mock lateinit var activePlugin: ActivePlugin
@@ -57,7 +56,7 @@ class CarbTimerImplTest : TestBase() {
     fun init() {
         Mockito.`when`(rh.gs(anyInt())).thenReturn("")
         Mockito.`when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL)
-        dateUtil = DateUtil(context)
+        dateUtil = DateUtilImpl(context)
         timerUtil = TimerUtil(context)
         automationPlugin = AutomationPlugin(
             injector, rh, context, sp, fabricPrivacy, loop, rxBus, constraintChecker, aapsLogger, aapsSchedulers, config, locationServiceHelper, dateUtil,
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt
index 11b7cc8518..b4ff42be96 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt
@@ -9,7 +9,6 @@ import info.nightscout.automation.ui.TimerUtil
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.pump.PumpEnactResult
 import info.nightscout.interfaces.queue.Callback
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.utils.DateUtil
 import info.nightscout.sharedtests.TestBase
@@ -23,7 +22,6 @@ import org.mockito.Mockito.`when`
 class ActionAlarmTest : TestBase() {
 
     @Mock lateinit var rh: ResourceHelper
-    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var context: Context
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var config: Config
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt
index a8fc633ab6..1cf9a096c7 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt
@@ -26,7 +26,7 @@ class ActionNotificationTest : TestBase() {
 
     @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var context: Context
-    @Mock lateinit var rxBus: RxBus
+    @Mock lateinit var rxBusMocked: RxBus
     @Mock lateinit var repository: AppRepository
 
     private lateinit var sut: ActionNotification
@@ -34,7 +34,7 @@ class ActionNotificationTest : TestBase() {
         AndroidInjector {
             if (it is ActionNotification) {
                 it.rh = rh
-                it.rxBus = rxBus
+                it.rxBus = rxBusMocked
                 it.repository = repository
             }
             if (it is PumpEnactResult) {
@@ -78,7 +78,7 @@ class ActionNotificationTest : TestBase() {
                 Assertions.assertTrue(result.success)
             }
         })
-        Mockito.verify(rxBus, Mockito.times(2)).send(anyObject())
+        Mockito.verify(rxBusMocked, Mockito.times(2)).send(anyObject())
         //Mockito.verify(repository, Mockito.times(1)).runTransaction(any(Transaction::class.java))
     }
 
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt
index 1e5ede19a8..0976da4cc7 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt
@@ -3,29 +3,24 @@ package info.nightscout.automation.actions
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.automation.triggers.Trigger
-import info.nightscout.database.entities.DeviceStatus
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.ConfigBuilder
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.Profile
-import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.profile.ProfileSource
-import info.nightscout.interfaces.pump.Pump
 import info.nightscout.interfaces.pump.PumpEnactResult
 import info.nightscout.interfaces.queue.CommandQueue
-import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.shared.utils.DateUtil
 import info.nightscout.sharedtests.TestBaseWithProfile
 import org.junit.jupiter.api.BeforeEach
 import org.mockito.Mock
@@ -45,7 +40,7 @@ ActionsTestBase : TestBaseWithProfile() {
 
         private var suspended = false
         override var lastRun: Loop.LastRun? = Loop.LastRun()
-        override var closedLoopEnabled: Constraint<Boolean>? = Constraint(true)
+        override var closedLoopEnabled: Constraint<Boolean>? = ConstraintObject(true, injector)
         override val isSuspended: Boolean = suspended
         override val isLGS: Boolean = false
         override val isSuperBolus: Boolean = false
@@ -174,6 +169,9 @@ ActionsTestBase : TestBaseWithProfile() {
                 it.rh = rh
                 it.aapsLogger = aapsLogger
             }
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
         }
     }
 
diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt
index 21aed46957..825a61499a 100644
--- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt
+++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTestBase.kt
@@ -8,7 +8,6 @@ import info.nightscout.database.impl.AppRepository
 import info.nightscout.implementation.iob.GlucoseStatusProviderImpl
 import info.nightscout.interfaces.aps.AutosensDataStore
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.sharedtests.TestBaseWithProfile
 import org.junit.jupiter.api.BeforeEach
 import org.mockito.Mock
@@ -31,7 +30,7 @@ open class TriggerTestBase : TestBaseWithProfile() {
         AndroidInjector {
             if (it is Trigger) {
                 it.aapsLogger = aapsLogger
-                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
+                it.rxBus = rxBus
                 it.rh = rh
                 it.profileFunction = profileFunction
                 it.sp = sp
diff --git a/plugins/configuration/build.gradle b/plugins/configuration/build.gradle
index e407d97d9e..f052fe6843 100644
--- a/plugins/configuration/build.gradle
+++ b/plugins/configuration/build.gradle
@@ -17,7 +17,6 @@ android {
 
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':core:interfaces')
     implementation project(':core:main')
diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/AndroidPermissionImpl.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/AndroidPermissionImpl.kt
index d6113c01d8..6e2c57c310 100644
--- a/plugins/configuration/src/main/java/info/nightscout/configuration/AndroidPermissionImpl.kt
+++ b/plugins/configuration/src/main/java/info/nightscout/configuration/AndroidPermissionImpl.kt
@@ -20,7 +20,6 @@ import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
-import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
 import info.nightscout.shared.interfaces.ResourceHelper
 import javax.inject.Inject
@@ -86,7 +85,7 @@ class AndroidPermissionImpl @Inject constructor(
 
     @Synchronized
     override fun notifyForSMSPermissions(activity: FragmentActivity, smsCommunicator: SmsCommunicator) {
-        if ((smsCommunicator as PluginBase).isEnabled()) {
+        if (smsCommunicator.isEnabled()) {
             if (permissionNotGranted(activity, Manifest.permission.RECEIVE_SMS))
                 activePlugin.activeOverview.addNotification(
                     id = Notification.PERMISSION_SMS,
diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/activities/DaggerAppCompatActivityWithResult.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/activities/DaggerAppCompatActivityWithResult.kt
index febf53fe67..f13e61ffe9 100644
--- a/plugins/configuration/src/main/java/info/nightscout/configuration/activities/DaggerAppCompatActivityWithResult.kt
+++ b/plugins/configuration/src/main/java/info/nightscout/configuration/activities/DaggerAppCompatActivityWithResult.kt
@@ -13,7 +13,6 @@ import info.nightscout.configuration.maintenance.PrefsFileContract
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.locale.LocaleHelper
 import info.nightscout.interfaces.maintenance.ImportExportPrefs
-import info.nightscout.interfaces.permissions.OptimizationPermissionContract
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventThemeSwitch
 import info.nightscout.rx.logging.AAPSLogger
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/permissions/OptimizationPermissionContract.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/activities/OptimizationPermissionContract.kt
similarity index 92%
rename from core/interfaces/src/main/java/info/nightscout/interfaces/permissions/OptimizationPermissionContract.kt
rename to plugins/configuration/src/main/java/info/nightscout/configuration/activities/OptimizationPermissionContract.kt
index c28d65c84f..b68ebc579d 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/permissions/OptimizationPermissionContract.kt
+++ b/plugins/configuration/src/main/java/info/nightscout/configuration/activities/OptimizationPermissionContract.kt
@@ -1,4 +1,4 @@
-package info.nightscout.interfaces.permissions
+package info.nightscout.configuration.activities
 
 import android.content.Context
 import android.content.Intent
diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt
index a00baaca9b..544e8dd99a 100644
--- a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt
+++ b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/MaintenanceFragment.kt
@@ -32,7 +32,6 @@ import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventPreferenceChange
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
-import info.nightscout.shared.extensions.runOnUiThread
 import info.nightscout.shared.extensions.toVisibility
 import info.nightscout.shared.interfaces.ResourceHelper
 import io.reactivex.rxjava3.core.Completable
@@ -106,7 +105,7 @@ class MaintenanceFragment : DaggerFragment() {
                                 onError = { aapsLogger.error("Error clearing databases", it) },
                                 onComplete = {
                                     rxBus.send(EventPreferenceChange(rh.gs(info.nightscout.core.utils.R.string.key_units)))
-                                    runOnUiThread { activity.recreate() }
+                                    info.nightscout.shared.extensions.runOnUiThread { activity.recreate() }
                                 }
                             )
                     uel.log(Action.RESET_DATABASES, Sources.Maintenance)
diff --git a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt
index 6a4bbc8b2a..f1f5727a53 100644
--- a/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt
+++ b/plugins/configuration/src/main/java/info/nightscout/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt
@@ -93,7 +93,7 @@ class CustomWatchfaceImportListActivity: TranslatedDaggerAppCompatActivity()  {
             val drawable = customWatchfaceFile.resDatas[ResFileMap.CUSTOM_WATCHFACE.fileName]?.toDrawable(resources)
             with(holder.customWatchfaceImportListItemBinding) {
                 val fileName = metadata[CWF_FILENAME]?.let { "$it${ZipWatchfaceFormat.CWF_EXTENTION}"} ?:""
-                filelistName.text = rh.gs(info.nightscout.shared.R.string.metadata_wear_import_filename, fileName)
+                filelistName.text = rh.gs(info.nightscout.interfaces.R.string.metadata_wear_import_filename, fileName)
                 filelistName.tag = customWatchfaceFile
                 customWatchface.setImageDrawable(drawable)
                 customName.text = rh.gs(CWF_NAME.label, metadata[CWF_NAME])
diff --git a/plugins/constraints/build.gradle b/plugins/constraints/build.gradle
index 6ae2a5865b..119eb33d88 100644
--- a/plugins/constraints/build.gradle
+++ b/plugins/constraints/build.gradle
@@ -16,8 +16,8 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:ui')
     implementation project(':core:utils')
     implementation project(':core:validators')
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsImpl.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt
similarity index 57%
rename from plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsImpl.kt
rename to plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt
index 990e860a28..09b1688ec8 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsImpl.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/ConstraintsCheckerImpl.kt
@@ -1,109 +1,135 @@
 package info.nightscout.plugins.constraints
 
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.Profile
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class ConstraintsImpl @Inject constructor(private val activePlugin: ActivePlugin) : Constraints {
+class ConstraintsCheckerImpl @Inject constructor(
+    private val activePlugin: ActivePlugin,
+    val injector: HasAndroidInjector
+) : ConstraintsChecker {
+
+    override fun isLoopInvocationAllowed(): Constraint<Boolean> = isLoopInvocationAllowed(ConstraintObject(true, injector))
 
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isLoopInvocationAllowed(value)
         }
         return value
     }
 
+    override fun isClosedLoopAllowed(): Constraint<Boolean> = isClosedLoopAllowed(ConstraintObject(true, injector))
+
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isClosedLoopAllowed(value)
         }
         return value
     }
 
+    override fun isLgsAllowed(): Constraint<Boolean> = isLgsAllowed(ConstraintObject(true, injector))
+
     override fun isLgsAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isLgsAllowed(value)
         }
         return value
     }
 
+    override fun isAutosensModeEnabled(): Constraint<Boolean> = isAutosensModeEnabled(ConstraintObject(true, injector))
+
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isAutosensModeEnabled(value)
         }
         return value
     }
 
+    override fun isSMBModeEnabled(): Constraint<Boolean> = isSMBModeEnabled(ConstraintObject(true, injector))
+
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isSMBModeEnabled(value)
         }
         return value
     }
 
+    override fun isDynIsfModeEnabled(): Constraint<Boolean> = isDynIsfModeEnabled(ConstraintObject(true, injector))
+
     override fun isDynIsfModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isDynIsfModeEnabled(value)
         }
         return value
     }
 
+    override fun isUAMEnabled(): Constraint<Boolean> = isUAMEnabled(ConstraintObject(true, injector))
+
     override fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isUAMEnabled(value)
         }
         return value
     }
 
+    override fun isAdvancedFilteringEnabled(): Constraint<Boolean> = isAdvancedFilteringEnabled(ConstraintObject(true, injector))
+
     override fun isAdvancedFilteringEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isAdvancedFilteringEnabled(value)
         }
         return value
     }
 
+    override fun isSuperBolusEnabled(): Constraint<Boolean> = isSuperBolusEnabled(ConstraintObject(true, injector))
+
     override fun isSuperBolusEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isSuperBolusEnabled(value)
         }
         return value
     }
 
+    override fun isAutomationEnabled(): Constraint<Boolean> = isAutomationEnabled(ConstraintObject(true, injector))
+
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.applyBasalConstraints(absoluteRate, profile)
         }
@@ -111,9 +137,9 @@ class ConstraintsImpl @Inject constructor(private val activePlugin: ActivePlugin
     }
 
     override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constrain = p as Constraints
+            val constrain = p as PluginConstraints
             if (!p.isEnabled()) continue
             constrain.applyBasalPercentConstraints(percentRate, profile)
         }
@@ -121,9 +147,9 @@ class ConstraintsImpl @Inject constructor(private val activePlugin: ActivePlugin
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constrain = p as Constraints
+            val constrain = p as PluginConstraints
             if (!p.isEnabled()) continue
             constrain.applyBolusConstraints(insulin)
         }
@@ -131,9 +157,9 @@ class ConstraintsImpl @Inject constructor(private val activePlugin: ActivePlugin
     }
 
     override fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constrain = p as Constraints
+            val constrain = p as PluginConstraints
             if (!p.isEnabled()) continue
             constrain.applyExtendedBolusConstraints(insulin)
         }
@@ -141,9 +167,9 @@ class ConstraintsImpl @Inject constructor(private val activePlugin: ActivePlugin
     }
 
     override fun applyCarbsConstraints(carbs: Constraint<Int>): Constraint<Int> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constrain = p as Constraints
+            val constrain = p as PluginConstraints
             if (!p.isEnabled()) continue
             constrain.applyCarbsConstraints(carbs)
         }
@@ -151,9 +177,9 @@ class ConstraintsImpl @Inject constructor(private val activePlugin: ActivePlugin
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constrain = p as Constraints
+            val constrain = p as PluginConstraints
             if (!p.isEnabled()) continue
             constrain.applyMaxIOBConstraints(maxIob)
         }
@@ -161,12 +187,34 @@ class ConstraintsImpl @Inject constructor(private val activePlugin: ActivePlugin
     }
 
     override fun isAutomationEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(Constraints::class.java)
+        val constraintsPlugins = activePlugin.getSpecificPluginsListByInterface(PluginConstraints::class.java)
         for (p in constraintsPlugins) {
-            val constraint = p as Constraints
+            val constraint = p as PluginConstraints
             if (!p.isEnabled()) continue
             constraint.isAutomationEnabled(value)
         }
         return value
     }
+
+    /*
+     * Determine max values by walking through all constraints
+     */
+
+    override fun getMaxBasalAllowed(profile: Profile): Constraint<Double> =
+        applyBasalConstraints(ConstraintObject(Double.MAX_VALUE, injector), profile)
+
+    override fun getMaxBasalPercentAllowed(profile: Profile): Constraint<Int> =
+        applyBasalPercentConstraints(ConstraintObject(Int.MAX_VALUE, injector), profile)
+
+    override fun getMaxBolusAllowed(): Constraint<Double> =
+        applyBolusConstraints(ConstraintObject(Double.MAX_VALUE, injector))
+
+    override fun getMaxExtendedBolusAllowed(): Constraint<Double> =
+        applyExtendedBolusConstraints(ConstraintObject(Double.MAX_VALUE, injector))
+
+    override fun getMaxCarbsAllowed(): Constraint<Int> =
+        applyCarbsConstraints(ConstraintObject(Int.MAX_VALUE, injector))
+
+    override fun getMaxIOBAllowed(): Constraint<Double> =
+        applyMaxIOBConstraints(ConstraintObject(Double.MAX_VALUE, injector))
 }
\ No newline at end of file
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
index 13f92597cc..3e2a9adf07 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase
@@ -48,7 +48,7 @@ class BgQualityCheckPlugin @Inject constructor(
         .showInList(false)
         .pluginName(R.string.bg_quality),
     aapsLogger, rh, injector
-), Constraints, BgQualityCheck {
+), PluginConstraints, BgQualityCheck {
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -71,7 +71,7 @@ class BgQualityCheckPlugin @Inject constructor(
     // Fallback to LGS if BG values are doubled
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> =
         if (state == BgQualityCheck.State.DOUBLED)
-            maxIob.set(aapsLogger, 0.0, "Doubled values in BGSource", this)
+            maxIob.set(0.0, "Doubled values in BGSource", this)
         else
             maxIob
 
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt
index 3fbc067aa2..f212ea58de 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/di/PluginsConstraintsModule.kt
@@ -3,9 +3,9 @@ package info.nightscout.plugins.constraints.di
 import dagger.Binds
 import dagger.Module
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.versionChecker.VersionCheckerUtils
-import info.nightscout.plugins.constraints.ConstraintsImpl
+import info.nightscout.plugins.constraints.ConstraintsCheckerImpl
 import info.nightscout.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin
 import info.nightscout.plugins.constraints.versionChecker.VersionCheckerUtilsImpl
 
@@ -24,6 +24,6 @@ abstract class PluginsConstraintsModule {
 
         @Binds fun bindVersionCheckerUtils(versionCheckerUtils: VersionCheckerUtilsImpl): VersionCheckerUtils
         @Binds fun bindBgQualityCheck(bgQualityCheck: BgQualityCheckPlugin): BgQualityCheck
-        @Binds fun bindsConstraints(constraintsImpl: ConstraintsImpl): Constraints
+        @Binds fun bindsConstraintChecker(constraintsCheckerImpl: ConstraintsCheckerImpl): ConstraintsChecker
     }
 }
\ No newline at end of file
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt
index ba7293a6ee..d51b2d833e 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/dstHelper/DstHelperPlugin.kt
@@ -3,7 +3,7 @@ package info.nightscout.plugins.constraints.dstHelper
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase
@@ -35,7 +35,7 @@ class DstHelperPlugin @Inject constructor(
         .showInList(false)
         .pluginName(R.string.dst_plugin_name),
     aapsLogger, rh, injector
-), Constraints {
+), PluginConstraints {
 
     companion object {
 
@@ -74,7 +74,7 @@ class DstHelperPlugin @Inject constructor(
             } else {
                 aapsLogger.debug(LTag.CONSTRAINTS, "Loop already suspended")
             }
-            value.set(aapsLogger, false, "DST in last 3 hours.", this)
+            value.set(false, "DST in last 3 hours.", this)
         }
         return value
     }
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt
index d1aa0a557c..9fec153972 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt
@@ -3,7 +3,6 @@ package info.nightscout.plugins.constraints.objectives
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
 import info.nightscout.interfaces.constraints.Objectives
 import info.nightscout.interfaces.constraints.Objectives.Companion.AUTOSENS_OBJECTIVE
 import info.nightscout.interfaces.constraints.Objectives.Companion.AUTO_OBJECTIVE
@@ -12,6 +11,7 @@ import info.nightscout.interfaces.constraints.Objectives.Companion.FIRST_OBJECTI
 import info.nightscout.interfaces.constraints.Objectives.Companion.MAXBASAL_OBJECTIVE
 import info.nightscout.interfaces.constraints.Objectives.Companion.MAXIOB_ZERO_CL_OBJECTIVE
 import info.nightscout.interfaces.constraints.Objectives.Companion.SMB_OBJECTIVE
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
@@ -54,7 +54,7 @@ class ObjectivesPlugin @Inject constructor(
         .shortName(R.string.objectives_shortname)
         .description(R.string.description_objectives),
     aapsLogger, rh, injector
-), Constraints, Objectives {
+), PluginConstraints, Objectives {
 
     var objectives: MutableList<Objective> = ArrayList()
 
@@ -112,49 +112,49 @@ class ObjectivesPlugin @Inject constructor(
      */
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[FIRST_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, FIRST_OBJECTIVE + 1), this)
+            value.set(false, rh.gs(R.string.objectivenotstarted, FIRST_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isLgsAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXBASAL_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, MAXBASAL_OBJECTIVE + 1), this)
+            value.set(false, rh.gs(R.string.objectivenotstarted, MAXBASAL_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            value.set(false, rh.gs(R.string.objectivenotstarted, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isAutosensModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AUTOSENS_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, AUTOSENS_OBJECTIVE + 1), this)
+            value.set(false, rh.gs(R.string.objectivenotstarted, AUTOSENS_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[SMB_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, SMB_OBJECTIVE + 1), this)
+            value.set(false, rh.gs(R.string.objectivenotstarted, SMB_OBJECTIVE + 1), this)
         return value
     }
 
     override fun isDynIsfModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[DYN_ISF_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, DYN_ISF_OBJECTIVE + 1), this)
+            value.set(false, rh.gs(R.string.objectivenotstarted, DYN_ISF_OBJECTIVE + 1), this)
         return value
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         if (objectives[MAXIOB_ZERO_CL_OBJECTIVE].isStarted && !objectives[MAXIOB_ZERO_CL_OBJECTIVE].isAccomplished)
-            maxIob.set(aapsLogger, 0.0, rh.gs(R.string.objectivenotfinished, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
+            maxIob.set(0.0, rh.gs(R.string.objectivenotfinished, MAXIOB_ZERO_CL_OBJECTIVE + 1), this)
         return maxIob
     }
 
     override fun isAutomationEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         if (!objectives[AUTO_OBJECTIVE].isStarted)
-            value.set(aapsLogger, false, rh.gs(R.string.objectivenotstarted, AUTO_OBJECTIVE + 1), this)
+            value.set(false, rh.gs(R.string.objectivenotstarted, AUTO_OBJECTIVE + 1), this)
         return value
     }
 
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt
index a1398fe8ef..49c035bb2f 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective4.kt
@@ -1,9 +1,8 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.plugins.constraints.R
@@ -14,12 +13,13 @@ class Objective4(injector: HasAndroidInjector) : Objective(injector, "maxbasal",
 
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
+
     init {
         tasks.add(
             object : Task(this, R.string.objectives_maxbasal_gate) {
                 override fun isCompleted(): Boolean {
                     val profile = profileFunction.getProfile() ?: return false
-                    val maxBasalSet = (activePlugin.activeAPS as Constraints).applyBasalConstraints(Constraint(Constants.REALLYHIGHBASALRATE), profile)
+                    val maxBasalSet = (activePlugin.activeAPS as PluginConstraints).applyBasalConstraints(ConstraintObject(Double.MAX_VALUE, injector), profile)
                     val maxDailyBasal = profile.getMaxDailyBasal()
                     return maxBasalSet.value() > 2.8 * maxDailyBasal
                 }
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
index d73cd22a2f..65dbe484e8 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective5.kt
@@ -1,7 +1,7 @@
 package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.plugins.constraints.R
 import info.nightscout.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.shared.utils.T
@@ -17,7 +17,7 @@ class Objective5(injector: HasAndroidInjector) : Objective(injector, "maxiobzero
         tasks.add(
             object : Task(this, R.string.closedmodeenabled) {
                 override fun isCompleted(): Boolean {
-                    val closedLoopEnabled = Constraint(true)
+                    val closedLoopEnabled = ConstraintObject(true, injector)
                     safetyPlugin.isClosedLoopAllowed(closedLoopEnabled)
                     return closedLoopEnabled.value()
                 }
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt
index a9030b8c2c..0b0b586b5d 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective6.kt
@@ -2,7 +2,7 @@ package info.nightscout.plugins.constraints.objectives.objectives
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.ApsMode
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.plugins.constraints.R
 import info.nightscout.shared.utils.T
 import javax.inject.Inject
@@ -10,7 +10,7 @@ import javax.inject.Inject
 @Suppress("SpellCheckingInspection")
 class Objective6(injector: HasAndroidInjector) : Objective(injector, "maxiob", R.string.objectives_maxiob_objective, R.string.objectives_maxiob_gate) {
 
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
 
     init {
         tasks.add(MinimumDurationTask(this, T.days(1).msecs()))
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
index 689bdd57a0..bab63a246d 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/phoneChecker/PhoneCheckerPlugin.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.Build
 import com.scottyab.rootbeer.RootBeer
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
@@ -22,13 +22,13 @@ class PhoneCheckerPlugin @Inject constructor(
     private val context: Context
 ) : PluginBase(
     PluginDescription()
-    .mainType(PluginType.CONSTRAINTS)
-    .neverVisible(true)
-    .alwaysEnabled(true)
-    .showInList(false)
-    .pluginName(R.string.phone_checker),
+        .mainType(PluginType.CONSTRAINTS)
+        .neverVisible(true)
+        .alwaysEnabled(true)
+        .showInList(false)
+        .pluginName(R.string.phone_checker),
     aapsLogger, rh, injector
-), Constraints {
+), PluginConstraints {
 
     var phoneRooted: Boolean = false
     var devMode: Boolean = false
@@ -36,8 +36,10 @@ class PhoneCheckerPlugin @Inject constructor(
     val manufacturer: String = Build.MANUFACTURER
 
     private fun isDevModeEnabled(): Boolean {
-        return android.provider.Settings.Secure.getInt(context.contentResolver,
-            android.provider.Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0
+        return android.provider.Settings.Secure.getInt(
+            context.contentResolver,
+            android.provider.Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0
+        ) != 0
     }
 
     override fun onStart() {
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
index 3c104f31e0..1ce7e85d93 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt
@@ -1,6 +1,7 @@
 package info.nightscout.plugins.constraints.safety
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.utils.extensions.putDouble
 import info.nightscout.core.utils.extensions.putInt
 import info.nightscout.core.utils.extensions.putString
@@ -10,7 +11,8 @@ import info.nightscout.core.utils.extensions.storeString
 import info.nightscout.interfaces.ApsMode
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.constraints.Safety
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.notifications.Notification
@@ -39,7 +41,7 @@ class SafetyPlugin @Inject constructor(
     aapsLogger: AAPSLogger,
     rh: ResourceHelper,
     private val sp: SP,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val activePlugin: ActivePlugin,
     private val hardLimits: HardLimits,
     private val config: Config,
@@ -56,57 +58,57 @@ class SafetyPlugin @Inject constructor(
         .pluginName(R.string.safety)
         .preferencesId(R.xml.pref_safety),
     aapsLogger, rh, injector
-), Constraints, Safety {
+), PluginConstraints, Safety {
 
     /**
      * Constraints interface
      */
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
-        if (!activePlugin.activePump.pumpDescription.isTempBasalCapable) value.set(aapsLogger, false, rh.gs(R.string.pumpisnottempbasalcapable), this)
+        if (!activePlugin.activePump.pumpDescription.isTempBasalCapable) value.set(false, rh.gs(R.string.pumpisnottempbasalcapable), this)
         return value
     }
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         val mode = ApsMode.fromString(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name))
-        if (mode == ApsMode.OPEN) value.set(aapsLogger, false, rh.gs(R.string.closedmodedisabledinpreferences), this)
+        if (mode == ApsMode.OPEN) value.set(false, rh.gs(R.string.closedmodedisabledinpreferences), this)
         if (!config.isEngineeringModeOrRelease()) {
             if (value.value()) {
                 uiInteraction.addNotification(Notification.TOAST_ALARM, rh.gs(R.string.closed_loop_disabled_on_dev_branch), Notification.NORMAL)
             }
-            value.set(aapsLogger, false, rh.gs(R.string.closed_loop_disabled_on_dev_branch), this)
+            value.set(false, rh.gs(R.string.closed_loop_disabled_on_dev_branch), this)
         }
         val pump = activePlugin.activePump
         if (!pump.isFakingTempsByExtendedBoluses && iobCobCalculator.getExtendedBolus(dateUtil.now()) != null) {
-            value.set(aapsLogger, false, rh.gs(R.string.closed_loop_disabled_with_eb), this)
+            value.set(false, rh.gs(R.string.closed_loop_disabled_with_eb), this)
         }
         return value
     }
 
     override fun isSMBModeEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val closedLoop = constraintChecker.isClosedLoopAllowed()
-        if (!closedLoop.value()) value.set(aapsLogger, false, rh.gs(R.string.smbnotallowedinopenloopmode), this)
+        if (!closedLoop.value()) value.set(false, rh.gs(R.string.smbnotallowedinopenloopmode), this)
         return value
     }
 
     override fun isAdvancedFilteringEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
         val bgSource = activePlugin.activeBgSource
-        if (!bgSource.advancedFilteringSupported()) value.set(aapsLogger, false, rh.gs(R.string.smbalwaysdisabled), this)
+        if (!bgSource.advancedFilteringSupported()) value.set(false, rh.gs(R.string.smbalwaysdisabled), this)
         return value
     }
 
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        absoluteRate.setIfGreater(aapsLogger, 0.0, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
-        absoluteRate.setIfSmaller(aapsLogger, hardLimits.maxBasal(), rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, hardLimits.maxBasal(), rh.gs(R.string.hardlimit)), this)
+        absoluteRate.setIfGreater(0.0, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
+        absoluteRate.setIfSmaller(hardLimits.maxBasal(), rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, hardLimits.maxBasal(), rh.gs(R.string.hardlimit)), this)
         val pump = activePlugin.activePump
         // check for pump max
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
             val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
-            absoluteRate.setIfSmaller(aapsLogger, pumpLimit, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+            absoluteRate.setIfSmaller(pumpLimit, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
         }
 
         // do rounding
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) {
-            absoluteRate.set(aapsLogger, Round.roundTo(absoluteRate.value(), pump.pumpDescription.tempAbsoluteStep))
+            absoluteRate.set(Round.roundTo(absoluteRate.value(), pump.pumpDescription.tempAbsoluteStep))
         }
         return absoluteRate
     }
@@ -119,52 +121,58 @@ class SafetyPlugin @Inject constructor(
                 currentBasal
             ) + " U/h", this
         )
-        val absoluteConstraint = Constraint(absoluteRate)
+        val absoluteConstraint = ConstraintObject(absoluteRate, injector)
         applyBasalConstraints(absoluteConstraint, profile)
         percentRate.copyReasons(absoluteConstraint)
         val pump = activePlugin.activePump
         var percentRateAfterConst = java.lang.Double.valueOf(absoluteConstraint.value() / currentBasal * 100).toInt()
-        percentRateAfterConst = if (percentRateAfterConst < 100) Round.ceilTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt() else Round.floorTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt()
-        percentRate.set(aapsLogger, percentRateAfterConst, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, percentRateAfterConst, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+        percentRateAfterConst =
+            if (percentRateAfterConst < 100) Round.ceilTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble())
+                .toInt() else Round.floorTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt()
+        percentRate.set(percentRateAfterConst, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, percentRateAfterConst, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
         if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT) {
             val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0
-            percentRate.setIfSmaller(aapsLogger, pumpLimit.toInt(), rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+            percentRate.setIfSmaller(pumpLimit.toInt(), rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
         }
         return percentRate
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfGreater(aapsLogger, 0.0, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
+        insulin.setIfGreater(0.0, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
         val maxBolus = sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0)
-        insulin.setIfSmaller(aapsLogger, maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, maxBolus, rh.gs(R.string.maxvalueinpreferences)), this)
-        insulin.setIfSmaller(aapsLogger, hardLimits.maxBolus(), rh.gs(info.nightscout.core.ui.R.string.limitingbolus, hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this)
+        insulin.setIfSmaller(maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, maxBolus, rh.gs(R.string.maxvalueinpreferences)), this)
+        insulin.setIfSmaller(hardLimits.maxBolus(), rh.gs(info.nightscout.core.ui.R.string.limitingbolus, hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this)
         val pump = activePlugin.activePump
         val rounded = pump.pumpDescription.pumpType.determineCorrectBolusSize(insulin.value())
-        insulin.setIfDifferent(aapsLogger, rounded, rh.gs(info.nightscout.core.ui.R.string.pumplimit), this)
+        insulin.setIfDifferent(rounded, rh.gs(info.nightscout.core.ui.R.string.pumplimit), this)
         return insulin
     }
 
     override fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfGreater(aapsLogger, 0.0, rh.gs(R.string.limitingextendedbolus, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
+        insulin.setIfGreater(0.0, rh.gs(R.string.limitingextendedbolus, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
         val maxBolus = sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0)
-        insulin.setIfSmaller(aapsLogger, maxBolus, rh.gs(R.string.limitingextendedbolus, maxBolus, rh.gs(R.string.maxvalueinpreferences)), this)
-        insulin.setIfSmaller(aapsLogger, hardLimits.maxBolus(), rh.gs(R.string.limitingextendedbolus, hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this)
+        insulin.setIfSmaller(maxBolus, rh.gs(R.string.limitingextendedbolus, maxBolus, rh.gs(R.string.maxvalueinpreferences)), this)
+        insulin.setIfSmaller(hardLimits.maxBolus(), rh.gs(R.string.limitingextendedbolus, hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this)
         val pump = activePlugin.activePump
         val rounded = pump.pumpDescription.pumpType.determineCorrectExtendedBolusSize(insulin.value())
-        insulin.setIfDifferent(aapsLogger, rounded, rh.gs(info.nightscout.core.ui.R.string.pumplimit), this)
+        insulin.setIfDifferent(rounded, rh.gs(info.nightscout.core.ui.R.string.pumplimit), this)
         return insulin
     }
 
     override fun applyCarbsConstraints(carbs: Constraint<Int>): Constraint<Int> {
-        carbs.setIfGreater(aapsLogger, 0, rh.gs(R.string.limitingcarbs, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
+        carbs.setIfGreater(0, rh.gs(R.string.limitingcarbs, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
         val maxCarbs = sp.getInt(info.nightscout.core.utils.R.string.key_treatmentssafety_maxcarbs, 48)
-        carbs.setIfSmaller(aapsLogger, maxCarbs, rh.gs(R.string.limitingcarbs, maxCarbs, rh.gs(R.string.maxvalueinpreferences)), this)
+        carbs.setIfSmaller(maxCarbs, rh.gs(R.string.limitingcarbs, maxCarbs, rh.gs(R.string.maxvalueinpreferences)), this)
         return carbs
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> {
         val apsMode = ApsMode.fromString(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name))
-        if (apsMode == ApsMode.LGS) maxIob.setIfSmaller(aapsLogger, HardLimits.MAX_IOB_LGS, rh.gs(info.nightscout.core.ui.R.string.limiting_iob, HardLimits.MAX_IOB_LGS, rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend)), this)
+        if (apsMode == ApsMode.LGS) maxIob.setIfSmaller(
+            HardLimits.MAX_IOB_LGS,
+            rh.gs(info.nightscout.core.ui.R.string.limiting_iob, HardLimits.MAX_IOB_LGS, rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend)),
+            this
+        )
         return maxIob
     }
 
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
index 6aaff96f09..97f966f3e1 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/signatureVerifier/SignatureVerifierPlugin.kt
@@ -6,7 +6,7 @@ import android.os.Handler
 import android.os.HandlerThread
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
@@ -54,7 +54,7 @@ class SignatureVerifierPlugin @Inject constructor(
         .showInList(false)
         .pluginName(R.string.signature_verifier),
     aapsLogger, rh, injector
-), Constraints {
+), PluginConstraints {
 
     private var handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
 
@@ -88,7 +88,7 @@ class SignatureVerifierPlugin @Inject constructor(
     override fun isLoopInvocationAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         if (hasIllegalSignature()) {
             showNotification()
-            value.set(aapsLogger, false)
+            value.set(false)
         }
         if (shouldDownloadCerts()) {
             handler.post {
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt
index 53d10c5296..677d1d7709 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt
@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
@@ -34,13 +34,13 @@ class StorageConstraintPlugin @Inject constructor(
         .showInList(false)
         .pluginName(R.string.storage),
     aapsLogger, rh, injector
-), Constraints {
+), PluginConstraints {
 
     override fun isClosedLoopAllowed(value: Constraint<Boolean>): Constraint<Boolean> {
         val diskFree = availableInternalMemorySize()
         if (diskFree < Constants.MINIMUM_FREE_SPACE) {
             aapsLogger.debug(LTag.CONSTRAINTS, "Closed loop disabled. Internal storage free (Mb):$diskFree")
-            value.set(aapsLogger, false, rh.gs(R.string.disk_full, Constants.MINIMUM_FREE_SPACE), this)
+            value.set(false, rh.gs(R.string.disk_full, Constants.MINIMUM_FREE_SPACE), this)
             activeNames.addNotification(Notification.DISK_FULL, rh.gs(R.string.disk_full, Constants.MINIMUM_FREE_SPACE), Notification.NORMAL)
         }
         return value
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
index 5bf36f822d..b2f27e1b9a 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/versionChecker/VersionCheckerPlugin.kt
@@ -3,7 +3,7 @@ package info.nightscout.plugins.constraints.versionChecker
 import dagger.android.HasAndroidInjector
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
@@ -40,7 +40,7 @@ class VersionCheckerPlugin @Inject constructor(
         .showInList(false)
         .pluginName(R.string.version_checker),
     aapsLogger, rh, injector
-), Constraints {
+), PluginConstraints {
 
     enum class GracePeriod(val warning: Long, val old: Long, val veryOld: Long) {
         RELEASE(30, 60, 90),
@@ -64,16 +64,16 @@ class VersionCheckerPlugin @Inject constructor(
         checkWarning()
         versionCheckerUtils.triggerCheckVersion()
         if (lastCheckOlderThan(gracePeriod.veryOld.daysToMillis()))
-            value.set(aapsLogger, false, rh.gs(R.string.very_old_version), this)
+            value.set(false, rh.gs(R.string.very_old_version), this)
         val endDate = sp.getLong(rh.gs(info.nightscout.core.utils.R.string.key_app_expiration) + "_" + config.VERSION_NAME, 0)
         if (endDate != 0L && dateUtil.now() > endDate)
-            value.set(aapsLogger, false, rh.gs(R.string.application_expired), this)
+            value.set(false, rh.gs(R.string.application_expired), this)
         return value
     }
 
     override fun applyMaxIOBConstraints(maxIob: Constraint<Double>): Constraint<Double> =
         if (lastCheckOlderThan(gracePeriod.old.daysToMillis()))
-            maxIob.set(aapsLogger, 0.0, rh.gs(R.string.old_version), this)
+            maxIob.set(0.0, rh.gs(R.string.old_version), this)
         else
             maxIob
 
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
index c1e599c8f5..09e07728a2 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt
@@ -2,16 +2,15 @@ package info.nightscout.plugins.constraints.bgQualityCheck
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.aps.AutosensDataStore
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
-import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.constraints.R
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.utils.DateUtil
 import info.nightscout.shared.utils.T
@@ -35,7 +34,13 @@ class BgQualityCheckPluginTest : TestBase() {
 
     private lateinit var plugin: BgQualityCheckPlugin
 
-    private val injector = HasAndroidInjector { AndroidInjector { } }
+    private val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
     private val now = 100000000L
     //private val autosensDataStore = AutosensDataStoreObject()
 
@@ -46,7 +51,7 @@ class BgQualityCheckPluginTest : TestBase() {
                 injector,
                 aapsLogger,
                 rh,
-                RxBus(aapsSchedulers, aapsLogger),
+                rxBus,
                 iobCobCalculator,
                 aapsSchedulers,
                 fabricPrivacy,
@@ -75,10 +80,46 @@ class BgQualityCheckPluginTest : TestBase() {
         Assertions.assertEquals(R.drawable.ic_baseline_warning_24_yellow, plugin.icon())
 
         val superData: MutableList<GlucoseValue> = ArrayList()
-        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(20).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(15).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(10).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        superData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = T.mins(5).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        superData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(20).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        superData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(15).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        superData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(10).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        superData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = T.mins(5).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
         `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(superData)
 
         `when`(autosensDataStore.lastUsed5minCalculation).thenReturn(true)
@@ -205,16 +246,106 @@ class BgQualityCheckPluginTest : TestBase() {
 
         // Flat data Libre
         val flatData: MutableList<GlucoseValue> = ArrayList()
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(0).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-5).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 101.0, timestamp = now + T.mins(-10).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-15).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-20).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-25).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 99.0, timestamp = now + T.mins(-30).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-35).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-40).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-45).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(0).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-5).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 101.0,
+                timestamp = now + T.mins(-10).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-15).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-20).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-25).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 99.0,
+                timestamp = now + T.mins(-30).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-35).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-40).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-45).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
         `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(flatData)
         `when`(iobCobCalculator.ads.lastBg()).thenReturn(InMemoryGlucoseValue(flatData[0]))
 
@@ -224,16 +355,106 @@ class BgQualityCheckPluginTest : TestBase() {
 
         // Flat data Libre
         val flatDataDexcom: MutableList<GlucoseValue> = ArrayList()
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(0).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-5).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 101.0, timestamp = now + T.mins(-10).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-15).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-20).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-25).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 99.0, timestamp = now + T.mins(-30).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-35).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-40).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatDataDexcom.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-45).msecs(), sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(0).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-5).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 101.0,
+                timestamp = now + T.mins(-10).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-15).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-20).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-25).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 99.0,
+                timestamp = now + T.mins(-30).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-35).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-40).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatDataDexcom.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-45).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.DEXCOM_G6_NATIVE,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
         `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(flatDataDexcom)
         `when`(iobCobCalculator.ads.lastBg()).thenReturn(InMemoryGlucoseValue(flatDataDexcom[0]))
 
@@ -243,19 +464,100 @@ class BgQualityCheckPluginTest : TestBase() {
 
         // not enough data
         val incompleteData: MutableList<GlucoseValue> = ArrayList()
-        incompleteData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(0).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        incompleteData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-5).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        incompleteData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(0).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        incompleteData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-5).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
         `when`(autosensDataStore.getBgReadingsDataTableCopy()).thenReturn(incompleteData)
         `when`(iobCobCalculator.ads.lastBg()).thenReturn(InMemoryGlucoseValue(incompleteData[0]))
         plugin.processBgData()// must be more than 5 values
         Assertions.assertNotEquals(BgQualityCheck.State.FLAT, plugin.state)
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 101.0, timestamp = now + T.mins(-10).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-15).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-20).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-25).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 99.0, timestamp = now + T.mins(-30).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-35).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
-        flatData.add(GlucoseValue(raw = 0.0, noise = 0.0, value = 100.0, timestamp = now + T.mins(-40).msecs(), sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 101.0,
+                timestamp = now + T.mins(-10).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-15).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-20).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-25).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 99.0,
+                timestamp = now + T.mins(-30).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-35).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
+        flatData.add(
+            GlucoseValue(
+                raw = 0.0,
+                noise = 0.0,
+                value = 100.0,
+                timestamp = now + T.mins(-40).msecs(),
+                sourceSensor = GlucoseValue.SourceSensor.LIBRE_1_OTHER,
+                trendArrow = GlucoseValue.TrendArrow.FLAT
+            )
+        )
         plugin.processBgData() // must be at least 45 min old
         Assertions.assertNotEquals(BgQualityCheck.State.FLAT, plugin.state)
     }
@@ -263,13 +565,13 @@ class BgQualityCheckPluginTest : TestBase() {
     @Test
     fun applyMaxIOBConstraintsTest() {
         plugin.state = BgQualityCheck.State.UNKNOWN
-        Assertions.assertEquals(10.0, plugin.applyMaxIOBConstraints(Constraint(10.0)).value(), 0.001)
+        Assertions.assertEquals(10.0, plugin.applyMaxIOBConstraints(ConstraintObject(10.0, injector)).value(), 0.001)
         plugin.state = BgQualityCheck.State.FIVE_MIN_DATA
-        Assertions.assertEquals(10.0, plugin.applyMaxIOBConstraints(Constraint(10.0)).value(), 0.001)
+        Assertions.assertEquals(10.0, plugin.applyMaxIOBConstraints(ConstraintObject(10.0, injector)).value(), 0.001)
         plugin.state = BgQualityCheck.State.RECALCULATED
-        Assertions.assertEquals(10.0, plugin.applyMaxIOBConstraints(Constraint(10.0)).value(), 0.001)
+        Assertions.assertEquals(10.0, plugin.applyMaxIOBConstraints(ConstraintObject(10.0, injector)).value(), 0.001)
         plugin.state = BgQualityCheck.State.DOUBLED
-        Assertions.assertEquals(0.0, plugin.applyMaxIOBConstraints(Constraint(10.0)).value(), 0.001)
+        Assertions.assertEquals(0.0, plugin.applyMaxIOBConstraints(ConstraintObject(10.0, injector)).value(), 0.001)
     }
 
 }
\ No newline at end of file
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt
index ea712ceea9..e668b07c09 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/objectives/ObjectivesPluginTest.kt
@@ -2,8 +2,8 @@ package info.nightscout.plugins.constraints.objectives
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.constraints.Objectives
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.constraints.R
@@ -35,6 +35,9 @@ class ObjectivesPluginTest : TestBase() {
                 it.rh = rh
                 it.dateUtil = dateUtil
             }
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
         }
     }
 
@@ -49,34 +52,30 @@ class ObjectivesPluginTest : TestBase() {
 
     @Test fun notStartedObjectivesShouldLimitLoopInvocation() {
         objectivesPlugin.objectives[Objectives.FIRST_OBJECTIVE].startedOn = 0
-        var c = Constraint(true)
-        c = objectivesPlugin.isLoopInvocationAllowed(c)
-        Assertions.assertEquals("Objectives: Objective 1 not started", c.getReasons(aapsLogger))
+        val c = objectivesPlugin.isLoopInvocationAllowed(ConstraintObject(true, injector))
+        Assertions.assertEquals("Objectives: Objective 1 not started", c.getReasons())
         Assertions.assertEquals(false, c.value())
         objectivesPlugin.objectives[Objectives.FIRST_OBJECTIVE].startedOn = dateUtil.now()
     }
 
     @Test fun notStartedObjective6ShouldLimitClosedLoop() {
         objectivesPlugin.objectives[Objectives.MAXIOB_ZERO_CL_OBJECTIVE].startedOn = 0
-        var c = Constraint(true)
-        c = objectivesPlugin.isClosedLoopAllowed(c)
-        Assertions.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 6 not started"))
+        val c = objectivesPlugin.isClosedLoopAllowed(ConstraintObject(true, injector))
+        Assertions.assertEquals(true, c.getReasons().contains("Objective 6 not started"))
         Assertions.assertEquals(false, c.value())
     }
 
     @Test fun notStartedObjective8ShouldLimitAutosensMode() {
         objectivesPlugin.objectives[Objectives.AUTOSENS_OBJECTIVE].startedOn = 0
-        var c = Constraint(true)
-        c = objectivesPlugin.isAutosensModeEnabled(c)
-        Assertions.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 8 not started"))
+        val c = objectivesPlugin.isAutosensModeEnabled(ConstraintObject(true, injector))
+        Assertions.assertEquals(true, c.getReasons().contains("Objective 8 not started"))
         Assertions.assertEquals(false, c.value())
     }
 
     @Test fun notStartedObjective10ShouldLimitSMBMode() {
         objectivesPlugin.objectives[Objectives.SMB_OBJECTIVE].startedOn = 0
-        var c = Constraint(true)
-        c = objectivesPlugin.isSMBModeEnabled(c)
-        Assertions.assertEquals(true, c.getReasons(aapsLogger).contains("Objective 9 not started"))
+        val c = objectivesPlugin.isSMBModeEnabled(ConstraintObject(true, injector))
+        Assertions.assertEquals(true, c.getReasons().contains("Objective 9 not started"))
         Assertions.assertEquals(false, c.value())
     }
 }
\ No newline at end of file
diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt
index 8e917a0652..51c8a130c9 100644
--- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt
+++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/storage/StorageConstraintPluginTest.kt
@@ -2,7 +2,7 @@ package info.nightscout.plugins.constraints.storage
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -20,6 +20,13 @@ class StorageConstraintPluginTest : TestBase() {
     @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var uiInteraction: UiInteraction
 
+    private val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
     private lateinit var storageConstraintPlugin: StorageConstraintPlugin
 
     @BeforeEach fun prepareMock() {
@@ -42,9 +49,9 @@ class StorageConstraintPluginTest : TestBase() {
         val mocked = MockedStorageConstraintPlugin({ AndroidInjector { } }, aapsLogger, rh, uiInteraction)
         // Set free space under 200(Mb) to disable loop
         mocked.memSize = 150L
-        Assertions.assertEquals(false, mocked.isClosedLoopAllowed(Constraint(true)).value())
+        Assertions.assertEquals(false, mocked.isClosedLoopAllowed(ConstraintObject(true, injector)).value())
         // Set free space over 200(Mb) to enable loop
         mocked.memSize = 300L
-        Assertions.assertEquals(true, mocked.isClosedLoopAllowed(Constraint(true)).value())
+        Assertions.assertEquals(true, mocked.isClosedLoopAllowed(ConstraintObject(true, injector)).value())
     }
 }
\ No newline at end of file
diff --git a/plugins/insulin/build.gradle b/plugins/insulin/build.gradle
index 74d0c33bc4..31c8144ae0 100644
--- a/plugins/insulin/build.gradle
+++ b/plugins/insulin/build.gradle
@@ -16,7 +16,6 @@ android {
 
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:graphview')
     implementation project(':core:interfaces')
     implementation project(':core:main')
diff --git a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt
index f9a2ae62dc..af3df55f01 100644
--- a/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt
+++ b/plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt
@@ -7,7 +7,6 @@ import info.nightscout.interfaces.insulin.Insulin
 import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.utils.HardLimits
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.sharedtests.TestBase
@@ -29,7 +28,6 @@ class InsulinOrefFreePeakPluginTest : TestBase() {
 
     @Mock lateinit var sp: SP
     @Mock lateinit var rh: ResourceHelper
-    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var config: Config
     @Mock lateinit var hardLimits: HardLimits
diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle
index 07d9669272..3f14652c4c 100644
--- a/plugins/main/build.gradle
+++ b/plugins/main/build.gradle
@@ -15,7 +15,7 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
+    implementation project(':app-wear-shared:shared-impl')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:graphview')
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
index f06bb93822..1157f7ee2a 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt
@@ -27,6 +27,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.directionToIcon
 import info.nightscout.core.graph.OverviewData
 import info.nightscout.core.iob.displayText
@@ -49,8 +50,7 @@ import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.aps.VariableSensitivityResult
 import info.nightscout.interfaces.automation.Automation
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.logging.UserEntryLogger
@@ -121,7 +121,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var profileUtil: ProfileUtil
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var statusLightHandler: StatusLightHandler
     @Inject lateinit var processedDeviceStatusData: ProcessedDeviceStatusData
     @Inject lateinit var nsSettingsStatus: NSSettingsStatus
@@ -190,7 +190,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         smallHeight = screenHeight <= Constants.SMALL_HEIGHT
         val landscape = screenHeight < screenWidth
 
-        skinProvider.activeSkin().preProcessLandscapeOverviewLayout(binding, landscape, rh.gb(info.nightscout.shared.R.bool.isTablet), smallHeight)
+        skinProvider.activeSkin().preProcessLandscapeOverviewLayout(binding, landscape, rh.gb(info.nightscout.core.ui.R.bool.isTablet), smallHeight)
         binding.nsclientCard.visibility = config.NSCLIENT.toVisibility()
 
         binding.notifications.setHasFixedSize(false)
@@ -516,7 +516,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             binding.buttonsLayout.quickWizardButton.visibility = View.VISIBLE
             val wizard = quickWizardEntry.doCalc(profile, profileName, actualBg)
             if (wizard.calculatedTotalInsulin > 0.0 && quickWizardEntry.carbs() > 0.0) {
-                val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(quickWizardEntry.carbs())).value()
+                val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(quickWizardEntry.carbs(), injector)).value()
                 activity?.let {
                     if (abs(wizard.insulinAfterConstraints - wizard.calculatedTotalInsulin) >= pump.pumpDescription.pumpType.determineCorrectBolusStepSize(wizard.insulinAfterConstraints) || carbsAfterConstraints != quickWizardEntry.carbs()) {
                         OKDialog.show(it, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), rh.gs(R.string.constraints_violation) + "\n" + rh.gs(R.string.change_your_input))
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
index 6b514eb010..8094509045 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt
@@ -34,6 +34,7 @@ import info.nightscout.rx.events.EventNewHistoryData
 import info.nightscout.rx.events.EventPumpStatusChanged
 import info.nightscout.rx.events.EventUpdateOverviewCalcProgress
 import info.nightscout.rx.logging.AAPSLogger
+import info.nightscout.shared.impl.rx.bus.RxBusImpl
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -72,7 +73,7 @@ class OverviewPlugin @Inject constructor(
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
-    override val overviewBus = RxBus(aapsSchedulers, aapsLogger)
+    override val overviewBus = RxBusImpl(aapsSchedulers, aapsLogger)
 
     override fun addNotificationWithDialogResponse(id: Int, text: String, level: Int, @StringRes actionButtonId: Int, title: String, message: String) {
         rxBus.send(
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt
index b55d8710aa..b499553e72 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt
@@ -146,11 +146,11 @@ class StatusLightHandler @Inject constructor(
     }
     private fun TherapyEvent.age(useShortText: Boolean, rh: ResourceHelper, dateUtil: DateUtil): String {
         val diff = dateUtil.computeDiff(timestamp, System.currentTimeMillis())
-        var days = " " + rh.gs(info.nightscout.shared.R.string.days) + " "
-        var hours = " " + rh.gs(info.nightscout.shared.R.string.hours) + " "
+        var days = " " + rh.gs(info.nightscout.interfaces.R.string.days) + " "
+        var hours = " " + rh.gs(info.nightscout.interfaces.R.string.hours) + " "
         if (useShortText) {
-            days = rh.gs(info.nightscout.shared.R.string.shortday)
-            hours = rh.gs(info.nightscout.shared.R.string.shorthour)
+            days = rh.gs(info.nightscout.interfaces.R.string.shortday)
+            hours = rh.gs(info.nightscout.interfaces.R.string.shorthour)
         }
         return diff[TimeUnit.DAYS].toString() + days + diff[TimeUnit.HOURS] + hours
     }
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index b05207344e..ea6a505ea8 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -11,6 +11,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.annotations.OpenForTesting
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.iob.generateCOBString
 import info.nightscout.core.iob.round
@@ -34,8 +35,7 @@ import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.XDripBroadcast
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.logging.UserEntryLogger
@@ -91,7 +91,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     private val smsManager: SmsManager?,
     private val aapsSchedulers: AapsSchedulers,
     private val sp: SP,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val rxBus: RxBus,
     private val profileFunction: ProfileFunction,
     private val profileUtil: ProfileUtil,
@@ -732,7 +732,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             else if (tempBasalPct == 0 && divided[1] != "0%") sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))
             else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.sms_wrong_tbr_duration, durationStep)))
             else {
-                tempBasalPct = constraintChecker.applyBasalPercentConstraints(Constraint(tempBasalPct), profile).value()
+                tempBasalPct = constraintChecker.applyBasalPercentConstraints(ConstraintObject(tempBasalPct, injector), profile).value()
                 val passCode = generatePassCode()
                 val reply = rh.gs(R.string.smscommunicator_basal_pct_reply_with_code, tempBasalPct, duration, passCode)
                 receivedSms.processed = true
@@ -787,7 +787,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             else if (tempBasal == 0.0 && divided[1] != "0") sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))
             else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.sms_wrong_tbr_duration, durationStep)))
             else {
-                tempBasal = constraintChecker.applyBasalConstraints(Constraint(tempBasal), profile).value()
+                tempBasal = constraintChecker.applyBasalConstraints(ConstraintObject(tempBasal, injector), profile).value()
                 val passCode = generatePassCode()
                 val reply = rh.gs(R.string.smscommunicator_basal_reply_with_code, tempBasal, duration, passCode)
                 receivedSms.processed = true
@@ -864,7 +864,7 @@ class SmsCommunicatorPlugin @Inject constructor(
         } else {
             var extended = SafeParse.stringToDouble(divided[1])
             val duration = SafeParse.stringToInt(divided[2])
-            extended = constraintChecker.applyExtendedBolusConstraints(Constraint(extended)).value()
+            extended = constraintChecker.applyExtendedBolusConstraints(ConstraintObject(extended, injector)).value()
             if (extended == 0.0 || duration == 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))
             else {
                 val passCode = generatePassCode()
@@ -918,7 +918,7 @@ class SmsCommunicatorPlugin @Inject constructor(
     private fun processBOLUS(divided: Array<String>, receivedSms: Sms) {
         var bolus = SafeParse.stringToDouble(divided[1])
         val isMeal = divided.size > 2 && divided[2].equals("MEAL", ignoreCase = true)
-        bolus = constraintChecker.applyBolusConstraints(Constraint(bolus)).value()
+        bolus = constraintChecker.applyBolusConstraints(ConstraintObject(bolus, injector)).value()
         if (divided.size == 3 && !isMeal) {
             sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))
         } else if (bolus > 0.0) {
@@ -1031,7 +1031,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 return
             }
         }
-        grams = constraintChecker.applyCarbsConstraints(Constraint(grams)).value()
+        grams = constraintChecker.applyCarbsConstraints(ConstraintObject(grams, injector)).value()
         if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format)))
         else {
             val passCode = generatePassCode()
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
index 2f9e46f04b..2cdfde27c6 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt
@@ -3,6 +3,7 @@ package info.nightscout.plugins.general.wear.wearintegration
 import android.app.NotificationManager
 import android.content.Context
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.core.extensions.toStringShort
 import info.nightscout.core.extensions.valueToUnits
@@ -33,8 +34,7 @@ import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
@@ -104,7 +104,7 @@ class DataHandlerMobile @Inject constructor(
     private val defaultValueHelper: DefaultValueHelper,
     private val trendCalculator: TrendCalculator,
     private val dateUtil: DateUtil,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val uel: UserEntryLogger,
     private val activePlugin: ActivePlugin,
     private val commandQueue: CommandQueue,
@@ -269,7 +269,7 @@ class DataHandlerMobile @Inject constructor(
             .observeOn(aapsSchedulers.io)
             .subscribe({
                            aapsLogger.debug(LTag.WEAR, "ActionFillConfirmed received $it from ${it.sourceNodeId}")
-                           if (constraintChecker.applyBolusConstraints(Constraint(it.insulin)).value() - it.insulin != 0.0) {
+                           if (constraintChecker.applyBolusConstraints(ConstraintObject(it.insulin, injector)).value() - it.insulin != 0.0) {
                                ToastUtils.showToastInUiThread(context, "aborting: previously applied constraint changed")
                                sendError("aborting: previously applied constraint changed")
                            } else
@@ -383,7 +383,7 @@ class DataHandlerMobile @Inject constructor(
             return
         }
         val carbsBeforeConstraints = command.carbs
-        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbsBeforeConstraints)).value()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(carbsBeforeConstraints, injector)).value()
         if (carbsAfterConstraints - carbsBeforeConstraints != 0) {
             sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_carbs_constraint))
             return
@@ -480,7 +480,7 @@ class DataHandlerMobile @Inject constructor(
 
         val wizard = quickWizardEntry.doCalc(profile, profileName, actualBg)
 
-        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(quickWizardEntry.carbs())).value()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(quickWizardEntry.carbs(), injector)).value()
         if (carbsAfterConstraints != quickWizardEntry.carbs()) {
             sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_carbs_constraint))
             return
@@ -506,8 +506,8 @@ class DataHandlerMobile @Inject constructor(
     }
 
     private fun handleBolusPreCheck(command: EventData.ActionBolusPreCheck) {
-        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(command.insulin)).value()
-        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(command.carbs)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(command.insulin, injector)).value()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(command.carbs, injector)).value()
         val pump = activePlugin.activePump
         if (insulinAfterConstraints > 0 && (!pump.isInitialized() || pump.isSuspended() || loop.isDisconnected)) {
             sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_pump_not_available))
@@ -530,7 +530,7 @@ class DataHandlerMobile @Inject constructor(
 
     private fun handleECarbsPreCheck(command: EventData.ActionECarbsPreCheck) {
         val startTimeStamp = System.currentTimeMillis() + T.mins(command.carbsTimeShift.toLong()).msecs()
-        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(command.carbs)).value()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(command.carbs, injector)).value()
         var message = rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + carbsAfterConstraints + rh.gs(R.string.grams_short) +
             "\n" + rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.timeString(startTimeStamp) +
             "\n" + rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + command.duration + rh.gs(R.string.hour_short)
@@ -558,7 +558,7 @@ class DataHandlerMobile @Inject constructor(
             3    -> sp.getDouble("fill_button3", 0.0)
             else -> return
         }
-        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(amount, injector)).value()
         var message = rh.gs(info.nightscout.core.ui.R.string.prime_fill) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short)
         if (insulinAfterConstraints - amount != 0.0) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.constraint_applied)
         rxBus.send(
@@ -572,7 +572,7 @@ class DataHandlerMobile @Inject constructor(
     }
 
     private fun handleFillPreCheck(command: EventData.ActionFillPreCheck) {
-        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(command.insulin)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(command.insulin, injector)).value()
         var message = rh.gs(info.nightscout.core.ui.R.string.prime_fill) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short)
         if (insulinAfterConstraints - command.insulin != 0.0) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.constraint_applied)
         rxBus.send(
@@ -750,8 +750,8 @@ class DataHandlerMobile @Inject constructor(
                     bolusPercentage = sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100),
                     maxCarbs = sp.getInt(info.nightscout.core.utils.R.string.key_treatmentssafety_maxcarbs, 48),
                     maxBolus = sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0),
-                    insulinButtonIncrement1 = sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_1, Constants.INSULIN_PLUS1_DEFAULT),
-                    insulinButtonIncrement2 = sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_2, Constants.INSULIN_PLUS2_DEFAULT),
+                    insulinButtonIncrement1 = sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_1, Constants.INSULIN_PLUS1_DEFAULT),
+                    insulinButtonIncrement2 = sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_2, Constants.INSULIN_PLUS2_DEFAULT),
                     carbsButtonIncrement1 = sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_1, Constants.CARBS_FAV1_DEFAULT),
                     carbsButtonIncrement2 = sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_2, Constants.CARBS_FAV2_DEFAULT)
                 )
@@ -884,7 +884,7 @@ class DataHandlerMobile @Inject constructor(
                     predictions.add(
                         EventData.SingleBg(
                             timeStamp = bg.data.timestamp,
-                            glucoseUnits = Constants.MGDL,
+                            glucoseUnits = GlucoseUnit.MGDL.asText,
                             sgv = bg.data.value,
                             high = 0.0,
                             low = 0.0,
@@ -1038,7 +1038,7 @@ class DataHandlerMobile @Inject constructor(
         get() {
             var ret = ""
             // decide if enabled/disabled closed/open; what Plugin as APS?
-            if ((loop as PluginBase).isEnabled()) {
+            if (loop.isEnabled()) {
                 ret += if (constraintChecker.isClosedLoopAllowed().value()) {
                     rh.gs(R.string.loop_status_closed) + "\n"
                 } else {
@@ -1137,7 +1137,7 @@ class DataHandlerMobile @Inject constructor(
     private fun generateStatusString(profile: Profile?): String {
         var status = ""
         profile ?: return rh.gs(info.nightscout.core.ui.R.string.noprofile)
-        if (!(loop as PluginBase).isEnabled()) status += rh.gs(R.string.disabled_loop) + "\n"
+        if (!loop.isEnabled()) status += rh.gs(R.string.disabled_loop) + "\n"
         return status
     }
 
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
index 5ac3495db4..b868b87f72 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt
@@ -77,8 +77,8 @@ class DataLayerListenerServiceMobile : WearableListenerService() {
 
     private val disposable = CompositeDisposable()
 
-    private val rxPath get() = getString(info.nightscout.shared.R.string.path_rx_bridge)
-    private val rxDataPath get() = getString(info.nightscout.shared.R.string.path_rx_data_bridge)
+    private val rxPath get() = getString(info.nightscout.interfaces.R.string.path_rx_bridge)
+    private val rxDataPath get() = getString(info.nightscout.interfaces.R.string.path_rx_data_bridge)
     @ExperimentalSerializationApi
     override fun onCreate() {
         AndroidInjection.inject(this)
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
index 1d2b6d4728..9c7f1862e0 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
@@ -131,7 +131,7 @@ class ProfileFragment : DaggerFragment() {
         val pumpDescription = activePlugin.activePump.pumpDescription
         if (profilePlugin.numOfProfiles == 0) profilePlugin.addNewProfile()
         val currentProfile = profilePlugin.currentProfile() ?: return
-        val units = if (currentProfile.mgdl) Constants.MGDL else Constants.MMOL
+        val units = if (currentProfile.mgdl) GlucoseUnit.MGDL.asText else GlucoseUnit.MMOL.asText
 
         binding.name.removeTextChangedListener(textWatch)
         binding.name.setText(currentProfile.name)
@@ -173,7 +173,7 @@ class ProfileFragment : DaggerFragment() {
                 DecimalFormat("0.00"),
                 save
             )
-        if (units == Constants.MGDL) {
+        if (units == GlucoseUnit.MGDL.asText) {
             val isfRange = doubleArrayOf(HardLimits.MIN_ISF, HardLimits.MAX_ISF)
             TimeListEdit(
                 requireContext(),
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
index df21a75f78..4b2e7e8b3f 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
@@ -163,7 +163,7 @@ class ProfilePlugin @Inject constructor(
             profile.put("basal", basal)
             profile.put("target_low", targetLow)
             profile.put("target_high", targetHigh)
-            profile.put("units", if (mgdl) Constants.MGDL else Constants.MMOL)
+            profile.put("units", if (mgdl) GlucoseUnit.MGDL.asText else GlucoseUnit.MMOL.asText)
             profile.put("timezone", TimeZone.getDefault().id)
         }
         val defaultUnits = JsonHelper.safeGetStringAllowNull(profile, "units", null)
@@ -400,7 +400,7 @@ class ProfilePlugin @Inject constructor(
                     profile.put("basal", basal)
                     profile.put("target_low", targetLow)
                     profile.put("target_high", targetHigh)
-                    profile.put("units", if (mgdl) Constants.MGDL else Constants.MMOL)
+                    profile.put("units", if (mgdl) GlucoseUnit.MGDL.asText else GlucoseUnit.MMOL.asText)
                     profile.put("timezone", TimeZone.getDefault().id)
                     store.put(name, profile)
                 }
diff --git a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index a591e04dc8..825555b7c8 100644
--- a/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -4,6 +4,7 @@ import android.telephony.SmsManager
 import com.google.common.truth.Truth.assertThat
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
@@ -16,8 +17,7 @@ import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.XDripBroadcast
 import info.nightscout.interfaces.aps.AutosensDataStore
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.CobInfo
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.iob.IobTotal
@@ -48,7 +48,7 @@ import org.mockito.invocation.InvocationOnMock
 @Suppress("SpellCheckingInspection")
 class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var loop: Loop
     @Mock lateinit var profileSource: ProfileSource
@@ -62,6 +62,9 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
     private var injector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
             if (it is PumpEnactResult) {
                 it.context = context
             }
@@ -836,7 +839,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("BASAL 20% 20")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("TBR duration must be a multiple of 30 minutes and greater than 0.")
-        `when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(Constraint(20))
+        `when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(ConstraintObject(20, injector))
 
         //BASAL 20% 30
         smsCommunicatorPlugin.messages = ArrayList()
@@ -862,7 +865,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("BASAL 1 0")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("TBR duration must be a multiple of 30 minutes and greater than 0.")
-        `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(Constraint(1.0))
+        `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(ConstraintObject(1.0, injector))
 
         //BASAL 1 20
         smsCommunicatorPlugin.messages = ArrayList()
@@ -870,7 +873,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("BASAL 1 20")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("TBR duration must be a multiple of 30 minutes and greater than 0.")
-        `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(Constraint(1.0))
+        `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(ConstraintObject(1.0, injector))
 
         //BASAL 1 30
         smsCommunicatorPlugin.messages = ArrayList()
@@ -918,7 +921,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("EXTENDED a%")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("Wrong format")
-        `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(Constraint(1.0))
+        `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(ConstraintObject(1.0, injector))
 
         //EXTENDED 1 0
         smsCommunicatorPlugin.messages = ArrayList()
@@ -955,7 +958,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("BOLUS")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("Wrong format")
-        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(1.0))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(1.0, injector))
         `when`(dateUtilMocked.now()).thenReturn(1000L)
         `when`(sp.getLong(R.string.key_smscommunicator_remote_bolus_min_distance, T.msecs(Constants.remoteBolusMinDistance).mins())).thenReturn(15L)
         //BOLUS 1
@@ -964,7 +967,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("BOLUS 1")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("Remote bolus not available. Try again later.")
-        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
         `when`(dateUtilMocked.now()).thenReturn(Constants.remoteBolusMinDistance + 1002L)
 
         //BOLUS 0
@@ -980,8 +983,8 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("BOLUS a")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("Wrong format")
-        `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(Constraint(1.0))
-        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(1.0))
+        `when`(constraintChecker.applyExtendedBolusConstraints(anyObject())).thenReturn(ConstraintObject(1.0, injector))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(1.0, injector))
 
         //BOLUS 1
         smsCommunicatorPlugin.messages = ArrayList()
@@ -1078,7 +1081,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("CARBS")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("Wrong format")
-        `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(Constraint(0))
+        `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(ConstraintObject(0, injector))
 
         //CARBS 0
         smsCommunicatorPlugin.messages = ArrayList()
@@ -1086,7 +1089,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         assertThat(smsCommunicatorPlugin.messages[0].text).isEqualTo("CARBS 0")
         assertThat(smsCommunicatorPlugin.messages[1].text).isEqualTo("Wrong format")
-        `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(Constraint(1))
+        `when`(constraintChecker.applyCarbsConstraints(anyObject())).thenReturn(ConstraintObject(1, injector))
 
         //CARBS 1
         smsCommunicatorPlugin.messages = ArrayList()
diff --git a/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt b/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt
index 56f3215545..e342e4eeb9 100644
--- a/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt
+++ b/plugins/main/src/test/java/info/nightscout/plugins/iob/AutosensDataStoreTest.kt
@@ -12,6 +12,7 @@ import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataStoreObject
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
+import info.nightscout.shared.utils.DateUtilImpl
 import info.nightscout.shared.utils.T
 import info.nightscout.sharedtests.TestBase
 import org.junit.jupiter.api.Assertions
@@ -46,7 +47,7 @@ class AutosensDataStoreTest : TestBase() {
 
     @BeforeEach
     fun mock() {
-        dateUtil = DateUtil(context)
+        dateUtil = DateUtilImpl(context)
     }
 
     @Test
diff --git a/plugins/sensitivity/build.gradle b/plugins/sensitivity/build.gradle
index 48544e8cd5..451ec3783e 100644
--- a/plugins/sensitivity/build.gradle
+++ b/plugins/sensitivity/build.gradle
@@ -16,7 +16,6 @@ android {
 
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:interfaces')
diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt
index f98681d3b8..d77c1de943 100644
--- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt
+++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt
@@ -12,7 +12,7 @@ import info.nightscout.interfaces.aps.AutosensResult
 import info.nightscout.interfaces.aps.SMBDefaults
 import info.nightscout.interfaces.aps.Sensitivity.SensitivityType
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.ProfileFunction
@@ -51,7 +51,7 @@ class SensitivityOref1Plugin @Inject constructor(
         .description(R.string.description_sensitivity_oref1)
         .setDefault(),
     injector, aapsLogger, rh, sp
-), Constraints {
+), PluginConstraints {
 
     override fun detectSensitivity(ads: AutosensDataStore, fromTime: Long, toTime: Long): AutosensResult {
         val profile = profileFunction.getProfile()
@@ -260,7 +260,7 @@ class SensitivityOref1Plugin @Inject constructor(
         get() = SensitivityType.SENSITIVITY_OREF1
 
     override fun isUAMEnabled(value: Constraint<Boolean>): Constraint<Boolean> {
-        if (!isEnabled()) value.set(aapsLogger, false, rh.gs(R.string.uam_disabled_oref1_not_selected), this)
+        if (!isEnabled()) value.set(false, rh.gs(R.string.uam_disabled_oref1_not_selected), this)
         return value
     }
 }
\ No newline at end of file
diff --git a/plugins/smoothing/build.gradle b/plugins/smoothing/build.gradle
index 8a10643212..aab84d1216 100644
--- a/plugins/smoothing/build.gradle
+++ b/plugins/smoothing/build.gradle
@@ -17,7 +17,6 @@ android {
 
 dependencies {
     implementation project(':database:entities')
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:interfaces')
     implementation project(':core:ui')
 }
\ No newline at end of file
diff --git a/plugins/source/build.gradle b/plugins/source/build.gradle
index 9a3c60f00b..962f225c5d 100644
--- a/plugins/source/build.gradle
+++ b/plugins/source/build.gradle
@@ -16,7 +16,7 @@ android {
 
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
+    implementation project(':app-wear-shared:shared-impl')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:interfaces')
diff --git a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
index ce62786154..24fe14f324 100644
--- a/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/PoctechPlugin.kt
@@ -11,6 +11,7 @@ import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CgmSourceTransaction
 import info.nightscout.database.transactions.TransactionGlucoseValue
 import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
@@ -63,7 +64,7 @@ class PoctechPlugin @Inject constructor(
                     val json = jsonArray.getJSONObject(i)
                     glucoseValues += TransactionGlucoseValue(
                         timestamp = json.getLong("date"),
-                        value = if (safeGetString(json, "units", Constants.MGDL) == "mmol/L") json.getDouble("current") * Constants.MMOLL_TO_MGDL
+                        value = if (safeGetString(json, "units", GlucoseUnit.MGDL.asText) == "mmol/L") json.getDouble("current") * Constants.MMOLL_TO_MGDL
                         else json.getDouble("current"),
                         raw = json.getDouble("raw"),
                         noise = null,
diff --git a/plugins/sync/build.gradle b/plugins/sync/build.gradle
index 2551c23cb3..e097e626a7 100644
--- a/plugins/sync/build.gradle
+++ b/plugins/sync/build.gradle
@@ -15,7 +15,7 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
+    implementation project(':app-wear-shared:shared-impl')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:main')
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt
index f7fa42799c..80ce4c938c 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDbImpl.kt
@@ -56,6 +56,7 @@ import info.nightscout.database.impl.transactions.UpdateNsIdTherapyEventTransact
 import info.nightscout.database.transactions.TransactionGlucoseValue
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.nsclient.StoreDataForDb
@@ -314,8 +315,8 @@ class StoreDataForDbImpl @Inject constructor(
                                 note = "",
                                 values = listOf(
                                     ValueWithUnit.TherapyEventTTReason(tt.reason),
-                                    ValueWithUnit.fromGlucoseUnit(tt.lowTarget, Constants.MGDL),
-                                    ValueWithUnit.fromGlucoseUnit(tt.highTarget, Constants.MGDL).takeIf { tt.lowTarget != tt.highTarget },
+                                    ValueWithUnit.fromGlucoseUnit(tt.lowTarget, GlucoseUnit.MGDL.asText),
+                                    ValueWithUnit.fromGlucoseUnit(tt.highTarget, GlucoseUnit.MGDL.asText).takeIf { tt.lowTarget != tt.highTarget },
                                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(tt.duration).toInt())
                                 )
                             )
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt
index 1fd84ce0b2..564b11cd97 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TemporaryTargetExtension.kt
@@ -10,7 +10,7 @@ import info.nightscout.shared.utils.T
 import org.json.JSONObject
 
 fun TemporaryTarget.Companion.fromJson(jsonObject: JSONObject, profileUtil: ProfileUtil): TemporaryTarget? {
-    val units = GlucoseUnit.fromText(JsonHelper.safeGetString(jsonObject, "units", Constants.MGDL))
+    val units = GlucoseUnit.fromText(JsonHelper.safeGetString(jsonObject, "units", GlucoseUnit.MGDL.asText))
     val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
     val duration = JsonHelper.safeGetLongAllowNull(jsonObject, "duration", null) ?: return null
     val durationInMilliseconds = JsonHelper.safeGetLongAllowNull(jsonObject, "durationInMilliseconds")
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt
index 685b50b371..dbc63b6121 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/extensions/TherapyEventExtension.kt
@@ -22,7 +22,7 @@ fun therapyEventFromNsMbg(mbg: NSMbg) =
     )
 
 fun TherapyEvent.Companion.fromJson(jsonObject: JSONObject): TherapyEvent? {
-    val glucoseUnit = if (JsonHelper.safeGetString(jsonObject, "units", Constants.MGDL) == Constants.MGDL) TherapyEvent.GlucoseUnit.MGDL else TherapyEvent.GlucoseUnit.MMOL
+    val glucoseUnit = if (JsonHelper.safeGetString(jsonObject, "units", GlucoseUnit.MGDL.asText) == GlucoseUnit.MGDL.asText) TherapyEvent.GlucoseUnit.MGDL else TherapyEvent.GlucoseUnit.MMOL
     val timestamp = JsonHelper.safeGetLongAllowNull(jsonObject, "mills", null) ?: return null
     val type = TherapyEvent.Type.fromString(JsonHelper.safeGetString(jsonObject, "eventType", TherapyEvent.Type.NONE.text))
     val duration = JsonHelper.safeGetLong(jsonObject, "duration")
@@ -57,7 +57,7 @@ fun TherapyEvent.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
         .put("isValid", isValid)
         .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", enteredBy)
-        .put("units", if (glucoseUnit == TherapyEvent.GlucoseUnit.MGDL) Constants.MGDL else Constants.MMOL)
+        .put("units", if (glucoseUnit == TherapyEvent.GlucoseUnit.MGDL) GlucoseUnit.MGDL.asText else GlucoseUnit.MMOL.asText)
         .also {
             if (duration != 0L) it.put("duration", T.msecs(duration).mins())
             if (duration != 0L) it.put("durationInMilliseconds", duration)
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
index 83b32ad668..bf0b62f41c 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
@@ -158,12 +158,12 @@ class NSClientV3Plugin @Inject constructor(
             when {
                 sp.getBoolean(R.string.key_ns_paused, false)                                           -> rh.gs(info.nightscout.core.ui.R.string.paused)
                 isAllowed.not()                                                                        -> blockingReason
-                sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected  -> "WS: " + rh.gs(info.nightscout.shared.R.string.connected)
+                sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected  -> "WS: " + rh.gs(info.nightscout.interfaces.R.string.connected)
                 sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && !wsConnected -> "WS: " + rh.gs(R.string.not_connected)
                 lastOperationError != null                                                             -> rh.gs(info.nightscout.core.ui.R.string.error)
                 nsAndroidClient?.lastStatus == null                                                    -> rh.gs(R.string.not_connected)
                 workIsRunning()                                                                        -> rh.gs(R.string.working)
-                nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true                          -> rh.gs(info.nightscout.shared.R.string.connected)
+                nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true                          -> rh.gs(info.nightscout.interfaces.R.string.connected)
                 nsAndroidClient?.lastStatus?.apiPermissions?.isRead() == true                          -> rh.gs(R.string.read_only)
                 else                                                                                   -> rh.gs(info.nightscout.core.ui.R.string.unknown)
             }
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt
index 3903925b52..ea9149f0c7 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt
@@ -3,7 +3,6 @@ package info.nightscout.plugins.sync.nsclient
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.plugins.sync.R
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventChargingState
 import info.nightscout.rx.events.EventNetworkChange
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -20,7 +19,6 @@ class ReceiverDelegateTest : TestBase() {
     @Mock lateinit var sp: SP
     @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var fabricPrivacy: FabricPrivacy
-    private val rxBus = RxBus(aapsSchedulers, aapsLogger)
 
     @Mock private lateinit var receiverStatusStore: ReceiverStatusStore
     private lateinit var sut: ReceiverDelegate
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
index 18eab903ec..4173e6e8e6 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
@@ -10,7 +10,6 @@ import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.sync.NsClient
 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.sharedtests.TestBase
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -30,7 +29,6 @@ internal class DataSyncWorkerTest : TestBase() {
     @Mock lateinit var dataSyncSelectorV3: DataSyncSelectorV3
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var nsClient: NsClient
-    @Mock lateinit var rxBus: RxBus
     @Mock lateinit var nsClientV3Plugin: NSClientV3Plugin
     @Mock lateinit var context: ContextWithInjector
 
diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
index 917dd76573..6e88ae34d7 100644
--- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
+++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
@@ -26,7 +26,6 @@ import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler
 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3
 import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
 import info.nightscout.plugins.sync.nsclientV3.extensions.toNSSvgV3
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.sdk.interfaces.NSAndroidClient
 import info.nightscout.sdk.remotemodel.LastModified
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -66,7 +65,6 @@ internal class LoadBgWorkerTest : TestBase() {
     @Mock lateinit var nsIncomingDataProcessor: NsIncomingDataProcessor
     @Mock lateinit var context: ContextWithInjector
 
-    private val rxBus: RxBus = RxBus(aapsSchedulers, aapsLogger)
     private lateinit var nsClientV3Plugin: NSClientV3Plugin
     private lateinit var receiverDelegate: ReceiverDelegate
     private lateinit var dataWorkerStorage: DataWorkerStorage
diff --git a/pump/combo/build.gradle b/pump/combo/build.gradle
index ff6202ea71..ea42b5a33f 100644
--- a/pump/combo/build.gradle
+++ b/pump/combo/build.gradle
@@ -21,9 +21,9 @@ android {
 dependencies {
     implementation project(':core:libraries')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:shared')
 
     testImplementation project(':app-wear-shared:shared-tests')
 
diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt
index 5273087c94..012713ed01 100644
--- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt
+++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt
@@ -19,7 +19,6 @@ import info.nightscout.pump.combo.ruffyscripter.PumpState
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventQueueChanged
-import info.nightscout.shared.extensions.runOnUiThread
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.utils.DateUtil
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -62,7 +61,7 @@ class ComboFragment : DaggerFragment() {
             binding.comboRefreshButton.isEnabled = false
             commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.user_request), object : Callback() {
                 override fun run() {
-                    runOnUiThread { binding.comboRefreshButton.isEnabled = true }
+                    activity?.runOnUiThread { binding.comboRefreshButton.isEnabled = true }
                 }
             })
         }
@@ -153,14 +152,17 @@ class ComboFragment : DaggerFragment() {
                     binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor))
                     binding.comboInsulinstate.setTypeface(null, Typeface.NORMAL)
                 }
+
                 PumpState.LOW     -> {
                     binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.omniYellowColor))
                     binding.comboInsulinstate.setTypeface(null, Typeface.BOLD)
                 }
+
                 PumpState.EMPTY   -> {
                     binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor))
                     binding.comboInsulinstate.setTypeface(null, Typeface.BOLD)
                 }
+
                 else              -> {
                     binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor))
                     binding.comboInsulinstate.setTypeface(null, Typeface.NORMAL)
@@ -175,10 +177,12 @@ class ComboFragment : DaggerFragment() {
                     binding.comboLastconnection.setText(R.string.combo_pump_connected_now)
                     binding.comboLastconnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor))
                 }
+
                 comboPlugin.pump.lastSuccessfulCmdTime + 30 * 60 * 1000 < System.currentTimeMillis() -> {
                     binding.comboLastconnection.text = rh.gs(R.string.combo_no_pump_connection, min)
                     binding.comboLastconnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor))
                 }
+
                 else                                                                                 -> {
                     binding.comboLastconnection.text = minAgo
                     binding.comboLastconnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor))
diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java
index e880a9684b..60076f31cd 100644
--- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java
+++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java
@@ -22,7 +22,7 @@ import javax.inject.Singleton;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.core.utils.fabric.InstanceId;
 import info.nightscout.interfaces.constraints.Constraint;
-import info.nightscout.interfaces.constraints.Constraints;
+import info.nightscout.interfaces.constraints.PluginConstraints;
 import info.nightscout.interfaces.notifications.Notification;
 import info.nightscout.interfaces.plugin.PluginDescription;
 import info.nightscout.interfaces.plugin.PluginType;
@@ -86,23 +86,41 @@ import info.nightscout.shared.utils.T;
  * Created by mike on 05.08.2016.
  */
 @Singleton
-public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
+public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstraints {
+    private final static PumpDescription pumpDescription = new PumpDescription();
+    @NonNull
+    private static final ComboPump pump = new ComboPump();
     // collaborators
     private final ProfileFunction profileFunction;
     private final SP sp;
-    private RxBus rxBus;
     private final CommandQueue commandQueue;
     private final PumpSync pumpSync;
     private final DateUtil dateUtil;
     private final RuffyCommands ruffyScripter;
     private final UiInteraction uiInteraction;
-
-    private final static PumpDescription pumpDescription = new PumpDescription();
-
-
-    @NonNull
-    private static final ComboPump pump = new ComboPump();
-
+    private RxBus rxBus;
+    private final BolusProgressReporter bolusProgressReporter = (state, percent, delivered) -> {
+        EventOverviewBolusProgress event = EventOverviewBolusProgress.INSTANCE;
+        switch (state) {
+            case PROGRAMMING:
+                event.setStatus(getRh().gs(R.string.combo_programming_bolus));
+                break;
+            case DELIVERING:
+                event.setStatus(getRh().gs(info.nightscout.core.ui.R.string.bolus_delivering, delivered));
+                break;
+            case DELIVERED:
+                event.setStatus(getRh().gs(info.nightscout.core.ui.R.string.bolus_delivered_successfully, delivered));
+                break;
+            case STOPPING:
+                event.setStatus(getRh().gs(R.string.bolusstopping));
+                break;
+            case STOPPED:
+                event.setStatus(getRh().gs(R.string.bolusstopped));
+                break;
+        }
+        event.setPercent(percent);
+        rxBus.send(event);
+    };
     /**
      * This is used to determine when to pass a bolus cancel request to the scripter
      */
@@ -112,7 +130,6 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
      * will reset this flag.
      */
     private volatile boolean cancelBolus;
-
     /**
      * This is set (in {@link #checkHistory()} whenever a connection to the pump is made and
      * indicates if new history records on the pump have been found. This effectively blocks
@@ -128,7 +145,6 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
      * direction - so that adding more complexity yields little benefit.
      */
     private volatile boolean pumpHistoryChanged = false;
-
     /**
      * Cache of the last <=2 boluses on the pump. Used to detect changes in pump history,
      * requiring reading more pump history. This is read/set in {@link #checkHistory()} when changed
@@ -136,8 +152,11 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
      * after bolus delivery. Newest record is the first one.
      */
     private volatile List<Bolus> recentBoluses = new ArrayList<>(0);
-
     private PumpEnactResult OPERATION_NOT_SUPPORTED;
+    // Constraints interface
+    private long lowSuspendOnlyLoopEnforcedUntil = 0;
+    private long violationWarningRaisedForBolusAt = 0;
+    private boolean validBasalRateProfileSelectedOnPump = true;
 
     @Inject
     public ComboPlugin(
@@ -469,29 +488,6 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
         }
     }
 
-    private final BolusProgressReporter bolusProgressReporter = (state, percent, delivered) -> {
-        EventOverviewBolusProgress event = EventOverviewBolusProgress.INSTANCE;
-        switch (state) {
-            case PROGRAMMING:
-                event.setStatus(getRh().gs(R.string.combo_programming_bolus));
-                break;
-            case DELIVERING:
-                event.setStatus(getRh().gs(info.nightscout.core.ui.R.string.bolus_delivering, delivered));
-                break;
-            case DELIVERED:
-                event.setStatus(getRh().gs(info.nightscout.core.ui.R.string.bolus_delivered_successfully, delivered));
-                break;
-            case STOPPING:
-                event.setStatus(getRh().gs(R.string.bolusstopping));
-                break;
-            case STOPPED:
-                event.setStatus(getRh().gs(R.string.bolusstopped));
-                break;
-        }
-        event.setPercent(percent);
-        rxBus.send(event);
-    };
-
     /**
      * Updates Treatment records with carbs and boluses and delivers a bolus if needed
      */
@@ -850,10 +846,6 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
         return 0;
     }
 
-    private interface CommandExecution {
-        CommandResult execute();
-    }
-
     /**
      * Runs a command, sets an activity if provided, retries if requested and updates fields
      * concerned with last connection.
@@ -980,7 +972,6 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
         return null;
     }
 
-
     private void checkBasalRate(PumpState state) {
         if (!pump.initialized) {
             // no cached profile to compare against
@@ -1386,22 +1377,17 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
         return result;
     }
 
-    // Constraints interface
-    private long lowSuspendOnlyLoopEnforcedUntil = 0;
-    private long violationWarningRaisedForBolusAt = 0;
-    private boolean validBasalRateProfileSelectedOnPump = true;
-
     @NonNull @Override
     public Constraint<Boolean> isLoopInvocationAllowed(@NonNull Constraint<Boolean> value) {
         if (!validBasalRateProfileSelectedOnPump)
-            value.set(getAapsLogger(), false, getRh().gs(info.nightscout.core.ui.R.string.no_valid_basal_rate), this);
+            value.set(false, getRh().gs(info.nightscout.core.ui.R.string.no_valid_basal_rate), this);
         return value;
     }
 
     @NonNull @Override
     public Constraint<Double> applyMaxIOBConstraints(@NonNull Constraint<Double> maxIob) {
         if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis())
-            maxIob.setIfSmaller(getAapsLogger(), 0d, getRh().gs(info.nightscout.core.ui.R.string.limiting_iob, 0d, getRh().gs(R.string.unsafeusage)), this);
+            maxIob.setIfSmaller(0d, getRh().gs(info.nightscout.core.ui.R.string.limiting_iob, 0d, getRh().gs(R.string.unsafeusage)), this);
         return maxIob;
     }
 
@@ -1409,4 +1395,8 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
     public boolean canHandleDST() {
         return false;
     }
+
+    private interface CommandExecution {
+        CommandResult execute();
+    }
 }
diff --git a/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt b/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt
index 1d238e0cb4..dee5d1eb5b 100644
--- a/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt
+++ b/pump/combo/src/test/java/info/nightscout/pump/combo/ComboPluginTest.kt
@@ -3,7 +3,7 @@ package info.nightscout.pump.combo
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.pump.PumpEnactResult
@@ -12,7 +12,6 @@ import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.pump.combo.ruffyscripter.RuffyScripter
 import info.nightscout.pump.combo.ruffyscripter.history.Bolus
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
@@ -37,6 +36,9 @@ class ComboPluginTest : TestBase() {
 
     private val injector = HasAndroidInjector {
         AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
             if (it is PumpEnactResult) {
                 it.context = context
             }
@@ -49,16 +51,15 @@ class ComboPluginTest : TestBase() {
     fun prepareMocks() {
         `when`(rh.gs(info.nightscout.core.ui.R.string.no_valid_basal_rate)).thenReturn("No valid basal rate read from pump")
         `when`(context.getString(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump")
-        comboPlugin = ComboPlugin(injector, aapsLogger, RxBus(aapsSchedulers, aapsLogger), rh, profileFunction, sp, commandQueue, pumpSync, dateUtil, ruffyScripter, uiInteraction)
+        comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, rh, profileFunction, sp, commandQueue, pumpSync, dateUtil, ruffyScripter, uiInteraction)
     }
 
     @Test
     fun invalidBasalRateOnComboPumpShouldLimitLoopInvocation() {
         comboPlugin.setPluginEnabled(PluginType.PUMP, true)
         comboPlugin.setValidBasalRateProfileSelectedOnPump(false)
-        var c = Constraint(true)
-        c = comboPlugin.isLoopInvocationAllowed(c)
-        Assertions.assertEquals("Combo: No valid basal rate read from pump", c.getReasons(aapsLogger))
+        val c = comboPlugin.isLoopInvocationAllowed(ConstraintObject(true, injector))
+        Assertions.assertEquals("Combo: No valid basal rate read from pump", c.getReasons())
         Assertions.assertEquals(false, c.value())
         comboPlugin.setPluginEnabled(PluginType.PUMP, false)
     }
diff --git a/pump/combov2/build.gradle b/pump/combov2/build.gradle
index 852ed510ac..902108af6a 100644
--- a/pump/combov2/build.gradle
+++ b/pump/combov2/build.gradle
@@ -13,12 +13,14 @@ apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
 dependencies {
     implementation project(':core:libraries')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:shared')
     implementation(project(":pump:combov2:comboctl"))
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version")
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version")
+
+    api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    api "org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version"
+
     // This is necessary to avoid errors like these which otherwise come up often at runtime:
     // "WARNING: Failed to transform class kotlinx/datetime/TimeZone$Companion
     // java.lang.NoClassDefFoundError: kotlinx/serialization/KSerializer"
diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
index 8439dd4295..4ae87a043c 100644
--- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
+++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt
@@ -240,7 +240,7 @@ class ComboV2Fragment : DaggerFragment() {
             }
 
             in 60..(30 * 60) -> {
-                binding.combov2LastConnection.text = rh.gs(info.nightscout.shared.R.string.minago, secondsPassed / 60)
+                binding.combov2LastConnection.text = rh.gs(info.nightscout.interfaces.R.string.minago, secondsPassed / 60)
                 binding.combov2LastConnection.setTextColor(Color.WHITE)
             }
 
@@ -267,7 +267,7 @@ class ComboV2Fragment : DaggerFragment() {
                 rh.gs(R.string.combov2_less_than_one_minute_ago)
 
             else ->
-                rh.gs(info.nightscout.shared.R.string.minago, secondsPassed / 60)
+                rh.gs(info.nightscout.interfaces.R.string.minago, secondsPassed / 60)
         }
 
         binding.combov2LastBolus.text =
diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
index 4cfac85c8e..b4029a24fd 100644
--- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
+++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
@@ -25,12 +25,14 @@ import info.nightscout.comboctl.parser.AlertScreenContent
 import info.nightscout.comboctl.parser.AlertScreenException
 import info.nightscout.comboctl.parser.BatteryState
 import info.nightscout.comboctl.parser.ReservoirState
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
@@ -101,14 +103,14 @@ import info.nightscout.comboctl.main.PumpManager as ComboCtlPumpManager
 internal const val PUMP_ERROR_TIMEOUT_INTERVAL_MSECS = 1000L * 60 * 5
 
 @Singleton
-class ComboV2Plugin @Inject constructor (
+class ComboV2Plugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     rh: ResourceHelper,
     commandQueue: CommandQueue,
     private val context: Context,
     private val rxBus: RxBus,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val sp: SP,
     private val pumpSync: PumpSync,
     private val dateUtil: DateUtil,
@@ -132,7 +134,7 @@ class ComboV2Plugin @Inject constructor (
         commandQueue
     ),
     Pump,
-    Constraints {
+    PluginConstraints {
 
     // Coroutine scope and the associated job. All coroutines
     // that are started in this plugin are part of this scope.
@@ -208,6 +210,7 @@ class ComboV2Plugin @Inject constructor (
     // overwritten. This check is performed in checkBasalProfile().
     // In setNewBasalProfile(), this value is changed.
     private var activeBasalProfile: BasalProfile? = null
+
     // This is used for checking that the correct basal profile is
     // active in the Combo. If not, loop invocation is disallowed.
     // This is _not_ reset by disconnect(). That's on purpose; it
@@ -220,22 +223,28 @@ class ComboV2Plugin @Inject constructor (
     /*** Public functions and base class & interface overrides ***/
 
     sealed class DriverState(@Suppress("unused") val label: String) {
+
         // Initial state when the driver is created.
-        object NotInitialized : DriverState("notInitialized")
+        data object NotInitialized : DriverState("notInitialized")
+
         // Driver is disconnected from the pump, or no pump
         // is currently paired. In onStart() the driver state
         // changes from NotInitialized to this.
-        object Disconnected : DriverState("disconnected")
+        data object Disconnected : DriverState("disconnected")
+
         // Driver is currently connecting to the pump. isBusy()
         // will return true in this state.
-        object Connecting : DriverState("connecting")
+        data object Connecting : DriverState("connecting")
+
         // Driver is running checks on the pump, like verifying
         // that the basal rate is OK, checking for any bolus
         // and TBR activity that AAPS doesn't know about etc.
         // isBusy() will return true in this state.
-        object CheckingPump : DriverState("checkingPump")
+        data object CheckingPump : DriverState("checkingPump")
+
         // Driver is connected and ready to execute commands.
-        object Ready : DriverState("ready")
+        data object Ready : DriverState("ready")
+
         // Driver is connected, but pump is suspended and
         // cannot currently execute commands. This state is
         // special in that it technically persists even after
@@ -252,11 +261,12 @@ class ComboV2Plugin @Inject constructor (
         // the pump is currently suspended or not. Use
         // isSuspended() instead. See the pumpIsSuspended
         // documentation for details.
-        object Suspended : DriverState("suspended")
+        data object Suspended : DriverState("suspended")
+
         // Driver is currently executing a command.
         // isBusy() will return true in this state.
         class ExecutingCommand(val description: ComboCtlPump.CommandDescription) : DriverState("executingCommand")
-        object Error : DriverState("error")
+        data object Error : DriverState("error")
     }
 
     private val driverStateFlow = _driverStateFlow.asStateFlow()
@@ -264,7 +274,9 @@ class ComboV2Plugin @Inject constructor (
     // Used by ComboV2PairingActivity to launch its own
     // custom activities that have a result.
     var customDiscoveryActivityStartCallback: ((intent: Intent) -> Unit)?
-        set(value) { bluetoothInterface?.customDiscoveryActivityStartCallback = value }
+        set(value) {
+            bluetoothInterface?.customDiscoveryActivityStartCallback = value
+        }
         get() = bluetoothInterface?.customDiscoveryActivityStartCallback
 
     init {
@@ -494,6 +506,7 @@ class ComboV2Plugin @Inject constructor (
             // returning true then causes problems with AAPS' KeepAlive mechanism.
             DriverState.CheckingPump,
             is DriverState.ExecutingCommand -> true
+
             else                            -> false
         }
 
@@ -509,6 +522,7 @@ class ComboV2Plugin @Inject constructor (
             DriverState.Ready,
             DriverState.Suspended,
             is DriverState.ExecutingCommand -> true
+
             else                            -> false
         }
 
@@ -516,7 +530,8 @@ class ComboV2Plugin @Inject constructor (
         when (driverStateFlow.value) {
             DriverState.Connecting,
             DriverState.CheckingPump -> true
-            else -> false
+
+            else                     -> false
         }
 
     // There is no corresponding indicator for this
@@ -554,7 +569,8 @@ class ComboV2Plugin @Inject constructor (
                 )
                 return
             }
-            else -> Unit
+
+            else              -> Unit
         }
 
         if (!isPaired()) {
@@ -575,6 +591,7 @@ class ComboV2Plugin @Inject constructor (
                 unpairDueToPumpDataError()
                 return
             }
+
             else -> address
         }
 
@@ -608,13 +625,13 @@ class ComboV2Plugin @Inject constructor (
                                 // the rxBus too early, potentially causing a situation where the connect()
                                 // call isn't fully done yet, but the queue gets that event and thinks that
                                 // it can try to reconnect now.
-                                ComboCtlPump.State.Disconnected -> return@onEach
-                                ComboCtlPump.State.Connecting -> DriverState.Connecting
-                                ComboCtlPump.State.CheckingPump -> DriverState.CheckingPump
-                                ComboCtlPump.State.ReadyForCommands -> DriverState.Ready
+                                ComboCtlPump.State.Disconnected        -> return@onEach
+                                ComboCtlPump.State.Connecting          -> DriverState.Connecting
+                                ComboCtlPump.State.CheckingPump        -> DriverState.CheckingPump
+                                ComboCtlPump.State.ReadyForCommands    -> DriverState.Ready
                                 is ComboCtlPump.State.ExecutingCommand -> DriverState.ExecutingCommand(pumpState.description)
-                                ComboCtlPump.State.Suspended -> DriverState.Suspended
-                                is ComboCtlPump.State.Error -> DriverState.Error
+                                ComboCtlPump.State.Suspended           -> DriverState.Suspended
+                                is ComboCtlPump.State.Error            -> DriverState.Error
                             }
                             setDriverState(driverState)
                         }
@@ -686,7 +703,8 @@ class ComboV2Plugin @Inject constructor (
                         pumpIsSuspended = when (it.stateFlow.value) {
                             ComboCtlPump.State.Suspended,
                             is ComboCtlPump.State.Error -> true
-                            else -> false
+
+                            else                        -> false
                         }
 
                         aapsLogger.debug(LTag.PUMP, "Pump is suspended: $pumpIsSuspended")
@@ -970,8 +988,8 @@ class ComboV2Plugin @Inject constructor (
 
         pumpStatus?.batteryState?.let { newState ->
             val newLevel = when (newState) {
-                BatteryState.NO_BATTERY -> 5
-                BatteryState.LOW_BATTERY -> 25
+                BatteryState.NO_BATTERY   -> 5
+                BatteryState.LOW_BATTERY  -> 25
                 BatteryState.FULL_BATTERY -> 100
             }
 
@@ -996,7 +1014,7 @@ class ComboV2Plugin @Inject constructor (
     override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
         val oldInsulinAmount = detailedBolusInfo.insulin
         detailedBolusInfo.insulin = constraintChecker
-            .applyBolusConstraints(Constraint(detailedBolusInfo.insulin))
+            .applyBolusConstraints(ConstraintObject(detailedBolusInfo.insulin, injector))
             .value()
         aapsLogger.debug(
             LTag.PUMP,
@@ -1015,8 +1033,8 @@ class ComboV2Plugin @Inject constructor (
 
         val requestedBolusAmount = detailedBolusInfo.insulin.iuToCctlBolus()
         val bolusReason = when (detailedBolusInfo.bolusType) {
-            DetailedBolusInfo.BolusType.NORMAL -> ComboCtlPump.StandardBolusReason.NORMAL
-            DetailedBolusInfo.BolusType.SMB -> ComboCtlPump.StandardBolusReason.SUPERBOLUS
+            DetailedBolusInfo.BolusType.NORMAL  -> ComboCtlPump.StandardBolusReason.NORMAL
+            DetailedBolusInfo.BolusType.SMB     -> ComboCtlPump.StandardBolusReason.SUPERBOLUS
             DetailedBolusInfo.BolusType.PRIMING -> ComboCtlPump.StandardBolusReason.PRIMING_INFUSION_SET
         }
 
@@ -1055,13 +1073,15 @@ class ComboV2Plugin @Inject constructor (
                             bolusingEvent.status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivering, detailedBolusInfo.insulin)
                             rxBus.send(bolusingEvent)
                         }
-                        BasicProgressStage.Finished -> {
+
+                        BasicProgressStage.Finished               -> {
                             val bolusingEvent = EventOverviewBolusProgress
                             bolusingEvent.percent = (progressReport.overallProgress * 100.0).toInt()
                             bolusingEvent.status = "Bolus finished, performing post-bolus checks"
                             rxBus.send(bolusingEvent)
                         }
-                        else -> Unit
+
+                        else                                      -> Unit
                     }
                 }
         }
@@ -1190,10 +1210,11 @@ class ComboV2Plugin @Inject constructor (
         aapsLogger.debug(LTag.PUMP, "Calculated percentage of $percentage% out of absolute rate $absoluteRate; rounded to: $roundedPercentage%; limited to: $limitedPercentage%")
 
         val cctlTbrType = when (tbrType) {
-            PumpSync.TemporaryBasalType.NORMAL -> ComboCtlTbr.Type.NORMAL
+            PumpSync.TemporaryBasalType.NORMAL                -> ComboCtlTbr.Type.NORMAL
             PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND -> ComboCtlTbr.Type.EMULATED_COMBO_STOP
-            PumpSync.TemporaryBasalType.SUPERBOLUS -> ComboCtlTbr.Type.SUPERBOLUS
-            PumpSync.TemporaryBasalType.PUMP_SUSPEND -> {
+            PumpSync.TemporaryBasalType.SUPERBOLUS            -> ComboCtlTbr.Type.SUPERBOLUS
+
+            PumpSync.TemporaryBasalType.PUMP_SUSPEND          -> {
                 aapsLogger.error(
                     LTag.PUMP,
                     "PUMP_SUSPEND TBR type produced by AAPS for the TBR initiation even though this is supposed to only be produced by pump drivers"
@@ -1221,10 +1242,11 @@ class ComboV2Plugin @Inject constructor (
         aapsLogger.debug(LTag.PUMP, "Got percentage of $percent%; rounded to: $roundedPercentage%; limited to: $limitedPercentage%")
 
         val cctlTbrType = when (tbrType) {
-            PumpSync.TemporaryBasalType.NORMAL -> ComboCtlTbr.Type.NORMAL
+            PumpSync.TemporaryBasalType.NORMAL                -> ComboCtlTbr.Type.NORMAL
             PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND -> ComboCtlTbr.Type.EMULATED_COMBO_STOP
-            PumpSync.TemporaryBasalType.SUPERBOLUS -> ComboCtlTbr.Type.SUPERBOLUS
-            PumpSync.TemporaryBasalType.PUMP_SUSPEND -> {
+            PumpSync.TemporaryBasalType.SUPERBOLUS            -> ComboCtlTbr.Type.SUPERBOLUS
+
+            PumpSync.TemporaryBasalType.PUMP_SUSPEND          -> {
                 aapsLogger.error(
                     LTag.PUMP,
                     "PUMP_SUSPEND TBR type produced by AAPS for the TBR initiation even though this is supposed to only be produced by pump drivers"
@@ -1277,10 +1299,13 @@ class ComboV2Plugin @Inject constructor (
                     val tbrComment = when (acquiredPump.setTbr(percentage, durationInMinutes, tbrType, force100Percent)) {
                         ComboCtlPump.SetTbrOutcome.SET_NORMAL_TBR                  ->
                             rh.gs(R.string.combov2_setting_tbr_succeeded)
+
                         ComboCtlPump.SetTbrOutcome.SET_EMULATED_100_TBR            ->
                             rh.gs(R.string.combov2_set_emulated_100_tbr)
+
                         ComboCtlPump.SetTbrOutcome.LETTING_EMULATED_100_TBR_FINISH ->
                             rh.gs(R.string.combov2_letting_emulated_100_tbr_finish)
+
                         ComboCtlPump.SetTbrOutcome.IGNORED_REDUNDANT_100_TBR       ->
                             rh.gs(R.string.combov2_ignoring_redundant_100_tbr)
                     }
@@ -1381,7 +1406,7 @@ class ComboV2Plugin @Inject constructor (
                 } ?: aapsLogger.info(
                     LTag.PUMP,
                     "Cannot include reservoir level in JSON status " +
-                    "since no such level is currently known"
+                        "since no such level is currently known"
                 )
                 put("extended", JSONObject().apply {
                     put("Version", version)
@@ -1401,15 +1426,17 @@ class ComboV2Plugin @Inject constructor (
                         aapsLogger.info(
                             LTag.PUMP,
                             "Cannot include base basal rate in JSON status " +
-                            "since no basal profile is currently active"
+                                "since no basal profile is currently active"
                         )
                     put("ActiveProfile", profileName)
                     when (val alert = lastComboAlert) {
                         is AlertScreenContent.Warning ->
                             put("WarningCode", alert.code)
-                        is AlertScreenContent.Error ->
+
+                        is AlertScreenContent.Error   ->
                             put("ErrorCode", alert.code)
-                        else -> Unit
+
+                        else                          -> Unit
                     }
                 })
             }
@@ -1448,8 +1475,8 @@ class ComboV2Plugin @Inject constructor (
 
         val alertCodeString = when (val alert = lastComboAlert) {
             is AlertScreenContent.Warning -> "W${alert.code}"
-            is AlertScreenContent.Error -> "E${alert.code}"
-            else -> null
+            is AlertScreenContent.Error   -> "E${alert.code}"
+            else                          -> null
         }
         if (alertCodeString != null)
             lines += rh.gs(R.string.combov2_short_status_alert, alertCodeString)
@@ -1476,8 +1503,8 @@ class ComboV2Plugin @Inject constructor (
                 it.availableUnitsInReservoir
             )
             val batteryStateDesc = when (it.batteryState) {
-                BatteryState.NO_BATTERY -> rh.gs(R.string.combov2_short_status_battery_state_empty)
-                BatteryState.LOW_BATTERY -> rh.gs(R.string.combov2_short_status_battery_state_low)
+                BatteryState.NO_BATTERY   -> rh.gs(R.string.combov2_short_status_battery_state_empty)
+                BatteryState.LOW_BATTERY  -> rh.gs(R.string.combov2_short_status_battery_state_low)
                 BatteryState.FULL_BATTERY -> rh.gs(R.string.combov2_short_status_battery_state_full)
             }
             lines += rh.gs(
@@ -1562,9 +1589,9 @@ class ComboV2Plugin @Inject constructor (
 
         val reason = when (timeChangeType) {
             TimeChangeType.TimezoneChanged -> rh.gs(R.string.combov2_timezone_changed)
-            TimeChangeType.TimeChanged -> rh.gs(R.string.combov2_datetime_changed)
-            TimeChangeType.DSTStarted -> rh.gs(R.string.combov2_dst_started)
-            TimeChangeType.DSTEnded -> rh.gs(R.string.combov2_dst_ended)
+            TimeChangeType.TimeChanged     -> rh.gs(R.string.combov2_datetime_changed)
+            TimeChangeType.DSTStarted      -> rh.gs(R.string.combov2_dst_started)
+            TimeChangeType.DSTEnded        -> rh.gs(R.string.combov2_dst_ended)
         }
         // Updating pump status implicitly also updates the pump's local datetime,
         // which is what we want after the system datetime/timezone/DST changed.
@@ -1594,12 +1621,7 @@ class ComboV2Plugin @Inject constructor (
             )
 
             if (!isAllowed) {
-                value.set(
-                    aapsLogger,
-                    false,
-                    rh.gs(R.string.combov2_incorrect_active_basal_profile, lastActiveBasalProfileNumber),
-                    this
-                )
+                value.set(false, rh.gs(R.string.combov2_incorrect_active_basal_profile, lastActiveBasalProfileNumber), this)
             }
         } else {
             aapsLogger.info(
@@ -1753,7 +1775,6 @@ class ComboV2Plugin @Inject constructor (
         // the PumpManager onPumpUnpaired callback.
     }
 
-
     /*** User interface flows ***/
 
     // "UI flows" are hot flows that are meant to be used for showing
@@ -1788,6 +1809,7 @@ class ComboV2Plugin @Inject constructor (
     // establishing a BT connection, or delivering a bolus, setting
     // a basal rate factor, reading the current pump datetime etc.
     data class CurrentActivityInfo(val description: String, val overallProgress: Double)
+
     private fun noCurrentActivity() = CurrentActivityInfo("", 0.0)
     private var _currentActivityUIFlow = MutableStateFlow(noCurrentActivity())
     val currentActivityUIFlow = _currentActivityUIFlow.asStateFlow()
@@ -1799,6 +1821,7 @@ class ComboV2Plugin @Inject constructor (
     val batteryStateUIFlow = _batteryStateUIFlow.asStateFlow()
 
     data class ReservoirLevel(val state: ReservoirState, val availableUnits: Int)
+
     private var _reservoirLevelUIFlow = MutableStateFlow<ReservoirLevel?>(null)
     val reservoirLevelUIFlow = _reservoirLevelUIFlow.asStateFlow()
 
@@ -1830,7 +1853,6 @@ class ComboV2Plugin @Inject constructor (
     private var _displayFrameUIFlow = MutableSharedFlow<DisplayFrame?>(replay = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
     val displayFrameUIFlow = _displayFrameUIFlow.asSharedFlow()
 
-
     /*** Misc private functions ***/
 
     private fun setupUiFlows(acquiredPump: ComboCtlPump) {
@@ -1845,6 +1867,7 @@ class ComboV2Plugin @Inject constructor (
                                         R.string.combov2_establishing_bt_connection,
                                         progStage.currentAttemptNr
                                     )
+
                                 BasicProgressStage.PerformingConnectionHandshake -> rh.gs(R.string.combov2_pairing_performing_handshake)
                                 else                                             -> ""
                             }
@@ -1860,10 +1883,12 @@ class ComboV2Plugin @Inject constructor (
                             val description = when (progressReport.stage) {
                                 RTCommandProgressStage.SettingDateTimeHour,
                                 RTCommandProgressStage.SettingDateTimeMinute -> rh.gs(R.string.combov2_setting_current_pump_time)
+
                                 RTCommandProgressStage.SettingDateTimeYear,
                                 RTCommandProgressStage.SettingDateTimeMonth,
-                                RTCommandProgressStage.SettingDateTimeDay -> rh.gs(R.string.combov2_setting_current_pump_date)
-                                else -> ""
+                                RTCommandProgressStage.SettingDateTimeDay    -> rh.gs(R.string.combov2_setting_current_pump_date)
+
+                                else                                         -> ""
                             }
                             _currentActivityUIFlow.value = CurrentActivityInfo(
                                 description,
@@ -1877,7 +1902,8 @@ class ComboV2Plugin @Inject constructor (
                             val description = when (val stage = progressReport.stage) {
                                 is RTCommandProgressStage.GettingBasalProfile ->
                                     rh.gs(R.string.combov2_getting_basal_profile, stage.numSetFactors)
-                                else -> ""
+
+                                else                                          -> ""
                             }
                             _currentActivityUIFlow.value = CurrentActivityInfo(
                                 description,
@@ -1891,7 +1917,8 @@ class ComboV2Plugin @Inject constructor (
                             val description = when (val stage = progressReport.stage) {
                                 is RTCommandProgressStage.SettingBasalProfile ->
                                     rh.gs(R.string.combov2_setting_basal_profile, stage.numSetFactors)
-                                else -> ""
+
+                                else                                          -> ""
                             }
                             _currentActivityUIFlow.value = CurrentActivityInfo(
                                 description,
@@ -1906,10 +1933,11 @@ class ComboV2Plugin @Inject constructor (
                                 is RTCommandProgressStage.DeliveringBolus ->
                                     rh.gs(
                                         R.string.combov2_delivering_bolus,
-                                        stage.deliveredImmediateAmount .cctlBolusToIU(),
+                                        stage.deliveredImmediateAmount.cctlBolusToIU(),
                                         stage.totalImmediateAmount.cctlBolusToIU()
                                     )
-                                else -> ""
+
+                                else                                      -> ""
                             }
                             _currentActivityUIFlow.value = CurrentActivityInfo(
                                 description,
@@ -1981,7 +2009,7 @@ class ComboV2Plugin @Inject constructor (
         aapsLogger.debug(LTag.PUMP, "Handling pump event $event")
 
         when (event) {
-            is ComboCtlPump.Event.BatteryLow -> {
+            is ComboCtlPump.Event.BatteryLow           -> {
                 uiInteraction.addNotification(
                     Notification.COMBO_PUMP_ALARM,
                     text = rh.gs(R.string.combov2_battery_low_warning),
@@ -1989,7 +2017,7 @@ class ComboV2Plugin @Inject constructor (
                 )
             }
 
-            is ComboCtlPump.Event.ReservoirLow -> {
+            is ComboCtlPump.Event.ReservoirLow         -> {
                 uiInteraction.addNotification(
                     Notification.COMBO_PUMP_ALARM,
                     text = rh.gs(R.string.combov2_reservoir_low_warning),
@@ -1997,7 +2025,7 @@ class ComboV2Plugin @Inject constructor (
                 )
             }
 
-            is ComboCtlPump.Event.QuickBolusInfused -> {
+            is ComboCtlPump.Event.QuickBolusInfused    -> {
                 pumpSync.syncBolusWithPumpId(
                     event.timestamp.toEpochMilliseconds(),
                     event.bolusAmount.cctlBolusToIU(),
@@ -2010,8 +2038,8 @@ class ComboV2Plugin @Inject constructor (
 
             is ComboCtlPump.Event.StandardBolusInfused -> {
                 val bolusType = when (event.standardBolusReason) {
-                    ComboCtlPump.StandardBolusReason.NORMAL -> DetailedBolusInfo.BolusType.NORMAL
-                    ComboCtlPump.StandardBolusReason.SUPERBOLUS -> DetailedBolusInfo.BolusType.SMB
+                    ComboCtlPump.StandardBolusReason.NORMAL               -> DetailedBolusInfo.BolusType.NORMAL
+                    ComboCtlPump.StandardBolusReason.SUPERBOLUS           -> DetailedBolusInfo.BolusType.SMB
                     ComboCtlPump.StandardBolusReason.PRIMING_INFUSION_SET -> DetailedBolusInfo.BolusType.PRIMING
                 }
                 pumpSync.syncBolusWithPumpId(
@@ -2036,7 +2064,7 @@ class ComboV2Plugin @Inject constructor (
                 )
             }
 
-            is ComboCtlPump.Event.ExtendedBolusEnded -> {
+            is ComboCtlPump.Event.ExtendedBolusEnded   -> {
                 pumpSync.syncStopExtendedBolusWithPumpId(
                     event.timestamp.toEpochMilliseconds(),
                     event.bolusId,
@@ -2045,15 +2073,15 @@ class ComboV2Plugin @Inject constructor (
                 )
             }
 
-            is ComboCtlPump.Event.TbrStarted -> {
+            is ComboCtlPump.Event.TbrStarted           -> {
                 aapsLogger.debug(LTag.PUMP, "Pump reports TBR started; expected state according to AAPS: ${pumpSync.expectedPumpState()}")
                 val tbrStartTimestampInMs = event.tbr.timestamp.toEpochMilliseconds()
                 val tbrType = when (event.tbr.type) {
-                    ComboCtlTbr.Type.NORMAL -> PumpSync.TemporaryBasalType.NORMAL
+                    ComboCtlTbr.Type.NORMAL               -> PumpSync.TemporaryBasalType.NORMAL
                     ComboCtlTbr.Type.EMULATED_100_PERCENT -> PumpSync.TemporaryBasalType.NORMAL
-                    ComboCtlTbr.Type.SUPERBOLUS -> PumpSync.TemporaryBasalType.SUPERBOLUS
-                    ComboCtlTbr.Type.EMULATED_COMBO_STOP -> PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND
-                    ComboCtlTbr.Type.COMBO_STOPPED -> PumpSync.TemporaryBasalType.PUMP_SUSPEND
+                    ComboCtlTbr.Type.SUPERBOLUS           -> PumpSync.TemporaryBasalType.SUPERBOLUS
+                    ComboCtlTbr.Type.EMULATED_COMBO_STOP  -> PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND
+                    ComboCtlTbr.Type.COMBO_STOPPED        -> PumpSync.TemporaryBasalType.PUMP_SUSPEND
                 }
                 pumpSync.syncTemporaryBasalWithPumpId(
                     timestamp = tbrStartTimestampInMs,
@@ -2067,7 +2095,7 @@ class ComboV2Plugin @Inject constructor (
                 )
             }
 
-            is ComboCtlPump.Event.TbrEnded -> {
+            is ComboCtlPump.Event.TbrEnded             -> {
                 aapsLogger.debug(LTag.PUMP, "Pump reports TBR ended; expected state according to AAPS: ${pumpSync.expectedPumpState()}")
                 val tbrEndTimestampInMs = event.timestampWhenTbrEnded.toEpochMilliseconds()
                 pumpSync.syncStopTemporaryBasalWithPumpId(
@@ -2078,7 +2106,7 @@ class ComboV2Plugin @Inject constructor (
                 )
             }
 
-            is ComboCtlPump.Event.UnknownTbrDetected -> {
+            is ComboCtlPump.Event.UnknownTbrDetected   -> {
                 // Inform about this unknown TBR that was observed (and automatically aborted).
                 val remainingDurationString = String.format(
                     "%02d:%02d",
@@ -2096,7 +2124,7 @@ class ComboV2Plugin @Inject constructor (
                 )
             }
 
-            else -> Unit
+            else                                       -> Unit
         }
     }
 
@@ -2229,9 +2257,11 @@ class ComboV2Plugin @Inject constructor (
                 when (driverStateUIFlow.value) {
                     DriverState.Error,
                     DriverState.Suspended -> false
-                    else -> true
+
+                    else                  -> true
                 }
             }
+
             else                     -> true
         }
         if (updateUIState) {
@@ -2264,10 +2294,12 @@ class ComboV2Plugin @Inject constructor (
                 if (oldState != DriverState.Suspended)
                     rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
             }
+
             DriverState.Suspended    -> {
                 if (oldState != DriverState.Ready)
                     rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
             }
+
             else                     -> Unit
         }
     }
@@ -2336,8 +2368,8 @@ class ComboV2Plugin @Inject constructor (
         when (alert) {
             is AlertScreenContent.Warning -> {
                 val desc = when (alert.code) {
-                    4 -> rh.gs(R.string.combov2_warning_4)
-                    10 -> rh.gs(R.string.combov2_warning_10)
+                    4    -> rh.gs(R.string.combov2_warning_4)
+                    10   -> rh.gs(R.string.combov2_warning_10)
                     else -> ""
                 }
 
@@ -2345,18 +2377,18 @@ class ComboV2Plugin @Inject constructor (
                     if (desc.isEmpty()) "" else ": $desc"
             }
 
-            is AlertScreenContent.Error -> {
+            is AlertScreenContent.Error   -> {
                 val desc = when (alert.code) {
-                    1 -> rh.gs(R.string.combov2_error_1)
-                    2 -> rh.gs(R.string.combov2_error_2)
-                    4 -> rh.gs(R.string.combov2_error_4)
-                    5 -> rh.gs(R.string.combov2_error_5)
-                    6 -> rh.gs(R.string.combov2_error_6)
-                    7 -> rh.gs(R.string.combov2_error_7)
-                    8 -> rh.gs(R.string.combov2_error_8)
-                    9 -> rh.gs(R.string.combov2_error_9)
-                    10 -> rh.gs(R.string.combov2_error_10)
-                    11 -> rh.gs(R.string.combov2_error_11)
+                    1    -> rh.gs(R.string.combov2_error_1)
+                    2    -> rh.gs(R.string.combov2_error_2)
+                    4    -> rh.gs(R.string.combov2_error_4)
+                    5    -> rh.gs(R.string.combov2_error_5)
+                    6    -> rh.gs(R.string.combov2_error_6)
+                    7    -> rh.gs(R.string.combov2_error_7)
+                    8    -> rh.gs(R.string.combov2_error_8)
+                    9    -> rh.gs(R.string.combov2_error_9)
+                    10   -> rh.gs(R.string.combov2_error_10)
+                    11   -> rh.gs(R.string.combov2_error_11)
                     else -> ""
                 }
 
@@ -2364,7 +2396,7 @@ class ComboV2Plugin @Inject constructor (
                     if (desc.isEmpty()) "" else ": $desc"
             }
 
-            else -> rh.gs(R.string.combov2_unrecognized_alert)
+            else                          -> rh.gs(R.string.combov2_unrecognized_alert)
         }
 
     private fun notifyAboutComboAlert(alert: AlertScreenContent) {
@@ -2411,6 +2443,7 @@ class ComboV2Plugin @Inject constructor (
         when (driverStateFlow.value) {
             DriverState.NotInitialized,
             DriverState.Disconnected -> true
-            else -> false
+
+            else                     -> false
         }
 }
diff --git a/pump/dana/build.gradle b/pump/dana/build.gradle
index aedc35aff8..e15b20fb70 100644
--- a/pump/dana/build.gradle
+++ b/pump/dana/build.gradle
@@ -27,9 +27,9 @@ android {
 dependencies {
     implementation project(':core:libraries')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:shared')
 
     api "androidx.room:room-ktx:$room_version"
     api "androidx.room:room-runtime:$room_version"
diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt
index acd4e7b830..87e5817b37 100644
--- a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt
+++ b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt
@@ -207,7 +207,7 @@ class DanaFragment : DaggerFragment() {
         if (pump.lastConnection != 0L) {
             val agoMilliseconds = System.currentTimeMillis() - pump.lastConnection
             val agoMin = (agoMilliseconds.toDouble() / 60.0 / 1000.0).toInt()
-            binding.lastConnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.shared.R.string.minago, agoMin) + ")"
+            binding.lastConnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.interfaces.R.string.minago, agoMin) + ")"
             warnColors.setColor(binding.lastConnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt
index 64d438997f..43d5608f8c 100644
--- a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt
+++ b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt
@@ -1,6 +1,7 @@
 package info.nightscout.pump.dana
 
 import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.profile.Instantiator
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.ProfileStore
@@ -268,7 +269,7 @@ class DanaPump @Inject constructor(
     var bolusCalculationOption = 0
     var missedBolusConfig = 0
     fun getUnits(): String {
-        return if (units == UNITS_MGDL) Constants.MGDL else Constants.MMOL
+        return if (units == UNITS_MGDL) GlucoseUnit.MGDL.asText else GlucoseUnit.MMOL.asText
     }
 
     var bolusStartErrorCode: Int = 0 // last start bolus errorCode
@@ -368,7 +369,7 @@ class DanaPump @Inject constructor(
                             .put("value", currentTarget)
                     )
                 )
-                profile.put("units", if (units == UNITS_MGDL) Constants.MGDL else Constants.MMOL)
+                profile.put("units", if (units == UNITS_MGDL) GlucoseUnit.MGDL.asText else GlucoseUnit.MMOL.asText)
                 store.put(PROFILE_PREFIX + (activeProfile + 1), profile)
             } catch (e: JSONException) {
                 aapsLogger.error("Unhandled exception", e)
diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt
index b410272c48..28320f54da 100644
--- a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt
+++ b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Constants
+import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.Callback
@@ -127,7 +128,7 @@ class DanaUserOptionsActivity : TranslatedDaggerAppCompatActivity() {
         binding.beep.isChecked = danaPump.beepAndAlarm > 4
         binding.screenTimeout.value = danaPump.lcdOnTimeSec.toDouble()
         binding.backlight.value = danaPump.backlightOnTimeSec.toDouble()
-        binding.units.isChecked = danaPump.getUnits() == Constants.MMOL
+        binding.units.isChecked = danaPump.getUnits() == GlucoseUnit.MMOL.asText
         binding.shutdown.value = danaPump.shutdownHour.toDouble()
         binding.lowReservoir.value = danaPump.lowReservoirRate.toDouble()
     }
diff --git a/pump/danar/build.gradle b/pump/danar/build.gradle
index 5a29590ff8..79b21390b3 100644
--- a/pump/danar/build.gradle
+++ b/pump/danar/build.gradle
@@ -15,14 +15,15 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.media3:media3-common:1.1.1'
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')
     implementation project(':pump:dana')
 
+    api 'androidx.media3:media3-common:1.1.1'
+
     testImplementation project(':app-wear-shared:shared-tests')
     testImplementation project(':core:main')
 }
\ No newline at end of file
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
index b2f3b92da9..f6936bc825 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
@@ -10,9 +10,9 @@ import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionServi
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin
 import info.nightscout.androidaps.danar.R
 import info.nightscout.annotations.OpenForTesting
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.pump.DetailedBolusInfo
@@ -51,7 +51,7 @@ class DanaRKoreanPlugin @Inject constructor(
     rxBus: RxBus,
     private val context: Context,
     rh: ResourceHelper,
-    constraintChecker: Constraints,
+    constraintChecker: ConstraintsChecker,
     activePlugin: ActivePlugin,
     sp: SP,
     commandQueue: CommandQueue,
@@ -147,7 +147,7 @@ class DanaRKoreanPlugin @Inject constructor(
     }
 
     override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
-        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(ConstraintObject(detailedBolusInfo.insulin, injector)).value()
         require(detailedBolusInfo.carbs > 0)
         return if (detailedBolusInfo.insulin > 0) {
             val t = EventOverviewBolusProgress.Treatment(0.0, 0, detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB, detailedBolusInfo.id)
@@ -192,7 +192,7 @@ class DanaRKoreanPlugin @Inject constructor(
     override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: TemporaryBasalType): PumpEnactResult {
         // Recheck pump status if older than 30 min
         //This should not be needed while using queue because connection should be done before calling this
-        val absoluteRateAfterConstraint = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val absoluteRateAfterConstraint = constraintChecker.applyBasalConstraints(ConstraintObject(absoluteRate, injector), profile).value()
         var doTempOff = baseBasalRate - absoluteRateAfterConstraint == 0.0 && absoluteRateAfterConstraint >= 0.10
         val doLowTemp = absoluteRateAfterConstraint < baseBasalRate || absoluteRateAfterConstraint < 0.10
         val doHighTemp = absoluteRateAfterConstraint > baseBasalRate && !useExtendedBoluses
@@ -266,7 +266,7 @@ class DanaRKoreanPlugin @Inject constructor(
             val durationInHalfHours = max(durationInMinutes / 30, 1)
             // We keep current basal running so need to sub current basal
             var extendedRateToSet: Double = absoluteRateAfterConstraint - baseBasalRate
-            extendedRateToSet = constraintChecker.applyBasalConstraints(Constraint(extendedRateToSet), profile).value()
+            extendedRateToSet = constraintChecker.applyBasalConstraints(ConstraintObject(extendedRateToSet, injector), profile).value()
             // needs to be rounded to 0.1
             extendedRateToSet = Round.roundTo(extendedRateToSet, pumpDescription.extendedBolusStep * 2) // *2 because of half hours
 
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index efe68dac24..062262cf4e 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -34,7 +34,7 @@ import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
 import info.nightscout.interfaces.Constants;
-import info.nightscout.interfaces.constraints.Constraints;
+import info.nightscout.interfaces.constraints.ConstraintsChecker;
 import info.nightscout.interfaces.notifications.Notification;
 import info.nightscout.interfaces.profile.Profile;
 import info.nightscout.interfaces.profile.ProfileFunction;
@@ -62,7 +62,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     @Inject AAPSLogger aapsLogger;
     @Inject RxBus rxBus;
     @Inject ResourceHelper rh;
-    @Inject Constraints constraintChecker;
+    @Inject ConstraintsChecker constraintChecker;
     @Inject DanaPump danaPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
@@ -83,12 +83,6 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         mBinder = new LocalBinder();
     }
 
-    public class LocalBinder extends Binder {
-        public DanaRKoreanExecutionService getServiceInstance() {
-            return DanaRKoreanExecutionService.this;
-        }
-    }
-
     @SuppressLint("MissingPermission") public void connect() {
         if (mConnectionInProgress)
             return;
@@ -330,4 +324,10 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         return null;
     }
 
+    public class LocalBinder extends Binder {
+        public DanaRKoreanExecutionService getServiceInstance() {
+            return DanaRKoreanExecutionService.this;
+        }
+    }
+
 }
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index 7c35ab543e..77b6cc0aa7 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -16,9 +16,9 @@ import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
 import info.nightscout.androidaps.danar.R;
 import info.nightscout.annotations.OpenForTesting;
+import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.core.utils.fabric.FabricPrivacy;
-import info.nightscout.interfaces.constraints.Constraint;
-import info.nightscout.interfaces.constraints.Constraints;
+import info.nightscout.interfaces.constraints.ConstraintsChecker;
 import info.nightscout.interfaces.plugin.ActivePlugin;
 import info.nightscout.interfaces.profile.Profile;
 import info.nightscout.interfaces.pump.DetailedBolusInfo;
@@ -53,6 +53,19 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     private final DetailedBolusInfoStorage detailedBolusInfoStorage;
     private final TemporaryBasalStorage temporaryBasalStorage;
     private final FabricPrivacy fabricPrivacy;
+    private final ServiceConnection mConnection = new ServiceConnection() {
+
+        public void onServiceDisconnected(ComponentName name) {
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected");
+            sExecutionService = null;
+        }
+
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            aapsLogger.debug(LTag.PUMP, "Service is connected");
+            DanaRv2ExecutionService.LocalBinder mLocalBinder = (DanaRv2ExecutionService.LocalBinder) service;
+            sExecutionService = mLocalBinder.getServiceInstance();
+        }
+    };
 
     @Inject
     public DanaRv2Plugin(
@@ -62,7 +75,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             RxBus rxBus,
             Context context,
             ResourceHelper rh,
-            Constraints constraintChecker,
+            ConstraintsChecker constraintChecker,
             ActivePlugin activePlugin,
             SP sp,
             CommandQueue commandQueue,
@@ -111,20 +124,6 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         super.onStop();
     }
 
-    private final ServiceConnection mConnection = new ServiceConnection() {
-
-        public void onServiceDisconnected(ComponentName name) {
-            aapsLogger.debug(LTag.PUMP, "Service is disconnected");
-            sExecutionService = null;
-        }
-
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            aapsLogger.debug(LTag.PUMP, "Service is connected");
-            DanaRv2ExecutionService.LocalBinder mLocalBinder = (DanaRv2ExecutionService.LocalBinder) service;
-            sExecutionService = mLocalBinder.getServiceInstance();
-        }
-    };
-
     // Plugin base interface
     @NonNull
     @Override
@@ -160,7 +159,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     // Pump interface
     @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new ConstraintObject<>(detailedBolusInfo.insulin, getInjector())).value();
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             // v2 stores end time for bolus, we need to adjust time
             // default delivery speed is 12 sec/U
@@ -225,7 +224,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
         PumpEnactResult result = new PumpEnactResult(getInjector());
 
-        absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
+        absoluteRate = constraintChecker.applyBasalConstraints(new ConstraintObject<>(absoluteRate, getInjector()), profile).value();
 
         boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate() || absoluteRate < 0.10d;
@@ -291,7 +290,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     public PumpEnactResult setTempBasalPercent(int percent, int durationInMinutes, @NonNull Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
         DanaPump pump = danaPump;
         PumpEnactResult result = new PumpEnactResult(getInjector());
-        percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
+        percent = constraintChecker.applyBasalPercentConstraints(new ConstraintObject<>(percent, getInjector()), profile).value();
         if (percent < 0) {
             result.isTempCancel(false).enacted(false).success(false).comment(info.nightscout.core.ui.R.string.invalid_input);
             aapsLogger.error("setTempBasalPercent: Invalid input");
@@ -352,7 +351,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     @NonNull @Override
     public PumpEnactResult setExtendedBolus(double insulin, int durationInMinutes) {
         DanaPump pump = danaPump;
-        insulin = constraintChecker.applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
+        insulin = constraintChecker.applyExtendedBolusConstraints(new ConstraintObject<>(insulin, getInjector())).value();
         // needs to be rounded
         int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
         insulin = Round.INSTANCE.roundTo(insulin, getPumpDescription().getExtendedBolusStep());
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index f723ac765d..9c30704f35 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -405,7 +405,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 rxBus.send(new EventPumpStatusChanged(rh.gs(info.nightscout.pump.dana.R.string.gettingbolusstatus)));
                 mSerialIOThread.sendMessage(new MsgStatus(injector));
                 bolusingEvent.setPercent(100);
-                rxBus.send(new EventPumpStatusChanged(rh.gs(info.nightscout.shared.R.string.disconnecting)));
+                rxBus.send(new EventPumpStatusChanged(rh.gs(info.nightscout.interfaces.R.string.disconnecting)));
             }
         });
         return !start.getFailed();
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
index f5d7c965d4..1304e70ca5 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -7,8 +7,10 @@ import org.json.JSONObject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
+import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.interfaces.constraints.Constraint;
-import info.nightscout.interfaces.constraints.Constraints;
+import info.nightscout.interfaces.constraints.ConstraintsChecker;
+import info.nightscout.interfaces.constraints.PluginConstraints;
 import info.nightscout.interfaces.notifications.Notification;
 import info.nightscout.interfaces.plugin.ActivePlugin;
 import info.nightscout.interfaces.plugin.OwnDatabasePlugin;
@@ -46,7 +48,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable;
  * Created by mike on 28.01.2018.
  */
 
-public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump, Dana, Constraints, OwnDatabasePlugin {
+public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump, Dana, PluginConstraints, OwnDatabasePlugin {
     protected AbstractDanaRExecutionService sExecutionService;
 
     protected CompositeDisposable disposable = new CompositeDisposable();
@@ -55,7 +57,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     protected PumpDescription pumpDescription = new PumpDescription();
     protected DanaPump danaPump;
-    protected Constraints constraintChecker;
+    protected ConstraintsChecker constraintChecker;
     protected RxBus rxBus;
     protected ActivePlugin activePlugin;
     protected SP sp;
@@ -65,11 +67,12 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     protected UiInteraction uiInteraction;
     protected DanaHistoryDatabase danaHistoryDatabase;
     protected DecimalFormatter decimalFormatter;
+
     protected AbstractDanaRPlugin(
             HasAndroidInjector injector,
             DanaPump danaPump,
             ResourceHelper rh,
-            Constraints constraintChecker,
+            ConstraintsChecker constraintChecker,
             AAPSLogger aapsLogger,
             AapsSchedulers aapsSchedulers,
             CommandQueue commandQueue,
@@ -223,7 +226,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     @NonNull @Override
     public PumpEnactResult setTempBasalPercent(int percent, int durationInMinutes, @NonNull Profile profile, boolean enforceNew, @NonNull PumpSync.TemporaryBasalType tbrType) {
         PumpEnactResult result = new PumpEnactResult(getInjector());
-        percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
+        percent = constraintChecker.applyBasalPercentConstraints(new ConstraintObject<>(percent, getInjector()), profile).value();
         if (percent < 0) {
             result.isTempCancel(false).enacted(false).success(false).comment(info.nightscout.core.ui.R.string.invalid_input);
             getAapsLogger().error("setTempBasalPercent: Invalid input");
@@ -270,7 +273,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @NonNull @Override
     public PumpEnactResult setExtendedBolus(double insulin, int durationInMinutes) {
-        insulin = constraintChecker.applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
+        insulin = constraintChecker.applyExtendedBolusConstraints(new ConstraintObject<>(insulin, getInjector())).value();
         // needs to be rounded
         int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
         insulin = Round.INSTANCE.roundTo(insulin, getPumpDescription().getExtendedBolusStep());
@@ -462,21 +465,21 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @NonNull @Override
     public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, @NonNull Profile profile) {
-        absoluteRate.setIfSmaller(getAapsLogger(), danaPump.getMaxBasal(), getRh().gs(info.nightscout.core.ui.R.string.limitingbasalratio, danaPump.getMaxBasal(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this);
+        absoluteRate.setIfSmaller(danaPump.getMaxBasal(), getRh().gs(info.nightscout.core.ui.R.string.limitingbasalratio, danaPump.getMaxBasal(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this);
         return absoluteRate;
     }
 
     @NonNull @Override
     public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
-        percentRate.setIfGreater(getAapsLogger(), 0, getRh().gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, getRh().gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().getMaxTempPercent(), getRh().gs(info.nightscout.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this);
+        percentRate.setIfGreater(0, getRh().gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, getRh().gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this);
+        percentRate.setIfSmaller(getPumpDescription().getMaxTempPercent(), getRh().gs(info.nightscout.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this);
 
         return percentRate;
     }
 
     @NonNull @Override
     public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfSmaller(getAapsLogger(), danaPump.getMaxBolus(), getRh().gs(info.nightscout.core.ui.R.string.limitingbolus, danaPump.getMaxBolus(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this);
+        insulin.setIfSmaller(danaPump.getMaxBolus(), getRh().gs(info.nightscout.core.ui.R.string.limitingbolus, danaPump.getMaxBolus(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this);
         return insulin;
     }
 
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
index ce102e2d25..ff4d9873be 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
@@ -14,9 +14,9 @@ import javax.inject.Singleton;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danar.services.DanaRExecutionService;
 import info.nightscout.annotations.OpenForTesting;
+import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.core.utils.fabric.FabricPrivacy;
-import info.nightscout.interfaces.constraints.Constraint;
-import info.nightscout.interfaces.constraints.Constraints;
+import info.nightscout.interfaces.constraints.ConstraintsChecker;
 import info.nightscout.interfaces.plugin.ActivePlugin;
 import info.nightscout.interfaces.profile.Profile;
 import info.nightscout.interfaces.pump.DetailedBolusInfo;
@@ -46,8 +46,20 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
     private final AAPSLogger aapsLogger;
     private final Context context;
     private final ResourceHelper rh;
-    private final Constraints constraints;
     private final FabricPrivacy fabricPrivacy;
+    private final ServiceConnection mConnection = new ServiceConnection() {
+
+        public void onServiceDisconnected(ComponentName name) {
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected");
+            sExecutionService = null;
+        }
+
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            aapsLogger.debug(LTag.PUMP, "Service is connected");
+            DanaRExecutionService.LocalBinder mLocalBinder = (DanaRExecutionService.LocalBinder) service;
+            sExecutionService = mLocalBinder.getServiceInstance();
+        }
+    };
 
     @Inject
     public DanaRPlugin(
@@ -57,7 +69,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             RxBus rxBus,
             Context context,
             ResourceHelper rh,
-            Constraints constraints,
+            ConstraintsChecker constraintsChecker,
             ActivePlugin activePlugin,
             SP sp,
             CommandQueue commandQueue,
@@ -69,11 +81,10 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             DanaHistoryDatabase danaHistoryDatabase,
             DecimalFormatter decimalFormatter
     ) {
-        super(injector, danaPump, rh, constraints, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync, uiInteraction, danaHistoryDatabase, decimalFormatter);
+        super(injector, danaPump, rh, constraintsChecker, aapsLogger, aapsSchedulers, commandQueue, rxBus, activePlugin, sp, dateUtil, pumpSync, uiInteraction, danaHistoryDatabase, decimalFormatter);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.rh = rh;
-        this.constraints = constraints;
         this.fabricPrivacy = fabricPrivacy;
 
         useExtendedBoluses = sp.getBoolean(info.nightscout.core.utils.R.string.key_danar_useextended, false);
@@ -114,20 +125,6 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
         super.onStop();
     }
 
-    private final ServiceConnection mConnection = new ServiceConnection() {
-
-        public void onServiceDisconnected(ComponentName name) {
-            aapsLogger.debug(LTag.PUMP, "Service is disconnected");
-            sExecutionService = null;
-        }
-
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            aapsLogger.debug(LTag.PUMP, "Service is connected");
-            DanaRExecutionService.LocalBinder mLocalBinder = (DanaRExecutionService.LocalBinder) service;
-            sExecutionService = mLocalBinder.getServiceInstance();
-        }
-    };
-
     // Plugin base interface
     @NonNull
     @Override
@@ -163,7 +160,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
     @NonNull @Override
     public PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        detailedBolusInfo.insulin = constraints.applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new ConstraintObject<>(detailedBolusInfo.insulin, getInjector())).value();
         if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             EventOverviewBolusProgress.Treatment t = new EventOverviewBolusProgress.Treatment(0, 0, detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB, detailedBolusInfo.getId());
             boolean connectionOK = false;
@@ -210,7 +207,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
         //This should not be needed while using queue because connection should be done before calling this
         PumpEnactResult result = new PumpEnactResult(getInjector());
 
-        absoluteRate = constraints.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
+        absoluteRate = constraintChecker.applyBasalConstraints(new ConstraintObject<>(absoluteRate, getInjector()), profile).value();
 
         boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
         final boolean doLowTemp = absoluteRate < getBaseBasalRate() || absoluteRate < 0.10d;
@@ -289,7 +286,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
             // We keep current basal running so need to sub current basal
             double extendedRateToSet = absoluteRate - getBaseBasalRate();
-            extendedRateToSet = constraints.applyBasalConstraints(new Constraint<>(extendedRateToSet), profile).value();
+            extendedRateToSet = constraintChecker.applyBasalConstraints(new ConstraintObject<>(extendedRateToSet, getInjector()), profile).value();
             // needs to be rounded to 0.1
             extendedRateToSet = Round.INSTANCE.roundTo(extendedRateToSet, pumpDescription.getExtendedBolusStep() * 2); // *2 because of half hours
 
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt
index a4e81c0bbf..785bc1c840 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MessageOriginalNames.getName
 import info.nightscout.androidaps.utils.CRC.getCrc16
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
 import info.nightscout.interfaces.pump.PumpSync
@@ -48,7 +48,7 @@ open class MessageBase(injector: HasAndroidInjector) {
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Inject lateinit var temporaryBasalStorage: TemporaryBasalStorage
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var pumpSync: PumpSync
     @Inject lateinit var danaHistoryRecordDao: DanaHistoryRecordDao
     @Inject lateinit var uiInteraction: UiInteraction
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
index d22424bed1..0049f5b93e 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
@@ -1,10 +1,9 @@
 package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.rx.logging.LTag
 
-
 class MsgBolusStart(
     injector: HasAndroidInjector,
     private var amount: Double
@@ -13,7 +12,7 @@ class MsgBolusStart(
     init {
         setCommand(0x0102)
         // HARDCODED LIMIT
-        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        amount = constraintChecker.applyBolusConstraints(ConstraintObject(amount, injector)).value()
         addParamInt((amount * 100).toInt())
         aapsLogger.debug(LTag.PUMPBTCOMM, "Bolus start : $amount")
     }
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
index caa86a6b6b..3a0c72d41a 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
@@ -1,10 +1,9 @@
 package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.rx.logging.LTag
 
-
 class MsgBolusStartWithSpeed(
     injector: HasAndroidInjector,
     private var amount: Double,
@@ -14,7 +13,7 @@ class MsgBolusStartWithSpeed(
     init {
         setCommand(0x0104)
         // HARDCODED LIMIT
-        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        amount = constraintChecker.applyBolusConstraints(ConstraintObject(amount, injector)).value()
         addParamInt((amount * 100).toInt())
         addParamByte(speed.toByte())
         aapsLogger.debug(LTag.PUMPBTCOMM, "Bolus start : $amount speed: $speed")
@@ -24,10 +23,10 @@ class MsgBolusStartWithSpeed(
         val errorCode = intFromBuff(bytes, 0, 1)
         if (errorCode != 2) {
             failed = true
-            aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode FAILED!!")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Message response: $errorCode FAILED!!")
         } else {
             failed = false
-            aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode OK")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Message response: $errorCode OK")
         }
         danaPump.bolusStartErrorCode = errorCode
     }
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
index 3bfc0a5aad..9c1f1ed0bc 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
@@ -1,14 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.rx.logging.LTag
 
-
 class MsgSetExtendedBolusStart(
     injector: HasAndroidInjector,
     private var amount: Double,
-    private var halfhours: Byte
+    private var halfHours: Byte
 
 ) : MessageBase(injector) {
 
@@ -16,12 +15,12 @@ class MsgSetExtendedBolusStart(
         setCommand(0x0407)
         aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
         // HARDCODED LIMITS
-        if (halfhours < 1) halfhours = 1
-        if (halfhours > 16) halfhours = 16
-        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        if (halfHours < 1) halfHours = 1
+        if (halfHours > 16) halfHours = 16
+        amount = constraintChecker.applyBolusConstraints(ConstraintObject(amount, injector)).value()
         addParamInt((amount * 100).toInt())
-        addParamByte(halfhours)
-        aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus start: " + (amount * 100).toInt() / 100.0 + "U halfhours: " + halfhours.toInt())
+        addParamByte(halfHours)
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Set extended bolus start: " + (amount * 100).toInt() / 100.0 + "U halfHours: " + halfHours.toInt())
     }
 
     override fun handleMessage(bytes: ByteArray) {
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt
index 095d7a676e..9f3585447a 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt
@@ -3,9 +3,8 @@ package info.nightscout.pump.danaR
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.Instantiator
 import info.nightscout.interfaces.pump.PumpSync
@@ -22,7 +21,7 @@ import org.mockito.Mockito.`when`
 
 class DanaRPluginTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var pumpSync: PumpSync
     @Mock lateinit var instantiator: Instantiator
@@ -34,7 +33,11 @@ class DanaRPluginTest : TestBaseWithProfile() {
     private lateinit var danaRPlugin: DanaRPlugin
 
     val injector = HasAndroidInjector {
-        AndroidInjector { }
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
     }
 
     @BeforeEach
@@ -57,11 +60,11 @@ class DanaRPluginTest : TestBaseWithProfile() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        val c = ConstraintObject(Double.MAX_VALUE, injector)
         danaRPlugin.applyBasalConstraints(c, validProfile)
         Assertions.assertEquals(0.8, c.value(), 0.01)
-        Assertions.assertEquals("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons())
+        Assertions.assertEquals("DanaR: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons())
     }
 
     @Test @Throws(Exception::class)
@@ -69,10 +72,10 @@ class DanaRPluginTest : TestBaseWithProfile() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        val c = ConstraintObject(Int.MAX_VALUE, injector)
         danaRPlugin.applyBasalPercentConstraints(c, validProfile)
         Assertions.assertEquals(200, c.value())
-        Assertions.assertEquals("DanaR: Limiting max percent rate to 200% because of pump limit", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaR: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaR: Limiting max percent rate to 200% because of pump limit", c.getReasons())
+        Assertions.assertEquals("DanaR: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons())
     }
 }
\ No newline at end of file
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt
index 363ccba06c..6f294d210b 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/DanaRTestBase.kt
@@ -6,8 +6,9 @@ import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.interfaces.ConfigBuilder
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.profile.Instantiator
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
 import info.nightscout.interfaces.pump.PumpSync
@@ -15,7 +16,6 @@ import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.dana.database.DanaHistoryRecordDao
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.sharedtests.TestBaseWithProfile
 import org.junit.jupiter.api.BeforeEach
 import org.mockito.ArgumentMatchers
@@ -32,7 +32,7 @@ open class DanaRTestBase : TestBaseWithProfile() {
     @Mock lateinit var configBuilder: ConfigBuilder
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var pumpSync: PumpSync
     @Mock lateinit var danaHistoryRecordDao: DanaHistoryRecordDao
     @Mock lateinit var instantiator: Instantiator
@@ -50,6 +50,9 @@ open class DanaRTestBase : TestBaseWithProfile() {
 
     val injector = HasAndroidInjector {
         AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
             if (it is MessageBase) {
                 it.aapsLogger = aapsLogger
                 it.dateUtil = dateUtil
@@ -57,7 +60,7 @@ open class DanaRTestBase : TestBaseWithProfile() {
                 it.danaRPlugin = danaRPlugin
                 it.danaRKoreanPlugin = danaRKoreanPlugin
                 it.danaRv2Plugin = danaRv2Plugin
-                it.rxBus = RxBus(aapsSchedulers, aapsLogger)
+                it.rxBus = rxBus
                 it.rh = rh
                 it.activePlugin = activePlugin
                 it.configBuilder = configBuilder
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt
index 9f4c683f63..83ac7c65e1 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MessageHashTableRTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MessageHashTableR
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
@@ -9,7 +9,7 @@ import org.mockito.Mockito
 class MessageHashTableRTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
         val messageHashTable = MessageHashTableR(injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assertions.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt
index da974f3209..daa4a0fb5a 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgBolusStart
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.`when`
@@ -9,7 +9,7 @@ import org.mockito.Mockito.`when`
 class MsgBolusStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
         val packet = MsgBolusStart(injector, 1.0)
 
         // test message decoding
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
index ff2313a4a5..0493dc8b1e 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgBolusStartWithSpeed
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
@@ -9,7 +9,7 @@ import org.mockito.Mockito
 class MsgBolusStartWithSpeedTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
         val packet = MsgBolusStartWithSpeed(injector, 0.0, 0)
 
         // test message decoding
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
index 2cea8ca437..d881bd911e 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStart
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.`when`
@@ -9,7 +9,7 @@ import org.mockito.Mockito.`when`
 class MsgSetExtendedBolusStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
         val packet = MsgSetExtendedBolusStart(injector, 2.0, 2.toByte())
 
         // test message decoding
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt
index 59c583263f..d843b7e67c 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -3,9 +3,8 @@ package info.nightscout.pump.danaRKorean
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.Instantiator
 import info.nightscout.interfaces.pump.PumpSync
@@ -22,7 +21,7 @@ import org.mockito.Mockito.`when`
 
 class DanaRKoreanPluginTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var pumpSync: PumpSync
     @Mock lateinit var instantiator: Instantiator
@@ -34,7 +33,11 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
     private lateinit var danaRPlugin: DanaRKoreanPlugin
 
     val injector = HasAndroidInjector {
-        AndroidInjector { }
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
     }
 
     @BeforeEach
@@ -57,11 +60,11 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        val c = ConstraintObject(Double.MAX_VALUE, injector)
         danaRPlugin.applyBasalConstraints(c, validProfile)
         Assertions.assertEquals(0.8, c.value(), 0.01)
-        Assertions.assertEquals("DanaRKorean: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaRKorean: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaRKorean: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons())
+        Assertions.assertEquals("DanaRKorean: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons())
     }
 
     @Test @Throws(Exception::class)
@@ -69,10 +72,10 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        val c = ConstraintObject(Int.MAX_VALUE, injector)
         danaRPlugin.applyBasalPercentConstraints(c, validProfile)
         Assertions.assertEquals(200, c.value())
-        Assertions.assertEquals("DanaRKorean: Limiting max percent rate to 200% because of pump limit", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaRKorean: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaRKorean: Limiting max percent rate to 200% because of pump limit", c.getReasons())
+        Assertions.assertEquals("DanaRKorean: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons())
     }
 }
\ No newline at end of file
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index 79fca9b748..8b43ed6677 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.pump.danaRKorean.comm
 
 import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.danaR.comm.DanaRTestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
@@ -10,7 +10,7 @@ import org.mockito.Mockito
 class MessageHashTableRKoreanTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
         val messageHashTable = MessageHashTableRKorean(injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assertions.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt
index d19b855b65..a95b45eef0 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt
@@ -3,9 +3,8 @@ package info.nightscout.pump.danaRv2
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.profile.Instantiator
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
@@ -24,7 +23,7 @@ import org.mockito.Mockito.`when`
 
 class DanaRv2PluginTest : TestBaseWithProfile() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
@@ -38,7 +37,11 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
     private lateinit var danaRv2Plugin: DanaRv2Plugin
 
     val injector = HasAndroidInjector {
-        AndroidInjector { }
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
     }
 
     @BeforeEach
@@ -61,11 +64,11 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        val c = ConstraintObject(Double.MAX_VALUE, injector)
         danaRv2Plugin.applyBasalConstraints(c, validProfile)
         Assertions.assertEquals(0.8, c.value(), 0.01)
-        Assertions.assertEquals("DanaRv2: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaRv2: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaRv2: Limiting max basal rate to 0.80 U/h because of pump limit", c.getReasons())
+        Assertions.assertEquals("DanaRv2: Limiting max basal rate to 0.80 U/h because of pump limit", c.getMostLimitedReasons())
     }
 
     @Test
@@ -73,10 +76,10 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        val c = ConstraintObject(Int.MAX_VALUE, injector)
         danaRv2Plugin.applyBasalPercentConstraints(c, validProfile)
         Assertions.assertEquals(200, c.value())
-        Assertions.assertEquals("DanaRv2: Limiting max percent rate to 200% because of pump limit", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaRv2: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaRv2: Limiting max percent rate to 200% because of pump limit", c.getReasons())
+        Assertions.assertEquals("DanaRv2: Limiting max percent rate to 200% because of pump limit", c.getMostLimitedReasons())
     }
 }
\ No newline at end of file
diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt
index 178b1488fc..94bfe539a4 100644
--- a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt
+++ b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/comm/MessageHashTableRv2Test.kt
@@ -3,7 +3,7 @@ package info.nightscout.pump.danaRv2.comm
 import info.nightscout.androidaps.danaRv2.comm.MessageHashTableRv2
 import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.interfaces.constraints.Constraint
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.pump.danaR.comm.DanaRTestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
@@ -13,7 +13,7 @@ class MessageHashTableRv2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
         val messageHashTableRv2 = MessageHashTableRv2(injector)
         val forTesting: MessageBase = MsgStatusAPS_v2(injector)
         val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
diff --git a/pump/danars/build.gradle b/pump/danars/build.gradle
index ceed13054c..f8fe783a48 100644
--- a/pump/danars/build.gradle
+++ b/pump/danars/build.gradle
@@ -31,11 +31,11 @@ android {
 
 dependencies {
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')
     implementation project(':pump:dana')
-    implementation project(':app-wear-shared:shared')
 
     testImplementation project(':app-wear-shared:shared-tests')
     testImplementation project(':core:main')
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
index 2374eb15ae..89ce1b2430 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt
@@ -8,10 +8,12 @@ import android.os.IBinder
 import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.OwnDatabasePlugin
 import info.nightscout.interfaces.plugin.PluginDescription
@@ -68,7 +70,7 @@ class DanaRSPlugin @Inject constructor(
     private val rxBus: RxBus,
     private val context: Context,
     rh: ResourceHelper,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val profileFunction: ProfileFunction,
     private val sp: SP,
     commandQueue: CommandQueue,
@@ -92,7 +94,7 @@ class DanaRSPlugin @Inject constructor(
         .preferencesId(R.xml.pref_danars)
         .description(info.nightscout.pump.dana.R.string.description_pump_dana_rs),
     injector, aapsLogger, rh, commandQueue
-), Pump, Dana, Constraints, OwnDatabasePlugin {
+), Pump, Dana, PluginConstraints, OwnDatabasePlugin {
 
     private val disposable = CompositeDisposable()
     private var danaRSService: DanaRSService? = null
@@ -202,18 +204,22 @@ class DanaRSPlugin @Inject constructor(
 
     // Constraints interface
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        absoluteRate.setIfSmaller(aapsLogger, danaPump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, danaPump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+        absoluteRate.setIfSmaller(danaPump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, danaPump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
         return absoluteRate
     }
 
     override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
-        percentRate.setIfGreater(aapsLogger, 0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
-        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+        percentRate.setIfGreater(0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
+        percentRate.setIfSmaller(
+            pumpDescription.maxTempPercent,
+            rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.pumplimit)),
+            this
+        )
         return percentRate
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfSmaller(aapsLogger, danaPump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, danaPump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+        insulin.setIfSmaller(danaPump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, danaPump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
         return insulin
     }
 
@@ -282,7 +288,7 @@ class DanaRSPlugin @Inject constructor(
 
     @Synchronized
     override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
-        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(ConstraintObject(detailedBolusInfo.insulin, injector)).value()
         return if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             val preferencesSpeed = sp.getInt(info.nightscout.pump.dana.R.string.key_danars_bolusspeed, 0)
             var speed = 12
@@ -337,7 +343,7 @@ class DanaRSPlugin @Inject constructor(
     // This is called from APS
     @Synchronized
     override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
-        val absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val absoluteAfterConstrain = constraintChecker.applyBasalConstraints(ConstraintObject(absoluteRate, injector), profile).value()
         var doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
         val doLowTemp = absoluteAfterConstrain < baseBasalRate
         val doHighTemp = absoluteAfterConstrain > baseBasalRate
@@ -413,7 +419,7 @@ class DanaRSPlugin @Inject constructor(
     @Synchronized
     override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
         val result = PumpEnactResult(injector)
-        var percentAfterConstraint = constraintChecker.applyBasalPercentConstraints(Constraint(percent), profile).value()
+        var percentAfterConstraint = constraintChecker.applyBasalPercentConstraints(ConstraintObject(percent, injector), profile).value()
         if (percentAfterConstraint < 0) {
             result.isTempCancel = false
             result.enacted = false
@@ -483,7 +489,7 @@ class DanaRSPlugin @Inject constructor(
 
     @Synchronized
     override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
-        var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(ConstraintObject(insulin, injector)).value()
         // needs to be rounded
         val durationInHalfHours = max(durationInMinutes / 30, 1)
         insulinAfterConstraint = Round.roundTo(insulinAfterConstraint, pumpDescription.extendedBolusStep)
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
index 07c2c171ec..7ded74eea2 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketBolusSetStepBolusStart.kt
@@ -2,8 +2,8 @@ package info.nightscout.pump.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.encryption.BleEncryption
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.rx.logging.LTag
 import javax.inject.Inject
@@ -15,13 +15,13 @@ class DanaRSPacketBolusSetStepBolusStart(
 ) : DanaRSPacket(injector) {
 
     @Inject lateinit var danaPump: DanaPump
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_START
         // Speed 0 => 12 sec/U, 1 => 30 sec/U, 2 => 60 sec/U
         // HARDCODED LIMIT - if there is one that could be created
-        amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
+        amount = constraintChecker.applyBolusConstraints(ConstraintObject(amount, injector)).value()
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus start : $amount speed: $speed")
     }
 
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt
index 1a63f6433c..e2e2d8a869 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt
@@ -10,7 +10,7 @@ import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.Profile
@@ -103,7 +103,7 @@ class DanaRSService : DaggerService() {
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var uiInteraction: UiInteraction
     @Inject lateinit var bleComm: BLEComm
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -346,7 +346,7 @@ class DanaRSService : DaggerService() {
                 rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.pump.dana.R.string.gettingbolusstatus)))
                 sendMessage(DanaRSPacketBolusGetStepBolusInformation(injector)) // last bolus
                 bolusingEvent.percent = 100
-                rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.shared.R.string.disconnecting)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.interfaces.R.string.disconnecting)))
             }
         })
         return !start.failed
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt
index 958f46f0b4..c2a9d6cc36 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt
@@ -1,9 +1,8 @@
 package info.nightscout.pump.danars
 
 import dagger.android.AndroidInjector
-import info.nightscout.interfaces.Constants
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.plugin.PluginType
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
 import info.nightscout.interfaces.pump.PumpSync
@@ -20,7 +19,7 @@ import org.mockito.Mockito
 @Suppress("SpellCheckingInspection")
 class DanaRSPluginTest : DanaRSTestBase() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
@@ -34,11 +33,11 @@ class DanaRSPluginTest : DanaRSTestBase() {
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHBASALRATE)
+        val c = ConstraintObject(Double.MAX_VALUE, injector)
         danaRSPlugin.applyBasalConstraints(c, validProfile)
         Assertions.assertEquals(java.lang.Double.valueOf(0.8), c.value(), 0.0001)
-        Assertions.assertEquals("DanaRS: limitingbasalratio", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaRS: limitingbasalratio", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaRS: limitingbasalratio", c.getReasons())
+        Assertions.assertEquals("DanaRS: limitingbasalratio", c.getMostLimitedReasons())
     }
 
     @Test
@@ -46,11 +45,11 @@ class DanaRSPluginTest : DanaRSTestBase() {
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaPump.maxBasal = 0.8
-        val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
+        val c = ConstraintObject(Int.MAX_VALUE, injector)
         danaRSPlugin.applyBasalPercentConstraints(c, validProfile)
         Assertions.assertEquals(200, c.value())
-        Assertions.assertEquals("DanaRS: limitingpercentrate", c.getReasons(aapsLogger))
-        Assertions.assertEquals("DanaRS: limitingpercentrate", c.getMostLimitedReasons(aapsLogger))
+        Assertions.assertEquals("DanaRS: limitingpercentrate", c.getReasons())
+        Assertions.assertEquals("DanaRS: limitingpercentrate", c.getMostLimitedReasons())
     }
 
     @BeforeEach
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt
index e64101e1f1..7c56fb2d9c 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSTestBase.kt
@@ -1,5 +1,8 @@
 package info.nightscout.pump.danars
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.interfaces.profile.Instantiator
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.pump.dana.DanaPump
@@ -17,6 +20,14 @@ open class DanaRSTestBase : TestBaseWithProfile() {
 
     lateinit var danaPump: DanaPump
 
+    val injector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is ConstraintObject<*>) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @BeforeEach
     fun prepare() {
         Mockito.`when`(rh.gs(ArgumentMatchers.anyInt())).thenReturn("AnyString")
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt
index 466890cfb9..97a189240c 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsMessageHashTableTest.kt
@@ -3,8 +3,8 @@ package info.nightscout.pump.danars.comm
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.encryption.BleEncryption
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.pump.dana.DanaPump
 import info.nightscout.pump.danars.DanaRSTestBase
 import org.junit.jupiter.api.Assertions
@@ -14,7 +14,7 @@ import org.mockito.Mockito.`when`
 
 class DanaRsMessageHashTableTest : DanaRSTestBase() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
@@ -36,7 +36,7 @@ class DanaRsMessageHashTableTest : DanaRSTestBase() {
 
     @Test
     fun runTest() {
-        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
 
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
         val forTesting: DanaRSPacket = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.HistoryEntry.CARBS.value, 0, 0, 0)
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
index b142a13226..27a8dcd7cd 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketBolusSetStepBolusStartTest.kt
@@ -2,8 +2,8 @@ package info.nightscout.pump.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.core.constraints.ConstraintObject
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.pump.TemporaryBasalStorage
@@ -18,7 +18,7 @@ import org.mockito.Mockito
 
 class DanaRsPacketBolusSetStepBolusStartTest : DanaRSTestBase() {
 
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
@@ -75,6 +75,6 @@ class DanaRsPacketBolusSetStepBolusStartTest : DanaRSTestBase() {
                 danaHistoryDatabase,
                 decimalFormatter
             )
-        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(ConstraintObject(0.0, injector))
     }
 }
\ No newline at end of file
diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
index dc0cdef0e8..08865517af 100644
--- a/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
+++ b/pump/danars/src/test/java/info/nightscout/pump/danars/comm/DanaRsPacketNotifyDeliveryRateDisplayTest.kt
@@ -2,7 +2,7 @@ package info.nightscout.pump.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.pump.TemporaryBasalStorage
@@ -20,7 +20,7 @@ import org.mockito.Mockito.`when`
 class DanaRsPacketNotifyDeliveryRateDisplayTest : DanaRSTestBase() {
 
     @Mock lateinit var danaHistoryDatabase: DanaHistoryDatabase
-    @Mock lateinit var constraintChecker: Constraints
+    @Mock lateinit var constraintChecker: ConstraintsChecker
     @Mock lateinit var commandQueue: CommandQueue
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var temporaryBasalStorage: TemporaryBasalStorage
diff --git a/pump/diaconn/build.gradle b/pump/diaconn/build.gradle
index 81af70ba94..95c51bd3af 100644
--- a/pump/diaconn/build.gradle
+++ b/pump/diaconn/build.gradle
@@ -25,9 +25,10 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
+    implementation project(':app-wear-shared:shared-impl')
     implementation project(':core:libraries')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
 
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
index eab7ce0a82..196134e88b 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt
@@ -160,7 +160,7 @@ class DiaconnG8Fragment : DaggerFragment() {
         if (pump.lastConnection != 0L) {
             val agoMsec = System.currentTimeMillis() - pump.lastConnection
             val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
-            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.shared.R.string.minago, agoMin) + ")"
+            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + rh.gs(info.nightscout.interfaces.R.string.minago, agoMin) + ")"
             warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
index caf8c0f2c0..0ed3187bbb 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt
@@ -9,10 +9,12 @@ import android.text.format.DateFormat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.OwnDatabasePlugin
 import info.nightscout.interfaces.plugin.PluginDescription
@@ -66,7 +68,7 @@ class DiaconnG8Plugin @Inject constructor(
     private val rxBus: RxBus,
     private val context: Context,
     rh: ResourceHelper,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val profileFunction: ProfileFunction,
     private val sp: SP,
     commandQueue: CommandQueue,
@@ -90,7 +92,7 @@ class DiaconnG8Plugin @Inject constructor(
         .preferencesId(R.xml.pref_diaconn)
         .description(R.string.description_pump_diaconn_g8),
     injector, aapsLogger, rh, commandQueue
-), Pump, Diaconn, Constraints, OwnDatabasePlugin {
+), Pump, Diaconn, PluginConstraints, OwnDatabasePlugin {
 
     private val disposable = CompositeDisposable()
     private var diaconnG8Service: DiaconnG8Service? = null
@@ -185,18 +187,22 @@ class DiaconnG8Plugin @Inject constructor(
 
     // Constraints interface
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        absoluteRate.setIfSmaller(aapsLogger, diaconnG8Pump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, diaconnG8Pump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+        absoluteRate.setIfSmaller(diaconnG8Pump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, diaconnG8Pump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
         return absoluteRate
     }
 
     override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
-        percentRate.setIfGreater(aapsLogger, 0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
-        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+        percentRate.setIfGreater(0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this)
+        percentRate.setIfSmaller(
+            pumpDescription.maxTempPercent,
+            rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.pumplimit)),
+            this
+        )
         return percentRate
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfSmaller(aapsLogger, diaconnG8Pump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, diaconnG8Pump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
+        insulin.setIfSmaller(diaconnG8Pump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, diaconnG8Pump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this)
         return insulin
     }
 
@@ -265,7 +271,7 @@ class DiaconnG8Plugin @Inject constructor(
 
     @Synchronized
     override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
-        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(ConstraintObject(detailedBolusInfo.insulin, injector)).value()
         return if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
             val carbs = detailedBolusInfo.carbs
             detailedBolusInfo.carbs = 0.0
@@ -304,7 +310,7 @@ class DiaconnG8Plugin @Inject constructor(
     @Synchronized
     override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
         val result = PumpEnactResult(injector)
-        val absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val absoluteAfterConstrain = constraintChecker.applyBasalConstraints(ConstraintObject(absoluteRate, injector), profile).value()
         val doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
         val doLowTemp = absoluteAfterConstrain < baseBasalRate
         val doHighTemp = absoluteAfterConstrain > baseBasalRate
@@ -391,7 +397,7 @@ class DiaconnG8Plugin @Inject constructor(
 
     @Synchronized
     override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
-        var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(ConstraintObject(insulin, injector)).value()
         // needs to be rounded
         insulinAfterConstraint = Round.roundTo(insulinAfterConstraint, pumpDescription.extendedBolusStep)
         val result = PumpEnactResult(injector)
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt
index 3c766a5058..24c0a03ffc 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt
@@ -538,7 +538,7 @@ class DiaconnG8Service : DaggerService() {
                 if(!diaconnG8Pump.isPumpVersionGe3_53) {
                     bolusingEvent.percent = 100
                 }
-                rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.shared.R.string.disconnecting)))
+                rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.interfaces.R.string.disconnecting)))
             }
         })
         return !start.failed
diff --git a/pump/eopatch/build.gradle b/pump/eopatch/build.gradle
index 224acbbcac..281a2187b4 100644
--- a/pump/eopatch/build.gradle
+++ b/pump/eopatch/build.gradle
@@ -21,11 +21,11 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':pump:eopatch-core')
     implementation project(':core:libraries')
-    implementation project(':app-wear-shared:shared')
-    implementation project(':database:entities')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
+    implementation project(':database:entities')
 
     api "com.google.guava:guava:$guava_version"
 
diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt
index ae020d1ccf..9897559ff8 100644
--- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt
+++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmRegistry.kt
@@ -27,6 +27,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 interface IAlarmRegistry {
+
     fun add(alarmCode: AlarmCode, triggerAfter: Long, isFirst: Boolean = false): Maybe<AlarmCode>
     fun add(patchAeCodes: Set<PatchAeCode>)
     fun remove(alarmCode: AlarmCode): Maybe<AlarmCode>
@@ -34,11 +35,13 @@ interface IAlarmRegistry {
 
 @Singleton
 class AlarmRegistry @Inject constructor() : IAlarmRegistry {
+
     @Inject lateinit var mContext: Context
     @Inject lateinit var pm: IPreferenceManager
     @Inject lateinit var rxBus: RxBus
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
+    @Inject lateinit var dateUtil: DateUtil
 
     private lateinit var mOsAlarmManager: AlarmManager
     private var mDisposable: Disposable? = null
@@ -49,19 +52,21 @@ class AlarmRegistry @Inject constructor() : IAlarmRegistry {
         mDisposable = pm.observePatchLifeCycle()
             .observeOn(aapsSchedulers.main)
             .subscribe {
-                when(it){
+                when (it) {
                     PatchLifecycle.REMOVE_NEEDLE_CAP -> {
                         val triggerAfter = pm.getPatchConfig().patchWakeupTimestamp + TimeUnit.HOURS.toMillis(1) - System.currentTimeMillis()
                         compositeDisposable.add(add(AlarmCode.A020, triggerAfter).subscribe())
                     }
-                    PatchLifecycle.ACTIVATED -> {
+
+                    PatchLifecycle.ACTIVATED         -> {
 
                     }
-                    PatchLifecycle.SHUTDOWN -> {
+
+                    PatchLifecycle.SHUTDOWN          -> {
                         val sources = ArrayList<Maybe<*>>()
                         sources.add(Maybe.just(true))
-                        pm.getAlarms().occurred.let{ occurredAlarms ->
-                            if(occurredAlarms.isNotEmpty()){
+                        pm.getAlarms().occurred.let { occurredAlarms ->
+                            if (occurredAlarms.isNotEmpty()) {
                                 occurredAlarms.keys.forEach { alarmCode ->
                                     sources.add(
                                         Maybe.just(alarmCode)
@@ -71,30 +76,30 @@ class AlarmRegistry @Inject constructor() : IAlarmRegistry {
                                 }
                             }
                         }
-                        pm.getAlarms().registered.let{ registeredAlarms ->
-                            if(registeredAlarms.isNotEmpty()){
+                        pm.getAlarms().registered.let { registeredAlarms ->
+                            if (registeredAlarms.isNotEmpty()) {
                                 registeredAlarms.keys.forEach { alarmCode ->
                                     sources.add(remove(alarmCode))
                                 }
                             }
                         }
                         compositeDisposable.add(Maybe.concat(sources)
-                            .subscribe {
-                                pm.getAlarms().clear()
-                                pm.flushAlarms()
-                            }
+                                                    .subscribe {
+                                                        pm.getAlarms().clear()
+                                                        pm.flushAlarms()
+                                                    }
                         )
                     }
 
-                    else -> Unit
+                    else                             -> Unit
                 }
             }
     }
 
     override fun add(alarmCode: AlarmCode, triggerAfter: Long, isFirst: Boolean): Maybe<AlarmCode> {
-        if(pm.getAlarms().occurred.containsKey(alarmCode)){
+        if (pm.getAlarms().occurred.containsKey(alarmCode)) {
             return Maybe.just(alarmCode)
-        }else {
+        } else {
             val triggerTimeMilli = System.currentTimeMillis() + triggerAfter
             pm.getAlarms().register(alarmCode, triggerAfter)
             pm.flushAlarms()
@@ -109,11 +114,11 @@ class AlarmRegistry @Inject constructor() : IAlarmRegistry {
     override fun add(patchAeCodes: Set<PatchAeCode>) {
         compositeDisposable.add(
             Observable.fromIterable(patchAeCodes)
-               .filter{patchAeCodeItem ->  AlarmCode.findByPatchAeCode(patchAeCodeItem.aeValue) != null}
-               .observeOn(aapsSchedulers.main)
-               .filter { aeCodes -> AlarmCode.findByPatchAeCode(aeCodes.aeValue) != null }
-               .flatMapMaybe{aeCodeResponse -> add(AlarmCode.findByPatchAeCode(aeCodeResponse.aeValue)!!, 0L, true)}
-               .subscribe()
+                .filter { patchAeCodeItem -> AlarmCode.findByPatchAeCode(patchAeCodeItem.aeValue) != null }
+                .observeOn(aapsSchedulers.main)
+                .filter { aeCodes -> AlarmCode.findByPatchAeCode(aeCodes.aeValue) != null }
+                .flatMapMaybe { aeCodeResponse -> add(AlarmCode.findByPatchAeCode(aeCodeResponse.aeValue)!!, 0L, true) }
+                .subscribe()
         )
     }
 
@@ -121,21 +126,21 @@ class AlarmRegistry @Inject constructor() : IAlarmRegistry {
         return Maybe.fromCallable {
             cancelOsAlarmInternal(alarmCode)
             val pendingIntent = createPendingIntent(alarmCode, 0)
-            aapsLogger.debug("[${alarmCode}] OS Alarm added. ${DateUtil(mContext).toISOString(triggerTime)}")
+            aapsLogger.debug("[${alarmCode}] OS Alarm added. ${dateUtil.toISOString(triggerTime)}")
             mOsAlarmManager.setAlarmClock(AlarmClockInfo(triggerTime, pendingIntent), pendingIntent)
             alarmCode
         }
     }
 
     override fun remove(alarmCode: AlarmCode): Maybe<AlarmCode> {
-        return if(pm.getAlarms().registered.containsKey(alarmCode)) {
+        return if (pm.getAlarms().registered.containsKey(alarmCode)) {
             cancelOsAlarms(alarmCode)
                 .doOnSuccess {
                     pm.getAlarms().unregister(alarmCode)
                     pm.flushAlarms()
                 }
                 .map { alarmCode }
-        }else{
+        } else {
             Maybe.just(alarmCode)
         }
     }
diff --git a/pump/medtronic/build.gradle b/pump/medtronic/build.gradle
index b44c33cb15..f842108c8d 100644
--- a/pump/medtronic/build.gradle
+++ b/pump/medtronic/build.gradle
@@ -16,8 +16,8 @@ android {
 
 dependencies {
     implementation project(':core:libraries')
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:ui')
     implementation project(':core:utils')
     implementation project(':core:validators')
diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index f449b22fb0..bec36b69a6 100644
--- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -275,7 +275,7 @@ class MedtronicFragment : DaggerFragment() {
             } else if (medtronicPumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) {
 
                 if (min < 60) {
-                    binding.lastConnection.text = rh.gs(info.nightscout.shared.R.string.minago, min)
+                    binding.lastConnection.text = rh.gs(info.nightscout.interfaces.R.string.minago, min)
                 } else if (min < 1440) {
                     val h = (min / 60).toInt()
                     binding.lastConnection.text = (rh.gq(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R.plurals.duration_hours, h, h) + " "
diff --git a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt
index ced4a4bc8f..f58892816e 100644
--- a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt
+++ b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicTestBase.kt
@@ -11,8 +11,6 @@ import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.pump.common.sync.PumpSyncStorage
 import info.nightscout.pump.core.utils.ByteUtil
-import info.nightscout.rx.TestAapsSchedulers
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.sharedtests.TestBase
@@ -21,7 +19,6 @@ import org.mockito.Mock
 
 open class MedtronicTestBase : TestBase() {
 
-    var rxBus: RxBus = RxBus(TestAapsSchedulers(), aapsLogger)
     var byteUtil = ByteUtil()
     var rileyLinkUtil = RileyLinkUtil()
 
diff --git a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt
index 434eb8e8df..dd77853710 100644
--- a/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt
+++ b/pump/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.kt
@@ -14,8 +14,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.database.impl.serialisation.SealedClassHelper
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.pump.core.utils.ByteUtil
-import info.nightscout.rx.TestAapsSchedulers
-import info.nightscout.rx.bus.RxBus
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.Mock
@@ -37,8 +35,6 @@ import org.mockito.Mock
 
     @BeforeEach
     fun setup() {
-        rxBus = RxBus(TestAapsSchedulers(), aapsLogger)
-
         medtronicPumpStatus = MedtronicPumpStatus(rh, sp, rxBus, rileyLinkUtil)
         medtronicUtil = MedtronicUtil(aapsLogger, rxBus, rileyLinkUtil, medtronicPumpStatus, uiInteraction)
         decoder = MedtronicPumpHistoryDecoder(aapsLogger, medtronicUtil, byteUtil)
diff --git a/pump/medtrum/build.gradle b/pump/medtrum/build.gradle
index f1f2e6a263..9107869f50 100644
--- a/pump/medtrum/build.gradle
+++ b/pump/medtrum/build.gradle
@@ -19,15 +19,14 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':core:libraries')
     implementation project(':core:interfaces')
     implementation project(':core:main')
     implementation project(':core:ui')
+    implementation project(':core:utils')
     implementation project(':core:validators')
     implementation project(':pump:pump-common')
-    implementation project(':core:utils')
 
     testImplementation project(':app-wear-shared:shared-tests')
     testImplementation project(':core:main')
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
index efcda22669..d4f41f9e74 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt
@@ -12,12 +12,12 @@ import androidx.preference.EditTextPreference
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceFragmentCompat
 import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.validators.ValidatingEditTextPreference
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.plugin.PluginType
@@ -67,7 +67,7 @@ import kotlin.math.abs
     aapsLogger: AAPSLogger,
     rh: ResourceHelper,
     commandQueue: CommandQueue,
-    private val constraintChecker: Constraints,
+    private val constraintChecker: ConstraintsChecker,
     private val aapsSchedulers: AapsSchedulers,
     private val rxBus: RxBus,
     private val context: Context,
@@ -348,7 +348,7 @@ import kotlin.math.abs
     override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
         aapsLogger.debug(LTag.PUMP, "deliverTreatment: " + detailedBolusInfo.insulin + "U")
         if (!isInitialized()) return PumpEnactResult(injector).success(false).enacted(false)
-        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(ConstraintObject(detailedBolusInfo.insulin, injector)).value()
         return if (detailedBolusInfo.insulin > 0 && detailedBolusInfo.carbs == 0.0) {
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: Delivering bolus: " + detailedBolusInfo.insulin + "U")
             val t = EventOverviewBolusProgress.Treatment(0.0, 0, detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB, detailedBolusInfo.id)
@@ -388,7 +388,7 @@ import kotlin.math.abs
 
         aapsLogger.info(LTag.PUMP, "setTempBasalAbsolute - absoluteRate: $absoluteRate, durationInMinutes: $durationInMinutes, enforceNew: $enforceNew")
         // round rate to pump rate
-        val pumpRate = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val pumpRate = constraintChecker.applyBasalConstraints(ConstraintObject(absoluteRate, injector), profile).value()
         temporaryBasalStorage.add(PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes.toLong()).msecs(), pumpRate, true, tbrType, 0L, 0L))
         val connectionOK = medtrumService?.setTempBasal(pumpRate, durationInMinutes) ?: false
         return if (connectionOK
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
index 569ed1b587..b5165b47c4 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
@@ -9,16 +9,15 @@ import android.os.SystemClock
 import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.profile.ProfileFunction
+import info.nightscout.interfaces.pump.BolusProgressData
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
-import info.nightscout.interfaces.pump.BolusProgressData
 import info.nightscout.interfaces.pump.PumpSync
-import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.ui.UiInteraction
@@ -28,7 +27,27 @@ import info.nightscout.pump.medtrum.R
 import info.nightscout.pump.medtrum.code.ConnectionState
 import info.nightscout.pump.medtrum.comm.enums.AlarmState
 import info.nightscout.pump.medtrum.comm.enums.MedtrumPumpState
-import info.nightscout.pump.medtrum.comm.packets.*
+import info.nightscout.pump.medtrum.comm.packets.ActivatePacket
+import info.nightscout.pump.medtrum.comm.packets.AuthorizePacket
+import info.nightscout.pump.medtrum.comm.packets.CancelBolusPacket
+import info.nightscout.pump.medtrum.comm.packets.CancelTempBasalPacket
+import info.nightscout.pump.medtrum.comm.packets.ClearPumpAlarmPacket
+import info.nightscout.pump.medtrum.comm.packets.GetDeviceTypePacket
+import info.nightscout.pump.medtrum.comm.packets.GetRecordPacket
+import info.nightscout.pump.medtrum.comm.packets.GetTimePacket
+import info.nightscout.pump.medtrum.comm.packets.MedtrumPacket
+import info.nightscout.pump.medtrum.comm.packets.NotificationPacket
+import info.nightscout.pump.medtrum.comm.packets.PrimePacket
+import info.nightscout.pump.medtrum.comm.packets.ResumePumpPacket
+import info.nightscout.pump.medtrum.comm.packets.SetBasalProfilePacket
+import info.nightscout.pump.medtrum.comm.packets.SetBolusPacket
+import info.nightscout.pump.medtrum.comm.packets.SetPatchPacket
+import info.nightscout.pump.medtrum.comm.packets.SetTempBasalPacket
+import info.nightscout.pump.medtrum.comm.packets.SetTimePacket
+import info.nightscout.pump.medtrum.comm.packets.SetTimeZonePacket
+import info.nightscout.pump.medtrum.comm.packets.StopPatchPacket
+import info.nightscout.pump.medtrum.comm.packets.SubscribePacket
+import info.nightscout.pump.medtrum.comm.packets.SynchronizePacket
 import info.nightscout.pump.medtrum.util.MedtrumSnUtil
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
@@ -67,7 +86,7 @@ class MedtrumService : DaggerService(), BLECommCallback {
     @Inject lateinit var medtrumPlugin: MedtrumPlugin
     @Inject lateinit var medtrumPump: MedtrumPump
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var uiInteraction: UiInteraction
     @Inject lateinit var bleComm: BLEComm
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -413,7 +432,7 @@ class MedtrumService : DaggerService(), BLECommCallback {
                     connectionRetryCounter++
                 } else {
                     communicationLost = true
-                    aapsLogger.warn(LTag.PUMPCOMM, "Retry connection faled, communication stopped")
+                    aapsLogger.warn(LTag.PUMPCOMM, "Retry connection failed, communication stopped")
                     disconnect("Communication stopped")
                 }
             } else {
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt
index 8291983817..dcc15dc074 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt
@@ -177,7 +177,7 @@ class MedtrumOverviewViewModel @Inject constructor(
         if (medtrumPump.lastConnection != 0L) {
             val agoMilliseconds = System.currentTimeMillis() - medtrumPump.lastConnection
             val agoMinutes = agoMilliseconds / 1000 / 60
-            _lastConnectionMinAgo.postValue(rh.gs(info.nightscout.shared.R.string.minago, agoMinutes))
+            _lastConnectionMinAgo.postValue(rh.gs(info.nightscout.interfaces.R.string.minago, agoMinutes))
         }
         if (medtrumPump.lastBolusTime != 0L) {
             val agoMilliseconds = System.currentTimeMillis() - medtrumPump.lastBolusTime
diff --git a/pump/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle
index 51397ea938..2258b47333 100644
--- a/pump/omnipod-common/build.gradle
+++ b/pump/omnipod-common/build.gradle
@@ -20,7 +20,6 @@ dependencies {
     implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:shared')
 
     api "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
     api "androidx.fragment:fragment-ktx:$fragmentktx_version"
diff --git a/pump/omnipod-dash/build.gradle b/pump/omnipod-dash/build.gradle
index 72c2bd4d84..7057f8a12c 100644
--- a/pump/omnipod-dash/build.gradle
+++ b/pump/omnipod-dash/build.gradle
@@ -27,9 +27,9 @@ android {
 dependencies {
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:libraries')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')
@@ -41,6 +41,7 @@ dependencies {
     api "androidx.room:room-rxjava3:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
 
+    androidTestImplementation project(':app-wear-shared:shared-tests')
     testImplementation project(':app-wear-shared:shared-tests')
     testImplementation "commons-codec:commons-codec:$commonscodec_version"
 
diff --git a/pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt b/pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
index 3ce25b2115..8c9ea1cd8f 100644
--- a/pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
+++ b/pump/omnipod-dash/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistoryTest.kt
@@ -8,9 +8,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.Omnipod
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.HistoryRecordDao
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.mapper.HistoryMapper
-import info.nightscout.rx.logging.AAPSLoggerTest
+import info.nightscout.sharedtests.AAPSLoggerTest
 import org.junit.Before
-import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 
diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt
index 735938a9e8..d8ef9a4200 100644
--- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt
+++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecry
 
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket
 import info.nightscout.core.utils.toHex
-import info.nightscout.rx.logging.AAPSLoggerTest
+import info.nightscout.sharedtests.AAPSLoggerTest
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.spongycastle.util.encoders.Hex
diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt
index 43a71e621c..0b95e71c27 100644
--- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt
+++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt
@@ -4,7 +4,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.Rand
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator
 import info.nightscout.core.utils.toHex
 import info.nightscout.interfaces.Config
-import info.nightscout.rx.logging.AAPSLoggerTest
+import info.nightscout.sharedtests.AAPSLoggerTest
 import info.nightscout.sharedtests.TestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt
index d8871467bf..c399939cd3 100644
--- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt
+++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
 
 import info.nightscout.core.utils.toHex
-import info.nightscout.rx.logging.AAPSLoggerTest
+import info.nightscout.sharedtests.AAPSLoggerTest
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.spongycastle.util.encoders.Hex
diff --git a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt
index ad82492289..2c7914eb24 100644
--- a/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt
+++ b/pump/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session
 
 import info.nightscout.core.utils.toHex
 import info.nightscout.interfaces.Config
-import info.nightscout.rx.logging.AAPSLoggerTest
+import info.nightscout.sharedtests.AAPSLoggerTest
 import info.nightscout.sharedtests.TestBase
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
diff --git a/pump/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle
index c3ff28071f..92da56024e 100644
--- a/pump/omnipod-eros/build.gradle
+++ b/pump/omnipod-eros/build.gradle
@@ -27,9 +27,9 @@ android {
 dependencies {
     implementation project(':database:entities')
     implementation project(':database:impl')
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:libraries')
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:utils')
     implementation project(':core:ui')
     implementation project(':core:validators')
@@ -37,6 +37,8 @@ dependencies {
     implementation project(':pump:rileylink')
     implementation project(':pump:omnipod-common')
 
+    testImplementation project(':app-wear-shared:shared-impl')
+
     api "androidx.room:room-ktx:$room_version"
     api "androidx.room:room-runtime:$room_version"
     api "androidx.room:room-rxjava3:$room_version"
diff --git a/pump/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt b/pump/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
index c585f2552e..d8c0da7cae 100644
--- a/pump/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
+++ b/pump/omnipod-eros/src/androidTest/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/history/ErosHistoryTest.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.Ero
 import org.junit.Assert.assertNotNull
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
 
 class ErosHistoryTest {
 
diff --git a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
index 9b7bd7e5a3..a4dae6e21f 100644
--- a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
+++ b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.kt
@@ -14,10 +14,9 @@ import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.interfaces.utils.DecimalFormatter
 import info.nightscout.pump.common.defs.TempBasalPair
-import info.nightscout.rx.TestAapsSchedulers
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.sharedtests.TestBase
+import info.nightscout.sharedtests.rx.TestAapsSchedulers
 import org.joda.time.DateTimeZone
 import org.joda.time.tz.UTCProvider
 import org.junit.jupiter.api.Assertions
@@ -41,7 +40,6 @@ class OmnipodErosPumpPluginTest : TestBase() {
     @Mock lateinit var erosHistoryDatabase: ErosHistoryDatabase
 
     private lateinit var decimalFormatter: DecimalFormatter
-    private var rxBusWrapper = RxBus(TestAapsSchedulers(), aapsLogger)
 
     @BeforeEach fun prepare() {
         `when`(rh.gs(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong()))
@@ -54,7 +52,7 @@ class OmnipodErosPumpPluginTest : TestBase() {
 
         // mock all the things
         val plugin = OmnipodErosPumpPlugin(
-            injector, aapsLogger, TestAapsSchedulers(), rxBusWrapper, null,
+            injector, aapsLogger, TestAapsSchedulers(), rxBus, null,
             rh, null, null, aapsOmnipodErosManager, commandQueue,
             null, null, null, null,
             rileyLinkUtil, null, null, pumpSync, uiInteraction, erosHistoryDatabase, decimalFormatter
diff --git a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
index 782ecc7604..f798368d1c 100644
--- a/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
+++ b/pump/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsErosPodStateManagerTest.kt
@@ -2,8 +2,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.eros.manager
 
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.FirmwareVersion
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.driver.definition.PodProgressStatus
-import info.nightscout.rx.TestAapsSchedulers
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.sharedtests.TestBase
 import org.joda.time.DateTime
@@ -19,8 +17,6 @@ class AapsErosPodStateManagerTest : TestBase() {
 
     @Mock lateinit var sp: SP
 
-    private val rxBus = RxBus(TestAapsSchedulers(), aapsLogger)
-
     @Test fun times() {
         val timeZone = DateTimeZone.UTC
         DateTimeZone.setDefault(timeZone)
diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle
index ba01b3436f..1f69307954 100644
--- a/pump/pump-common/build.gradle
+++ b/pump/pump-common/build.gradle
@@ -16,8 +16,8 @@ android {
 
 dependencies {
     implementation project(':core:interfaces')
+    implementation project(':core:main')
     implementation project(':core:utils')
-    implementation project(':app-wear-shared:shared')
 
     implementation('com.thoughtworks.xstream:xstream:1.4.20') {
         exclude group: 'xmlpull', module: 'xmlpull'
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt
index 3c5517200a..fbf9738856 100644
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt
@@ -8,7 +8,7 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.utils.fabric.FabricPrivacy
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.PluginConstraints
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.plugin.PluginDescription
 import info.nightscout.interfaces.profile.Profile
@@ -63,7 +63,7 @@ abstract class PumpPluginAbstract protected constructor(
     var pumpSync: PumpSync,
     var pumpSyncStorage: PumpSyncStorage,
     var decimalFormatter: DecimalFormatter
-) : PumpPluginBase(pluginDescription, injector, aapsLogger, rh, commandQueue), Pump, Constraints, PumpSyncEntriesCreator {
+) : PumpPluginBase(pluginDescription, injector, aapsLogger, rh, commandQueue), Pump, PluginConstraints, PumpSyncEntriesCreator {
 
     protected val disposable = CompositeDisposable()
 
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt
index f2829bb298..311522e5db 100644
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/data/PumpStatus.kt
@@ -32,7 +32,7 @@ abstract class PumpStatus(var pumpType: PumpType) {
     // TDD
     var dailyTotalUnits: Double? = null
     var maxDailyTotalUnits: String? = null
-    var units: String? = null // Constants.MGDL or Constants.MMOL
+    var units: String? = null // GlucoseUnit.MGDL.asText or GlucoseUnit.MMOL.asText
     var pumpRunningState = PumpRunningState.Running
     var basalsByHour: DoubleArray? = null
     var tempBasalStart: Long? = null
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt
index 432cb2d074..601a0db542 100644
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt
@@ -9,14 +9,14 @@ enum class PumpDriverState(var resourceId: Int) {
 
     NotInitialized(R.string.pump_status_not_initialized), // this state should be set only when driver is created
     Connecting(info.nightscout.core.ui.R.string.connecting), //
-    Connected(info.nightscout.shared.R.string.connected), //
+    Connected(info.nightscout.interfaces.R.string.connected), //
     Initialized(R.string.pump_status_initialized), // this is weird state that probably won't be used, since its more driver centric that communication centric
     EncryptCommunication(R.string.pump_status_encrypt), //
     Ready(R.string.pump_status_ready),
     Busy(R.string.pump_status_busy), //
     Suspended(R.string.pump_status_suspended), //
     ExecutingCommand(R.string.pump_status_executing_command),
-    Disconnecting(info.nightscout.shared.R.string.disconnecting),
+    Disconnecting(info.nightscout.interfaces.R.string.disconnecting),
     Disconnected(info.nightscout.core.ui.R.string.disconnected);
 
     fun isConnected(): Boolean = this == Connected || this == Initialized || this == Busy || this == Suspended
diff --git a/pump/rileylink/build.gradle b/pump/rileylink/build.gradle
index 03620015ee..439dfa0917 100644
--- a/pump/rileylink/build.gradle
+++ b/pump/rileylink/build.gradle
@@ -15,7 +15,6 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':core:interfaces')
     implementation project(':core:ui')
     implementation project(':pump:pump-common')
diff --git a/pump/virtual/build.gradle b/pump/virtual/build.gradle
index ecdf3d7798..f22de01853 100644
--- a/pump/virtual/build.gradle
+++ b/pump/virtual/build.gradle
@@ -17,7 +17,6 @@ android {
 }
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':core:interfaces')
     implementation project(':core:main')
diff --git a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt
index e9c2922e52..87722bf9b4 100644
--- a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt
+++ b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt
@@ -9,7 +9,6 @@ import info.nightscout.interfaces.profile.ProfileFunction
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.interfaces.queue.CommandQueue
-import info.nightscout.rx.bus.RxBus
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.shared.sharedPreferences.SP
 import info.nightscout.shared.utils.DateUtil
@@ -22,7 +21,6 @@ import org.mockito.Mockito.`when`
 
 class VirtualPumpPluginUTest : TestBase() {
 
-    private val rxBus = RxBus(aapsSchedulers, aapsLogger)
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var rh: ResourceHelper
     @Mock lateinit var sp: SP
diff --git a/settings.gradle b/settings.gradle
index 816e1ae58d..02f044b440 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
 include ':app'
 include ':wear'
-include ':app-wear-shared:shared'
 include ':app-wear-shared:shared-impl'
 include ':app-wear-shared:shared-tests'
 include ':core:main'
diff --git a/ui/build.gradle b/ui/build.gradle
index 65f2b951c7..43d3d72941 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -17,7 +17,6 @@ android {
 dependencies {
     implementation project(':core:libraries')
     implementation project(':core:graphview')
-    implementation project(':app-wear-shared:shared')
     implementation project(':database:entities')
     implementation project(':database:impl')
     implementation project(':core:interfaces')
diff --git a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
index 2fe3bd3b0a..8635605c11 100644
--- a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt
@@ -156,7 +156,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag
         }
         addMenuProvider(object : MenuProvider {
             override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-                menuInflater.inflate(info.nightscout.core.utils.R.menu.menu_actions, menu)
+                menuInflater.inflate(info.nightscout.core.main.R.menu.menu_actions, menu)
             }
 
             override fun onMenuItemSelected(menuItem: MenuItem): Boolean =
diff --git a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt
index 07bfea0f9e..410806021b 100644
--- a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt
+++ b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt
@@ -102,7 +102,7 @@ class ActivityMonitor @Inject constructor(
                             row.gravity = Gravity.CENTER_HORIZONTAL
                             row.addView(TextView(context).apply { layoutParams = lp.apply { column = 0 }; text = activity })
                             row.addView(TextView(context).apply { layoutParams = lp.apply { column = 1 }; text = duration })
-                            row.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.shared.R.string.in_days, days.toDouble()) })
+                            row.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 }; text = rh.gs(info.nightscout.interfaces.R.string.in_days, days.toDouble()) })
                         }
                     )
                 }
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
index 0cc7b4cb5d..8095e08415 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
@@ -8,6 +8,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
@@ -23,8 +25,7 @@ import info.nightscout.interfaces.Constants.CARBS_FAV2_DEFAULT
 import info.nightscout.interfaces.Constants.CARBS_FAV3_DEFAULT
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.automation.Automation
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.logging.UserEntryLogger
@@ -54,7 +55,7 @@ class CarbsDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var ctx: Context
     @Inject lateinit var rh: ResourceHelper
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileUtil: ProfileUtil
     @Inject lateinit var iobCobCalculator: IobCobCalculator
@@ -66,6 +67,7 @@ class CarbsDialog : DialogFragmentWithDate() {
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var uiInteraction: UiInteraction
     @Inject lateinit var decimalFormatter: DecimalFormatter
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var queryingProtection = false
     private val disposable = CompositeDisposable()
@@ -225,7 +227,7 @@ class CarbsDialog : DialogFragmentWithDate() {
     override fun submit(): Boolean {
         if (_binding == null) return false
         val carbs = binding.carbs.value.toInt()
-        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(carbs, injector)).value()
         val units = profileUtil.units
         val activityTTDuration = defaultValueHelper.determineActivityTTDuration()
         val activityTT = defaultValueHelper.determineActivityTT()
@@ -276,7 +278,7 @@ class CarbsDialog : DialogFragmentWithDate() {
             actions.add(rh.gs(info.nightscout.core.ui.R.string.alarminxmin, timeOffset).formatColor(context, rh, info.nightscout.core.ui.R.attr.infoColor))
         val duration = binding.duration.value.toInt()
         if (duration > 0)
-            actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(info.nightscout.shared.R.string.shorthour))
+            actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(info.nightscout.interfaces.R.string.shorthour))
         if (carbsAfterConstraints > 0) {
             actions.add(
                 rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "<font color='" + rh.gac(
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
index 10f02b2f0f..49ecf11135 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
@@ -6,14 +6,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.protection.ProtectionCheck
@@ -34,12 +35,13 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
 
     @Inject lateinit var ctx: Context
     @Inject lateinit var rh: ResourceHelper
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var uiInteraction: UiInteraction
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var queryingProtection = false
     private var _binding: DialogExtendedbolusBinding? = null
@@ -94,7 +96,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
         val insulin = SafeParse.stringToDouble(binding.insulin.text)
         val durationInMinutes = binding.duration.value.toInt()
         val actions: LinkedList<String> = LinkedList()
-        val insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        val insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(ConstraintObject(insulin, injector)).value()
         actions.add(rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, insulinAfterConstraint))
         actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, durationInMinutes))
         if (abs(insulinAfterConstraint - insulin) > 0.01)
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
index 2b1084f47b..7f149d45d6 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
@@ -6,6 +6,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
@@ -15,8 +17,7 @@ import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.protection.ProtectionCheck
@@ -38,7 +39,7 @@ import kotlin.math.abs
 
 class FillDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var ctx: Context
     @Inject lateinit var commandQueue: CommandQueue
@@ -48,6 +49,7 @@ class FillDialog : DialogFragmentWithDate() {
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var uiInteraction: UiInteraction
     @Inject lateinit var decimalFormatter: DecimalFormatter
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var queryingProtection = false
     private val disposable = CompositeDisposable()
@@ -116,7 +118,7 @@ class FillDialog : DialogFragmentWithDate() {
         val insulin = SafeParse.stringToDouble(binding.fillInsulinAmount.text)
         val actions: LinkedList<String?> = LinkedList()
 
-        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(insulin, injector)).value()
         if (insulinAfterConstraints > 0) {
             actions.add(rh.gs(R.string.fill_warning))
             actions.add("")
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
index 1c8596bc04..9602f779c1 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
@@ -8,6 +8,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
@@ -23,8 +25,7 @@ import info.nightscout.interfaces.Constants.INSULIN_PLUS2_DEFAULT
 import info.nightscout.interfaces.Constants.INSULIN_PLUS3_DEFAULT
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.automation.Automation
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -56,7 +57,7 @@ import kotlin.math.max
 
 class InsulinDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var profileFunction: ProfileFunction
@@ -72,6 +73,7 @@ class InsulinDialog : DialogFragmentWithDate() {
     @Inject lateinit var uiInteraction: UiInteraction
     @Inject lateinit var persistenceLayer: PersistenceLayer
     @Inject lateinit var decimalFormatter: DecimalFormatter
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var queryingProtection = false
     private val disposable = CompositeDisposable()
@@ -137,35 +139,35 @@ class InsulinDialog : DialogFragmentWithDate() {
                 .okcancel.ok, textWatcher
         )
 
-        val plus05Text = sp.getDouble(rh.gs(info.nightscout.shared.R.string.key_insulin_button_increment_1), INSULIN_PLUS1_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter)
+        val plus05Text = sp.getDouble(rh.gs(info.nightscout.interfaces.R.string.key_insulin_button_increment_1), INSULIN_PLUS1_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter)
         binding.plus05.text = plus05Text
         binding.plus05.contentDescription = rh.gs(info.nightscout.core.ui.R.string.overview_insulin_label) + " " + plus05Text
         binding.plus05.setOnClickListener {
             binding.amount.value = max(
                 0.0, binding.amount.value
-                    + sp.getDouble(rh.gs(info.nightscout.shared.R.string.key_insulin_button_increment_1), INSULIN_PLUS1_DEFAULT)
+                    + sp.getDouble(rh.gs(info.nightscout.interfaces.R.string.key_insulin_button_increment_1), INSULIN_PLUS1_DEFAULT)
             )
             validateInputs()
             binding.amount.announceValue()
         }
-        val plus10Text = sp.getDouble(rh.gs(info.nightscout.shared.R.string.key_insulin_button_increment_2), INSULIN_PLUS2_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter)
+        val plus10Text = sp.getDouble(rh.gs(info.nightscout.interfaces.R.string.key_insulin_button_increment_2), INSULIN_PLUS2_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter)
         binding.plus10.text = plus10Text
         binding.plus10.contentDescription = rh.gs(info.nightscout.core.ui.R.string.overview_insulin_label) + " " + plus10Text
         binding.plus10.setOnClickListener {
             binding.amount.value = max(
                 0.0, binding.amount.value
-                    + sp.getDouble(rh.gs(info.nightscout.shared.R.string.key_insulin_button_increment_2), INSULIN_PLUS2_DEFAULT)
+                    + sp.getDouble(rh.gs(info.nightscout.interfaces.R.string.key_insulin_button_increment_2), INSULIN_PLUS2_DEFAULT)
             )
             validateInputs()
             binding.amount.announceValue()
         }
-        val plus20Text = sp.getDouble(rh.gs(info.nightscout.shared.R.string.key_insulin_button_increment_3), INSULIN_PLUS3_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter)
+        val plus20Text = sp.getDouble(rh.gs(info.nightscout.interfaces.R.string.key_insulin_button_increment_3), INSULIN_PLUS3_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter)
         binding.plus20.text = plus20Text
         binding.plus20.contentDescription = rh.gs(info.nightscout.core.ui.R.string.overview_insulin_label) + " " + plus20Text
         binding.plus20.setOnClickListener {
             binding.amount.value = max(
                 0.0, binding.amount.value
-                    + sp.getDouble(rh.gs(info.nightscout.shared.R.string.key_insulin_button_increment_3), INSULIN_PLUS3_DEFAULT)
+                    + sp.getDouble(rh.gs(info.nightscout.interfaces.R.string.key_insulin_button_increment_3), INSULIN_PLUS3_DEFAULT)
             )
             validateInputs()
             binding.amount.announceValue()
@@ -189,7 +191,7 @@ class InsulinDialog : DialogFragmentWithDate() {
         if (_binding == null) return false
         val pumpDescription = activePlugin.activePump.pumpDescription
         val insulin = SafeParse.stringToDouble(binding.amount.text)
-        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(insulin, injector)).value()
         val actions: LinkedList<String?> = LinkedList()
         val units = profileFunction.getUnits()
         val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(info.nightscout.core.ui.R.string.mmol) else rh.gs(info.nightscout.core.ui.R.string.mgdl)
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
index e668f6bee8..00577a4b11 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
@@ -10,7 +10,9 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import androidx.fragment.app.FragmentManager
+import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.fabric.FabricPrivacy
@@ -20,11 +22,10 @@ import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
-import info.nightscout.interfaces.ConfigBuilder
 import info.nightscout.interfaces.ApsMode
+import info.nightscout.interfaces.ConfigBuilder
 import info.nightscout.interfaces.aps.Loop
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.constraints.Objectives
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -64,7 +65,7 @@ class LoopDialog : DaggerDialogFragment() {
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var loop: Loop
     @Inject lateinit var activePlugin: ActivePlugin
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var commandQueue: CommandQueue
     @Inject lateinit var configBuilder: ConfigBuilder
     @Inject lateinit var uel: UserEntryLogger
@@ -72,6 +73,7 @@ class LoopDialog : DaggerDialogFragment() {
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var uiInteraction: UiInteraction
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var queryingProtection = false
     private var showOkCancel: Boolean = true
@@ -152,16 +154,14 @@ class LoopDialog : DaggerDialogFragment() {
         disposable.clear()
     }
 
-    var task: Runnable? = null
-
     @Synchronized
     fun updateGUI(from: String) {
         if (_binding == null) return
         aapsLogger.debug("UpdateGUI from $from")
         val pumpDescription: PumpDescription = activePlugin.activePump.pumpDescription
-        val closedLoopAllowed = constraintChecker.isClosedLoopAllowed(Constraint(true))
+        val closedLoopAllowed = constraintChecker.isClosedLoopAllowed(ConstraintObject(true, injector))
         val closedLoopAllowed2 = activePlugin.activeObjectives?.isAccomplished(Objectives.MAXIOB_OBJECTIVE) ?: false
-        val lgsEnabled = constraintChecker.isLgsAllowed(Constraint(true))
+        val lgsEnabled = constraintChecker.isLgsAllowed(ConstraintObject(true, injector))
         val apsMode = ApsMode.fromString(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name))
         val pump = activePlugin.activePump
 
@@ -189,7 +189,7 @@ class LoopDialog : DaggerDialogFragment() {
                 binding.overviewReconnect.visibility = View.VISIBLE
             }
 
-            !(loop as PluginBase).isEnabled()                      -> {
+            !loop.isEnabled()                                      -> {
                 binding.overviewLoop.visibility = View.VISIBLE
                 binding.overviewEnable.visibility = View.VISIBLE
                 binding.overviewDisable.visibility = View.GONE
@@ -279,7 +279,7 @@ class LoopDialog : DaggerDialogFragment() {
         return true
     }
 
-    fun onClick(v: View): Boolean {
+    private fun onClick(v: View): Boolean {
         when (v.id) {
             R.id.overview_closeloop                       -> {
                 uel.log(UserEntry.Action.CLOSED_LOOP_MODE, UserEntry.Sources.LoopDialog)
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
index 4e35a60cd9..43dac342da 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt
@@ -138,7 +138,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             profile?.let { profile1 ->
                 profile2?.let { profile2 ->
                     binding.units.text = profileFunction.getUnits().asText
-                    binding.dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile2.dia, DecimalFormat("0.00"), rh.gs(info.nightscout.shared.R.string.shorthour)))
+                    binding.dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile2.dia, DecimalFormat("0.00"), rh.gs(info.nightscout.interfaces.R.string.shorthour)))
                     val profileNames = profileName!!.split("\n").toTypedArray()
                     binding.activeProfile.text = HtmlHelper.fromHtml(formatColors(profileNames[0], profileNames[1]))
                     binding.date.text = date
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
index 730af01f57..4cf3cf85d8 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
@@ -6,14 +6,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.core.utils.extensions.formatColor
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.ProfileFunction
@@ -35,7 +36,7 @@ import kotlin.math.abs
 
 class TempBasalDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activePlugin: ActivePlugin
@@ -44,6 +45,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var protectionCheck: ProtectionCheck
     @Inject lateinit var uiInteraction: UiInteraction
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var queryingProtection = false
     private var isPercentPump = true
@@ -118,13 +120,13 @@ class TempBasalDialog : DialogFragmentWithDate() {
         val actions: LinkedList<String> = LinkedList()
         if (isPercentPump) {
             val basalPercentInput = SafeParse.stringToInt(binding.basalPercentInput.text)
-            percent = constraintChecker.applyBasalPercentConstraints(Constraint(basalPercentInput), profile).value()
+            percent = constraintChecker.applyBasalPercentConstraints(ConstraintObject(basalPercentInput, injector), profile).value()
             actions.add(rh.gs(info.nightscout.core.ui.R.string.tempbasal_label) + ": $percent%")
             actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, durationInMinutes))
             if (percent != basalPercentInput) actions.add(rh.gs(info.nightscout.core.ui.R.string.constraint_applied))
         } else {
             val basalAbsoluteInput = SafeParse.stringToDouble(binding.basalAbsoluteInput.text)
-            absolute = constraintChecker.applyBasalConstraints(Constraint(basalAbsoluteInput), profile).value()
+            absolute = constraintChecker.applyBasalConstraints(ConstraintObject(basalAbsoluteInput, injector), profile).value()
             actions.add(rh.gs(info.nightscout.core.ui.R.string.tempbasal_label) + ": " + rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, absolute))
             actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, durationInMinutes))
             if (abs(absolute - basalAbsoluteInput) > 0.01)
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt
index 7e08d66765..8fe66ed052 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt
@@ -20,7 +20,7 @@ import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIf
 import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.profile.DefaultValueHelper
 import info.nightscout.interfaces.profile.ProfileFunction
@@ -39,7 +39,7 @@ import javax.inject.Inject
 
 class TempTargetDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var profileUtil: ProfileUtil
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
index 25e2905bf4..02099655ce 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
@@ -8,6 +8,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import dagger.android.HasAndroidInjector
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.HtmlHelper
@@ -16,8 +18,7 @@ import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.db.PersistenceLayer
 import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -32,7 +33,6 @@ import info.nightscout.shared.SafeParse
 import info.nightscout.shared.interfaces.ResourceHelper
 import info.nightscout.ui.R
 import info.nightscout.ui.databinding.DialogTreatmentBinding
-import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.text.DecimalFormat
 import java.util.LinkedList
 import javax.inject.Inject
@@ -40,7 +40,7 @@ import kotlin.math.abs
 
 class TreatmentDialog : DialogFragmentWithDate() {
 
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var rh: ResourceHelper
     @Inject lateinit var activePlugin: ActivePlugin
     @Inject lateinit var commandQueue: CommandQueue
@@ -52,9 +52,9 @@ class TreatmentDialog : DialogFragmentWithDate() {
     @Inject lateinit var uiInteraction: UiInteraction
     @Inject lateinit var persistenceLayer: PersistenceLayer
     @Inject lateinit var decimalFormatter: DecimalFormatter
+    @Inject lateinit var injector: HasAndroidInjector
 
     private var queryingProtection = false
-    private val disposable = CompositeDisposable()
     private var _binding: DialogTreatmentBinding? = null
 
     // This property is only valid between onCreateView and onDestroyView.
@@ -138,8 +138,8 @@ class TreatmentDialog : DialogFragmentWithDate() {
         val carbs = SafeParse.stringToInt(binding.carbs.text)
         val recordOnlyChecked = binding.recordOnly.isChecked
         val actions: LinkedList<String?> = LinkedList()
-        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value()
-        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
+        val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(insulin, injector)).value()
+        val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(carbs, injector)).value()
 
         if (insulinAfterConstraints > 0) {
             actions.add(
diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
index 690e6080a1..31b4c03bd8 100644
--- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt
@@ -18,6 +18,7 @@ import android.widget.CompoundButton
 import androidx.fragment.app.FragmentManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
+import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.valueToUnits
 import info.nightscout.core.iob.round
 import info.nightscout.core.profile.ProfileSealed
@@ -30,8 +31,7 @@ import info.nightscout.database.ValueWrapper
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
-import info.nightscout.interfaces.constraints.Constraint
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.Profile
@@ -65,7 +65,7 @@ class WizardDialog : DaggerDialogFragment() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var aapsSchedulers: AapsSchedulers
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var ctx: Context
     @Inject lateinit var sp: SP
     @Inject lateinit var rxBus: RxBus
@@ -364,7 +364,7 @@ class WizardDialog : DaggerDialogFragment() {
     }
 
     private fun valueToUnitsToString(value: Double, units: String): String =
-        if (units == Constants.MGDL) decimalFormatter.to0Decimal(value)
+        if (units == GlucoseUnit.MGDL.asText) decimalFormatter.to0Decimal(value)
         else decimalFormatter.to1Decimal(value * Constants.MGDL_TO_MMOLL)
 
     private fun initDialog() {
@@ -444,7 +444,7 @@ class WizardDialog : DaggerDialogFragment() {
                 SafeParse.stringToDouble(binding.correctionInput.text)
         } else
             sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100).toDouble()
-        val carbsAfterConstraint = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
+        val carbsAfterConstraint = constraintChecker.applyCarbsConstraints(ConstraintObject(carbs, injector)).value()
         if (abs(carbs - carbsAfterConstraint) > 0.01) {
             binding.carbsInput.value = 0.0
             ToastUtils.warnToast(ctx, R.string.carbs_constraint_applied)
diff --git a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
index beaadb4a0a..972fe0c565 100644
--- a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
+++ b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt
@@ -22,7 +22,7 @@ import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.aps.Loop
 import info.nightscout.interfaces.aps.VariableSensitivityResult
-import info.nightscout.interfaces.constraints.Constraints
+import info.nightscout.interfaces.constraints.ConstraintsChecker
 import info.nightscout.interfaces.iob.GlucoseStatusProvider
 import info.nightscout.interfaces.iob.IobCobCalculator
 import info.nightscout.interfaces.plugin.ActivePlugin
@@ -62,10 +62,11 @@ class Widget : AppWidgetProvider() {
     @Inject lateinit var loop: Loop
     @Inject lateinit var config: Config
     @Inject lateinit var sp: SP
-    @Inject lateinit var constraintChecker: Constraints
+    @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var decimalFormatter: DecimalFormatter
 
     companion object {
+
         // This object doesn't behave like singleton,
         // many threads were created. Making handler static resolve this issue
         private var handler = Handler(HandlerThread(this::class.simpleName + "Handler").also { it.start() }.looper)
@@ -78,6 +79,7 @@ class Widget : AppWidgetProvider() {
             })
         }
     }
+
     private val intentAction = "OpenApp"
 
     override fun onReceive(context: Context, intent: Intent?) {
@@ -133,9 +135,9 @@ class Widget : AppWidgetProvider() {
             overviewData.lastBg(iobCobCalculator.ads)?.let { profileUtil.fromMgdlToStringInUnits(it.value) } ?: rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short))
         views.setTextColor(
             R.id.bg, when {
-                overviewData.isLow(iobCobCalculator.ads) -> rh.gc(info.nightscout.core.ui.R.color.widget_low)
+                overviewData.isLow(iobCobCalculator.ads)  -> rh.gc(info.nightscout.core.ui.R.color.widget_low)
                 overviewData.isHigh(iobCobCalculator.ads) -> rh.gc(info.nightscout.core.ui.R.color.widget_high)
-                else -> rh.gc(info.nightscout.core.ui.R.color.widget_inrange)
+                else                                      -> rh.gc(info.nightscout.core.ui.R.color.widget_inrange)
             }
         )
         trendCalculator.getTrendArrow(iobCobCalculator.ads)?.let {
diff --git a/wear/build.gradle b/wear/build.gradle
index a7638ba42d..d259af9558 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -93,8 +93,8 @@ allprojects {
 
 
 dependencies {
-    implementation project(':app-wear-shared:shared')
     implementation project(':app-wear-shared:shared-impl')
+    implementation project(':core:interfaces')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
diff --git a/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt b/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt
index 6a1c07a3f8..69fabd8083 100644
--- a/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt
@@ -163,8 +163,8 @@ class DataHandlerWear @Inject constructor(
                 sp.putInt(R.string.key_bolus_wizard_percentage, it.bolusPercentage)
                 sp.putInt(R.string.key_treatments_safety_max_carbs, it.maxCarbs)
                 sp.putDouble(R.string.key_treatments_safety_max_bolus, it.maxBolus)
-                sp.putDouble(info.nightscout.shared.R.string.key_insulin_button_increment_1, it.insulinButtonIncrement1)
-                sp.putDouble(info.nightscout.shared.R.string.key_insulin_button_increment_2, it.insulinButtonIncrement2)
+                sp.putDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_1, it.insulinButtonIncrement1)
+                sp.putDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_2, it.insulinButtonIncrement2)
                 sp.putInt(R.string.key_carbs_button_increment_1, it.carbsButtonIncrement1)
                 sp.putInt(R.string.key_carbs_button_increment_2, it.carbsButtonIncrement2)
             }
diff --git a/wear/src/main/java/info/nightscout/androidaps/comm/DataLayerListenerServiceWear.kt b/wear/src/main/java/info/nightscout/androidaps/comm/DataLayerListenerServiceWear.kt
index 7a1c894b49..5acc1677db 100644
--- a/wear/src/main/java/info/nightscout/androidaps/comm/DataLayerListenerServiceWear.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/comm/DataLayerListenerServiceWear.kt
@@ -44,8 +44,8 @@ class DataLayerListenerServiceWear : WearableListenerService() {
 
     private val disposable = CompositeDisposable()
 
-    private val rxPath get() = getString(info.nightscout.shared.R.string.path_rx_bridge)
-    private val rxDataPath get() = getString(info.nightscout.shared.R.string.path_rx_data_bridge)
+    private val rxPath get() = getString(info.nightscout.interfaces.R.string.path_rx_bridge)
+    private val rxDataPath get() = getString(info.nightscout.interfaces.R.string.path_rx_data_bridge)
     @ExperimentalSerializationApi
     override fun onCreate() {
         AndroidInjection.inject(this)
diff --git a/wear/src/main/java/info/nightscout/androidaps/di/WearModule.kt b/wear/src/main/java/info/nightscout/androidaps/di/WearModule.kt
index 014b247cc8..a4b8295bbd 100644
--- a/wear/src/main/java/info/nightscout/androidaps/di/WearModule.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/di/WearModule.kt
@@ -6,8 +6,6 @@ import dagger.Module
 import dagger.Provides
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.WearApp
-import info.nightscout.rx.di.RxModule
-import info.nightscout.shared.di.SharedModule
 import info.nightscout.shared.impl.di.SharedImplModule
 import kotlinx.datetime.Clock
 
@@ -16,8 +14,6 @@ import kotlinx.datetime.Clock
     includes = [
         WearModule.AppBindings::class,
         WearActivitiesModule::class,
-        RxModule::class,
-        SharedModule::class,
         SharedImplModule::class
     ]
 )
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.kt
index e136fa0341..c97128e541 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/BolusActivity.kt
@@ -35,8 +35,8 @@ class BolusActivity : ViewSelectorActivity() {
         override fun getColumnCount(arg0: Int): Int = 2
         override fun getRowCount(): Int = 1
 
-        val increment1 = (sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_1, 0.5) * 10).roundToInt() / 10.0
-        val increment2 = (sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_2, 1.0) * 10).roundToInt() / 10.0
+        val increment1 = (sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_1, 0.5) * 10).roundToInt() / 10.0
+        val increment2 = (sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_2, 1.0) * 10).roundToInt() / 10.0
         val stepValues = listOf(0.1, increment1, increment2)
 
         override fun instantiateItem(container: ViewGroup, row: Int, col: Int): View = when (col) {
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt
index 7302329b3a..f3231d78a3 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/actions/TreatmentActivity.kt
@@ -37,8 +37,8 @@ class TreatmentActivity : ViewSelectorActivity() {
         override fun getColumnCount(arg0: Int): Int = 3
         override fun getRowCount(): Int = 1
 
-        val incrementInsulin1 = (sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_1, 0.5) * 10).roundToInt() / 10.0
-        val incrementInsulin2 = (sp.getDouble(info.nightscout.shared.R.string.key_insulin_button_increment_2, 1.0) * 10).roundToInt() / 10.0
+        val incrementInsulin1 = (sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_1, 0.5) * 10).roundToInt() / 10.0
+        val incrementInsulin2 = (sp.getDouble(info.nightscout.interfaces.R.string.key_insulin_button_increment_2, 1.0) * 10).roundToInt() / 10.0
         val stepValuesInsulin = listOf(0.1, incrementInsulin1, incrementInsulin2)
         val incrementCarbs1 = sp.getInt(R.string.key_carbs_button_increment_1, 5).toDouble()
         val incrementCarbs2 = sp.getInt(R.string.key_carbs_button_increment_2, 10).toDouble()
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
index 36655f08ee..78986ec24a 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt
@@ -35,15 +35,15 @@ import info.nightscout.androidaps.watchfaces.utils.BaseWatchFace
 import info.nightscout.rx.logging.LTag
 import info.nightscout.rx.weardata.CUSTOM_VERSION
 import info.nightscout.rx.weardata.CwfData
-import info.nightscout.rx.weardata.ResFileMap
-import info.nightscout.rx.weardata.CwfResDataMap
 import info.nightscout.rx.weardata.CwfMetadataKey
 import info.nightscout.rx.weardata.CwfMetadataMap
-import info.nightscout.rx.weardata.ResData
-import info.nightscout.rx.weardata.ResFormat
+import info.nightscout.rx.weardata.CwfResDataMap
 import info.nightscout.rx.weardata.EventData
 import info.nightscout.rx.weardata.JsonKeyValues
 import info.nightscout.rx.weardata.JsonKeys.*
+import info.nightscout.rx.weardata.ResData
+import info.nightscout.rx.weardata.ResFileMap
+import info.nightscout.rx.weardata.ResFormat
 import info.nightscout.rx.weardata.ViewKeys
 import info.nightscout.rx.weardata.ZipWatchfaceFormat
 import info.nightscout.shared.extensions.toVisibility
@@ -53,6 +53,7 @@ import org.joda.time.TimeOfDay
 import org.json.JSONObject
 import java.io.ByteArrayOutputStream
 import javax.inject.Inject
+
 @SuppressLint("UseCompatLoadingForDrawables")
 class CustomWatchface : BaseWatchFace() {
 
@@ -220,13 +221,13 @@ class CustomWatchface : BaseWatchFace() {
 
     private fun defaultWatchface(): EventData.ActionSetCustomWatchface {
         val metadata = JSONObject()
-            .put(CwfMetadataKey.CWF_NAME.key, getString(info.nightscout.shared.R.string.wear_default_watchface))
-            .put(CwfMetadataKey.CWF_FILENAME.key, getString(info.nightscout.shared.R.string.wear_default_watchface))
+            .put(CwfMetadataKey.CWF_NAME.key, getString(info.nightscout.interfaces.R.string.wear_default_watchface))
+            .put(CwfMetadataKey.CWF_FILENAME.key, getString(info.nightscout.interfaces.R.string.wear_default_watchface))
             .put(CwfMetadataKey.CWF_AUTHOR.key, "Philoul")
             .put(CwfMetadataKey.CWF_CREATED_AT.key, dateUtil.dateString(dateUtil.now()))
             .put(CwfMetadataKey.CWF_AUTHOR_VERSION.key, CUSTOM_VERSION)
             .put(CwfMetadataKey.CWF_VERSION.key, CUSTOM_VERSION)
-            .put(CwfMetadataKey.CWF_COMMENT.key, getString(info.nightscout.shared.R.string.default_custom_watchface_comment))
+            .put(CwfMetadataKey.CWF_COMMENT.key, getString(info.nightscout.interfaces.R.string.default_custom_watchface_comment))
         val json = JSONObject()
             .put(METADATA.key, metadata)
             .put(HIGHCOLOR.key, String.format("#%06X", 0xFFFFFF and highColor))
@@ -275,7 +276,7 @@ class CustomWatchface : BaseWatchFace() {
         }
         val metadataMap = ZipWatchfaceFormat.loadMetadata(json)
         val drawableDataMap: CwfResDataMap = mutableMapOf()
-        getResourceByteArray(info.nightscout.shared.R.drawable.watchface_custom)?.let {
+        getResourceByteArray(info.nightscout.shared.impl.R.drawable.watchface_custom)?.let {
             drawableDataMap[ResFileMap.CUSTOM_WATCHFACE.fileName] = ResData(it, ResFormat.PNG)
         }
         return EventData.ActionSetCustomWatchface(CwfData(json.toString(4), metadataMap, drawableDataMap))
@@ -376,7 +377,7 @@ class CustomWatchface : BaseWatchFace() {
             ViewKeys.BACKGROUND.key,
             R.id.background,
             null,
-            info.nightscout.shared.R.drawable.background,
+            info.nightscout.shared.impl.R.drawable.background,
             ResFileMap.BACKGROUND,
             ResFileMap.BACKGROUND_HIGH,
             ResFileMap.BACKGROUND_LOW
@@ -422,7 +423,7 @@ class CustomWatchface : BaseWatchFace() {
             ViewKeys.COVER_PLATE.key,
             R.id.cover_plate,
             null,
-            info.nightscout.shared.R.drawable.simplified_dial,
+            info.nightscout.shared.impl.R.drawable.simplified_dial,
             ResFileMap.COVER_PLATE,
             ResFileMap.COVER_PLATE_HIGH,
             ResFileMap.COVER_PLATE_LOW
@@ -431,7 +432,7 @@ class CustomWatchface : BaseWatchFace() {
             ViewKeys.HOUR_HAND.key,
             R.id.hour_hand,
             null,
-            info.nightscout.shared.R.drawable.hour_hand,
+            info.nightscout.shared.impl.R.drawable.hour_hand,
             ResFileMap.HOUR_HAND,
             ResFileMap.HOUR_HAND_HIGH,
             ResFileMap.HOUR_HAND_LOW
@@ -440,7 +441,7 @@ class CustomWatchface : BaseWatchFace() {
             ViewKeys.MINUTE_HAND.key,
             R.id.minute_hand,
             null,
-            info.nightscout.shared.R.drawable.minute_hand,
+            info.nightscout.shared.impl.R.drawable.minute_hand,
             ResFileMap.MINUTE_HAND,
             ResFileMap.MINUTE_HAND_HIGH,
             ResFileMap.MINUTE_HAND_LOW
@@ -449,7 +450,7 @@ class CustomWatchface : BaseWatchFace() {
             ViewKeys.SECOND_HAND.key,
             R.id.second_hand,
             R.string.key_show_seconds,
-            info.nightscout.shared.R.drawable.second_hand,
+            info.nightscout.shared.impl.R.drawable.second_hand,
             ResFileMap.SECOND_HAND,
             ResFileMap.SECOND_HAND_HIGH,
             ResFileMap.SECOND_HAND_LOW
@@ -465,9 +466,18 @@ class CustomWatchface : BaseWatchFace() {
 
         fun drawable(resources: Resources, drawableDataMap: CwfResDataMap, sgvLevel: Long): Drawable? = customDrawable?.let { cd ->
             when (sgvLevel) {
-                1L   -> { customHigh?.let { drawableDataMap[customHigh.fileName] }?.toDrawable(resources) ?: drawableDataMap[cd.fileName]?.toDrawable(resources) }
-                0L   -> { drawableDataMap[cd.fileName]?.toDrawable(resources) }
-                -1L  -> { customLow?.let {drawableDataMap[customLow.fileName] }?.toDrawable(resources) ?: drawableDataMap[cd.fileName]?.toDrawable(resources) }
+                1L   -> {
+                    customHigh?.let { drawableDataMap[customHigh.fileName] }?.toDrawable(resources) ?: drawableDataMap[cd.fileName]?.toDrawable(resources)
+                }
+
+                0L   -> {
+                    drawableDataMap[cd.fileName]?.toDrawable(resources)
+                }
+
+                -1L  -> {
+                    customLow?.let { drawableDataMap[customLow.fileName] }?.toDrawable(resources) ?: drawableDataMap[cd.fileName]?.toDrawable(resources)
+                }
+
                 else -> drawableDataMap[cd.fileName]?.toDrawable(resources)
             }
         }
@@ -537,6 +547,7 @@ class CustomWatchface : BaseWatchFace() {
 
     @SuppressLint("RtlHardcoded")
     private enum class GravityMap(val key: String, val gravity: Int) {
+
         CENTER(JsonKeyValues.CENTER.key, Gravity.CENTER),
         LEFT(JsonKeyValues.LEFT.key, Gravity.LEFT),
         RIGHT(JsonKeyValues.RIGHT.key, Gravity.RIGHT);
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt b/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt
index b9db42cdd9..8cac6aecc7 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/DigitalStyleWatchface.kt
@@ -7,16 +7,13 @@ import android.support.wearable.watchface.WatchFaceStyle
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.viewbinding.ViewBinding
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.databinding.ActivityDigitalstyleBinding
-import info.nightscout.shared.extensions.toVisibility
 import info.nightscout.androidaps.watchfaces.utils.BaseWatchFace
 import info.nightscout.rx.logging.LTag
 
-
 class DigitalStyleWatchface : BaseWatchFace() {
 
     private lateinit var binding: ActivityDigitalstyleBinding
diff --git a/wear/src/test/java/info/nightscout/androidaps/heartrate/HeartRateListenerTest.kt b/wear/src/test/java/info/nightscout/androidaps/heartrate/HeartRateListenerTest.kt
index 7daf20917e..87eb3a12fe 100644
--- a/wear/src/test/java/info/nightscout/androidaps/heartrate/HeartRateListenerTest.kt
+++ b/wear/src/test/java/info/nightscout/androidaps/heartrate/HeartRateListenerTest.kt
@@ -5,8 +5,8 @@ import android.hardware.Sensor
 import android.hardware.SensorManager
 import com.google.common.truth.Truth.assertThat
 import info.nightscout.rx.AapsSchedulers
-import info.nightscout.rx.logging.AAPSLoggerTest
 import info.nightscout.rx.weardata.EventData.ActionHeartRate
+import info.nightscout.sharedtests.AAPSLoggerTest
 import io.reactivex.rxjava3.core.Scheduler
 import io.reactivex.rxjava3.disposables.Disposable
 import org.junit.jupiter.api.AfterEach
diff --git a/workflow/build.gradle b/workflow/build.gradle
index 823e355efe..9cf2954d14 100644
--- a/workflow/build.gradle
+++ b/workflow/build.gradle
@@ -17,11 +17,10 @@ android {
 dependencies {
     implementation project(':core:libraries')
     implementation project(':core:graphview')
-    implementation project(':app-wear-shared:shared')
-    implementation project(':database:entities')
-    implementation project(':database:impl')
     implementation project(':core:interfaces')
     implementation project(':core:main')
     implementation project(':core:ui')
     implementation project(':core:utils')
+    implementation project(':database:entities')
+    implementation project(':database:impl')
 }
\ No newline at end of file