diff --git a/metadata/ca.rmen.android.poetassistant.txt b/metadata/ca.rmen.android.poetassistant.txt
index f4e1ae32da..31e8a31039 100644
--- a/metadata/ca.rmen.android.poetassistant.txt
+++ b/metadata/ca.rmen.android.poetassistant.txt
@@ -1,4 +1,4 @@
-Categories:Science & Education
+Categories:Writing
 License:GPLv3
 Web Site:https://github.com/caarmen/poet-assistant/blob/HEAD/README.md
 Source Code:https://github.com/caarmen/poet-assistant
diff --git a/metadata/com.elementarytoday.theia.txt b/metadata/com.elementarytoday.theia.txt
index 15f6963386..d39d27a042 100644
--- a/metadata/com.elementarytoday.theia.txt
+++ b/metadata/com.elementarytoday.theia.txt
@@ -1,4 +1,4 @@
-Categories:Multimedia,Theming
+Categories:Theming
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/varlesh/theia-icon-theme
diff --git a/metadata/com.jelly.theme.revenge.txt b/metadata/com.jelly.theme.revenge.txt
index 5b4b6ae4ac..4e19ca8017 100644
--- a/metadata/com.jelly.theme.revenge.txt
+++ b/metadata/com.jelly.theme.revenge.txt
@@ -1,4 +1,4 @@
-Categories:Multimedia,Theming
+Categories:Theming
 License:Apache2
 Web Site:https://github.com/enricocid/JellyRevenge-CM11-theme/blob/HEAD/README.md
 Source Code:https://github.com/enricocid/JellyRevenge-CM11-theme
diff --git a/metadata/com.termux.txt b/metadata/com.termux.txt
index 141fd351fe..f98b2362a0 100644
--- a/metadata/com.termux.txt
+++ b/metadata/com.termux.txt
@@ -1,4 +1,4 @@
-Categories:System,Development
+Categories:Development
 License:GPLv3
 Web Site:http://termux.com
 Source Code:https://github.com/termux/termux-app
diff --git a/metadata/com.xda.theme.cyanogenmod.txt b/metadata/com.xda.theme.cyanogenmod.txt
index 5aa7096edd..f544d91eee 100644
--- a/metadata/com.xda.theme.cyanogenmod.txt
+++ b/metadata/com.xda.theme.cyanogenmod.txt
@@ -1,4 +1,4 @@
-Categories:Multimedia,Theming
+Categories:Theming
 License:Apache2
 Web Site:https://github.com/enricocid/ChocoUI---XDA-Colors/blob/HEAD/README.md
 Source Code:https://github.com/enricocid/ChocoUI---XDA-Colors
diff --git a/metadata/info.guardianproject.pixelknot.txt b/metadata/info.guardianproject.pixelknot.txt
index 349b7129b7..5c1fc06903 100644
--- a/metadata/info.guardianproject.pixelknot.txt
+++ b/metadata/info.guardianproject.pixelknot.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:GPLv3
 Web Site:https://guardianproject.info
 Source Code:https://github.com/guardianproject/PixelKnot
diff --git a/metadata/me.alexghr.bulkshare.android.app2.txt b/metadata/me.alexghr.bulkshare.android.app2.txt
index 541c1b8b81..14c3377a70 100644
--- a/metadata/me.alexghr.bulkshare.android.app2.txt
+++ b/metadata/me.alexghr.bulkshare.android.app2.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Internet
 License:Apache2
 Web Site:https://github.com/alexghr/bulkshare/blob/HEAD/README.md
 Source Code:https://github.com/alexghr/bulkshare
diff --git a/metadata/net.syntaxblitz.plucklock.txt b/metadata/net.syntaxblitz.plucklock.txt
index d7b4e193fc..e8ebfad860 100644
--- a/metadata/net.syntaxblitz.plucklock.txt
+++ b/metadata/net.syntaxblitz.plucklock.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:MIT
 Web Site:
 Source Code:https://github.com/SyntaxBlitz/PluckLock
diff --git a/metadata/net.tedstein.AndroSS.txt b/metadata/net.tedstein.AndroSS.txt
index 7cac99ce15..0ceb5e1375 100644
--- a/metadata/net.tedstein.AndroSS.txt
+++ b/metadata/net.tedstein.AndroSS.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Graphics
 License:GPLv2
 Web Site:
 Source Code:https://github.com/tstein/AndroSS
diff --git a/metadata/org.crocodile.sbautologin.txt b/metadata/org.crocodile.sbautologin.txt
index 687964d6e1..e22cbafbfe 100644
--- a/metadata/org.crocodile.sbautologin.txt
+++ b/metadata/org.crocodile.sbautologin.txt
@@ -1,4 +1,4 @@
-Categories:Internet
+Categories:Connectivity
 License:GPLv3+
 Web Site:https://code.google.com/p/sbautologin
 Source Code:https://code.google.com/p/sbautologin/source
diff --git a/metadata/org.cyanogenmod.great.freedom.txt b/metadata/org.cyanogenmod.great.freedom.txt
index faa1762564..62a54d161f 100644
--- a/metadata/org.cyanogenmod.great.freedom.txt
+++ b/metadata/org.cyanogenmod.great.freedom.txt
@@ -1,4 +1,4 @@
-Categories:Multimedia
+Categories:Theming
 License:Apache2
 Web Site:
 Source Code:https://github.com/elelinux/GreatFreedom
diff --git a/metadata/org.primftpd.txt b/metadata/org.primftpd.txt
index e1091d6b77..e0da14c2f5 100644
--- a/metadata/org.primftpd.txt
+++ b/metadata/org.primftpd.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Connectivity
 License:Apache2
 Web Site:
 Source Code:https://github.com/wolpi/prim-ftpd