diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b7025b7d9..67d371b49 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <color name="unsigned">#ffCC0000</color>
     <color name="unverified">#ff999999</color>
     <color name="red">#ffdd2c00</color>
 
-    <color name="category_connectivity">#CBEFEC</color>
-    <color name="category_development">#E2D6BC</color>
-    <color name="category_games">#6D6862</color>
-    <color name="category_graphics">#F25050</color>
-    <color name="category_internet">#DBDDC9</color>
-    <color name="category_money">#DDDDD0</color>
-    <color name="category_multimedia">#FF7F66</color>
-    <color name="category_navigation">#94D6FD</color>
-    <color name="category_phone_sms">#F3CFC0</color>
-    <color name="category_reading">#D6A07A</color>
-    <color name="category_science_education">#F4F4EC</color>
-    <color name="category_security">#6D6862</color>
-    <color name="category_sports_health">#72C7EA</color>
-    <color name="category_system">#D3DB77</color>
-    <color name="category_theming">#DEEFE9</color>
-    <color name="category_time">#FF7043</color>
-    <color name="category_writing">#F2E9CE</color>
+    <!-- Ignore UnusedResources errors here, because the resources are loaded dynamically at runtime -->
+    <color tools:ignore="UnusedResources" name="category_connectivity">#CBEFEC</color>
+    <color tools:ignore="UnusedResources" name="category_development">#E2D6BC</color>
+    <color tools:ignore="UnusedResources" name="category_games">#6D6862</color>
+    <color tools:ignore="UnusedResources" name="category_graphics">#F25050</color>
+    <color tools:ignore="UnusedResources" name="category_internet">#DBDDC9</color>
+    <color tools:ignore="UnusedResources" name="category_money">#DDDDD0</color>
+    <color tools:ignore="UnusedResources" name="category_multimedia">#FF7F66</color>
+    <color tools:ignore="UnusedResources" name="category_navigation">#94D6FD</color>
+    <color tools:ignore="UnusedResources" name="category_phone_sms">#F3CFC0</color>
+    <color tools:ignore="UnusedResources" name="category_reading">#D6A07A</color>
+    <color tools:ignore="UnusedResources" name="category_science_education">#F4F4EC</color>
+    <color tools:ignore="UnusedResources" name="category_security">#6D6862</color>
+    <color tools:ignore="UnusedResources" name="category_sports_health">#72C7EA</color>
+    <color tools:ignore="UnusedResources" name="category_system">#D3DB77</color>
+    <color tools:ignore="UnusedResources" name="category_theming">#DEEFE9</color>
+    <color tools:ignore="UnusedResources" name="category_time">#FF7043</color>
+    <color tools:ignore="UnusedResources" name="category_writing">#F2E9CE</color>
 
     <color name="fdroid_blue">#ff1976d2</color>
     <color name="fdroid_blue_dark">#ff0d47a1</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d51af95f..9159e596f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="app_name">F-Droid</string>
 
@@ -286,23 +286,23 @@
     <string name="category_All">All</string>
     <string name="category_Whats_New">What\'s New</string>
     <string name="category_Recently_Updated">Recently Updated</string>
-    <string name="category_Connectivity">Connectivity</string>
-    <string name="category_Development">Development</string>
-    <string name="category_Games">Games</string>
-    <string name="category_Graphics">Graphics</string>
-    <string name="category_Internet">Internet</string>
-    <string name="category_Money">Money</string>
-    <string name="category_Multimedia">Multimedia</string>
-    <string name="category_Navigation">Navigation</string>
-    <string name="category_Phone_SMS">Phone &amp; SMS</string>
-    <string name="category_Reading">Reading</string>
-    <string name="category_Science_Education">Science &amp; Education</string>
-    <string name="category_Security">Security</string>
-    <string name="category_Sports_Health">Sports &amp; Health</string>
-    <string name="category_System">System</string>
-    <string name="category_Theming">Theming</string>
-    <string name="category_Time">Time</string>
-    <string name="category_Writing">Writing</string>
+    <string tools:ignore="UnusedResources" name="category_Connectivity">Connectivity</string>
+    <string tools:ignore="UnusedResources" name="category_Development">Development</string>
+    <string tools:ignore="UnusedResources" name="category_Games">Games</string>
+    <string tools:ignore="UnusedResources" name="category_Graphics">Graphics</string>
+    <string tools:ignore="UnusedResources" name="category_Internet">Internet</string>
+    <string tools:ignore="UnusedResources" name="category_Money">Money</string>
+    <string tools:ignore="UnusedResources" name="category_Multimedia">Multimedia</string>
+    <string tools:ignore="UnusedResources" name="category_Navigation">Navigation</string>
+    <string tools:ignore="UnusedResources" name="category_Phone_SMS">Phone &amp; SMS</string>
+    <string tools:ignore="UnusedResources" name="category_Reading">Reading</string>
+    <string tools:ignore="UnusedResources" name="category_Science_Education">Science &amp; Education</string>
+    <string tools:ignore="UnusedResources" name="category_Security">Security</string>
+    <string tools:ignore="UnusedResources" name="category_Sports_Health">Sports &amp; Health</string>
+    <string tools:ignore="UnusedResources" name="category_System">System</string>
+    <string tools:ignore="UnusedResources" name="category_Theming">Theming</string>
+    <string tools:ignore="UnusedResources" name="category_Time">Time</string>
+    <string tools:ignore="UnusedResources" name="category_Writing">Writing</string>
 
     <plurals name="button_view_all_apps_in_category">
         <!-- Even though these are the same as eachother, Android docs suggest always specifying at