diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 0b02d9a048..ecffee5c8e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -125,69 +125,6 @@
         <item>YpsoPump</item>
     </string-array>
 
-    <string-array name="medtronicPumpTypeArray">
-        <item>Other (unsupported)</item>
-        <item>512</item>
-        <item>712</item>
-        <item>515</item>
-        <item>715</item>
-        <item>522</item>
-        <item>722</item>
-        <item>523 (Fw 2.4A or lower)</item>
-        <item>723 (Fw 2.4A or lower)</item>
-        <item>554 (EU Fw. &lt;= 2.6A)</item>
-        <item>754 (EU Fw. &lt;= 2.6A)</item>
-        <item>554 (CA Fw. &lt;= 2.7A)</item>
-        <item>754 (CA Fw. &lt;= 2.7A)</item>
-    </string-array>
-
-    <string-array name="medtronicPumpFreqArray">
-        <item>@string/medtronic_pump_frequency_us_ca</item>
-        <item>@string/medtronic_pump_frequency_worldwide</item>
-    </string-array>
-
-    <string-array name="medtronicPumpFreqValues">
-        <item>@string/key_medtronic_pump_frequency_us_ca</item>
-        <item>@string/key_medtronic_pump_frequency_worldwide</item>
-    </string-array>
-
-    <string-array name="medtronicBolusDelay">
-        <item>5</item>
-        <item>10</item>
-        <item>15</item>
-    </string-array>
-
-    <string-array name="medtronicEncoding">
-        <item>@string/medtronic_pump_encoding_4b6b_local</item>
-        <item>@string/medtronic_pump_encoding_4b6b_rileylink</item>
-    </string-array>
-
-    <string-array name="onOff">
-        <item>@string/common_on</item>
-        <item>@string/common_off</item>
-    </string-array>
-
-    <string-array name="medtronicEncodingValues">
-        <item>@string/key_medtronic_pump_encoding_4b6b_local</item>
-        <item>@string/key_medtronic_pump_encoding_4b6b_rileylink</item>
-    </string-array>
-
-    <string-array name="medtronicBatteryType">
-        <item>@string/medtronic_pump_battery_no</item>
-        <item>@string/medtronic_pump_battery_alkaline</item>
-        <item>@string/medtronic_pump_battery_lithium</item>
-        <item>@string/medtronic_pump_battery_nizn</item>
-        <item>@string/medtronic_pump_battery_nimh</item>
-    </string-array>
-
-    <string-array name="medtronicBatteryTypeValues">
-        <item>@string/key_medtronic_pump_battery_no</item>
-        <item>@string/key_medtronic_pump_battery_alkaline</item>
-        <item>@string/key_medtronic_pump_battery_lithium</item>
-        <item>@string/key_medtronic_pump_battery_nizn</item>
-        <item>@string/key_medtronic_pump_battery_nimh</item>
-    </string-array>
-
     <string-array name="smbMaxMinutes">
         <item>15</item>
         <item>30</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d7e5910da..9c0acd512a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1251,7 +1251,6 @@
     <string name="key_snoozedTo" translatable="false">snoozedTo</string>
     <string name="key_snooze_dst_in24h" translatable="false">snooze_dst_in24h</string>
     <string name="key_snooze_loopdisabled" translatable="false">snooze_loopdisabled</string>
-    <string name="sixdigitnumber" translatable="false">^\\d{6}</string>
     <string name="ebstopsloop">Use of Extended bolus feature will stop closed loop mode for the time of running extended bolus. Do you really want it?</string>
     <string name="closed_loop_disabled_with_eb">Closed loop disabled because of running Extended bolus</string>
     <string name="phonechecker">\"PhoneChecker\"</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 054f8f8d23..b79d02361d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,16 +22,6 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="Theme.AppCompat.NoTitle" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
     <style name="section_header_label">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/core/build.gradle b/core/build.gradle
index 9d8dbc05da..9b2d54be1e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -4,8 +4,10 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.hiya.jacoco-android'
 
+apply from: 'core_dependencies.gradle'
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
     defaultConfig {
@@ -18,5 +20,3 @@ dependencies {
     implementation project(':database')
 }
 
-apply from: 'core_dependencies.gradle'
-apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
\ No newline at end of file
diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle
index cf40da5288..1a689b6f8c 100644
--- a/core/core_dependencies.gradle
+++ b/core/core_dependencies.gradle
@@ -22,10 +22,6 @@ dependencies {
 
     api "com.google.dagger:dagger-android:$dagger_version"
     api "com.google.dagger:dagger-android-support:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
     //Logger
     api 'org.slf4j:slf4j-api:1.7.30'
@@ -105,6 +101,8 @@ dependencies {
     api 'com.github.kenglxn.QRGen:android:2.6.0'
     api 'com.eatthepath:java-otp:0.2.0'
 
+    api "commons-codec:commons-codec:$commonscodec_version"
+
     // Phone checker
     api 'com.scottyab:rootbeer-lib:0.0.8'
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/core/src/main/res/drawable/ic_refresh.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_refresh.xml
rename to core/src/main/res/drawable/ic_refresh.xml
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 7e8020884a..9090a3e7c7 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -18,6 +18,16 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
+    <style name="Theme.AppCompat.NoTitle" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
     <style name="AppThemeWarningDialog" parent="AppTheme">
         <item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
         <item name="dialogTitleBackground">@color/warningAlertBackground</item>
diff --git a/dana/build.gradle b/dana/build.gradle
index 0c70d57791..8020051b31 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -3,53 +3,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.hiya.jacoco-android'
 
-android {
-    compileSdkVersion 28
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
+
+android {
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    buildFeatures {
-        viewBinding true
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            testCoverageEnabled(project.hasProperty('coverage'))
-        }
-        firebaseDisable {
-            System.setProperty("disableFirebase", "true")
-            ext.enableCrashlytics = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
     implementation project(':core')
-
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-}
-
-apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+}
\ No newline at end of file
diff --git a/dana/src/androidTest/java/info/nightscout/androidaps/dana/ExampleInstrumentedTest.kt b/dana/src/androidTest/java/info/nightscout/androidaps/dana/ExampleInstrumentedTest.kt
deleted file mode 100644
index 92ec3b8644..0000000000
--- a/dana/src/androidTest/java/info/nightscout/androidaps/dana/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package info.nightscout.androidaps.dana
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("info.nightscout.androidaps.dana.test", appContext.packageName)
-    }
-}
diff --git a/danar/build.gradle b/danar/build.gradle
index 2ef2c3a88c..09899f5540 100644
--- a/danar/build.gradle
+++ b/danar/build.gradle
@@ -3,55 +3,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.hiya.jacoco-android'
 
-android {
-    compileSdkVersion 28
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
+android {
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
     }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    buildFeatures {
-        viewBinding true
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            testCoverageEnabled(project.hasProperty('coverage'))
-        }
-        firebaseDisable {
-            System.setProperty("disableFirebase", "true")
-            ext.enableCrashlytics = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
 }
 
 dependencies {
     implementation project(':core')
     implementation project(':dana')
-
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-}
-
-apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+}
\ No newline at end of file
diff --git a/danars/build.gradle b/danars/build.gradle
index e0caafd2c9..09899f5540 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -5,6 +5,7 @@ apply plugin: 'com.hiya.jacoco-android'
 
 apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
     defaultConfig {
@@ -16,11 +17,4 @@ android {
 dependencies {
     implementation project(':core')
     implementation project(':dana')
-
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-}
-
-apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+}
\ No newline at end of file
diff --git a/database/build.gradle b/database/build.gradle
index d530a292e5..0966d4b85e 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
-android {
-    compileSdkVersion 28
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 
+android {
     defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         kapt {
@@ -17,26 +16,6 @@ android {
             }
         }
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-        }
-        firebaseDisable {
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
@@ -60,8 +39,4 @@ dependencies {
 
     implementation "com.google.dagger:dagger-android:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
 }
diff --git a/gradle/android_module_dependencies.gradle b/gradle/android_module_dependencies.gradle
index 4f75fb8546..7125e612f7 100644
--- a/gradle/android_module_dependencies.gradle
+++ b/gradle/android_module_dependencies.gradle
@@ -5,5 +5,21 @@ android {
         full {
             dimension "standard"
         }
+        pumpcontrol {
+            dimension "standard"
+        }
+        nsclient {
+            dimension "standard"
+        }
+        nsclient2 {
+            dimension "standard"
+        }
     }
+}
+
+dependencies {
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
 }
\ No newline at end of file
diff --git a/medtronic/build.gradle b/medtronic/build.gradle
index 49e7df1c9b..a3cb9f789e 100644
--- a/medtronic/build.gradle
+++ b/medtronic/build.gradle
@@ -1,58 +1,20 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.hiya.jacoco-android'
+
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
-    compileSdkVersion 28
-
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    buildFeatures {
-        viewBinding true
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            testCoverageEnabled(project.hasProperty('coverage'))
-        }
-        firebaseDisable {
-            System.setProperty("disableFirebase", "true")
-            ext.enableCrashlytics = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
     implementation project(':core')
     implementation project(':rileylink')
-
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-
-    testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
-    androidTestImplementation "androidx.test:rules:$androidx_rules"
 }
diff --git a/medtronic/src/androidTest/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleInstrumentedTest.java b/medtronic/src/androidTest/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleInstrumentedTest.java
deleted file mode 100644
index 63cded8fe7..0000000000
--- a/medtronic/src/androidTest/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-        assertEquals("info.nightscout.androidaps.plugins.pump.medtronic.test", appContext.getPackageName());
-    }
-}
diff --git a/medtronic/src/main/res/layout/medtronic_history_activity.xml b/medtronic/src/main/res/layout/medtronic_history_activity.xml
index 08c92aae6e..5c909f5937 100644
--- a/medtronic/src/main/res/layout/medtronic_history_activity.xml
+++ b/medtronic/src/main/res/layout/medtronic_history_activity.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".plugins.pump.medtronic.dialog.MedtronicHistoryActivity">
+    tools:context="info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity">
 
 
     <LinearLayout
diff --git a/medtronic/src/main/res/values/arrays.xml b/medtronic/src/main/res/values/arrays.xml
new file mode 100644
index 0000000000..d4e7309e4f
--- /dev/null
+++ b/medtronic/src/main/res/values/arrays.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="medtronicPumpTypeArray">
+        <item>Other (unsupported)</item>
+        <item>512</item>
+        <item>712</item>
+        <item>515</item>
+        <item>715</item>
+        <item>522</item>
+        <item>722</item>
+        <item>523 (Fw 2.4A or lower)</item>
+        <item>723 (Fw 2.4A or lower)</item>
+        <item>554 (EU Fw. &lt;= 2.6A)</item>
+        <item>754 (EU Fw. &lt;= 2.6A)</item>
+        <item>554 (CA Fw. &lt;= 2.7A)</item>
+        <item>754 (CA Fw. &lt;= 2.7A)</item>
+    </string-array>
+
+    <string-array name="medtronicPumpFreqArray">
+        <item>@string/medtronic_pump_frequency_us_ca</item>
+        <item>@string/medtronic_pump_frequency_worldwide</item>
+    </string-array>
+
+    <string-array name="medtronicPumpFreqValues">
+        <item>@string/key_medtronic_pump_frequency_us_ca</item>
+        <item>@string/key_medtronic_pump_frequency_worldwide</item>
+    </string-array>
+
+    <string-array name="medtronicBolusDelay">
+        <item>5</item>
+        <item>10</item>
+        <item>15</item>
+    </string-array>
+
+    <string-array name="medtronicEncoding">
+        <item>@string/medtronic_pump_encoding_4b6b_local</item>
+        <item>@string/medtronic_pump_encoding_4b6b_rileylink</item>
+    </string-array>
+
+    <string-array name="medtronicEncodingValues">
+        <item>@string/key_medtronic_pump_encoding_4b6b_local</item>
+        <item>@string/key_medtronic_pump_encoding_4b6b_rileylink</item>
+    </string-array>
+
+    <string-array name="medtronicBatteryType">
+        <item>@string/medtronic_pump_battery_no</item>
+        <item>@string/medtronic_pump_battery_alkaline</item>
+        <item>@string/medtronic_pump_battery_lithium</item>
+        <item>@string/medtronic_pump_battery_nizn</item>
+        <item>@string/medtronic_pump_battery_nimh</item>
+    </string-array>
+
+    <string-array name="medtronicBatteryTypeValues">
+        <item>@string/key_medtronic_pump_battery_no</item>
+        <item>@string/key_medtronic_pump_battery_alkaline</item>
+        <item>@string/key_medtronic_pump_battery_lithium</item>
+        <item>@string/key_medtronic_pump_battery_nizn</item>
+        <item>@string/key_medtronic_pump_battery_nimh</item>
+    </string-array>
+
+    <string-array name="onOff">
+        <item>@string/common_on</item>
+        <item>@string/common_off</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/medtronic/src/main/res/values/strings.xml b/medtronic/src/main/res/values/strings.xml
index 12c1900a27..3a3e627f80 100644
--- a/medtronic/src/main/res/values/strings.xml
+++ b/medtronic/src/main/res/values/strings.xml
@@ -116,4 +116,6 @@
     <string name="set_neutral_temps_title">Set neutral temp basals</string>
     <string name="set_neutral_temps_summary">If enabled, it will cancel a temporary basal before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
 
+    <string name="sixdigitnumber" translatable="false">^\\d{6}</string>
+
 </resources>
\ No newline at end of file
diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle
index 66ca373984..00d241f0df 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -1,52 +1,19 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.hiya.jacoco-android'
+
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
-    compileSdkVersion 28
-
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            testCoverageEnabled(project.hasProperty('coverage'))
-        }
-        firebaseDisable {
-            System.setProperty("disableFirebase", "true")
-            ext.enableCrashlytics = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-
-    implementation "commons-codec:commons-codec:$commonscodec_version"
-    implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation "com.google.android.material:material:$material_version"
-    testImplementation "junit:junit:$junit_version"
-    androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
+    implementation project(':core')
 }
\ No newline at end of file
diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle
index 5f95aa675c..a3cb9f789e 100644
--- a/omnipod-eros/build.gradle
+++ b/omnipod-eros/build.gradle
@@ -1,60 +1,20 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.hiya.jacoco-android'
+
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
-    compileSdkVersion 28
-
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    buildFeatures {
-        viewBinding true
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            testCoverageEnabled(project.hasProperty('coverage'))
-        }
-        firebaseDisable {
-            System.setProperty("disableFirebase", "true")
-            ext.enableCrashlytics = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
     implementation project(':core')
     implementation project(':rileylink')
-
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-
-    testImplementation "junit:junit:$junit_version"
-    testImplementation "org.mockito:mockito-core:${mockitoVersion}"
-    testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
-    testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
-    testImplementation "joda-time:joda-time:$jodatime_version"
-    androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
-    androidTestImplementation "androidx.test:rules:$androidx_rules"
 }
diff --git a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java
index 795f36fc25..69e771f88c 100644
--- a/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java
+++ b/omnipod-eros/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPluginTest.java
@@ -61,7 +61,7 @@ public class OmnipodErosPumpPluginTest {
         OmnipodErosPumpPlugin plugin = new OmnipodErosPumpPlugin(injector, aapsLogger, new TestAapsSchedulers(), rxBusWrapper, null,
                 resourceHelper, activePluginProvider, null, null, aapsOmnipodManager, commandQueueProvider,
                 null, null, null, null,
-                rileyLinkUtil, null, null, null, null
+                rileyLinkUtil, null, null, null
         );
         when(activePluginProvider.getActiveTreatments().getTempBasalFromHistory(anyLong())).thenReturn(null);
         when(rileyLinkUtil.getRileyLinkHistory()).thenReturn(new ArrayList<>());
diff --git a/rileylink/build.gradle b/rileylink/build.gradle
index 7ed50e56d3..1cae2aa0f9 100644
--- a/rileylink/build.gradle
+++ b/rileylink/build.gradle
@@ -1,57 +1,19 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'com.hiya.jacoco-android'
+
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
-    compileSdkVersion 28
-
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        debug {
-            testCoverageEnabled(project.hasProperty('coverage'))
-        }
-        firebaseDisable {
-            System.setProperty("disableFirebase", "true")
-            ext.enableCrashlytics = false
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
     implementation project(':core')
-
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-
-    testImplementation "junit:junit:$junit_version"
-    testImplementation "org.mockito:mockito-core:${mockitoVersion}"
-    testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
-    testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
-    androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
-    androidTestImplementation "androidx.test:rules:$androidx_rules"
 }
diff --git a/rileylink/src/androidTest/java/info/nightscout/androidaps/plugins/pump/common/ExampleInstrumentedTest.java b/rileylink/src/androidTest/java/info/nightscout/androidaps/plugins/pump/common/ExampleInstrumentedTest.java
deleted file mode 100644
index 9942e86384..0000000000
--- a/rileylink/src/androidTest/java/info/nightscout/androidaps/plugins/pump/common/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-        assertEquals("info.nightscout.androidaps.plugins.pump.common.test", appContext.getPackageName());
-    }
-}
diff --git a/rileylink/src/main/res/layout/rileylink_status_history.xml b/rileylink/src/main/res/layout/rileylink_status_history.xml
index 7f6bbdb31b..3a44c3a8e8 100644
--- a/rileylink/src/main/res/layout/rileylink_status_history.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_history.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment">
+    tools:context="info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
             android:id="@+id/rileylink_historystatus"
             android:layout_width="match_parent"
             android:layout_height="10px"
-            android:layout_below="@id/medtronic_historytop"
+            android:layout_below="@+id/medtronic_historytop"
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal" />
 
diff --git a/wear/build.gradle b/wear/build.gradle
index 3eb32a9dd5..f3a1cf2f75 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -11,11 +11,10 @@ buildscript {
     }
 }
 apply plugin: 'com.android.application'
-//apply plugin: 'jacoco-android'
 apply plugin: 'com.hiya.jacoco-android'
 
 jacoco {
-    toolVersion = "0.8.3"
+    toolVersion = "0.8.6"
 }
 
 ext {