diff --git a/metadata/com.brocktice.JustSit.txt b/metadata/com.brocktice.JustSit.txt
deleted file mode 100644
index af818ee67a..0000000000
--- a/metadata/com.brocktice.JustSit.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/justsit
-Source Code:https://code.google.com/p/justsit/source
-Issue Tracker:
-
-Auto Name:Just Sit
-Summary:Meditation timer
-Description:
-JustSit is designed to help you meditate. It currently runs timers for
-preparation to meditate and meditation, and allows you to turn off audible
-ringing and/or the device radios, and keep the screen on while the timer is
-running.
-
-The name is inspired by the saying, "If you walk, just walk, if you sit, just
-sit, but whatever you do, don't wobble." -Zen Master Unmon
-.
-
-Repo Type:git-svn
-Repo:https://justsit.googlecode.com/svn/trunk/JustSit
-
-Build:0.3.3,17
-    commit=24
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0.3.3
-Current Version Code:17
diff --git a/metadata/com.brocktice.JustSit.yml b/metadata/com.brocktice.JustSit.yml
new file mode 100644
index 0000000000..08e6f135c5
--- /dev/null
+++ b/metadata/com.brocktice.JustSit.yml
@@ -0,0 +1,29 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-only
+WebSite: https://code.google.com/p/justsit
+SourceCode: https://code.google.com/p/justsit/source
+
+AutoName: Just Sit
+Summary: Meditation timer
+Description: |-
+    JustSit is designed to help you meditate. It currently runs timers for
+    preparation to meditate and meditation, and allows you to turn off audible
+    ringing and/or the device radios, and keep the screen on while the timer is
+    running.
+
+    The name is inspired by the saying, "If you walk, just walk, if you sit, just
+    sit, but whatever you do, don't wobble." -Zen Master Unmon
+
+RepoType: git-svn
+Repo: https://justsit.googlecode.com/svn/trunk/JustSit
+
+Builds:
+  - versionName: 0.3.3
+    versionCode: 17
+    commit: '24'
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 0.3.3
+CurrentVersionCode: 17
diff --git a/metadata/com.byagowi.persiancalendar.txt b/metadata/com.byagowi.persiancalendar.txt
deleted file mode 100644
index 765d1ae22f..0000000000
--- a/metadata/com.byagowi.persiancalendar.txt
+++ /dev/null
@@ -1,226 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:https://github.com/ebraminio/DroidPersianCalendar/wiki
-Source Code:https://github.com/ebraminio/DroidPersianCalendar
-Issue Tracker:https://github.com/ebraminio/DroidPersianCalendar/issues
-Changelog:https://github.com/ebraminio/DroidPersianCalendar/releases
-
-Auto Name:Persian Calendar
-Summary:View the Persian calendar
-Description:
-Persian calendar is not supported in Android natively so this can be used
-instead. Includes widgets and dashclock provider, Compass/Qibla and Athan, and
-Afghanistan holidays, Dari, Kurdish and Pashto support.
-.
-
-Repo Type:git
-Repo:https://github.com/ebraminio/DroidPersianCalendar.git
-
-Build:1.98,18
-    commit=85329
-    srclibs=PrayTimes@0b8576aa74
-    prebuild=rm -rf libs && \
-        cp -r $$PrayTimes$$/java/src/PrayTimes/src/* src/
-
-Build:2.04,24
-    commit=04e6dd9c4
-
-Build:2.09,29
-    commit=14c35f5d215390ef6d287395112d471c67890fb4
-
-Build:3.06,36
-    commit=9f3293ecca
-    srclibs=ColorPickerPreference@a6ffb91b1c
-    prebuild=rm -rf extra && \
-        sed -i 's@\.1=.*@.1=$$ColorPickerPreference$$@' project.properties
-
-Build:3.08,38
-    commit=03e3a31d88
-    srclibs=ColorPicker-Ebraminio@27deadaffe
-    prebuild=rm -rf extra && \
-        sed -i 's@\.1=.*@.1=$$ColorPicker-Ebraminio$$@' project.properties
-
-Build:4.02,42
-    commit=84a7b52237
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.03,43
-    commit=4.03
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.04,44
-    commit=4.04
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.05,45
-    commit=v4.05
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.06,46
-    commit=v4.06
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.07,47
-    commit=v4.07
-    subdir=PersianCalendar
-    gradle=yes
-    forceversion=yes
-    forcevercode=yes
-    rm=extra/
-
-Build:4.08,48
-    commit=65c8483d146a581503d3bd080a54a2ffa55d8122
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.09,49
-    commit=v4.09
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.1.0,410
-    commit=v4.1.0
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.1.1,411
-    commit=v4.1.1
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:4.1.2,412
-    commit=v4.1.2
-    subdir=PersianCalendar
-    gradle=yes
-    rm=extra/
-
-Build:5.0.0,500
-    commit=v5.0.0
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.0.1,501
-    commit=v5.0.1
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.0.2,502
-    commit=v5.0.2
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.0.3,503
-    commit=v5.0.3
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.0.5,505
-    commit=v5.0.5
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.0.6,506
-    commit=v5.0.6
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.1.0,510
-    commit=v5.1.0
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.2.1,521
-    commit=v5.2.1
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.2.2,522
-    commit=v5.2.2
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.3.1,531
-    commit=v5.3.1
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.4.0,540
-    disable=Could not find com.android.tools.build:gradle:3.0.1
-    commit=v5.4.0
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.5.1,551
-    commit=v5.5.1
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.6.0,560
-    commit=v5.6.0
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.7.2,572
-    disable=ProGuard: Duplicate jar entry [android/support/v4/d/b$a.class]
-    commit=v5.7.2
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.8.1,581
-    commit=v5.8.1
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.8.6,586
-    commit=v5.8.6
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.8.7,587
-    commit=v5.8.7
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.8.8,588
-    commit=v5.8.8
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.9.1,591
-    commit=v5.9.1
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.9.2,592
-    commit=v5.9.2
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.9.3,593
-    commit=v5.9.3
-    subdir=PersianCalendar
-    gradle=yes
-
-Build:5.9.4,594
-    commit=v5.9.4
-    subdir=PersianCalendar
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags ^[0-9.v]*$
-Current Version:5.9.4
-Current Version Code:594
diff --git a/metadata/com.byagowi.persiancalendar.yml b/metadata/com.byagowi.persiancalendar.yml
new file mode 100644
index 0000000000..aa5e0a8ff9
--- /dev/null
+++ b/metadata/com.byagowi.persiancalendar.yml
@@ -0,0 +1,315 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: https://github.com/ebraminio/DroidPersianCalendar/wiki
+SourceCode: https://github.com/ebraminio/DroidPersianCalendar
+IssueTracker: https://github.com/ebraminio/DroidPersianCalendar/issues
+Changelog: https://github.com/ebraminio/DroidPersianCalendar/releases
+
+AutoName: Persian Calendar
+Summary: View the Persian calendar
+Description: |-
+    Persian calendar is not supported in Android natively so this can be used
+    instead. Includes widgets and dashclock provider, Compass/Qibla and Athan, and
+    Afghanistan holidays, Dari, Kurdish and Pashto support.
+
+RepoType: git
+Repo: https://github.com/ebraminio/DroidPersianCalendar.git
+
+Builds:
+  - versionName: '1.98'
+    versionCode: 18
+    commit: '85329'
+    srclibs:
+      - PrayTimes@0b8576aa74
+    prebuild:
+      - rm -rf libs
+      - cp -r $$PrayTimes$$/java/src/PrayTimes/src/* src/
+
+  - versionName: '2.04'
+    versionCode: 24
+    commit: 04e6dd9c4
+
+  - versionName: '2.09'
+    versionCode: 29
+    commit: 14c35f5d215390ef6d287395112d471c67890fb4
+
+  - versionName: '3.06'
+    versionCode: 36
+    commit: 9f3293ecca
+    srclibs:
+      - ColorPickerPreference@a6ffb91b1c
+    prebuild:
+      - rm -rf extra
+      - sed -i 's@\.1=.*@.1=$$ColorPickerPreference$$@' project.properties
+
+  - versionName: '3.08'
+    versionCode: 38
+    commit: 03e3a31d88
+    srclibs:
+      - ColorPicker-Ebraminio@27deadaffe
+    prebuild:
+      - rm -rf extra
+      - sed -i 's@\.1=.*@.1=$$ColorPicker-Ebraminio$$@' project.properties
+
+  - versionName: '4.02'
+    versionCode: 42
+    commit: 84a7b52237
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: '4.03'
+    versionCode: 43
+    commit: '4.03'
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: '4.04'
+    versionCode: 44
+    commit: '4.04'
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: '4.05'
+    versionCode: 45
+    commit: v4.05
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: '4.06'
+    versionCode: 46
+    commit: v4.06
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: '4.07'
+    versionCode: 47
+    commit: v4.07
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    forceversion: true
+    forcevercode: true
+    rm:
+      - extra/
+
+  - versionName: '4.08'
+    versionCode: 48
+    commit: 65c8483d146a581503d3bd080a54a2ffa55d8122
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: '4.09'
+    versionCode: 49
+    commit: v4.09
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: 4.1.0
+    versionCode: 410
+    commit: v4.1.0
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: 4.1.1
+    versionCode: 411
+    commit: v4.1.1
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: 4.1.2
+    versionCode: 412
+    commit: v4.1.2
+    subdir: PersianCalendar
+    gradle:
+      - yes
+    rm:
+      - extra/
+
+  - versionName: 5.0.0
+    versionCode: 500
+    commit: v5.0.0
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.0.1
+    versionCode: 501
+    commit: v5.0.1
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.0.2
+    versionCode: 502
+    commit: v5.0.2
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.0.3
+    versionCode: 503
+    commit: v5.0.3
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.0.5
+    versionCode: 505
+    commit: v5.0.5
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.0.6
+    versionCode: 506
+    commit: v5.0.6
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.1.0
+    versionCode: 510
+    commit: v5.1.0
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.2.1
+    versionCode: 521
+    commit: v5.2.1
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.2.2
+    versionCode: 522
+    commit: v5.2.2
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.3.1
+    versionCode: 531
+    commit: v5.3.1
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.4.0
+    versionCode: 540
+    disable: Could not find com.android.tools.build:gradle:3.0.1
+    commit: v5.4.0
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.5.1
+    versionCode: 551
+    commit: v5.5.1
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.6.0
+    versionCode: 560
+    commit: v5.6.0
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.7.2
+    versionCode: 572
+    disable: 'ProGuard: Duplicate jar entry [android/support/v4/d/b$a.class]'
+    commit: v5.7.2
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.8.1
+    versionCode: 581
+    commit: v5.8.1
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.8.6
+    versionCode: 586
+    commit: v5.8.6
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.8.7
+    versionCode: 587
+    commit: v5.8.7
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.8.8
+    versionCode: 588
+    commit: v5.8.8
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.9.1
+    versionCode: 591
+    commit: v5.9.1
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.9.2
+    versionCode: 592
+    commit: v5.9.2
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.9.3
+    versionCode: 593
+    commit: v5.9.3
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+  - versionName: 5.9.4
+    versionCode: 594
+    commit: v5.9.4
+    subdir: PersianCalendar
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags ^[0-9.v]*$
+CurrentVersion: 5.9.4
+CurrentVersionCode: 594
diff --git a/metadata/com.bytehamster.changelog.txt b/metadata/com.bytehamster.changelog.txt
deleted file mode 100644
index 207574f2a1..0000000000
--- a/metadata/com.bytehamster.changelog.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-Categories:System,Development
-License:MIT
-Author Name:ByteHamster
-Author Email:info@bytehamster.com
-Web Site:https://gitlab.com/ByteHamster/changelog
-Source Code:https://gitlab.com/ByteHamster/changelog/tree/HEAD
-Issue Tracker:https://gitlab.com/ByteHamster/changelog/issues
-
-Name:OmniROM Changelog
-Auto Name:Changelog
-
-Repo Type:git
-Repo:https://gitlab.com/ByteHamster/changelog.git
-
-Build:3.12,31
-    commit=v3.12
-    subdir=app
-    gradle=yes
-
-Build:3.13,32
-    commit=v3.13
-    subdir=app
-    gradle=yes
-
-Build:3.14,34
-    disable=Could not get unknown property 'TRIPLET_API_KEY' for object of type de.triplet.gradle.play.PlayAccountConfig
-    commit=v3.14
-    subdir=app
-    gradle=yes
-
-Build:3.14,35
-    disable=Could not get unknown property 'TRIPLET_API_KEY' for object of type de.triplet.gradle.play.PlayAccountConfig
-    commit=v3.14
-    subdir=app
-    gradle=yes
-
-Build:3.15,36
-    commit=v3.15
-    subdir=app
-    gradle=yes
-
-Build:3.16,38
-    commit=v3.16
-    subdir=app
-    gradle=yes
-
-Build:3.17,39
-    commit=v3.17
-    subdir=app
-    gradle=yes
-
-Build:3.18,40
-    commit=v3.18
-    subdir=app
-    gradle=yes
-
-Build:3.19,41
-    commit=v3.19
-    subdir=app
-    gradle=yes
-
-Build:3.20,42
-    commit=v3.20
-    subdir=app
-    gradle=yes
-
-Build:3.21,43
-    commit=v3.21
-    subdir=app
-    gradle=yes
-
-Build:3.22,44
-    commit=v3.22
-    subdir=app
-    gradle=yes
-
-Build:3.23,45
-    commit=v3.23
-    subdir=app
-    gradle=yes
-
-Build:3.24,46
-    commit=v3.24
-    subdir=app
-    gradle=yes
-
-Build:3.25,47
-    commit=v3.25
-    subdir=app
-    gradle=yes
-
-Build:4.0,48
-    commit=v4.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:4.0
-Current Version Code:48
diff --git a/metadata/com.bytehamster.changelog.yml b/metadata/com.bytehamster.changelog.yml
new file mode 100644
index 0000000000..3e19054519
--- /dev/null
+++ b/metadata/com.bytehamster.changelog.yml
@@ -0,0 +1,135 @@
+Categories:
+  - System
+  - Development
+License: MIT
+AuthorName: ByteHamster
+AuthorEmail: info@bytehamster.com
+WebSite: https://gitlab.com/ByteHamster/changelog
+SourceCode: https://gitlab.com/ByteHamster/changelog/tree/HEAD
+IssueTracker: https://gitlab.com/ByteHamster/changelog/issues
+
+Name: OmniROM Changelog
+AutoName: Changelog
+
+RepoType: git
+Repo: https://gitlab.com/ByteHamster/changelog.git
+
+Builds:
+  - versionName: '3.12'
+    versionCode: 31
+    commit: v3.12
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.13'
+    versionCode: 32
+    commit: v3.13
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.14'
+    versionCode: 34
+    disable: Could not get unknown property 'TRIPLET_API_KEY' for object of type de.triplet.gradle.play.PlayAccountConfig
+    commit: v3.14
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.14'
+    versionCode: 35
+    disable: Could not get unknown property 'TRIPLET_API_KEY' for object of type de.triplet.gradle.play.PlayAccountConfig
+    commit: v3.14
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.15'
+    versionCode: 36
+    commit: v3.15
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.16'
+    versionCode: 38
+    commit: v3.16
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.17'
+    versionCode: 39
+    commit: v3.17
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.18'
+    versionCode: 40
+    commit: v3.18
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.19'
+    versionCode: 41
+    commit: v3.19
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.20'
+    versionCode: 42
+    commit: v3.20
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.21'
+    versionCode: 43
+    commit: v3.21
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.22'
+    versionCode: 44
+    commit: v3.22
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.23'
+    versionCode: 45
+    commit: v3.23
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.24'
+    versionCode: 46
+    commit: v3.24
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.25'
+    versionCode: 47
+    commit: v3.25
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.0'
+    versionCode: 48
+    commit: v4.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '4.0'
+CurrentVersionCode: 48
diff --git a/metadata/com.bytestemplar.tonedef.txt b/metadata/com.bytestemplar.tonedef.txt
deleted file mode 100644
index fdb8a76e44..0000000000
--- a/metadata/com.bytestemplar.tonedef.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Categories:Multimedia
-License:GPL-2.0-or-later
-Web Site:http://BytesTemplar.com/
-Source Code:https://github.com/Fortyseven/ToneDef
-Issue Tracker:https://github.com/Fortyseven/ToneDef/issues
-
-Auto Name:ToneDef
-Summary:Tone dialer with DTMF, bluebox and redbox tones
-Description:
-Small, but powerful tone dialer application featuring DTMF, bluebox, and redbox
-tone generation. Use the keypad, enter a predefined sequence, or select an entry
-from your contact list.
-.
-
-Repo Type:git
-Repo:https://github.com/Fortyseven/ToneDef
-
-Build:11,11
-    commit=11
-    subdir=MainApp
-    gradle=yes
-
-Build:12,12
-    commit=39db6171f822bdb1482fd7288712fdf8c27b5eec
-    subdir=MainApp
-    gradle=yes
-
-Build:13,13
-    commit=00bc586b156d981041117da534456cb7e6b86ff8
-    subdir=MainApp
-    gradle=yes
-
-Build:14,14
-    commit=14
-    subdir=MainApp
-    gradle=yes
-
-Build:15,15
-    commit=15
-    subdir=MainApp
-    gradle=yes
-
-Build:16,16
-    commit=16
-    subdir=MainApp
-    gradle=yes
-
-Build:18,18
-    commit=18
-    subdir=MainApp
-    gradle=yes
-
-Build:19,19
-    commit=19
-    subdir=MainApp
-    gradle=yes
-
-Build:20,20
-    commit=20
-    subdir=MainApp
-    gradle=yes
-
-Auto Update Mode:Version %c
-Update Check Mode:Tags
-Current Version:20
-Current Version Code:20
diff --git a/metadata/com.bytestemplar.tonedef.yml b/metadata/com.bytestemplar.tonedef.yml
new file mode 100644
index 0000000000..64a408bfc8
--- /dev/null
+++ b/metadata/com.bytestemplar.tonedef.yml
@@ -0,0 +1,85 @@
+Categories:
+  - Multimedia
+License: GPL-2.0-or-later
+WebSite: http://BytesTemplar.com/
+SourceCode: https://github.com/Fortyseven/ToneDef
+IssueTracker: https://github.com/Fortyseven/ToneDef/issues
+
+AutoName: ToneDef
+Summary: Tone dialer with DTMF, bluebox and redbox tones
+Description: |-
+    Small, but powerful tone dialer application featuring DTMF, bluebox, and redbox
+    tone generation. Use the keypad, enter a predefined sequence, or select an entry
+    from your contact list.
+
+RepoType: git
+Repo: https://github.com/Fortyseven/ToneDef
+
+Builds:
+  - versionName: '11'
+    versionCode: 11
+    commit: '11'
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '12'
+    versionCode: 12
+    commit: 39db6171f822bdb1482fd7288712fdf8c27b5eec
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '13'
+    versionCode: 13
+    commit: 00bc586b156d981041117da534456cb7e6b86ff8
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '14'
+    versionCode: 14
+    commit: '14'
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '15'
+    versionCode: 15
+    commit: '15'
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '16'
+    versionCode: 16
+    commit: '16'
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '18'
+    versionCode: 18
+    commit: '18'
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '19'
+    versionCode: 19
+    commit: '19'
+    subdir: MainApp
+    gradle:
+      - yes
+
+  - versionName: '20'
+    versionCode: 20
+    commit: '20'
+    subdir: MainApp
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %c
+UpdateCheckMode: Tags
+CurrentVersion: '20'
+CurrentVersionCode: 20
diff --git a/metadata/com.call.recorder.txt b/metadata/com.call.recorder.txt
deleted file mode 100644
index 0e4866c260..0000000000
--- a/metadata/com.call.recorder.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:https://code.google.com/p/call-recorder-for-android
-Source Code:https://code.google.com/p/call-recorder-for-android/source
-Issue Tracker:
-
-Auto Name:Call recorder for Android
-Summary:Record calls
-Description:
-Records all incoming and outgoing calls from/to your phone. Your calls are saved
-in mp3 format and can be sent by various methods.
-
-The main application screen contains a list of all calls with details of phone
-numbers, date and time of a call. A click on one of the items will provide you
-with 3 options: erase record, send record and play record.
-
-In order to allow or disallow recordings open the main menu and choose
-enable/disable recordings.
-
-Information: Might not work with Android > 4.1.0 (see issues).
-.
-
-Repo Type:git-svn
-Repo:https://call-recorder-for-android.googlecode.com/svn/
-
-Build:2.0.3,24
-    commit=52
-    subdir=Android Call Recorder
-
-Maintainer Notes:
-GPLv3 as seen on the GoggleCode project page.
-.
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:2.0.3
-Current Version Code:24
diff --git a/metadata/com.call.recorder.yml b/metadata/com.call.recorder.yml
new file mode 100644
index 0000000000..d2eba2177d
--- /dev/null
+++ b/metadata/com.call.recorder.yml
@@ -0,0 +1,36 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: https://code.google.com/p/call-recorder-for-android
+SourceCode: https://code.google.com/p/call-recorder-for-android/source
+
+AutoName: Call recorder for Android
+Summary: Record calls
+Description: |-
+    Records all incoming and outgoing calls from/to your phone. Your calls are saved
+    in mp3 format and can be sent by various methods.
+
+    The main application screen contains a list of all calls with details of phone
+    numbers, date and time of a call. A click on one of the items will provide you
+    with 3 options: erase record, send record and play record.
+
+    In order to allow or disallow recordings open the main menu and choose
+    enable/disable recordings.
+
+    Information: Might not work with Android > 4.1.0 (see issues).
+
+RepoType: git-svn
+Repo: https://call-recorder-for-android.googlecode.com/svn/
+
+Builds:
+  - versionName: 2.0.3
+    versionCode: 24
+    commit: '52'
+    subdir: Android Call Recorder
+
+MaintainerNotes: GPLv3 as seen on the GoggleCode project page.
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 2.0.3
+CurrentVersionCode: 24
diff --git a/metadata/com.casimirlab.simpleDeadlines.txt b/metadata/com.casimirlab.simpleDeadlines.txt
deleted file mode 100644
index f29ab742de..0000000000
--- a/metadata/com.casimirlab.simpleDeadlines.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:http://www.casimir-lab.net
-Source Code:https://github.com/chibibi/simpleDeadlines
-Issue Tracker:https://github.com/chibibi/simpleDeadlines/issues
-
-Auto Name:Simple Deadlines
-Summary:Deadline/task manager
-Description:
-A simple and easily readable deadline manager. A daily notification allows you
-to organise your day. It is aimed towards simplicity and is very lightweight.
-.
-
-Repo Type:git
-Repo:https://github.com/chibibi/simpleDeadlines.git
-
-Build:2.3.1,9
-    commit=2.3.1
-
-Build:2.3.2,10
-    commit=2.3.2
-
-Build:3.0.1,12
-    commit=3.0.1
-    prebuild=rm -rf art/ screenshots/
-    target=android-17
-
-Build:3.1.1,14
-    commit=3.1.1
-    gradle=yes
-    prebuild=rm -rf art/ screenshots/
-
-Build:3.1.2,15
-    commit=3.1.2
-    gradle=yes
-    prebuild=rm -rf art/ screenshots/
-
-Build:3.2.0,16
-    commit=3.2.0
-    gradle=yes
-    prebuild=rm -rf art/ screenshots/
-
-Build:3.2.1,17
-    commit=3.2.1
-    gradle=yes
-    prebuild=rm -rf art/ screenshots/
-
-Build:3.2.2,18
-    commit=3.2.2
-    gradle=yes
-    prebuild=rm -rf art/ screenshots/
-
-Build:3.2.3,19
-    commit=2803eb2fd65e0a176dbbab97f85494b6193e9134
-    gradle=yes
-    prebuild=rm -rf store
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:3.2.2
-Current Version Code:18
diff --git a/metadata/com.casimirlab.simpleDeadlines.yml b/metadata/com.casimirlab.simpleDeadlines.yml
new file mode 100644
index 0000000000..9973ea5012
--- /dev/null
+++ b/metadata/com.casimirlab.simpleDeadlines.yml
@@ -0,0 +1,77 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: http://www.casimir-lab.net
+SourceCode: https://github.com/chibibi/simpleDeadlines
+IssueTracker: https://github.com/chibibi/simpleDeadlines/issues
+
+AutoName: Simple Deadlines
+Summary: Deadline/task manager
+Description: |-
+    A simple and easily readable deadline manager. A daily notification allows you
+    to organise your day. It is aimed towards simplicity and is very lightweight.
+
+RepoType: git
+Repo: https://github.com/chibibi/simpleDeadlines.git
+
+Builds:
+  - versionName: 2.3.1
+    versionCode: 9
+    commit: 2.3.1
+
+  - versionName: 2.3.2
+    versionCode: 10
+    commit: 2.3.2
+
+  - versionName: 3.0.1
+    versionCode: 12
+    commit: 3.0.1
+    prebuild: rm -rf art/ screenshots/
+    target: android-17
+
+  - versionName: 3.1.1
+    versionCode: 14
+    commit: 3.1.1
+    gradle:
+      - yes
+    prebuild: rm -rf art/ screenshots/
+
+  - versionName: 3.1.2
+    versionCode: 15
+    commit: 3.1.2
+    gradle:
+      - yes
+    prebuild: rm -rf art/ screenshots/
+
+  - versionName: 3.2.0
+    versionCode: 16
+    commit: 3.2.0
+    gradle:
+      - yes
+    prebuild: rm -rf art/ screenshots/
+
+  - versionName: 3.2.1
+    versionCode: 17
+    commit: 3.2.1
+    gradle:
+      - yes
+    prebuild: rm -rf art/ screenshots/
+
+  - versionName: 3.2.2
+    versionCode: 18
+    commit: 3.2.2
+    gradle:
+      - yes
+    prebuild: rm -rf art/ screenshots/
+
+  - versionName: 3.2.3
+    versionCode: 19
+    commit: 2803eb2fd65e0a176dbbab97f85494b6193e9134
+    gradle:
+      - yes
+    prebuild: rm -rf store
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 3.2.2
+CurrentVersionCode: 18
diff --git a/metadata/com.cepmuvakkit.times.txt b/metadata/com.cepmuvakkit.times.txt
deleted file mode 100644
index 27e3ce4fef..0000000000
--- a/metadata/com.cepmuvakkit.times.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:http://www.cepmuvakkit.com/en
-Source Code:https://code.google.com/p/android-salat-times/source
-Issue Tracker:
-
-Auto Name:Salat Times
-Summary:Show prayer times
-Description:
-The app can use GPS to find your location, although you can enter geographic
-coordinates. It calculates prayer times, gives notifications and has a Qibla for
-showing the direction of Mecca.
-.
-
-Repo Type:git
-Repo:https://code.google.com/p/android-salat-times
-
-Build:2.5,200
-    commit=1c443f55db96
-    target=android-16
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:2.5
-Current Version Code:200
diff --git a/metadata/com.cepmuvakkit.times.yml b/metadata/com.cepmuvakkit.times.yml
new file mode 100644
index 0000000000..b8ba39fb17
--- /dev/null
+++ b/metadata/com.cepmuvakkit.times.yml
@@ -0,0 +1,23 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: http://www.cepmuvakkit.com/en
+SourceCode: https://code.google.com/p/android-salat-times/source
+
+AutoName: Salat Times
+Summary: Show prayer times
+Description: |-
+    The app can use GPS to find your location, although you can enter geographic
+    coordinates. It calculates prayer times, gives notifications and has a Qibla for
+    showing the direction of Mecca.
+
+Builds:
+  - versionName: '2.5'
+    versionCode: 200
+    commit: 1c443f55db96
+    target: android-16
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: '2.5'
+CurrentVersionCode: 200
diff --git a/metadata/com.cgogolin.library.txt b/metadata/com.cgogolin.library.txt
deleted file mode 100644
index 8b886e95a8..0000000000
--- a/metadata/com.cgogolin.library.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/cgogolin/library
-Issue Tracker:https://github.com/cgogolin/library/issues
-
-Auto Name:Library
-Summary:Browse BibTeX files
-Description:
-Library allows you to browse BibTeX files on your Android device.
-
-Features include:
-
-* Clear presentation of BibTeX entries in a list
-* Search/Filter
-* Open associated local files (including file path conversion)
-* Open URL and DOI links
-* Minimal permissions
-* Can load library file from cloud storage via storage access provider (on Android 4.4 and newer)
-.
-
-Repo Type:git
-Repo:https://github.com/cgogolin/library
-
-Build:4.2.1,24
-    commit=93e53aca10d89e47150fc42e3afc6ac8b1ae66ac
-
-Build:4.4,27
-    commit=52d1e69b05a008418c75bf4388f982bb9f700c60
-
-Build:5.0,28
-    disable=appcompat resolve to a path with no project.properties
-    commit=6467600e53a3cec461c0e7d2584c06a5376471a8
-
-Build:5.1,31
-    commit=26774a278f36ffc3c8860372ebb9a8ed327ed688
-
-Build:5.5,54
-    commit=v5.5
-
-Build:6.0,60
-    commit=v6.0
-
-Build:6.1,61
-    commit=v6.1
-
-Build:6.2,63
-    commit=v6.2
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:6.2
-Current Version Code:63
diff --git a/metadata/com.cgogolin.library.yml b/metadata/com.cgogolin.library.yml
new file mode 100644
index 0000000000..75b4e287d8
--- /dev/null
+++ b/metadata/com.cgogolin.library.yml
@@ -0,0 +1,61 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+SourceCode: https://github.com/cgogolin/library
+IssueTracker: https://github.com/cgogolin/library/issues
+
+AutoName: Library
+Summary: Browse BibTeX files
+Description: |-
+    Library allows you to browse BibTeX files on your Android device.
+
+    Features include:
+
+    * Clear presentation of BibTeX entries in a list
+    * Search/Filter
+    * Open associated local files (including file path conversion)
+    * Open URL and DOI links
+    * Minimal permissions
+    * Can load library file from cloud storage via storage access provider (on Android 4.4 and newer)
+
+RepoType: git
+Repo: https://github.com/cgogolin/library
+
+Builds:
+  - versionName: 4.2.1
+    versionCode: 24
+    commit: 93e53aca10d89e47150fc42e3afc6ac8b1ae66ac
+
+  - versionName: '4.4'
+    versionCode: 27
+    commit: 52d1e69b05a008418c75bf4388f982bb9f700c60
+
+  - versionName: '5.0'
+    versionCode: 28
+    disable: appcompat resolve to a path with no project.properties
+    commit: 6467600e53a3cec461c0e7d2584c06a5376471a8
+
+  - versionName: '5.1'
+    versionCode: 31
+    commit: 26774a278f36ffc3c8860372ebb9a8ed327ed688
+
+  - versionName: '5.5'
+    versionCode: 54
+    commit: v5.5
+
+  - versionName: '6.0'
+    versionCode: 60
+    commit: v6.0
+
+  - versionName: '6.1'
+    versionCode: 61
+    commit: v6.1
+
+  - versionName: '6.2'
+    versionCode: 63
+    commit: v6.2
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '6.2'
+CurrentVersionCode: 63
diff --git a/metadata/com.chessclock.android.txt b/metadata/com.chessclock.android.txt
deleted file mode 100644
index 2b4a2e3942..0000000000
--- a/metadata/com.chessclock.android.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/simenheg/simple-chess-clock
-Issue Tracker:https://github.com/simenheg/simple-chess-clock/issues
-Changelog:https://github.com/simenheg/simple-chess-clock#changelog
-
-Auto Name:Simple Chess Clock
-Summary:Two touchable chess timers
-Description:
-Simple Chess Clock is what its name implies: a chess clock (that’s simple!). It
-aims to be easy to use and easy to read, while also providing some reasonably
-expected features.
-.
-
-Repo Type:git
-Repo:https://github.com/simenheg/simple-chess-clock
-
-Build:1.2.0,8
-    commit=379155447bff
-    subdir=simplechessclock
-    target=android-8
-
-Build:2.1.0,10
-    commit=v2.1.0
-    target=android-23
-
-Build:2.1.1,11
-    commit=v2.1.1
-    target=android-23
-
-Build:2.1.2,12
-    commit=v2.1.2
-    target=android-23
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.1.2
-Current Version Code:12
diff --git a/metadata/com.chessclock.android.yml b/metadata/com.chessclock.android.yml
new file mode 100644
index 0000000000..68803a98d8
--- /dev/null
+++ b/metadata/com.chessclock.android.yml
@@ -0,0 +1,43 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://github.com/simenheg/simple-chess-clock
+IssueTracker: https://github.com/simenheg/simple-chess-clock/issues
+Changelog: https://github.com/simenheg/simple-chess-clock#changelog
+
+AutoName: Simple Chess Clock
+Summary: Two touchable chess timers
+Description: |-
+    Simple Chess Clock is what its name implies: a chess clock (that’s simple!). It
+    aims to be easy to use and easy to read, while also providing some reasonably
+    expected features.
+
+RepoType: git
+Repo: https://github.com/simenheg/simple-chess-clock
+
+Builds:
+  - versionName: 1.2.0
+    versionCode: 8
+    commit: 379155447bff
+    subdir: simplechessclock
+    target: android-8
+
+  - versionName: 2.1.0
+    versionCode: 10
+    commit: v2.1.0
+    target: android-23
+
+  - versionName: 2.1.1
+    versionCode: 11
+    commit: v2.1.1
+    target: android-23
+
+  - versionName: 2.1.2
+    versionCode: 12
+    commit: v2.1.2
+    target: android-23
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 2.1.2
+CurrentVersionCode: 12
diff --git a/metadata/com.cityzen.cityzen.txt b/metadata/com.cityzen.cityzen.txt
deleted file mode 100644
index 4e47a1caea..0000000000
--- a/metadata/com.cityzen.cityzen.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Categories:Navigation
-License:MPL-2.0
-Web Site:http://www.cityzenapp.co/
-Source Code:https://github.com/CityZenApp/AndroidApp
-Issue Tracker:https://github.com/CityZenApp/AndroidApp/issues
-Changelog:https://github.com/CityZenApp/AndroidApp/releases
-Donate:https://github.com/CityZenApp/Funding/blob/HEAD/README.md
-
-Auto Name:CityZen
-Summary:City navigation app
-Description:
-OpenStreetMap based city navigation app that helps you explore your city easily.
-The app shows points of interest in different categories such as ATMs, gas
-stations, drugstores, mobile phone stores etc. based on your location and it
-does so without keeping your data. If you are an OSM contributor you can also
-edit or add POIs directly from the app.
-.
-
-Repo Type:git
-Repo:https://github.com/CityZenApp/Android-Development
-
-Build:1.0,1
-    commit=v1.0.0
-    subdir=CityZenApp/app
-    gradle=yes
-
-Build:1.1.0,10100099
-    commit=v1.1.0
-    subdir=CityZenApp/app
-    gradle=yes
-
-Build:1.1.1,10100199
-    commit=v1.1.1
-    subdir=CityZenApp/app
-    gradle=yes
-
-Build:1.2.0,10200099
-    commit=v1.2.0
-    subdir=CityZenApp/app
-    gradle=yes
-
-Build:1.2.1,10200199
-    commit=v1.2.1
-    subdir=CityZenApp/app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2.1
-Current Version Code:10200199
diff --git a/metadata/com.cityzen.cityzen.yml b/metadata/com.cityzen.cityzen.yml
new file mode 100644
index 0000000000..edc9d62bd8
--- /dev/null
+++ b/metadata/com.cityzen.cityzen.yml
@@ -0,0 +1,61 @@
+Categories:
+  - Navigation
+License: MPL-2.0
+WebSite: http://www.cityzenapp.co/
+SourceCode: https://github.com/CityZenApp/AndroidApp
+IssueTracker: https://github.com/CityZenApp/AndroidApp/issues
+Changelog: https://github.com/CityZenApp/AndroidApp/releases
+Donate: https://github.com/CityZenApp/Funding/blob/HEAD/README.md
+
+AutoName: CityZen
+Summary: City navigation app
+Description: |-
+    OpenStreetMap based city navigation app that helps you explore your city easily.
+    The app shows points of interest in different categories such as ATMs, gas
+    stations, drugstores, mobile phone stores etc. based on your location and it
+    does so without keeping your data. If you are an OSM contributor you can also
+    edit or add POIs directly from the app.
+
+RepoType: git
+Repo: https://github.com/CityZenApp/Android-Development
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0.0
+    subdir: CityZenApp/app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 10100099
+    commit: v1.1.0
+    subdir: CityZenApp/app
+    gradle:
+      - yes
+
+  - versionName: 1.1.1
+    versionCode: 10100199
+    commit: v1.1.1
+    subdir: CityZenApp/app
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 10200099
+    commit: v1.2.0
+    subdir: CityZenApp/app
+    gradle:
+      - yes
+
+  - versionName: 1.2.1
+    versionCode: 10200199
+    commit: v1.2.1
+    subdir: CityZenApp/app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.1
+CurrentVersionCode: 10200199
diff --git a/metadata/com.code.android.vibevault.txt b/metadata/com.code.android.vibevault.txt
deleted file mode 100644
index f569ed0c9c..0000000000
--- a/metadata/com.code.android.vibevault.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:http://blog.andrewpearson.org/2010/11/vibe-vault.html
-Source Code:https://code.google.com/p/vibevault/source
-Issue Tracker:
-
-Auto Name:Vibe Vault
-Summary:archive.org music client
-Description:
-Vibe Vault lets you browse, stream, and download from www.archive.org's
-collection of over 84,000 live concerts. Archive.org's collection spans almost
-8,000 Grateful Dead recordings, among recordings of other great bands like
-Lotus, Sound Tribe Sector 9, Yonder Mountain String Band, String Cheese
-Incident, and a huge number of other great acts.
-
-Vibe Vault will play your music in the background while you do other things with
-your phone. You can play whole shows at once, make playlists with songs from
-multiple shows, and download single tracks or entire concerts.
-
-It is designed to be fast, light on resources, attractive, and intuitive.
-.
-
-Repo Type:git-svn
-Repo:https://vibevault.googlecode.com/svn/
-
-Build:4.1,35
-    commit=8
-    subdir=VibeVaultV4.1
-    prebuild=rm -r ../VibeVaultV[1,2,3]* && \
-        mkdir libs && \
-        mv assets/htmlcleaner-2.2.jar libs/
-
-Maintainer Notes:
-Useless directory structure, can't use git-svn with tags. No UCM applies since
-different versions will be under different dirs.
-.
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0
-Current Version Code:0
diff --git a/metadata/com.code.android.vibevault.yml b/metadata/com.code.android.vibevault.yml
new file mode 100644
index 0000000000..3a43f855f0
--- /dev/null
+++ b/metadata/com.code.android.vibevault.yml
@@ -0,0 +1,42 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: http://blog.andrewpearson.org/2010/11/vibe-vault.html
+SourceCode: https://code.google.com/p/vibevault/source
+
+AutoName: Vibe Vault
+Summary: archive.org music client
+Description: |-
+    Vibe Vault lets you browse, stream, and download from www.archive.org's
+    collection of over 84,000 live concerts. Archive.org's collection spans almost
+    8,000 Grateful Dead recordings, among recordings of other great bands like
+    Lotus, Sound Tribe Sector 9, Yonder Mountain String Band, String Cheese
+    Incident, and a huge number of other great acts.
+
+    Vibe Vault will play your music in the background while you do other things with
+    your phone. You can play whole shows at once, make playlists with songs from
+    multiple shows, and download single tracks or entire concerts.
+
+    It is designed to be fast, light on resources, attractive, and intuitive.
+
+RepoType: git-svn
+Repo: https://vibevault.googlecode.com/svn/
+
+Builds:
+  - versionName: '4.1'
+    versionCode: 35
+    commit: '8'
+    subdir: VibeVaultV4.1
+    prebuild:
+      - rm -r ../VibeVaultV[1,2,3]*
+      - mkdir libs
+      - mv assets/htmlcleaner-2.2.jar libs/
+
+MaintainerNotes: |-
+    Useless directory structure, can't use git-svn with tags. No UCM applies since
+    different versions will be under different dirs.
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '0'
+CurrentVersionCode: 0