diff --git a/accounts/build.gradle.kts b/accounts/build.gradle.kts
index 691f3a1ba..7af645def 100644
--- a/accounts/build.gradle.kts
+++ b/accounts/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.accounts"
 }
 
 dependencies {
diff --git a/accounts/src/main/AndroidManifest.xml b/accounts/src/main/AndroidManifest.xml
index b69a17f83..a5918e68a 100644
--- a/accounts/src/main/AndroidManifest.xml
+++ b/accounts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.accounts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0a9483eb7..8cdf0f43f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -64,6 +64,7 @@ android {
     lint {
         abortOnError = false
     }
+    namespace = "de.mm20.launcher2"
 }
 
 fun buildTime(): String {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89abd4678..89f6514cd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="de.mm20.launcher2">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.SET_ALARM" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
diff --git a/applications/build.gradle.kts b/applications/build.gradle.kts
index 44e63ff07..c5947322e 100644
--- a/applications/build.gradle.kts
+++ b/applications/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "de.mm20.launcher2.applications"
 }
 
 dependencies {
diff --git a/applications/src/main/AndroidManifest.xml b/applications/src/main/AndroidManifest.xml
index a1e7322fd..a5c402166 100644
--- a/applications/src/main/AndroidManifest.xml
+++ b/applications/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.applications">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/appshortcuts/build.gradle.kts b/appshortcuts/build.gradle.kts
index 770b02765..57c552e48 100644
--- a/appshortcuts/build.gradle.kts
+++ b/appshortcuts/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "de.mm20.launcher2.appshortcuts"
 }
 
 dependencies {
diff --git a/appshortcuts/src/main/AndroidManifest.xml b/appshortcuts/src/main/AndroidManifest.xml
index 7e42faf49..a5918e68a 100644
--- a/appshortcuts/src/main/AndroidManifest.xml
+++ b/appshortcuts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.appshortcuts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/badges/build.gradle.kts b/badges/build.gradle.kts
index dfcc3b06c..7e99d0e37 100644
--- a/badges/build.gradle.kts
+++ b/badges/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.badges"
 }
 
 dependencies {
diff --git a/badges/src/main/AndroidManifest.xml b/badges/src/main/AndroidManifest.xml
index 839d84a6e..a5c402166 100644
--- a/badges/src/main/AndroidManifest.xml
+++ b/badges/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.badges">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/base/build.gradle.kts b/base/build.gradle.kts
index b651e3b8f..df2c67bfe 100644
--- a/base/build.gradle.kts
+++ b/base/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.base"
 }
 
 dependencies {
diff --git a/base/src/main/AndroidManifest.xml b/base/src/main/AndroidManifest.xml
index e1598c629..972c3a837 100644
--- a/base/src/main/AndroidManifest.xml
+++ b/base/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.base">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 24464e24e..d54504288 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.3")
+        classpath("com.android.tools.build:gradle:7.2.0")
         classpath(libs.kotlin.gradle)
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/calculator/build.gradle.kts b/calculator/build.gradle.kts
index 28ce625b0..b276590eb 100644
--- a/calculator/build.gradle.kts
+++ b/calculator/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.calculator"
 }
 
 dependencies {
diff --git a/calculator/src/main/AndroidManifest.xml b/calculator/src/main/AndroidManifest.xml
index be86c1bde..a5c402166 100644
--- a/calculator/src/main/AndroidManifest.xml
+++ b/calculator/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/calendar/build.gradle.kts b/calendar/build.gradle.kts
index 0862b17bf..7234ea5de 100644
--- a/calendar/build.gradle.kts
+++ b/calendar/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.calendar"
 }
 
 dependencies {
diff --git a/calendar/src/main/AndroidManifest.xml b/calendar/src/main/AndroidManifest.xml
index 40b502ee5..38e1bfaab 100644
--- a/calendar/src/main/AndroidManifest.xml
+++ b/calendar/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.calendar">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_CALENDAR" />
 </manifest>
\ No newline at end of file
diff --git a/compat/build.gradle.kts b/compat/build.gradle.kts
index 2f513358b..3ea7828cd 100644
--- a/compat/build.gradle.kts
+++ b/compat/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.compat"
 }
 
 dependencies {
diff --git a/compat/src/main/AndroidManifest.xml b/compat/src/main/AndroidManifest.xml
index 4446b93ff..a5918e68a 100644
--- a/compat/src/main/AndroidManifest.xml
+++ b/compat/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.compat">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/contacts/build.gradle.kts b/contacts/build.gradle.kts
index 7fb672b60..d4ca2e94c 100644
--- a/contacts/build.gradle.kts
+++ b/contacts/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.contacts"
 }
 
 dependencies {
diff --git a/contacts/src/main/AndroidManifest.xml b/contacts/src/main/AndroidManifest.xml
index 7842fbc78..a5c402166 100644
--- a/contacts/src/main/AndroidManifest.xml
+++ b/contacts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.contacts">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/crashreporter/build.gradle.kts b/crashreporter/build.gradle.kts
index 8715fbb7c..f134c0948 100644
--- a/crashreporter/build.gradle.kts
+++ b/crashreporter/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.crashreporter"
 }
 
 dependencies {
diff --git a/crashreporter/src/main/AndroidManifest.xml b/crashreporter/src/main/AndroidManifest.xml
index 8146fcf81..487940a68 100644
--- a/crashreporter/src/main/AndroidManifest.xml
+++ b/crashreporter/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.crashreporter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <provider
             android:name="com.balsikandar.crashreporter.CrashReporterInitProvider"
diff --git a/currencies/build.gradle.kts b/currencies/build.gradle.kts
index 4303f3127..f620a9f33 100644
--- a/currencies/build.gradle.kts
+++ b/currencies/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.currencies"
 }
 
 dependencies {
diff --git a/currencies/src/main/AndroidManifest.xml b/currencies/src/main/AndroidManifest.xml
index 78f9c4688..a2e15ef62 100644
--- a/currencies/src/main/AndroidManifest.xml
+++ b/currencies/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
-<manifest package="de.mm20.launcher2.currencies">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index baf83e661..1bdedd048 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -38,6 +38,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.database"
 }
 
 dependencies {
diff --git a/database/src/main/AndroidManifest.xml b/database/src/main/AndroidManifest.xml
index d89737733..a5c402166 100644
--- a/database/src/main/AndroidManifest.xml
+++ b/database/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.database">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/favorites/build.gradle.kts b/favorites/build.gradle.kts
index d747a6c0b..ac9a8103b 100644
--- a/favorites/build.gradle.kts
+++ b/favorites/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.favorites"
 }
 
 dependencies {
diff --git a/favorites/src/main/AndroidManifest.xml b/favorites/src/main/AndroidManifest.xml
index ec0d47939..227314eeb 100644
--- a/favorites/src/main/AndroidManifest.xml
+++ b/favorites/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="de.mm20.launcher2.favorites" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/files/build.gradle.kts b/files/build.gradle.kts
index 4db9d056b..95e133f79 100644
--- a/files/build.gradle.kts
+++ b/files/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.files"
 }
 
 dependencies {
diff --git a/files/src/main/AndroidManifest.xml b/files/src/main/AndroidManifest.xml
index b5b954c38..a5c402166 100644
--- a/files/src/main/AndroidManifest.xml
+++ b/files/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.files">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/g-services/build.gradle.kts b/g-services/build.gradle.kts
index 01518a9ef..c0d51802c 100644
--- a/g-services/build.gradle.kts
+++ b/g-services/build.gradle.kts
@@ -32,6 +32,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.gservices"
 }
 
 dependencies {
diff --git a/g-services/src/main/AndroidManifest.xml b/g-services/src/main/AndroidManifest.xml
index 7a13544e9..6033eb755 100644
--- a/g-services/src/main/AndroidManifest.xml
+++ b/g-services/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.gservices">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c788fcfc2..2f1f8a5d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Aug 16 10:19:49 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/hiddenitems/build.gradle.kts b/hiddenitems/build.gradle.kts
index 868de8851..80d1de51d 100644
--- a/hiddenitems/build.gradle.kts
+++ b/hiddenitems/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.hiddenitems"
 }
 
 dependencies {
diff --git a/hiddenitems/src/main/AndroidManifest.xml b/hiddenitems/src/main/AndroidManifest.xml
index 0692c026c..a5c402166 100644
--- a/hiddenitems/src/main/AndroidManifest.xml
+++ b/hiddenitems/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.hiddenitems">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/i18n/build.gradle.kts b/i18n/build.gradle.kts
index 060a4335d..646c0fe71 100644
--- a/i18n/build.gradle.kts
+++ b/i18n/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.i18n"
 }
 
 dependencies {
diff --git a/i18n/src/main/AndroidManifest.xml b/i18n/src/main/AndroidManifest.xml
index fab88aca6..972c3a837 100644
--- a/i18n/src/main/AndroidManifest.xml
+++ b/i18n/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.i18n">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/icons/build.gradle.kts b/icons/build.gradle.kts
index 52de5e0d2..7968632f5 100644
--- a/icons/build.gradle.kts
+++ b/icons/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.icons"
 }
 
 dependencies {
diff --git a/icons/src/main/AndroidManifest.xml b/icons/src/main/AndroidManifest.xml
index 6e78bb99f..c3f283bf5 100644
--- a/icons/src/main/AndroidManifest.xml
+++ b/icons/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.icons">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
         <intent>
diff --git a/ktx/build.gradle.kts b/ktx/build.gradle.kts
index 5501b5879..3ae57c9b5 100644
--- a/ktx/build.gradle.kts
+++ b/ktx/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.ktx"
 }
 
 dependencies {
diff --git a/ktx/src/main/AndroidManifest.xml b/ktx/src/main/AndroidManifest.xml
index 3b1edbcfc..a5c402166 100644
--- a/ktx/src/main/AndroidManifest.xml
+++ b/ktx/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.ktx">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/material-color-utilities/build.gradle.kts b/material-color-utilities/build.gradle.kts
index 34fc41805..8dee7013f 100644
--- a/material-color-utilities/build.gradle.kts
+++ b/material-color-utilities/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.materialcolorutilities"
 }
 
 dependencies {
diff --git a/material-color-utilities/src/main/AndroidManifest.xml b/material-color-utilities/src/main/AndroidManifest.xml
index 3a283795d..a5918e68a 100644
--- a/material-color-utilities/src/main/AndroidManifest.xml
+++ b/material-color-utilities/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.materialcolorutilities">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/ms-services/build.gradle.kts b/ms-services/build.gradle.kts
index 3905a10db..c6326ad21 100644
--- a/ms-services/build.gradle.kts
+++ b/ms-services/build.gradle.kts
@@ -32,6 +32,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.msservices"
 }
 
 dependencies {
diff --git a/ms-services/src/main/AndroidManifest.xml b/ms-services/src/main/AndroidManifest.xml
index 1dbe0cd51..b9c82bd13 100644
--- a/ms-services/src/main/AndroidManifest.xml
+++ b/ms-services/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.msservices">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/music/build.gradle.kts b/music/build.gradle.kts
index b70a405db..9d071c9b3 100644
--- a/music/build.gradle.kts
+++ b/music/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.music"
 }
 
 dependencies {
diff --git a/music/src/main/AndroidManifest.xml b/music/src/main/AndroidManifest.xml
index 8766846ea..a5c402166 100644
--- a/music/src/main/AndroidManifest.xml
+++ b/music/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.music">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/nextcloud/build.gradle.kts b/nextcloud/build.gradle.kts
index 8e7c8f8f7..c6ab80923 100644
--- a/nextcloud/build.gradle.kts
+++ b/nextcloud/build.gradle.kts
@@ -35,6 +35,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.nextcloud"
 }
 
 dependencies {
diff --git a/nextcloud/src/main/AndroidManifest.xml b/nextcloud/src/main/AndroidManifest.xml
index 929b68b32..ab04e2d9c 100644
--- a/nextcloud/src/main/AndroidManifest.xml
+++ b/nextcloud/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.nextcloud">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/notifications/build.gradle.kts b/notifications/build.gradle.kts
index ab5a63a2e..32c69c0cd 100644
--- a/notifications/build.gradle.kts
+++ b/notifications/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.notifications"
 }
 
 dependencies {
diff --git a/notifications/src/main/AndroidManifest.xml b/notifications/src/main/AndroidManifest.xml
index e8ea614fd..6f50ba30b 100644
--- a/notifications/src/main/AndroidManifest.xml
+++ b/notifications/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.notifications">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <service
diff --git a/owncloud/build.gradle.kts b/owncloud/build.gradle.kts
index 3d6a1dae4..670432160 100644
--- a/owncloud/build.gradle.kts
+++ b/owncloud/build.gradle.kts
@@ -35,6 +35,7 @@ android {
     buildFeatures {
         viewBinding = true
     }
+    namespace = "de.mm20.launcher2.owncloud"
 }
 
 dependencies {
diff --git a/owncloud/src/main/AndroidManifest.xml b/owncloud/src/main/AndroidManifest.xml
index 3b333ea88..fa73c4fcc 100644
--- a/owncloud/src/main/AndroidManifest.xml
+++ b/owncloud/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.owncloud">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <activity
diff --git a/permissions/build.gradle.kts b/permissions/build.gradle.kts
index bb5c86bbb..49d452648 100644
--- a/permissions/build.gradle.kts
+++ b/permissions/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.permissions"
 }
 
 dependencies {
diff --git a/permissions/src/main/AndroidManifest.xml b/permissions/src/main/AndroidManifest.xml
index 9482c8acd..a5918e68a 100644
--- a/permissions/src/main/AndroidManifest.xml
+++ b/permissions/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.permissions">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/preferences/build.gradle.kts b/preferences/build.gradle.kts
index ae306e77a..c27835f7d 100644
--- a/preferences/build.gradle.kts
+++ b/preferences/build.gradle.kts
@@ -34,6 +34,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "de.mm20.launcher2.preferences"
 }
 
 protobuf {
diff --git a/preferences/src/main/AndroidManifest.xml b/preferences/src/main/AndroidManifest.xml
index 6618030f6..972c3a837 100644
--- a/preferences/src/main/AndroidManifest.xml
+++ b/preferences/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.preferences">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/search/build.gradle.kts b/search/build.gradle.kts
index cfa4b3a73..410fe7b86 100644
--- a/search/build.gradle.kts
+++ b/search/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.search"
 }
 
 dependencies {
diff --git a/search/src/main/AndroidManifest.xml b/search/src/main/AndroidManifest.xml
index 787492217..227314eeb 100644
--- a/search/src/main/AndroidManifest.xml
+++ b/search/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="de.mm20.launcher2.search" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/transition/build.gradle.kts b/transition/build.gradle.kts
index 370ff588e..2fc6ad45c 100644
--- a/transition/build.gradle.kts
+++ b/transition/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.transition"
 }
 
 dependencies {
diff --git a/transition/src/main/AndroidManifest.xml b/transition/src/main/AndroidManifest.xml
index 578925b4b..a5c402166 100644
--- a/transition/src/main/AndroidManifest.xml
+++ b/transition/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.transition">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 3aaae275e..f6f2ba47c 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -45,6 +45,7 @@ android {
     lint {
         abortOnError = false
     }
+    namespace = "de.mm20.launcher2.ui"
 }
 
 dependencies {
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 6e9a9dd29..1347ac8d9 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <application>
diff --git a/unitconverter/build.gradle.kts b/unitconverter/build.gradle.kts
index 20e73c723..f369f2f6b 100644
--- a/unitconverter/build.gradle.kts
+++ b/unitconverter/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.unitconverter"
 }
 
 dependencies {
diff --git a/unitconverter/src/main/AndroidManifest.xml b/unitconverter/src/main/AndroidManifest.xml
index 978f561ad..a5c402166 100644
--- a/unitconverter/src/main/AndroidManifest.xml
+++ b/unitconverter/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.unitconverter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/weather/build.gradle.kts b/weather/build.gradle.kts
index 6151f391f..c287843ea 100644
--- a/weather/build.gradle.kts
+++ b/weather/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.weather"
 }
 
 dependencies {
diff --git a/weather/src/main/AndroidManifest.xml b/weather/src/main/AndroidManifest.xml
index 6e41a107f..f4cc71dd7 100644
--- a/weather/src/main/AndroidManifest.xml
+++ b/weather/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.weather">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 </manifest>
\ No newline at end of file
diff --git a/webdav/build.gradle.kts b/webdav/build.gradle.kts
index 9e5af7ad6..569b2cf3f 100644
--- a/webdav/build.gradle.kts
+++ b/webdav/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.webdav"
 }
 
 dependencies {
diff --git a/webdav/src/main/AndroidManifest.xml b/webdav/src/main/AndroidManifest.xml
index 85197f983..a5c402166 100644
--- a/webdav/src/main/AndroidManifest.xml
+++ b/webdav/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.webdav">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/websites/build.gradle.kts b/websites/build.gradle.kts
index c89225ca1..f1275a97a 100644
--- a/websites/build.gradle.kts
+++ b/websites/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.websites"
 }
 
 dependencies {
diff --git a/websites/src/main/AndroidManifest.xml b/websites/src/main/AndroidManifest.xml
index 53f93c8f8..a5c402166 100644
--- a/websites/src/main/AndroidManifest.xml
+++ b/websites/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.websites">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/widgets/build.gradle.kts b/widgets/build.gradle.kts
index 1d5221939..69849a13e 100644
--- a/widgets/build.gradle.kts
+++ b/widgets/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.widgets"
 }
 
 dependencies {
diff --git a/widgets/src/main/AndroidManifest.xml b/widgets/src/main/AndroidManifest.xml
index 8fb5f0b7b..a5c402166 100644
--- a/widgets/src/main/AndroidManifest.xml
+++ b/widgets/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.widgets">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file
diff --git a/wikipedia/build.gradle.kts b/wikipedia/build.gradle.kts
index 695d71c4a..4feb9e681 100644
--- a/wikipedia/build.gradle.kts
+++ b/wikipedia/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    namespace = "de.mm20.launcher2.wikipedia"
 }
 
 dependencies {
diff --git a/wikipedia/src/main/AndroidManifest.xml b/wikipedia/src/main/AndroidManifest.xml
index 1aeb7e78e..a5c402166 100644
--- a/wikipedia/src/main/AndroidManifest.xml
+++ b/wikipedia/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.mm20.launcher2.wikipedia">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     /
 </manifest>
\ No newline at end of file