diff --git a/app/build.gradle b/app/build.gradle
index dfb342d..8014b3c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,10 +15,13 @@ android {
             Properties properties = new Properties()
             if (project.rootProject.file('local.properties').exists()) {
                 properties.load(project.rootProject.file('local.properties').newDataInputStream())
-                storeFile file(properties.getProperty('keystore.file'))
-                storePassword properties.getProperty('keystore.password')
-                keyAlias 'key0'
-                keyPassword properties.getProperty('keystore.password')
+                // AndroidStudio generate local.properties, only set values if file is defined.
+                if (properties.hasProperty('keystore.file')) {
+                    storeFile file(properties.getProperty('keystore.file'))
+                    storePassword properties.getProperty('keystore.password')
+                    keyAlias 'key0'
+                    keyPassword properties.getProperty('keystore.password')
+                }
             }
         }
     }
@@ -167,6 +170,11 @@ aboutLibraries {
     additionalLicenses = ["LGPL_3_0_only", "Apache_2_0"]
 }
 
+configurations {
+    // Access all imported libraries
+    compileOnly.extendsFrom(runtimeOnly)
+}
+
 // "true" is not allowed inside this block, use "hasSentryConfig" instead.
 // This is because gradle doesn't allow to enable/disable plugins conditionally
 sentry {
@@ -248,7 +256,7 @@ dependencies {
     implementation "dev.rikka.rikkax.insets:insets:1.3.0"
     implementation 'com.github.Dimezis:BlurView:version-2.0.2'
     implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
-    implementation 'com.github.Fox2Code:FoxCompat:0.1.6'
+    implementation 'com.github.Fox2Code:FoxCompat:0.1.7'
     // Update the version code in the root build.gradle
     implementation "com.mikepenz:aboutlibraries:${latestAboutLibsRelease}"
 
@@ -319,3 +327,21 @@ android {
         }
     }
 }
+
+// Safeguard (Do not remove)
+final File res = new File(projectDir, "src/main/res")
+for (String name : res.list()) {
+    // Character.isDigit is required to make sure
+    // we don't confuse "values-vi" as "values-v69"
+    if (name.startsWith("values-v") &&
+            Character.isDigit(name.charAt(8))) {
+        final String ext = name + "/strings.xml"
+        if (new File(res, ext).exists()) {
+            final String errMessage =
+                    "String should not be defined in " + ext +
+                            " use values/strings.xml instead"
+            println(errMessage)
+            throw new GradleException(errMessage)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/strings.xml b/app/src/main/res/values-v23/strings.xml
deleted file mode 100644
index 1258a33..0000000
--- a/app/src/main/res/values-v23/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="crash_reporting_desc">If you disable this, the developer will not get automatic bug reports, and this may make troubleshooting harder</string>
-    <string name="api_key">Androidacy API Key</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/strings.xml b/app/src/main/res/values-v31/strings.xml
deleted file mode 100644
index 1258a33..0000000
--- a/app/src/main/res/values-v31/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="crash_reporting_desc">If you disable this, the developer will not get automatic bug reports, and this may make troubleshooting harder</string>
-    <string name="api_key">Androidacy API Key</string>
-</resources>
\ No newline at end of file