diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index f4ee9b9cf..8e7103475 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -32,13 +32,13 @@ tasks.compileLint {
 
 android {
 
-    compileSdk = 30
+    compileSdk = 31
 
     defaultConfig {
         versionCode = 20003
         versionName = "2.0.3"
         minSdk = 23
-        targetSdk = 30
+        targetSdk = 31
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/uhabits-android/src/main/AndroidManifest.xml b/uhabits-android/src/main/AndroidManifest.xml
index b5d06f181..5d4547550 100644
--- a/uhabits-android/src/main/AndroidManifest.xml
+++ b/uhabits-android/src/main/AndroidManifest.xml
@@ -17,7 +17,6 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.isoron.uhabits">
 
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -48,11 +47,11 @@
             android:name=".activities.habits.list.ListHabitsActivity"
             android:exported="true"
             android:label="@string/main_activity_title"
-            android:launchMode="singleTop">
-        </activity>
+            android:launchMode="singleTop" />
 
         <activity-alias
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/main_activity_title"
             android:launchMode="singleTop"
             android:targetActivity=".activities.habits.list.ListHabitsActivity">
@@ -85,6 +84,7 @@
 
         <activity
             android:name=".widgets.activities.HabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -93,6 +93,7 @@
 
         <activity
             android:name=".widgets.activities.BooleanHabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -101,6 +102,7 @@
 
         <activity
             android:name=".widgets.activities.NumericalHabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -117,9 +119,10 @@
 
         <activity
             android:name=".widgets.activities.NumericalCheckmarkWidgetActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
             android:label="NumericalCheckmarkWidget"
             android:noHistory="true"
-            android:excludeFromRecents="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="org.isoron.uhabits.ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY" />
@@ -128,13 +131,14 @@
 
         <activity
             android:name=".notifications.SnoozeDelayPickerActivity"
-            android:taskAffinity=""
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
+            android:taskAffinity=""
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <receiver
             android:name=".widgets.CheckmarkWidgetProvider"
+            android:exported="true"
             android:label="@string/checkmark">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -152,6 +156,7 @@
 
         <receiver
             android:name=".widgets.HistoryWidgetProvider"
+            android:exported="true"
             android:label="@string/history">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -164,6 +169,7 @@
 
         <receiver
             android:name=".widgets.ScoreWidgetProvider"
+            android:exported="true"
             android:label="@string/score">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -176,6 +182,7 @@
 
         <receiver
             android:name=".widgets.StreakWidgetProvider"
+            android:exported="true"
             android:label="@string/streaks">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -188,6 +195,7 @@
 
         <receiver
             android:name=".widgets.FrequencyWidgetProvider"
+            android:exported="true"
             android:label="@string/frequency">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -200,6 +208,7 @@
 
         <receiver
             android:name=".widgets.TargetWidgetProvider"
+            android:exported="true"
             android:label="@string/target">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -210,13 +219,17 @@
                 android:resource="@xml/widget_target_info" />
         </receiver>
 
-        <receiver android:name=".receivers.ReminderReceiver">
+        <receiver
+            android:name=".receivers.ReminderReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receivers.WidgetReceiver">
+        <receiver android:name=".receivers.WidgetReceiver"
+            android:exported="true"
+            android:permission="false">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="org.isoron.uhabits.ACTION_SET_NUMERICAL_VALUE" />
@@ -267,7 +280,7 @@
         <!-- Locale/Tasker -->
         <receiver
             android:name=".automation.FireSettingReceiver"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>