diff --git a/metadata/jupiter.broadcasting.live.tv.txt b/metadata/jupiter.broadcasting.live.tv.txt
index b22468250d..99a0c2ea0c 100644
--- a/metadata/jupiter.broadcasting.live.tv.txt
+++ b/metadata/jupiter.broadcasting.live.tv.txt
@@ -25,8 +25,7 @@ Build Version:2.2.3,8,d470760d67
 Build Version:2.2.4,9,55114f
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.2.4
 Current Version Code:9
 
diff --git a/metadata/net.mafro.android.wakeonlan.txt b/metadata/net.mafro.android.wakeonlan.txt
index e0c052b6f7..abc5450868 100644
--- a/metadata/net.mafro.android.wakeonlan.txt
+++ b/metadata/net.mafro.android.wakeonlan.txt
@@ -18,8 +18,7 @@ Build Version:1.4.2,12,468312845057e78a70f7b6260f2b116042571c42,prebuild=rm -rf
 Build Version:1.5,13,0f21d8beec740b823a45927df36f6c55dca526ad,prebuild=rm -rf releases/
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:13
 
diff --git a/metadata/net.sylvek.sharemyposition.txt b/metadata/net.sylvek.sharemyposition.txt
index 70bf00e98f..dad256f3e3 100644
--- a/metadata/net.sylvek.sharemyposition.txt
+++ b/metadata/net.sylvek.sharemyposition.txt
@@ -27,8 +27,7 @@ Build Version:1.1.0-beta3,20,70,subdir=ShareMyPosition-android,target=android-11
 Build Version:1.1.2,24,75,subdir=ShareMyPosition-android,target=android-11,prebuild=mv lib libs
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1.2
 Current Version Code:24
 
diff --git a/metadata/nl.ttys0.simplec25k.txt b/metadata/nl.ttys0.simplec25k.txt
index 662fbad6ec..cf1bfe76c0 100644
--- a/metadata/nl.ttys0.simplec25k.txt
+++ b/metadata/nl.ttys0.simplec25k.txt
@@ -19,8 +19,7 @@ Build Version:0.2.3,7,9dbc2a401d60cc
 Build Version:0.2.4,8,f1d43b15599ed4
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.2.4
 Current Version Code:8
 
diff --git a/metadata/no.rkkc.bysykkel.txt b/metadata/no.rkkc.bysykkel.txt
index 34dc17071f..07428db0a2 100644
--- a/metadata/no.rkkc.bysykkel.txt
+++ b/metadata/no.rkkc.bysykkel.txt
@@ -34,8 +34,7 @@ Build Version:1.1.2,25,1a6785f288967205bd347ec7af07bc8a525b473b
 Build Version:1.1.3,26,a81b6dee91993ff6f0dd0299b1195f60e06c967f
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1.3
 Current Version Code:26
 
diff --git a/metadata/org.ametro.txt b/metadata/org.ametro.txt
index 527e4472ba..0cf46a828c 100644
--- a/metadata/org.ametro.txt
+++ b/metadata/org.ametro.txt
@@ -27,8 +27,7 @@ Build Version:1.1.4,16,488,subdir=workspace/aMetro
 Build Version:1.1.5,17,489,subdir=workspace/aMetro
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1.4
-Current Version Code:16
+Update Check Mode:RepoManifest
+Current Version:1.1.5
+Current Version Code:17
 
diff --git a/metadata/org.crocodile.sbautologin.txt b/metadata/org.crocodile.sbautologin.txt
index 14d065be91..a25f005676 100644
--- a/metadata/org.crocodile.sbautologin.txt
+++ b/metadata/org.crocodile.sbautologin.txt
@@ -21,7 +21,6 @@ Build Version:2.0,10,ed49e06e5e75,extlibs=junit/junit-4.10.jar
 Build Version:2.1,21,8063a3302dfc,extlibs=junit/junit-4.10.jar,forceversion=yes,forcevercode=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:2.1
 Current Version Code:21
diff --git a/metadata/org.cry.otp.txt b/metadata/org.cry.otp.txt
index 107cca5f94..10b68b73da 100644
--- a/metadata/org.cry.otp.txt
+++ b/metadata/org.cry.otp.txt
@@ -16,8 +16,7 @@ Repo:http://motp.googlecode.com/svn/trunk/
 Build Version:1.5,20,4,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:20
 
diff --git a/metadata/org.diygenomics.pg.txt b/metadata/org.diygenomics.pg.txt
index df91e082bb..19c7eb097e 100644
--- a/metadata/org.diygenomics.pg.txt
+++ b/metadata/org.diygenomics.pg.txt
@@ -20,8 +20,7 @@ rm libs/FlurryAgent.jar && \
 echo "android.library.reference.1=$$FinfAgent$$" >> project.properties
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:6
 
diff --git a/metadata/org.gc.networktester.txt b/metadata/org.gc.networktester.txt
index 3e152c0790..c1916bb63c 100644
--- a/metadata/org.gc.networktester.txt
+++ b/metadata/org.gc.networktester.txt
@@ -18,8 +18,7 @@ Repo:http://androidnetworktester.googlecode.com/svn/trunk/
 Build Version:1.1,2,34,target=android-15
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:2
 
diff --git a/metadata/org.ironrabbit.txt b/metadata/org.ironrabbit.txt
index 6078fd879d..9fdf230ba4 100644
--- a/metadata/org.ironrabbit.txt
+++ b/metadata/org.ironrabbit.txt
@@ -25,9 +25,7 @@ cp $$Jericho$$/compile-time-dependencies/* libs/ && \
 cp -r $$Jericho$$/src/java/net src/
 
 Auto Update Mode:
-#Update Check Mode:RepoManifest
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.0.6
 Current Version Code:6
 
diff --git a/metadata/org.jfedor.nxtremotecontrol.txt b/metadata/org.jfedor.nxtremotecontrol.txt
index beccd3de3e..c802b5198f 100644
--- a/metadata/org.jfedor.nxtremotecontrol.txt
+++ b/metadata/org.jfedor.nxtremotecontrol.txt
@@ -18,8 +18,7 @@ Repo:http://nxt-remote-control.googlecode.com/svn/trunk/
 Build Version:1.4,5,9
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.4
 Current Version Code:5
 
diff --git a/metadata/org.jtb.alogcat.txt b/metadata/org.jtb.alogcat.txt
index 0d313e0582..c93b797266 100644
--- a/metadata/org.jtb.alogcat.txt
+++ b/metadata/org.jtb.alogcat.txt
@@ -27,8 +27,7 @@ Build Version:2.5,40,41,prebuild=find . -type f -name \*.java -print0 | xargs -0
 Build Version:2.6.1,43,48,prebuild=find . -type f -name \*.java -print0 | xargs -0 sed -i "s/^import org\.jtb\.alogcat\.donate\.R;$/import org.jtb.alogcat.R;/g" && sed -i "s/org.jtb.alogcat.donate/org.jtb.alogcat/" AndroidManifest.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.6.1
 Current Version Code:43
 
diff --git a/metadata/org.nathan.jf.build.prop.editor.txt b/metadata/org.nathan.jf.build.prop.editor.txt
index 856698df8a..73ab29eaef 100644
--- a/metadata/org.nathan.jf.build.prop.editor.txt
+++ b/metadata/org.nathan.jf.build.prop.editor.txt
@@ -13,9 +13,8 @@ editing an entry you must press a button in the top right hand corner
 that isn't very visible and changes may not register in the list until
 you re-enter the app.
 
-Don't
-mess with this unless you know what you are doing and are confident
-that you can restore a backup via adb shell in recovery.
+Don't mess with this unless you know what you are doing and are confident that
+you can restore a backup via adb shell in recovery.
 
 Requires root: Yes. The build.prop is located in /system.
 .
@@ -26,11 +25,10 @@ Repo Type:git
 Repo:https://github.com/nathanpc/Build.prop-Editor.git
 
 Build Version:2.0.0,3,581902,target=android-14
-Build Version:2.0.1,4,b3dd61f8,init=rm -rf bin gen
+Build Version:2.0.1,4,b3dd61f8
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.0.1
 Current Version Code:4
 
diff --git a/metadata/org.qii.weiciyuan.txt b/metadata/org.qii.weiciyuan.txt
index ce8369fefd..f51cd715eb 100644
--- a/metadata/org.qii.weiciyuan.txt
+++ b/metadata/org.qii.weiciyuan.txt
@@ -19,8 +19,7 @@ Build Version:0.483,25,00a434ba7,rm=libs/android-support-v4.jar,\
 extlibs=android/android-support-v4.jar,prebuild=rm -rf libs/google-play-services_lib
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.483
 Current Version Code:25
 
diff --git a/metadata/org.scid.android.txt b/metadata/org.scid.android.txt
index a8d13f7478..3cff00cbad 100644
--- a/metadata/org.scid.android.txt
+++ b/metadata/org.scid.android.txt
@@ -22,8 +22,7 @@ Build Version:1.39,40,255,buildjni=yes,target=android-15,extlibs=android/android
 Build Version:1.42,42,277,buildjni=yes,target=android-15,extlibs=android/android-support-v4.jar
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.42
 Current Version Code:42
 
diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt
index 1bc03d763e..e04739d9f0 100644
--- a/metadata/org.yaaic.txt
+++ b/metadata/org.yaaic.txt
@@ -19,11 +19,10 @@ Repo:https://github.com/pocmo/Yaaic.git
 Build Version:0.7,9,v0.7,subdir=application,bindir=builds/ant
 Build Version:0.8,10,v0.8,subdir=application,bindir=builds/ant
 Build Version:0.9,11,v0.9,subdir=application,bindir=builds/ant
-Build Version:1.0,12,db6ed0a1224,subdir=application
+Build Version:1.0,12,v1.0,subdir=application
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:12
 
diff --git a/metadata/org.zirco.txt b/metadata/org.zirco.txt
index 4377502f01..34f053de4f 100644
--- a/metadata/org.zirco.txt
+++ b/metadata/org.zirco.txt
@@ -20,20 +20,37 @@ A web browser featuring:
 .
 
 Repo Type:git-svn
-Repo:http://zirco-browser.googlecode.com/svn/trunk
+Repo:http://zirco-browser.googlecode.com/svn;trunk=trunk;tags=tags
 
-Build Version:0.3.6,10,315
-Build Version:0.3.7,11,329
-Build Version:0.3.8,12,339
-Build Version:0.3.9,13,367
-Build Version:0.4.1,15,407
-Build Version:0.4.2,16,438,target=android-10
-Build Version:0.4.3,17,443,target=android-10
-Build Version:0.4.4,18,464,target=android-10
+Build:0.3.6,10
+    commit=315
+
+Build:0.3.7,11
+    commit=329
+
+Build:0.3.8,12
+    commit=339
+
+Build:0.3.9,13
+    commit=367
+
+Build:0.4.1,15
+    commit=407
+
+Build:0.4.2,16
+    commit=438
+    target=android-10
+
+Build:0.4.3,17
+    commit=443
+    target=android-10
+
+Build:0.4.4,18
+    commit=0.4.4
+    target=android-10
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:0.4.4
 Current Version Code:18
 
diff --git a/metadata/sk.madzik.android.logcatudp.txt b/metadata/sk.madzik.android.logcatudp.txt
index 24a3831482..260903552b 100644
--- a/metadata/sk.madzik.android.logcatudp.txt
+++ b/metadata/sk.madzik.android.logcatudp.txt
@@ -25,8 +25,7 @@ Repo:https://code.google.com/p/logcatudp/
 Build Version:0.5,5,235851
 
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.5
 Current Version Code:5