diff --git a/metadata/com.gueei.applocker.txt b/metadata/com.gueei.applocker.txt
index a2efe3d015..4060a380f9 100644
--- a/metadata/com.gueei.applocker.txt
+++ b/metadata/com.gueei.applocker.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:GPLv3
 Web Site:https://code.google.com/p/applocker
 Source Code:https://code.google.com/p/applocker/source
diff --git a/metadata/com.jecelyin.editor.txt b/metadata/com.jecelyin.editor.txt
index c368a01430..1ffd283b8b 100644
--- a/metadata/com.jecelyin.editor.txt
+++ b/metadata/com.jecelyin.editor.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Development
 License:GPLv3
 Web Site:http://jecelyin.com
 Source Code:https://github.com/jecelyin/920-Text-Editor
diff --git a/metadata/com.twinone.locker.txt b/metadata/com.twinone.locker.txt
index 4dfc7d3f74..1d02d5f634 100644
--- a/metadata/com.twinone.locker.txt
+++ b/metadata/com.twinone.locker.txt
@@ -1,5 +1,5 @@
 AntiFeatures:Tracking
-Categories:System
+Categories:Security
 License:Apache2
 Web Site:https://github.com/twinone/AppLocker/blob/HEAD/README.md
 Source Code:https://github.com/twinone/AppLocker
diff --git a/metadata/com.u17od.upm.txt b/metadata/com.u17od.upm.txt
index 4e16629a3b..b88cd0d153 100644
--- a/metadata/com.u17od.upm.txt
+++ b/metadata/com.u17od.upm.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Security
 License:GPLv3
 Web Site:http://upm.sourceforge.net
 Source Code:https://github.com/adrian/upm-android
diff --git a/metadata/com.vrem.wifianalyzer.txt b/metadata/com.vrem.wifianalyzer.txt
index 4a17928866..25c619ad8e 100644
--- a/metadata/com.vrem.wifianalyzer.txt
+++ b/metadata/com.vrem.wifianalyzer.txt
@@ -1,4 +1,4 @@
-Categories:System,Connectivity
+Categories:Connectivity
 License:Apache2
 Web Site:https://github.com/VREMSoftwareDevelopment/WifiAnalyzer/blob/HEAD/README.md
 Source Code:https://github.com/VREMSoftwareDevelopment/WifiAnalyzer
diff --git a/metadata/dasher.android.txt b/metadata/dasher.android.txt
index 11a040fe09..9ae5816e42 100644
--- a/metadata/dasher.android.txt
+++ b/metadata/dasher.android.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Writing
 License:GPLv3
 Web Site:http://www.inference.phy.cam.ac.uk/dasher/MobileDasher.html
 Source Code:https://github.com/acl33/AndroidDasher
diff --git a/metadata/faenza.adw.theme.txt b/metadata/faenza.adw.theme.txt
index fe961a5640..96e6372425 100644
--- a/metadata/faenza.adw.theme.txt
+++ b/metadata/faenza.adw.theme.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Theming
 License:GPLv3
 Web Site:https://code.google.com/p/faenza-adw-theme
 Source Code:https://code.google.com/p/faenza-adw-theme/source
diff --git a/metadata/jp.co.omronsoft.openwnn.txt b/metadata/jp.co.omronsoft.openwnn.txt
index f6a3ce9e8d..8a17d2c65c 100644
--- a/metadata/jp.co.omronsoft.openwnn.txt
+++ b/metadata/jp.co.omronsoft.openwnn.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Writing
 License:Apache2
 Web Site:
 Source Code:https://android.googlesource.com/platform/packages/inputmethods/OpenWnn
diff --git a/metadata/org.sufficientlysecure.standalonecalendar.txt b/metadata/org.sufficientlysecure.standalonecalendar.txt
index 1524b800d1..b0504a46db 100644
--- a/metadata/org.sufficientlysecure.standalonecalendar.txt
+++ b/metadata/org.sufficientlysecure.standalonecalendar.txt
@@ -1,4 +1,4 @@
-Categories:System,Time
+Categories:Time
 License:Apache2
 Web Site:
 Source Code:https://github.com/free-software-for-android/Standalone-Calendar
diff --git a/metadata/org.tamanegi.atmosphere.txt b/metadata/org.tamanegi.atmosphere.txt
index 19246a0dd5..3c13612084 100644
--- a/metadata/org.tamanegi.atmosphere.txt
+++ b/metadata/org.tamanegi.atmosphere.txt
@@ -1,4 +1,4 @@
-Categories:System
+Categories:Science & Education
 License:PublicDomain
 Web Site:http://www.tamanegi.org/prog/android-apps
 Source Code:https://github.com/lllllT/AtmosphereLogger
diff --git a/metadata/ws.xsoh.etar.txt b/metadata/ws.xsoh.etar.txt
index eb765d9a1b..adf80d38d1 100644
--- a/metadata/ws.xsoh.etar.txt
+++ b/metadata/ws.xsoh.etar.txt
@@ -1,4 +1,4 @@
-Categories:System,Time
+Categories:Time
 License:Apache2
 Web Site:
 Source Code:https://github.com/xsoh/Etar-Calendar