diff --git a/metadata/at.zweng.bankomatinfos2.txt b/metadata/at.zweng.bankomatinfos2.txt
index 0e9e2ddfc1..4362b67d1f 100644
--- a/metadata/at.zweng.bankomatinfos2.txt
+++ b/metadata/at.zweng.bankomatinfos2.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Money
 License:GPLv3
 Web Site:http://johannes.zweng.at
 Source Code:https://github.com/johnzweng/bankomatinfos
diff --git a/metadata/cc.co.eurdev.urecorder.txt b/metadata/cc.co.eurdev.urecorder.txt
index 6253c69a02..1f83c63267 100644
--- a/metadata/cc.co.eurdev.urecorder.txt
+++ b/metadata/cc.co.eurdev.urecorder.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Multimedia
 License:GPLv3
 Web Site:
 Source Code:https://bitbucket.org/thomasebell/urecord
diff --git a/metadata/com.alfray.timeriffic.txt b/metadata/com.alfray.timeriffic.txt
index 105c1c90b1..0cab095238 100644
--- a/metadata/com.alfray.timeriffic.txt
+++ b/metadata/com.alfray.timeriffic.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:GPLv3
 Web Site:https://code.google.com/p/timeriffic
 Source Code:https://code.google.com/p/timeriffic/source
diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt
index 3b543ea0d8..600d9fa1f9 100644
--- a/metadata/com.android.keepass.txt
+++ b/metadata/com.android.keepass.txt
@@ -1,10 +1,10 @@
-Categories:Office
+Categories:Security
 License:GPLv3
 Web Site:http://www.keepassdroid.com
 Source Code:https://github.com/bpellin/keepassdroid
 Issue Tracker:
-Donate:http://www.keepassdroid.com
 Changelog:https://github.com/bpellin/keepassdroid/blob/HEAD/CHANGELOG
+Donate:http://www.keepassdroid.com
 
 Auto Name:KeePassDroid
 Summary:KeePass-compatible password safe
diff --git a/metadata/com.annimon.minizipandroid.txt b/metadata/com.annimon.minizipandroid.txt
index 5d45a50e24..2510bf9b24 100644
--- a/metadata/com.annimon.minizipandroid.txt
+++ b/metadata/com.annimon.minizipandroid.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:System
 License:Zlib
 Web Site:
 Source Code:https://github.com/aNNiMON/MinizipAndroid
diff --git a/metadata/com.anysoftkeyboard.languagepack.pali.txt b/metadata/com.anysoftkeyboard.languagepack.pali.txt
index 983068da55..eb57b01b2b 100644
--- a/metadata/com.anysoftkeyboard.languagepack.pali.txt
+++ b/metadata/com.anysoftkeyboard.languagepack.pali.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:System
 License:GPLv3
 Web Site:https://github.com/yuttadhammo
 Source Code:https://github.com/yuttadhammo/ask-pali-keyboard
diff --git a/metadata/com.banasiak.coinflip.txt b/metadata/com.banasiak.coinflip.txt
index d2709536c9..a26293ec69 100644
--- a/metadata/com.banasiak.coinflip.txt
+++ b/metadata/com.banasiak.coinflip.txt
@@ -1,5 +1,5 @@
 AntiFeatures:UpstreamNonFree
-Categories:Office
+Categories:Games
 License:GPLv3
 Web Site:
 Source Code:https://github.com/banasiak/CoinFlip
diff --git a/metadata/com.bmpak.anagramsolver.txt b/metadata/com.bmpak.anagramsolver.txt
index 5438268387..03313f7c63 100644
--- a/metadata/com.bmpak.anagramsolver.txt
+++ b/metadata/com.bmpak.anagramsolver.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Reading
 License:MIT
 Web Site:https://charbgr.github.io/Anagram-Solver
 Source Code:https://github.com/charbgr/Anagram-Solver
diff --git a/metadata/com.byagowi.persiancalendar.txt b/metadata/com.byagowi.persiancalendar.txt
index ea3f828b5e..287bab10ad 100644
--- a/metadata/com.byagowi.persiancalendar.txt
+++ b/metadata/com.byagowi.persiancalendar.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:GPLv3
 Web Site:https://github.com/ebraminio/DroidPersianCalendar/blob/HEAD/README.md
 Source Code:https://github.com/ebraminio/DroidPersianCalendar
diff --git a/metadata/com.colinmcdonough.android.torch.txt b/metadata/com.colinmcdonough.android.torch.txt
index 942ceace5f..6e04ed156f 100644
--- a/metadata/com.colinmcdonough.android.torch.txt
+++ b/metadata/com.colinmcdonough.android.torch.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:System
 License:Apache2
 Web Site:https://code.google.com/p/torch
 Source Code:https://code.google.com/p/torch/source
diff --git a/metadata/com.collabora.libreoffice.txt b/metadata/com.collabora.libreoffice.txt
index 0780d976ec..7fa1a0594c 100644
--- a/metadata/com.collabora.libreoffice.txt
+++ b/metadata/com.collabora.libreoffice.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Multimedia
 License:MPL2
 Web Site:https://wiki.documentfoundation.org/Android
 Source Code:http://cgit.freedesktop.org/libreoffice/core/tree
@@ -33,10 +33,10 @@ Repo Type:git
 Repo:git://anongit.freedesktop.org/libreoffice/core
 
 Build:4.5.0.0.alpha0+/7f68f67,6
-    commit=7f68f67
     disable=Remove old alpha build
-    srclibs=LOTarballs@c873ae6f
+    commit=7f68f67
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
+    srclibs=LOTarballs@c873ae6f
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac
@@ -46,8 +46,8 @@ Build:4.5.0.0.alpha0+/7f68f67,6
 
 Build:4.5.0.0.alpha0+/3f1713b,7
     commit=3f1713b
-    srclibs=LOTarballs@c873ae6f
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
+    srclibs=LOTarballs@c873ae6f
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac
@@ -57,8 +57,8 @@ Build:4.5.0.0.alpha0+/3f1713b,7
 
 Build:4.5.0.0.alpha0+/3f1713b,8
     commit=3f1713b
-    srclibs=LOTarballs@c873ae6f
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
+    srclibs=LOTarballs@c873ae6f
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac
@@ -68,8 +68,8 @@ Build:4.5.0.0.alpha0+/3f1713b,8
 
 Build:4.5.0.0.alpha0+/2f6bc9c,9
     commit=2f6bc9c
-    srclibs=LOTarballs@c873ae6f
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
+    srclibs=LOTarballs@c873ae6f
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac
@@ -79,8 +79,8 @@ Build:4.5.0.0.alpha0+/2f6bc9c,9
 
 Build:4.5.0.0.alpha0+/2f6bc9c,10
     commit=2f6bc9c
-    srclibs=LOTarballs@c873ae6f
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
+    srclibs=LOTarballs@c873ae6f
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac
@@ -90,8 +90,8 @@ Build:4.5.0.0.alpha0+/2f6bc9c,10
 
 Build:4.5.0.0.alpha0+/2d6e16f,11
     commit=2d6e16f
-    srclibs=LOTarballs@187cf421
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
+    srclibs=LOTarballs@187cf421
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
@@ -104,8 +104,8 @@ Build:4.5.0.0.alpha0+/2d6e16f,11
 
 Build:4.5.0.0.alpha0+/2d6e16f,12
     commit=2d6e16f
-    srclibs=LOTarballs@187cf421
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
+    srclibs=LOTarballs@187cf421
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
diff --git a/metadata/com.easytarget.micopi.txt b/metadata/com.easytarget.micopi.txt
index c105c554cd..36b6df3c2f 100644
--- a/metadata/com.easytarget.micopi.txt
+++ b/metadata/com.easytarget.micopi.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Graphics
 License:Apache2
 Web Site:https://easytargetmixel.github.io/micopi_android
 #Web Site:http://micopi.easy-target.org/ ## points to the playstore
diff --git a/metadata/com.funambol.androidsync.txt b/metadata/com.funambol.androidsync.txt
index 87267256e1..359b3ddba3 100644
--- a/metadata/com.funambol.androidsync.txt
+++ b/metadata/com.funambol.androidsync.txt
@@ -1,5 +1,5 @@
 Disabled:Replaced by com.funambol.funv10
-Categories:Office
+Categories:System
 License:AGPLv3
 Web Site:http://www.funambol.com
 Source Code:https://funambol.svn.sourceforge.net/viewvc/funambol/android-client/trunk/android-client
diff --git a/metadata/com.gimranov.zandy.app.txt b/metadata/com.gimranov.zandy.app.txt
index 3586c97b71..ce830ed2d8 100644
--- a/metadata/com.gimranov.zandy.app.txt
+++ b/metadata/com.gimranov.zandy.app.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Reading
 License:AGPLv3
 Web Site:http://www.gimranov.com/avram/w/zandy-user-guide
 Source Code:https://github.com/ajlyon/zandy
diff --git a/metadata/com.gmail.mugcuposup.android.txt b/metadata/com.gmail.mugcuposup.android.txt
index eb4ccf74ce..4fcf97935a 100644
--- a/metadata/com.gmail.mugcuposup.android.txt
+++ b/metadata/com.gmail.mugcuposup.android.txt
@@ -1,4 +1,4 @@
-Categories:Multimedia,Office
+Categories:Multimedia,Graphics
 License:MIT
 Web Site:
 Source Code:https://github.com/mugcupsoup/SimpleReflectedLightMeter
diff --git a/metadata/com.hlidskialf.android.pomodoro.txt b/metadata/com.hlidskialf.android.pomodoro.txt
index 756e0a5d67..3544ddf36c 100644
--- a/metadata/com.hlidskialf.android.pomodoro.txt
+++ b/metadata/com.hlidskialf.android.pomodoro.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:Apache2
 Web Site:http://android.hlidskialf.com/apps/pomodoro
 Source Code:https://github.com/lithium/pomodoro
diff --git a/metadata/com.hughes.android.dictionary.txt b/metadata/com.hughes.android.dictionary.txt
index a765cd428c..22739d328e 100644
--- a/metadata/com.hughes.android.dictionary.txt
+++ b/metadata/com.hughes.android.dictionary.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Reading
 License:Apache2
 Web Site:https://code.google.com/p/quickdic-dictionary
 Source Code:https://code.google.com/p/quickdic-dictionary/source
diff --git a/metadata/com.maskyn.fileeditorpro.txt b/metadata/com.maskyn.fileeditorpro.txt
index ff357181f8..70c498ac22 100644
--- a/metadata/com.maskyn.fileeditorpro.txt
+++ b/metadata/com.maskyn.fileeditorpro.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Writing
 License:GPLv3+
 Web Site:https://vmihalachi.github.io/turbo-editor
 Source Code:https://github.com/vmihalachi/turbo-editor
diff --git a/metadata/com.matburt.mobileorg.txt b/metadata/com.matburt.mobileorg.txt
index 04f49ac838..44d34c044a 100644
--- a/metadata/com.matburt.mobileorg.txt
+++ b/metadata/com.matburt.mobileorg.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Writing
 License:GPLv2
 Web Site:https://github.com/matburt/mobileorg-android/wiki
 Source Code:https://github.com/matburt/mobileorg-android
diff --git a/metadata/com.mattieapps.roommates.txt b/metadata/com.mattieapps.roommates.txt
index d6e8869d91..aa2a1299e3 100644
--- a/metadata/com.mattieapps.roommates.txt
+++ b/metadata/com.mattieapps.roommates.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Science & Education
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/mattieapps/roommates
diff --git a/metadata/com.moonpi.swiftnotes.txt b/metadata/com.moonpi.swiftnotes.txt
index 80728a3703..88e977d52f 100644
--- a/metadata/com.moonpi.swiftnotes.txt
+++ b/metadata/com.moonpi.swiftnotes.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Writing
 License:Apache2
 Web Site:
 Source Code:https://github.com/adrianchifor/Swiftnotes
diff --git a/metadata/com.nathanosman.chronosnap.txt b/metadata/com.nathanosman.chronosnap.txt
index f96d5b39f1..47caa1142b 100644
--- a/metadata/com.nathanosman.chronosnap.txt
+++ b/metadata/com.nathanosman.chronosnap.txt
@@ -1,4 +1,4 @@
-Categories:Multimedia,Office
+Categories:Multimedia,Graphics
 License:MIT
 Web Site:https://github.com/nathan-osman/chronosnap/blob/HEAD/README.md
 Source Code:https://github.com/nathan-osman/chronosnap
diff --git a/metadata/com.nilhcem.frcndict.txt b/metadata/com.nilhcem.frcndict.txt
index 17c8fabe85..04ada00040 100644
--- a/metadata/com.nilhcem.frcndict.txt
+++ b/metadata/com.nilhcem.frcndict.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Reading
 License:NewBSD
 Web Site:
 Source Code:https://github.com/Nilhcem/frcndict-android
diff --git a/metadata/com.olam.txt b/metadata/com.olam.txt
index 6de4643e07..fc667cb68d 100644
--- a/metadata/com.olam.txt
+++ b/metadata/com.olam.txt
@@ -1,5 +1,6 @@
-Categories:Office
+Categories:Reading
 License:MIT
+Web Site:
 Source Code:https://github.com/vishnus/Olam
 Issue Tracker:https://github.com/vishnus/Olam/issues
 
diff --git a/metadata/com.omegavesko.holocounter.txt b/metadata/com.omegavesko.holocounter.txt
index 609377c800..37173a96eb 100644
--- a/metadata/com.omegavesko.holocounter.txt
+++ b/metadata/com.omegavesko.holocounter.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:MIT
 Web Site:
 Source Code:https://github.com/omegavesko/HoloCounter
diff --git a/metadata/com.politedroid.txt b/metadata/com.politedroid.txt
index fc8bd13a18..fbc9fd217e 100644
--- a/metadata/com.politedroid.txt
+++ b/metadata/com.politedroid.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:GPLv3
 Web Site:
 Source Code:https://github.com/miguelvps/PoliteDroid
diff --git a/metadata/com.rhiannonweb.android.migrainetracker.txt b/metadata/com.rhiannonweb.android.migrainetracker.txt
index d14f26cc3f..2db855fbcb 100644
--- a/metadata/com.rhiannonweb.android.migrainetracker.txt
+++ b/metadata/com.rhiannonweb.android.migrainetracker.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:GPLv2
 Web Site:
 Source Code:http://sourceforge.net/projects/migrainetracker
diff --git a/metadata/com.sli.juicymobile.txt b/metadata/com.sli.juicymobile.txt
index db1b700a87..c41b112a7d 100644
--- a/metadata/com.sli.juicymobile.txt
+++ b/metadata/com.sli.juicymobile.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Science & Education
 License:AGPL
 Web Site:
 Source Code:https://github.com/sli/juicy-mobile
diff --git a/metadata/com.yasfa.views.txt b/metadata/com.yasfa.views.txt
index 5c91a2de8c..f24cc7c69d 100644
--- a/metadata/com.yasfa.views.txt
+++ b/metadata/com.yasfa.views.txt
@@ -1,4 +1,4 @@
-Categories:Office,Multimedia
+Categories:Multimedia,Reading
 License:GPLv3
 Web Site:https://github.com/IanEH/YASFA1/blob/HEAD/ReadMe.txt
 Source Code:https://github.com/IanEH/YASFA1
diff --git a/metadata/de.azapps.mirakel.dashclock.txt b/metadata/de.azapps.mirakel.dashclock.txt
index 6f4afceec6..6277c53f2e 100644
--- a/metadata/de.azapps.mirakel.dashclock.txt
+++ b/metadata/de.azapps.mirakel.dashclock.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Theming
 License:GPLv3+
 Web Site:http://mirakel.azapps.de
 Source Code:https://github.com/MirakelX/mirakel-android
diff --git a/metadata/de.k3b.android.toGoZip.txt b/metadata/de.k3b.android.toGoZip.txt
index c8f566a1a5..adaedb0afc 100644
--- a/metadata/de.k3b.android.toGoZip.txt
+++ b/metadata/de.k3b.android.toGoZip.txt
@@ -1,4 +1,4 @@
-Categories:Office,System
+Categories:System
 License:GPLv3
 Web Site:https://github.com/k3b/toGoZip/wiki
 Source Code:https://github.com/k3b/toGoZip
diff --git a/metadata/de.nico.ha_manager.txt b/metadata/de.nico.ha_manager.txt
index 138c034add..5ac4ff8c86 100644
--- a/metadata/de.nico.ha_manager.txt
+++ b/metadata/de.nico.ha_manager.txt
@@ -1,4 +1,4 @@
-Categories:Science & Education,Office
+Categories:Science & Education
 License:GPLv3
 Web Site:https://altnico.github.io/projects/android/HW-Manager.html
 Source Code:https://github.com/hw-manager/android
@@ -79,3 +79,4 @@ Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:0.94
 Current Version Code:23
+
diff --git a/metadata/de.we.acaldav.txt b/metadata/de.we.acaldav.txt
index a1b7fd05a3..8f98df699f 100644
--- a/metadata/de.we.acaldav.txt
+++ b/metadata/de.we.acaldav.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:System
 License:GPLv3+
 Web Site:https://github.com/ennswi/AndroidCaldavSyncAdapater/blob/HEAD/README.md
 Source Code:https://github.com/ennswi/AndroidCaldavSyncAdapater
diff --git a/metadata/edu.killerud.kitchentimer.txt b/metadata/edu.killerud.kitchentimer.txt
index a6eecca1c5..ee27300a2f 100644
--- a/metadata/edu.killerud.kitchentimer.txt
+++ b/metadata/edu.killerud.kitchentimer.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:GPLv3
 Web Site:
 Source Code:https://github.com/wkillerud/hiofenigma-android
diff --git a/metadata/eu.vranckaert.worktime.txt b/metadata/eu.vranckaert.worktime.txt
index 8005ac27d9..2d26928d96 100644
--- a/metadata/eu.vranckaert.worktime.txt
+++ b/metadata/eu.vranckaert.worktime.txt
@@ -1,5 +1,5 @@
 AntiFeatures:UpstreamNonFree
-Categories:Office
+Categories:Time
 License:Apache2
 Web Site:https://code.google.com/p/worktime
 Source Code:https://code.google.com/p/worktime/source
diff --git a/metadata/fr.pssoftware.scoretarot.txt b/metadata/fr.pssoftware.scoretarot.txt
index 296c8d3739..55d78d354c 100644
--- a/metadata/fr.pssoftware.scoretarot.txt
+++ b/metadata/fr.pssoftware.scoretarot.txt
@@ -1,4 +1,4 @@
-Categories:Games,Office
+Categories:Games
 License:GPLv3
 Web Site:http://scoretarot.tuxfamily.org
 Source Code:http://git.tuxfamily.org/?p=scoretarot/git.git
@@ -26,10 +26,10 @@ Build:2.0,20
     commit=20
     subdir=app
     gradle=yes
-    rm=app/libs/*
     srclibs=AChartengineXlythe@0b27908f012ba17360977f8b87c64e755948302c
+    rm=app/libs/*
     prebuild=cp -fR $$AChartengineXlythe$$/src/org src/main/java/ && \
-         sed -i -e '/achartengine/d' build.gradle
+        sed -i -e '/achartengine/d' build.gradle
 
 Auto Update Mode:Version %c
 Update Check Mode:Tags
diff --git a/metadata/io.github.droidapps.pdfreader.txt b/metadata/io.github.droidapps.pdfreader.txt
index 6cef9b09b9..302a29db37 100644
--- a/metadata/io.github.droidapps.pdfreader.txt
+++ b/metadata/io.github.droidapps.pdfreader.txt
@@ -1,4 +1,4 @@
-Categories:Office,Reading
+Categories:Reading,Multimedia
 License:GPLv3
 Web Site:https://droidapps.github.io/pdfreader4Android
 Source Code:https://github.com/droidapps/pdfreader4Android
diff --git a/metadata/me.bpear.chromeapkpackager.txt b/metadata/me.bpear.chromeapkpackager.txt
index 97aa05b076..544cd45db3 100644
--- a/metadata/me.bpear.chromeapkpackager.txt
+++ b/metadata/me.bpear.chromeapkpackager.txt
@@ -1,4 +1,4 @@
-Categories:System,Office
+Categories:System
 License:GPLv3
 Web Site:https://github.com/bpear96/Chrome-APK-Packager/blob/HEAD/README.md
 Source Code:https://github.com/bpear96/Chrome-APK-Packager
diff --git a/metadata/me.writeily.txt b/metadata/me.writeily.txt
index 6f6e2addfe..e77f941d71 100644
--- a/metadata/me.writeily.txt
+++ b/metadata/me.writeily.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Writing
 License:MIT
 Web Site:http://writeily.me
 Source Code:https://github.com/plafue/writeily-pro
diff --git a/metadata/nerd.tuxmobil.fahrplan.camp.txt b/metadata/nerd.tuxmobil.fahrplan.camp.txt
index ceb36af160..da1cbe7792 100644
--- a/metadata/nerd.tuxmobil.fahrplan.camp.txt
+++ b/metadata/nerd.tuxmobil.fahrplan.camp.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:Apache2
 Web Site:
 Source Code:https://github.com/tuxmobil/CampFahrplan
diff --git a/metadata/net.androgames.level.txt b/metadata/net.androgames.level.txt
index 7ede22d64a..0c317efc62 100644
--- a/metadata/net.androgames.level.txt
+++ b/metadata/net.androgames.level.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Science & Education
 License:GPLv3
 Web Site:http://avianey.blogspot.com
 Source Code:https://github.com/avianey/Level
@@ -33,13 +33,7 @@ Build:1.9.7,36
     commit=a3a4935f760632d90fc735ff64189333a4a411a2
     subdir=Level
     maven=yes
-    prebuild=$$MVN3$$ install:install-file \
-        -Dfile=$ANDROID_HOME/platforms/android-19/android.jar \
-        -DgroupId=android \
-        -DartifactId=android \
-        -Dversion=4.4.2_r2 \
-        -Dpackaging=jar \
-        -DgeneratePom=true && \
+    prebuild=$$MVN3$$ install:install-file -Dfile=$ANDROID_HOME/platforms/android-19/android.jar -DgroupId=android -DartifactId=android -Dversion=4.4.2_r2 -Dpackaging=jar -DgeneratePom=true && \
         sed -i -e 's@<version>3.8.2</version>@<version>3.7.0</version>@g' pom.xml && \
         sed -i -e '32,65d' pom.xml && \
         sed -i -e 's@<debug>true</debug>@<debug>false</debug>@g' pom.xml && \
diff --git a/metadata/net.usikkert.kouchat.android.txt b/metadata/net.usikkert.kouchat.android.txt
index 59ab40829b..e9b24bf131 100644
--- a/metadata/net.usikkert.kouchat.android.txt
+++ b/metadata/net.usikkert.kouchat.android.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Connectivity
 License:GPLv3
 Web Site:http://www.kouchat.net
 Source Code:https://github.com/blurpy/kouchat-android
@@ -15,11 +15,11 @@ Repo Type:git
 Repo:https://github.com/blurpy/kouchat-android
 
 Build:1.0.2,14
+    disable=doesn't build
     commit=kouchat-android-1.0.2
     subdir=kouchat-android-impl
     srclibs=1:ActionBarSherlock@4.4.0,2:HoloColorPicker@7c067bcff762320f1ded682a73f59b34867ad93d
     target=android-21
-    disable=doesn't build
 
 Maintainer Notes:
 There is a maven build, but it uses sonatype.
diff --git a/metadata/net.vivekiyer.GAL.txt b/metadata/net.vivekiyer.GAL.txt
index d967348c4f..b90a74a6fb 100644
--- a/metadata/net.vivekiyer.GAL.txt
+++ b/metadata/net.vivekiyer.GAL.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:System
 License:Apache2
 Web Site:https://code.google.com/p/corporateaddressbook
 Source Code:https://code.google.com/p/corporateaddressbook/source
diff --git a/metadata/org.dgtale.icsimport.txt b/metadata/org.dgtale.icsimport.txt
index 471bc9b0af..cd9756497c 100644
--- a/metadata/org.dgtale.icsimport.txt
+++ b/metadata/org.dgtale.icsimport.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Time
 License:GPLv3+
 Web Site:https://github.com/danielegobbetti/ICSImport/blob/HEAD/README.md
 Source Code:https://github.com/danielegobbetti/ICSImport
diff --git a/metadata/org.grapentin.apps.exceer.txt b/metadata/org.grapentin.apps.exceer.txt
index 6fc4eb124c..213bcdc0ab 100644
--- a/metadata/org.grapentin.apps.exceer.txt
+++ b/metadata/org.grapentin.apps.exceer.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Sports & Health
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/oaken-source/exceer
diff --git a/metadata/org.okfn.pod.txt b/metadata/org.okfn.pod.txt
index 0ea49eef21..fb611a2878 100644
--- a/metadata/org.okfn.pod.txt
+++ b/metadata/org.okfn.pod.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Multimedia
 License:MIT
 Web Site:http://okfn.org
 Source Code:https://github.com/okfn/product-browser-android
diff --git a/metadata/org.tryton.client.txt b/metadata/org.tryton.client.txt
index 0c3e0ddd40..e911466182 100644
--- a/metadata/org.tryton.client.txt
+++ b/metadata/org.tryton.client.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Money
 License:GPLv3
 Web Site:http://trac.scil.coop/tryton_android
 Source Code:http://trac.scil.coop/tryton_android/browser
diff --git a/metadata/org.uaraven.e.txt b/metadata/org.uaraven.e.txt
index 5abc049cab..7e5d818249 100644
--- a/metadata/org.uaraven.e.txt
+++ b/metadata/org.uaraven.e.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Science & Education
 License:GPLv3
 Web Site:http://android.acute-angle.net/enumbers
 Source Code:https://bitbucket.org/uaraven/enumbers/src
diff --git a/metadata/org.yuttadhammo.tipitaka.txt b/metadata/org.yuttadhammo.tipitaka.txt
index 150ef9448e..3b144352c4 100644
--- a/metadata/org.yuttadhammo.tipitaka.txt
+++ b/metadata/org.yuttadhammo.tipitaka.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Reading
 License:GPLv3
 Web Site:http://www.sirimangalo.org
 Source Code:https://github.com/yuttadhammo/E-Tipitaka-for-Android
diff --git a/metadata/ro.weednet.contactssync.txt b/metadata/ro.weednet.contactssync.txt
index 234633c44f..6c7e895f7a 100644
--- a/metadata/ro.weednet.contactssync.txt
+++ b/metadata/ro.weednet.contactssync.txt
@@ -1,5 +1,5 @@
 AntiFeatures:UpstreamNonFree
-Categories:Office
+Categories:System
 License:GPLv3
 Web Site:
 Source Code:https://github.com/loadrunner/Facebook-Contact-Sync
diff --git a/metadata/ru.gelin.android.browser.open.txt b/metadata/ru.gelin.android.browser.open.txt
index 2e70e1fd74..e34fef5bba 100644
--- a/metadata/ru.gelin.android.browser.open.txt
+++ b/metadata/ru.gelin.android.browser.open.txt
@@ -1,4 +1,4 @@
-Categories:Office,Internet
+Categories:Internet,Reading
 License:GPLv3
 Web Site:https://bitbucket.org/gelin/open-in-browser
 Source Code:https://bitbucket.org/gelin/open-in-browser/src
diff --git a/metadata/ru.glesik.wifireminders.txt b/metadata/ru.glesik.wifireminders.txt
index 6047060dcf..d41cea01c8 100644
--- a/metadata/ru.glesik.wifireminders.txt
+++ b/metadata/ru.glesik.wifireminders.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:Connectivity
 License:GPLv3+
 Web Site:
 Source Code:https://github.com/glesik/wifireminders
diff --git a/metadata/ru.neverdark.silentnight.txt b/metadata/ru.neverdark.silentnight.txt
index dd00b8a61b..70d9da81aa 100644
--- a/metadata/ru.neverdark.silentnight.txt
+++ b/metadata/ru.neverdark.silentnight.txt
@@ -1,4 +1,4 @@
-Categories:Office
+Categories:System
 License:GPLv3
 Web Site:
 Source Code:https://github.com/yankovskiy/SilentNight
diff --git a/metadata/se.chalmers.doit.txt b/metadata/se.chalmers.doit.txt
index 301660fc0a..b5527d7a0f 100644
--- a/metadata/se.chalmers.doit.txt
+++ b/metadata/se.chalmers.doit.txt
@@ -1,5 +1,5 @@
 Disabled:Let's forget this one: alpha and probably won't get any more revisions
-Categories:Office
+Categories:Writing
 License:GPLv3
 Web Site:https://code.google.com/p/dat255-doit
 Source Code:https://code.google.com/p/dat255-doit/source
diff --git a/metadata/z4pp3r.flashlightwidget.txt b/metadata/z4pp3r.flashlightwidget.txt
index f22df22741..97c838af04 100644
--- a/metadata/z4pp3r.flashlightwidget.txt
+++ b/metadata/z4pp3r.flashlightwidget.txt
@@ -1,4 +1,4 @@
-Categories:Office,Theming
+Categories:Theming,System
 License:GPLv2
 Web Site:
 Source Code:https://github.com/fs1995/FlashlightWidget
@@ -16,8 +16,8 @@ Repo:https://github.com/fs1995/FlashlightWidget
 Build:0.1,1
     commit=f133eb5da94ab1aacd259d1e9a7fdf4a40d63b7a
     subdir=src
-    target=android-21
     prebuild=mv java src
+    target=android-21
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest