diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98043e941c..5b4b5e4f74 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,15 +58,6 @@
             </intent-filter>
         </activity>
         <activity android:name=".activities.PreferencesActivity" />
-        <activity
-            android:name=".activities.BolusProgressHelperActivity"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-        <activity
-            android:name=".activities.ErrorHelperActivity"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-        <activity android:name="info.nightscout.androidaps.dana.activities.DanaHistoryActivity" />
-        <activity android:name="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity" />
-        <activity android:name=".activities.TDDStatsActivity" />
         <activity android:name=".plugins.general.overview.activities.QuickWizardListActivity">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
@@ -74,18 +65,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name="info.nightscout.androidaps.danars.activities.BLEScanActivity">
-            <intent-filter>
-                <action android:name="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="info.nightscout.androidaps.danars.activities.PairingHelperActivity"
-            android:launchMode="singleTask" />
-        <activity android:name="info.nightscout.androidaps.danars.activities.EnterPinActivity"
-            android:launchMode="singleTask" />
         <activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
         <activity android:name=".activities.SurveyActivity" />
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 6174bcdf64..593d1e09e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -38,6 +38,5 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorOtpActivity(): SmsCommunicatorOtpActivity
     @ContributesAndroidInjector abstract fun contributesStatsActivity(): StatsActivity
     @ContributesAndroidInjector abstract fun contributesSurveyActivity(): SurveyActivity
-    @ContributesAndroidInjector abstract fun contributesTDDStatsActivity(): TDDStatsActivity
     @ContributesAndroidInjector abstract fun contributesPrefImportListActivity(): PrefImportListActivity
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 4535f6820b..3fb97d8a32 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -100,10 +100,8 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
     @ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
     @ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
-    @ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
     @ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
     @ContributesAndroidInjector abstract fun contributesProfileSwitchDialog(): ProfileSwitchDialog
-    @ContributesAndroidInjector abstract fun contributesProfileViewerDialog(): ProfileViewerDialog
     @ContributesAndroidInjector abstract fun contributesTempBasalDialog(): TempBasalDialog
     @ContributesAndroidInjector abstract fun contributesTempTargetDialog(): TempTargetDialog
     @ContributesAndroidInjector abstract fun contributesTreatmentDialog(): TreatmentDialog
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3a8d62955b..cd9e3d509c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,14 +16,6 @@
         <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
     </style>
 
-    <style name="Theme.AppCompat.Translucent" 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">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-    </style>
-
     <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog.MinWidth">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 0ff2fcd7b8..6d8a02d4c2 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,5 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.core" >
+    package="info.nightscout.androidaps.core">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.activities.TDDStatsActivity" />
+        <activity
+            android:name="info.nightscout.androidaps.activities.BolusProgressHelperActivity"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+        <activity
+            android:name="info.nightscout.androidaps.activities.ErrorHelperActivity"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+
+    </application>
 </manifest>
diff --git a/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt b/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
index 51a308697b..43bfc39cca 100644
--- a/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
+++ b/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
@@ -2,17 +2,25 @@ package info.nightscout.androidaps.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.activities.BolusProgressHelperActivity
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.activities.TDDStatsActivity
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.dialogs.ErrorDialog
+import info.nightscout.androidaps.dialogs.NtpProgressDialog
+import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 
 @Module
 @Suppress("unused")
 abstract class CoreFragmentsModule {
 
+    @ContributesAndroidInjector abstract fun contributesTDDStatsActivity(): TDDStatsActivity
+    @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
     @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
 
     @ContributesAndroidInjector abstract fun contributesBolusProgressDialog(): BolusProgressDialog
     @ContributesAndroidInjector abstract fun contributesErrorDialog(): ErrorDialog
+    @ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
+    @ContributesAndroidInjector abstract fun contributesProfileViewerDialog(): ProfileViewerDialog
 
 }
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 8c6ea8c019..bcfae4473e 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -10,6 +10,14 @@
         <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
     </style>
 
+    <style name="Theme.AppCompat.Translucent" 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">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+    </style>
+
     <style name="AppThemeWarningDialog" parent="AppTheme">
         <item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
         <item name="dialogTitleBackground">@color/warningAlertBackground</item>
diff --git a/dana/src/main/AndroidManifest.xml b/dana/src/main/AndroidManifest.xml
index 4701a95697..3503bdc49f 100644
--- a/dana/src/main/AndroidManifest.xml
+++ b/dana/src/main/AndroidManifest.xml
@@ -1,2 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.dana" />
+    package="info.nightscout.androidaps.dana">
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaHistoryActivity" />
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity" />
+    </application>
+</manifest>
diff --git a/danars/src/main/AndroidManifest.xml b/danars/src/main/AndroidManifest.xml
index 128d47771d..46526b1fa9 100644
--- a/danars/src/main/AndroidManifest.xml
+++ b/danars/src/main/AndroidManifest.xml
@@ -1,6 +1,21 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.danars" >
+    package="info.nightscout.androidaps.danars">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.danars.activities.BLEScanActivity">
+            <intent-filter>
+                <action android:name="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="info.nightscout.androidaps.danars.activities.PairingHelperActivity"
+            android:launchMode="singleTask" />
+        <activity
+            android:name="info.nightscout.androidaps.danars.activities.EnterPinActivity"
+            android:launchMode="singleTask" />
+    </application>
 </manifest>