diff --git a/metadata/org.ppsspp.ppsspp.txt b/metadata/org.ppsspp.ppsspp.txt
index a3fcd97cef..3d2bebb025 100644
--- a/metadata/org.ppsspp.ppsspp.txt
+++ b/metadata/org.ppsspp.ppsspp.txt
@@ -1,4 +1,4 @@
-Categories:Games
+Category:None
 License:GPLv2+
 Web Site:http://ppsspp.org/
 Source Code:https://github.com/hrydgard/ppsspp
@@ -20,32 +20,84 @@ games, which are available online.
 Repo Type:git
 Repo:https://github.com/hrydgard/ppsspp.git
 
-Build Version:0.6.1,61,v0.6.1,target=android-10,subdir=android,submodules=yes,\
-update=.;../native/android,buildjni=no,prebuild=rm -rf ../pspautotests/demos*/,\
-build=NDK=$$NDK$$ ./ab.sh,forceversion=yes,forcevercode=yes
-Build Version:0.70,70,v0.7,target=android-10,subdir=android,submodules=yes,\
-update=.;../native/android,buildjni=no,prebuild=rm -rf ../pspautotests/demos*/,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.7.5,75,v0.7.5,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.7.6,76,v0.7.6,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.8,80,v0.8,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.8.1,81,v0.8.1,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
-Build Version:0.9.0,90,v0.9,subdir=android,submodules=yes,update=.;../native/android,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
+Build:0.6.1,61
+    commit=v0.6.1
+    subdir=android
+    submodules=yes
+    target=android-10
+    update=.;../native/android
+    forceversion=yes
+    forcevercode=yes
+    prebuild=rm -rf ../pspautotests/demos*/
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.70,70
+    commit=v0.7
+    subdir=android
+    submodules=yes
+    target=android-10
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.7.5,75
+    commit=v0.7.5
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.7.6,76
+    commit=v0.7.6
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.8,80
+    commit=v0.8
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.8.1,81
+    commit=v0.8.1
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.9.0,90
+    commit=v0.9
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
 # dev forgot to bump AM.xml
-Build Version:0.9.1,91,v0.9.1,subdir=android,submodules=yes,update=.;../native/android,\
-forceversion=yes,forcevercode=yes,\
-buildjni=no,prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml,\
-build=NDK=$$NDK$$ ./ab.sh
+Build:0.9.1,91
+    commit=v0.9.1
+    subdir=android
+    submodules=yes
+    update=.;../native/android
+    forceversion=yes
+    forcevercode=yes
+    prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    build=NDK=$$NDK$$ ./ab.sh
+    buildjni=no
 
 # +0: - (upstream)
 # +1: x86
@@ -53,7 +105,6 @@ build=NDK=$$NDK$$ ./ab.sh
 # +3: armv7 (CV)
 Auto Update Mode:None
 Update Check Mode:Tags
-Vercode Operation:%c*10 + 3
 Current Version:0.9.5
-Current Version Code:953
+Current Version Code:95