diff --git a/metadata/de.schildbach.oeffi.txt b/metadata/de.schildbach.oeffi.txt
deleted file mode 100644
index 95df7e9fa5..0000000000
--- a/metadata/de.schildbach.oeffi.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-Categories:Navigation
-License:GPL-3.0-only
-Author Name:Andreas Schildbach
-Web Site:https://oeffi.schildbach.de
-Source Code:https://gitlab.com/oeffi/oeffi
-Issue Tracker:
-Changelog:https://gitlab.com/oeffi/oeffi/raw/HEAD/oeffi/CHANGES
-Donate:https://oeffi.schildbach.de/donate.html
-Bitcoin:1PW21MuBgPnjfUQriwK7TnRADFotEhdysr
-
-
-Repo Type:git
-Repo:https://gitlab.com/oeffi/oeffi.git
-Binaries:https://oeffi.schildbach.de/downloads/oeffi-%v.apk
-
-Build:10.0-aosp,610
-    commit=v10.0
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.0.2-aosp,612
-    commit=v10.0.2
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.0.3-aosp,613
-    commit=v10.0.3
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.1.4-aosp,618
-    commit=v10.1.4
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.3.4-aosp,626
-    commit=v10.3.4
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.3.6-aosp,628
-    commit=v10.3.6
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.4.2-aosp,634
-    commit=v10.4.2
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.4.5-aosp,637
-    commit=v10.4.5
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.4.7-aosp,639
-    commit=v10.4.7
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.4.11-aosp,643
-    commit=v10.4.11
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.5.1-aosp,645
-    commit=v10.5.1
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.5.3-aosp,647
-    commit=v10.5.3
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> ../build.gradle
-
-Build:10.5.5-aosp,649
-    commit=v10.5.5
-    subdir=oeffi
-    submodules=yes
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "4.4.1" }' >> ../build.gradle
-
-Auto Update Mode:None
-Update Check Mode:None
diff --git a/metadata/de.schildbach.oeffi.yml b/metadata/de.schildbach.oeffi.yml
new file mode 100644
index 0000000000..cefa88dd05
--- /dev/null
+++ b/metadata/de.schildbach.oeffi.yml
@@ -0,0 +1,147 @@
+Categories:
+  - Navigation
+License: GPL-3.0-only
+AuthorName: Andreas Schildbach
+WebSite: https://oeffi.schildbach.de
+SourceCode: https://gitlab.com/oeffi/oeffi
+Changelog: https://gitlab.com/oeffi/oeffi/raw/HEAD/oeffi/CHANGES
+Donate: https://oeffi.schildbach.de/donate.html
+Bitcoin: 1PW21MuBgPnjfUQriwK7TnRADFotEhdysr
+
+RepoType: git
+Repo: https://gitlab.com/oeffi/oeffi.git
+Binaries: https://oeffi.schildbach.de/downloads/oeffi-%v.apk
+
+Builds:
+  - versionName: 10.0-aosp
+    versionCode: 610
+    commit: v10.0
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.0.2-aosp
+    versionCode: 612
+    commit: v10.0.2
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.0.3-aosp
+    versionCode: 613
+    commit: v10.0.3
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.1.4-aosp
+    versionCode: 618
+    commit: v10.1.4
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.3.4-aosp
+    versionCode: 626
+    commit: v10.3.4
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.3.6-aosp
+    versionCode: 628
+    commit: v10.3.6
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.4.2-aosp
+    versionCode: 634
+    commit: v10.4.2
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.4.5-aosp
+    versionCode: 637
+    commit: v10.4.5
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.4.7-aosp
+    versionCode: 639
+    commit: v10.4.7
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.4.11-aosp
+    versionCode: 643
+    commit: v10.4.11
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.5.1-aosp
+    versionCode: 645
+    commit: v10.5.1
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.5.3-aosp
+    versionCode: 647
+    commit: v10.5.3
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ ../build.gradle"
+
+  - versionName: 10.5.5-aosp
+    versionCode: 649
+    commit: v10.5.5
+    subdir: oeffi
+    submodules: true
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"4.4.1\" }' >>\
+        \ ../build.gradle"
+
+AutoUpdateMode: None
+UpdateCheckMode: None
diff --git a/metadata/de.schildbach.wallet.faircoin.txt b/metadata/de.schildbach.wallet.faircoin.txt
deleted file mode 100644
index 1ecfd3beeb..0000000000
--- a/metadata/de.schildbach.wallet.faircoin.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Categories:Money
-License:GPL-3.0-only
-Web Site:https://fair-coin.org/
-Source Code:https://github.com/faircoin/faircoin-android-wallet
-Issue Tracker:https://github.com/faircoin/faircoin-android-wallet/issues
-
-Auto Name:FairCoin
-Summary:Pay and receive FairCoins
-Description:
-Standalone FairCoin payment app, based on [[de.schildbach.wallet]].
-.
-
-Repo Type:git
-Repo:https://github.com/faircoin/faircoin-android-wallet
-
-Build:4.21.9,219
-    disable=needs in-build signing removed
-    commit=4cebc4e63f873c0244ce5f32fe539e5fbb5389e6
-    subdir=wallet
-    maven=yes@..
-    srclibs=faircoinj@release-0.12
-    scanignore=wallet/assets/ssl-keystore
-    build=$$MVN3$$ clean install -DskipTests -f $$faircoinj$$/pom.xml
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest/prod
-Current Version:4.21.9
-Current Version Code:219
diff --git a/metadata/de.schildbach.wallet.faircoin.yml b/metadata/de.schildbach.wallet.faircoin.yml
new file mode 100644
index 0000000000..4ea605903f
--- /dev/null
+++ b/metadata/de.schildbach.wallet.faircoin.yml
@@ -0,0 +1,31 @@
+Categories:
+  - Money
+License: GPL-3.0-only
+WebSite: https://fair-coin.org/
+SourceCode: https://github.com/faircoin/faircoin-android-wallet
+IssueTracker: https://github.com/faircoin/faircoin-android-wallet/issues
+
+AutoName: FairCoin
+Summary: Pay and receive FairCoins
+Description: Standalone FairCoin payment app, based on [[de.schildbach.wallet]].
+
+RepoType: git
+Repo: https://github.com/faircoin/faircoin-android-wallet
+
+Builds:
+  - versionName: 4.21.9
+    versionCode: 219
+    disable: needs in-build signing removed
+    commit: 4cebc4e63f873c0244ce5f32fe539e5fbb5389e6
+    subdir: wallet
+    maven: yes@..
+    srclibs:
+      - faircoinj@release-0.12
+    scanignore:
+      - wallet/assets/ssl-keystore
+    build: $$MVN3$$ clean install -DskipTests -f $$faircoinj$$/pom.xml
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest/prod
+CurrentVersion: 4.21.9
+CurrentVersionCode: 219
diff --git a/metadata/org.billthefarmer.accordion.txt b/metadata/org.billthefarmer.accordion.txt
deleted file mode 100644
index 46f63a020c..0000000000
--- a/metadata/org.billthefarmer.accordion.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:https://github.com/billthefarmer/accordion/wiki
-Source Code:https://github.com/billthefarmer/accordion
-Issue Tracker:https://github.com/billthefarmer/accordion/issues
-
-Auto Name:Accordion
-Summary:Accordion emulator for tablets
-Description:
-Emulates a three row diatonic or continental chromatic accordion. There is a
-choice of midi instruments and keys, including C System and B System.
-
-* Keys: F/Bb/Eb, G/C/F, A/D/G, C#/D/G, B/C/C#, C System, B System
-* Instruments: Standard midi set, defaults to accordion
-* Choice of one standard 31 button Hohner layout and two 25 button layouts
-* Choice of fascia images
-
-Uses undocumented built in Sonivox midi synthesizer for midi audio output.
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/accordion
-
-Build:1.01,101
-    commit=v1.01
-    extlibs=arch-arm/libsonivox.so
-    scanignore=libs/libsonivox.so
-    build=mkdir -p ndk-r8e/toolchains && \
-        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r8e/ && \
-        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/ && \
-        mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/ && \
-        ./ndk-r8e/ndk-build && \
-        rm -rf ndk-r8e/
-
-Build:1.02,102
-    commit=v1.02
-    extlibs=arch-arm/libsonivox.so
-    scanignore=libs/libsonivox.so
-    scandelete=libs/armeabi/libmidi.so
-    build=mkdir -p ndk-r9d/toolchains && \
-        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r9d/ && \
-        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/ && \
-        mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/ && \
-        ./ndk-r9d/ndk-build && \
-        rm -rf ndk-r9d/
-
-Build:1.03,103
-    commit=v1.03
-    scanignore=jni/libs
-    scandelete=libs
-    buildjni=yes
-
-Build:1.04,104
-    commit=v1.04
-    scanignore=jni/libs
-    scandelete=libs
-    buildjni=yes
-
-Build:1.05,105
-    commit=v1.05
-    scanignore=jni/libs
-    scandelete=libs
-    buildjni=yes
-
-Build:1.06,106
-    commit=v1.06
-    scandelete=libs
-    buildjni=yes
-
-Build:1.07,107
-    commit=v1.07
-    scandelete=libs
-    buildjni=yes
-
-Build:1.08,108
-    commit=v1.08
-    scandelete=libs
-    buildjni=yes
-
-Build:1.09,109
-    commit=v1.09
-    scandelete=libs
-    buildjni=yes
-
-Build:1.10,110
-    commit=v1.10
-    scandelete=libs
-    buildjni=yes
-
-Build:1.11,111
-    commit=v1.11
-    gradle=yes
-
-Build:1.12,112
-    commit=v1.12
-    gradle=yes
-
-Build:1.13,113
-    commit=v1.13
-    gradle=yes
-
-Build:1.14,114
-    commit=v1.14
-    gradle=yes
-
-Build:1.15,115
-    commit=v1.15
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.15
-Current Version Code:115
diff --git a/metadata/org.billthefarmer.accordion.yml b/metadata/org.billthefarmer.accordion.yml
new file mode 100644
index 0000000000..67b709fa2c
--- /dev/null
+++ b/metadata/org.billthefarmer.accordion.yml
@@ -0,0 +1,162 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: https://github.com/billthefarmer/accordion/wiki
+SourceCode: https://github.com/billthefarmer/accordion
+IssueTracker: https://github.com/billthefarmer/accordion/issues
+
+AutoName: Accordion
+Summary: Accordion emulator for tablets
+Description: |-
+    Emulates a three row diatonic or continental chromatic accordion. There is a
+    choice of midi instruments and keys, including C System and B System.
+
+    * Keys: F/Bb/Eb, G/C/F, A/D/G, C#/D/G, B/C/C#, C System, B System
+    * Instruments: Standard midi set, defaults to accordion
+    * Choice of one standard 31 button Hohner layout and two 25 button layouts
+    * Choice of fascia images
+
+    Uses undocumented built in Sonivox midi synthesizer for midi audio output.
+
+RepoType: git
+Repo: https://github.com/billthefarmer/accordion
+
+Builds:
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+    extlibs:
+      - arch-arm/libsonivox.so
+    scanignore:
+      - libs/libsonivox.so
+    build:
+      - mkdir -p ndk-r8e/toolchains
+      - find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs
+        -0 cp -r -t ndk-r8e/
+      - cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/
+      - mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/
+      - ./ndk-r8e/ndk-build
+      - rm -rf ndk-r8e/
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+    extlibs:
+      - arch-arm/libsonivox.so
+    scanignore:
+      - libs/libsonivox.so
+    scandelete:
+      - libs/armeabi/libmidi.so
+    build:
+      - mkdir -p ndk-r9d/toolchains
+      - find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs
+        -0 cp -r -t ndk-r9d/
+      - cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/
+      - mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/
+      - ./ndk-r9d/ndk-build
+      - rm -rf ndk-r9d/
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+    scanignore:
+      - jni/libs
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+    scanignore:
+      - jni/libs
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+    scanignore:
+      - jni/libs
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 112
+    commit: v1.12
+    gradle:
+      - yes
+
+  - versionName: '1.13'
+    versionCode: 113
+    commit: v1.13
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 114
+    commit: v1.14
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 115
+    commit: v1.15
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.15'
+CurrentVersionCode: 115
diff --git a/metadata/org.billthefarmer.crossword.txt b/metadata/org.billthefarmer.crossword.txt
deleted file mode 100644
index 02036b7596..0000000000
--- a/metadata/org.billthefarmer.crossword.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/billthefarmer/crossword
-Issue Tracker:https://github.com/billthefarmer/crossword/issues
-Changelog:https://github.com/billthefarmer/crossword/releases
-
-Auto Name:Crossword
-Summary:Simple crossword solver
-Description:
-Simple crossword solver.
-
-* Words up to 22 letters
-
-* 58,000 word dictionary
-
-* Web search word definitions
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/crossword
-
-Build:1.0,1
-    commit=v1.0
-    gradle=yes
-
-Build:1.01,101
-    commit=v1.01
-    gradle=yes
-
-Build:1.02,102
-    commit=v1.02
-    gradle=yes
-
-Build:1.03,103
-    commit=v1.03
-    gradle=yes
-
-Build:1.04,104
-    commit=v1.04
-    gradle=yes
-
-Build:1.05,105
-    commit=v1.05
-    gradle=yes
-
-Build:1.06,106
-    commit=v1.06
-    gradle=yes
-
-Build:1.07,107
-    commit=v1.07
-    gradle=yes
-
-Build:1.08,108
-    commit=v1.08
-    gradle=yes
-
-Build:1.09,109
-    commit=v1.09
-    gradle=yes
-
-Build:1.10,110
-    commit=v1.10
-    gradle=yes
-
-Build:1.11,111
-    commit=v1.11
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.11
-Current Version Code:111
diff --git a/metadata/org.billthefarmer.crossword.yml b/metadata/org.billthefarmer.crossword.yml
new file mode 100644
index 0000000000..020ab994d3
--- /dev/null
+++ b/metadata/org.billthefarmer.crossword.yml
@@ -0,0 +1,98 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://github.com/billthefarmer/crossword
+IssueTracker: https://github.com/billthefarmer/crossword/issues
+Changelog: https://github.com/billthefarmer/crossword/releases
+
+AutoName: Crossword
+Summary: Simple crossword solver
+Description: |-
+    Simple crossword solver.
+
+    * Words up to 22 letters
+
+    * 58,000 word dictionary
+
+    * Web search word definitions
+
+RepoType: git
+Repo: https://github.com/billthefarmer/crossword
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    gradle:
+      - yes
+
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+    gradle:
+      - yes
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+    gradle:
+      - yes
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+    gradle:
+      - yes
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+    gradle:
+      - yes
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+    gradle:
+      - yes
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+    gradle:
+      - yes
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+    gradle:
+      - yes
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+    gradle:
+      - yes
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.11'
+CurrentVersionCode: 111
diff --git a/metadata/org.billthefarmer.currency.txt b/metadata/org.billthefarmer.currency.txt
deleted file mode 100644
index d4f2745c0b..0000000000
--- a/metadata/org.billthefarmer.currency.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-Categories:Money
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/billthefarmer/currency
-Issue Tracker:https://github.com/billthefarmer/currency/issues
-Changelog:https://github.com/billthefarmer/currency/releases
-
-Auto Name:Currency
-Summary:Currency conversion
-Description:
-Simple currency conversion.
-
-* Currency rates from the European Central Bank
-
-* 32 international currencies
-
-* Currency rates updated daily
-
-* Last rate update retained for use offline
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/currency
-
-Build:1.0,1
-    commit=v1.0
-    gradle=yes
-    prebuild=sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
-
-Build:1.01,101
-    commit=v1.01
-    gradle=yes
-    prebuild=sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
-
-Build:1.02,102
-    commit=v1.02
-    gradle=yes
-    prebuild=sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
-
-Build:1.03,103
-    commit=v1.03
-    gradle=yes
-    prebuild=sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
-
-Build:1.04,104
-    commit=v1.04
-    gradle=yes
-    prebuild=sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
-
-Build:1.05,105
-    commit=v1.05
-    gradle=yes
-    prebuild=sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
-
-Build:1.06,106
-    commit=v1.06
-    gradle=yes
-
-Build:1.07,107
-    commit=v1.07
-    gradle=yes
-
-Build:1.08,108
-    commit=v1.08
-    gradle=yes
-
-Build:1.09,109
-    commit=v1.09
-    gradle=yes
-
-Build:1.10,110
-    commit=v1.10
-    gradle=yes
-
-Build:1.11,111
-    commit=v1.11
-    gradle=yes
-
-Build:1.12,112
-    commit=v1.12
-    gradle=yes
-
-Build:1.13,113
-    commit=v1.13
-    gradle=yes
-
-Build:1.14,114
-    commit=v1.14
-    gradle=yes
-
-Build:1.15,115
-    commit=v1.15
-    gradle=yes
-
-Build:1.16,116
-    commit=v1.16
-    gradle=yes
-
-Build:1.17,117
-    commit=v1.17
-    gradle=yes
-
-Build:1.18,118
-    commit=v1.18
-    gradle=yes
-
-Build:1.19,119
-    commit=v1.19
-    gradle=yes
-
-Build:1.20,120
-    commit=v1.20
-    gradle=yes
-
-Build:1.21,121
-    commit=v1.21
-    gradle=yes
-
-Build:1.22,122
-    commit=v1.22
-    gradle=yes
-
-Build:1.23,123
-    commit=v1.23
-    gradle=yes
-
-Build:1.24,124
-    commit=v1.24
-    gradle=yes
-
-Build:1.25,125
-    commit=v1.25
-    gradle=yes
-
-Build:1.26,126
-    commit=v1.26
-    gradle=yes
-
-Build:1.27,127
-    commit=v1.27
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.27
-Current Version Code:127
diff --git a/metadata/org.billthefarmer.currency.yml b/metadata/org.billthefarmer.currency.yml
new file mode 100644
index 0000000000..859b65bc96
--- /dev/null
+++ b/metadata/org.billthefarmer.currency.yml
@@ -0,0 +1,202 @@
+Categories:
+  - Money
+License: GPL-3.0-only
+SourceCode: https://github.com/billthefarmer/currency
+IssueTracker: https://github.com/billthefarmer/currency/issues
+Changelog: https://github.com/billthefarmer/currency/releases
+
+AutoName: Currency
+Summary: Currency conversion
+Description: |-
+    Simple currency conversion.
+
+    * Currency rates from the European Central Bank
+
+    * 32 international currencies
+
+    * Currency rates updated daily
+
+    * Last rate update retained for use offline
+
+RepoType: git
+Repo: https://github.com/billthefarmer/currency
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    gradle:
+      - yes
+    prebuild: sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
+
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+    gradle:
+      - yes
+    prebuild: sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+    gradle:
+      - yes
+    prebuild: sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+    gradle:
+      - yes
+    prebuild: sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+    gradle:
+      - yes
+    prebuild: sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+    gradle:
+      - yes
+    prebuild: sed -i 's/3.2.1/2.10/' gradle/wrapper/gradle-wrapper.properties
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+    gradle:
+      - yes
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+    gradle:
+      - yes
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+    gradle:
+      - yes
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 112
+    commit: v1.12
+    gradle:
+      - yes
+
+  - versionName: '1.13'
+    versionCode: 113
+    commit: v1.13
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 114
+    commit: v1.14
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 115
+    commit: v1.15
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 116
+    commit: v1.16
+    gradle:
+      - yes
+
+  - versionName: '1.17'
+    versionCode: 117
+    commit: v1.17
+    gradle:
+      - yes
+
+  - versionName: '1.18'
+    versionCode: 118
+    commit: v1.18
+    gradle:
+      - yes
+
+  - versionName: '1.19'
+    versionCode: 119
+    commit: v1.19
+    gradle:
+      - yes
+
+  - versionName: '1.20'
+    versionCode: 120
+    commit: v1.20
+    gradle:
+      - yes
+
+  - versionName: '1.21'
+    versionCode: 121
+    commit: v1.21
+    gradle:
+      - yes
+
+  - versionName: '1.22'
+    versionCode: 122
+    commit: v1.22
+    gradle:
+      - yes
+
+  - versionName: '1.23'
+    versionCode: 123
+    commit: v1.23
+    gradle:
+      - yes
+
+  - versionName: '1.24'
+    versionCode: 124
+    commit: v1.24
+    gradle:
+      - yes
+
+  - versionName: '1.25'
+    versionCode: 125
+    commit: v1.25
+    gradle:
+      - yes
+
+  - versionName: '1.26'
+    versionCode: 126
+    commit: v1.26
+    gradle:
+      - yes
+
+  - versionName: '1.27'
+    versionCode: 127
+    commit: v1.27
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.27'
+CurrentVersionCode: 127
diff --git a/metadata/org.billthefarmer.melodeon.txt b/metadata/org.billthefarmer.melodeon.txt
deleted file mode 100644
index 3890ad896e..0000000000
--- a/metadata/org.billthefarmer.melodeon.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:https://github.com/billthefarmer/melodeon/wiki
-Source Code:https://github.com/billthefarmer/melodeon
-Issue Tracker:https://github.com/billthefarmer/melodeon/issues
-
-Auto Name:Melodeon
-Summary:Melodeon emulator for tablets
-Description:
-Emulates a one row melodeon or a one and a half row organetto. There is a choice
-of midi instruments and keys.
-
-* Keys: Eb, Bb, F, C, G, D, A
-* Instruments: Standard midi set, defaults to accordion
-* Choice of one row melodeon layout and one and a half row organetto layout
-* Choice of fascia images
-
-Uses undocumented built in Sonivox midi synthesizer for midi audio output.
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/melodeon
-
-Build:1.0,1
-    commit=v1.0
-    extlibs=arch-arm/libsonivox.so
-    scanignore=libs/libsonivox.so
-    build=mkdir -p ndk-r8e/toolchains/ && \
-        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r8e/ && \
-        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/ && \
-        mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/ && \
-        ./ndk-r8e/ndk-build && \
-        rm -rf ndk-r8e/
-
-Build:1.01,101
-    commit=v1.01
-    extlibs=arch-arm/libsonivox.so
-    scanignore=libs/libsonivox.so
-    scandelete=libs/armeabi-v7a/libmidi.so,libs/armeabi/libmidi.so,libs/mips/libmidi.so,libs/x86/libmidi.so
-    build=mkdir -p ndk-r9d/toolchains/ && \
-        find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs -0 cp -r -t ndk-r9d/ && \
-        cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/ && \
-        mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/ && \
-        ./ndk-r9d/ndk-build && \
-        rm -rf ndk-r9d/
-
-Build:1.02,102
-    commit=v1.02
-    scanignore=jni/libs
-    scandelete=libs
-    buildjni=yes
-
-Build:1.03,103
-    commit=v1.03
-    scanignore=jni/libs
-    scandelete=libs
-    buildjni=yes
-
-Build:1.04,104
-    commit=v1.04
-    scanignore=jni/libs
-    scandelete=libs
-    buildjni=yes
-
-Build:1.05,105
-    commit=v1.05
-    scandelete=libs
-    buildjni=yes
-
-Build:1.06,106
-    commit=v1.06
-    scandelete=libs
-    buildjni=yes
-
-Build:1.07,107
-    commit=v1.07
-    scandelete=libs
-    buildjni=yes
-
-Build:1.08,108
-    commit=v1.08
-    scandelete=libs
-    buildjni=yes
-
-Build:1.09,109
-    commit=v1.09
-    gradle=yes
-
-Build:1.10,110
-    commit=v1.10
-    gradle=yes
-
-Build:1.11,111
-    commit=v1.11
-    gradle=yes
-
-Build:1.12,112
-    commit=v1.12
-    gradle=yes
-
-Build:1.13,113
-    commit=v1.13
-    gradle=yes
-
-Maintainer Notes:
-Does not build on my local machine, but clean checkout works for
-upstream, see https://github.com/billthefarmer/melodeon/issues/2.
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.13
-Current Version Code:113
diff --git a/metadata/org.billthefarmer.melodeon.yml b/metadata/org.billthefarmer.melodeon.yml
new file mode 100644
index 0000000000..1273f206d0
--- /dev/null
+++ b/metadata/org.billthefarmer.melodeon.yml
@@ -0,0 +1,161 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: https://github.com/billthefarmer/melodeon/wiki
+SourceCode: https://github.com/billthefarmer/melodeon
+IssueTracker: https://github.com/billthefarmer/melodeon/issues
+
+AutoName: Melodeon
+Summary: Melodeon emulator for tablets
+Description: |-
+    Emulates a one row melodeon or a one and a half row organetto. There is a choice
+    of midi instruments and keys.
+
+    * Keys: Eb, Bb, F, C, G, D, A
+    * Instruments: Standard midi set, defaults to accordion
+    * Choice of one row melodeon layout and one and a half row organetto layout
+    * Choice of fascia images
+
+    Uses undocumented built in Sonivox midi synthesizer for midi audio output.
+
+RepoType: git
+Repo: https://github.com/billthefarmer/melodeon
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    extlibs:
+      - arch-arm/libsonivox.so
+    scanignore:
+      - libs/libsonivox.so
+    build:
+      - mkdir -p ndk-r8e/toolchains/
+      - find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs
+        -0 cp -r -t ndk-r8e/
+      - cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r8e/toolchains/
+      - mv libs/libsonivox.so ndk-r8e/platforms/android-14/arch-arm/usr/lib/
+      - ./ndk-r8e/ndk-build
+      - rm -rf ndk-r8e/
+
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+    extlibs:
+      - arch-arm/libsonivox.so
+    scanignore:
+      - libs/libsonivox.so
+    scandelete:
+      - libs/armeabi-v7a/libmidi.so
+      - libs/armeabi/libmidi.so
+      - libs/mips/libmidi.so
+      - libs/x86/libmidi.so
+    build:
+      - mkdir -p ndk-r9d/toolchains/
+      - find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 | xargs
+        -0 cp -r -t ndk-r9d/
+      - cp -r $$NDK$$/toolchains/arm-linux-androideabi-4.6/ ndk-r9d/toolchains/
+      - mv libs/libsonivox.so ndk-r9d/platforms/android-17/arch-arm/usr/lib/
+      - ./ndk-r9d/ndk-build
+      - rm -rf ndk-r9d/
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+    scanignore:
+      - jni/libs
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+    scanignore:
+      - jni/libs
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+    scanignore:
+      - jni/libs
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+    scandelete:
+      - libs
+    buildjni:
+      - yes
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 112
+    commit: v1.12
+    gradle:
+      - yes
+
+  - versionName: '1.13'
+    versionCode: 113
+    commit: v1.13
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    Does not build on my local machine, but clean checkout works for
+    upstream, see https://github.com/billthefarmer/melodeon/issues/2.
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.13'
+CurrentVersionCode: 113
diff --git a/metadata/org.billthefarmer.scope.txt b/metadata/org.billthefarmer.scope.txt
deleted file mode 100644
index 68111d3f82..0000000000
--- a/metadata/org.billthefarmer.scope.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:https://github.com/billthefarmer/scope/wiki
-Source Code:https://github.com/billthefarmer/scope
-Issue Tracker:https://github.com/billthefarmer/scope/issues
-Changelog:https://github.com/billthefarmer/scope/releases
-
-Auto Name:Oscilloscope
-Summary:Audio Oscilloscope and Spectrum
-Description:
-An android audio oscilloscope and spectrum with following features:
-
-*  Timebase 0.1 ms - 0.5 sec
-*  Single shot
-*  Storage
-*  Index
-*  Spectrum
-
-There are toolbar icons to control single step, sync polarity, timebase, storage
-and scrolling. The spectrum display has a display lock function and shows the
-current dominant frequency in the toolbar.
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/scope
-
-Build:1.0,1
-    commit=v1.0
-
-Build:1.01,101
-    commit=v1.01
-
-Build:1.02,102
-    commit=v1.02
-
-Build:1.03,103
-    commit=v1.03
-
-Build:1.04,104
-    commit=v1.04
-
-Build:1.05,105
-    commit=v1.05
-
-Build:1.06,106
-    commit=v1.06
-
-Build:1.07,107
-    commit=v1.07
-
-Build:1.08,108
-    commit=v1.08
-
-Build:1.09,109
-    commit=v1.09
-
-Build:1.10,110
-    commit=v1.10
-
-Build:1.11,111
-    commit=v1.11
-    gradle=yes
-
-Build:1.12,112
-    commit=v1.12
-    gradle=yes
-
-Build:1.13,113
-    commit=v1.13
-    gradle=yes
-
-Build:1.14,114
-    commit=v1.14
-    gradle=yes
-
-Build:1.15,115
-    commit=v1.15
-    gradle=yes
-
-Build:1.16,116
-    commit=v1.16
-    gradle=yes
-
-Build:1.17,117
-    commit=v1.17
-    gradle=yes
-
-Build:1.18,118
-    commit=v1.18
-    gradle=yes
-
-Build:1.19,119
-    commit=v1.19
-    gradle=yes
-
-Build:1.20,120
-    commit=v1.20
-    gradle=yes
-
-Build:1.21,121
-    commit=v1.21
-    gradle=yes
-
-Build:1.22,122
-    commit=v1.22
-    gradle=yes
-
-Build:1.23,123
-    commit=v1.23
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.23
-Current Version Code:123
diff --git a/metadata/org.billthefarmer.scope.yml b/metadata/org.billthefarmer.scope.yml
new file mode 100644
index 0000000000..918b555c88
--- /dev/null
+++ b/metadata/org.billthefarmer.scope.yml
@@ -0,0 +1,153 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: https://github.com/billthefarmer/scope/wiki
+SourceCode: https://github.com/billthefarmer/scope
+IssueTracker: https://github.com/billthefarmer/scope/issues
+Changelog: https://github.com/billthefarmer/scope/releases
+
+AutoName: Oscilloscope
+Summary: Audio Oscilloscope and Spectrum
+Description: |-
+    An android audio oscilloscope and spectrum with following features:
+
+    *  Timebase 0.1 ms - 0.5 sec
+    *  Single shot
+    *  Storage
+    *  Index
+    *  Spectrum
+
+    There are toolbar icons to control single step, sync polarity, timebase, storage
+    and scrolling. The spectrum display has a display lock function and shows the
+    current dominant frequency in the toolbar.
+
+RepoType: git
+Repo: https://github.com/billthefarmer/scope
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 112
+    commit: v1.12
+    gradle:
+      - yes
+
+  - versionName: '1.13'
+    versionCode: 113
+    commit: v1.13
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 114
+    commit: v1.14
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 115
+    commit: v1.15
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 116
+    commit: v1.16
+    gradle:
+      - yes
+
+  - versionName: '1.17'
+    versionCode: 117
+    commit: v1.17
+    gradle:
+      - yes
+
+  - versionName: '1.18'
+    versionCode: 118
+    commit: v1.18
+    gradle:
+      - yes
+
+  - versionName: '1.19'
+    versionCode: 119
+    commit: v1.19
+    gradle:
+      - yes
+
+  - versionName: '1.20'
+    versionCode: 120
+    commit: v1.20
+    gradle:
+      - yes
+
+  - versionName: '1.21'
+    versionCode: 121
+    commit: v1.21
+    gradle:
+      - yes
+
+  - versionName: '1.22'
+    versionCode: 122
+    commit: v1.22
+    gradle:
+      - yes
+
+  - versionName: '1.23'
+    versionCode: 123
+    commit: v1.23
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.23'
+CurrentVersionCode: 123
diff --git a/metadata/org.billthefarmer.shorty.txt b/metadata/org.billthefarmer.shorty.txt
deleted file mode 100644
index b2e9ae860b..0000000000
--- a/metadata/org.billthefarmer.shorty.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/billthefarmer/shorty
-Issue Tracker:https://github.com/billthefarmer/shorty/issues
-Changelog:https://github.com/billthefarmer/shorty/releases
-
-Auto Name:Shorty
-Summary:Shortcuts for Intent Radio
-Description:
-Create shortcuts for Intent Radio.
-
-* Create shortcuts from the app or the android launcher.
-* Defaults to BBC Radio 4 if no data is entered.
-* Lookup stations from a list.
-* Values and list saved between uses.
-* Save and restore the list from the device file system.
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/shorty
-
-Build:1.0,1
-    commit=v1.0
-
-Build:1.01,101
-    commit=v1.01
-
-Build:1.02,102
-    commit=v1.02
-
-Build:1.03,103
-    commit=v1.03
-
-Build:1.04,104
-    commit=v1.04
-
-Build:1.05,105
-    commit=v1.05
-
-Build:1.06,106
-    commit=v1.06
-    gradle=yes
-
-Build:1.07,107
-    commit=v1.07
-    gradle=yes
-
-Build:1.08,108
-    commit=v1.08
-    gradle=yes
-
-Build:1.09,109
-    commit=v1.09
-    gradle=yes
-
-Build:1.10,110
-    commit=v1.10
-    gradle=yes
-
-Build:1.11,111
-    commit=v1.11
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.11
-Current Version Code:111
diff --git a/metadata/org.billthefarmer.shorty.yml b/metadata/org.billthefarmer.shorty.yml
new file mode 100644
index 0000000000..758d185cde
--- /dev/null
+++ b/metadata/org.billthefarmer.shorty.yml
@@ -0,0 +1,86 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://github.com/billthefarmer/shorty
+IssueTracker: https://github.com/billthefarmer/shorty/issues
+Changelog: https://github.com/billthefarmer/shorty/releases
+
+AutoName: Shorty
+Summary: Shortcuts for Intent Radio
+Description: |-
+    Create shortcuts for Intent Radio.
+
+    * Create shortcuts from the app or the android launcher.
+    * Defaults to BBC Radio 4 if no data is entered.
+    * Lookup stations from a list.
+    * Values and list saved between uses.
+    * Save and restore the list from the device file system.
+
+RepoType: git
+Repo: https://github.com/billthefarmer/shorty
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+    gradle:
+      - yes
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+    gradle:
+      - yes
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+    gradle:
+      - yes
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.11'
+CurrentVersionCode: 111
diff --git a/metadata/org.billthefarmer.siggen.txt b/metadata/org.billthefarmer.siggen.txt
deleted file mode 100644
index 10f3818268..0000000000
--- a/metadata/org.billthefarmer.siggen.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:https://github.com/billthefarmer/sig-gen/wiki
-Source Code:https://github.com/billthefarmer/sig-gen
-Issue Tracker:https://github.com/billthefarmer/sig-gen/issues
-
-Auto Name:Signal Generator
-Summary:Signal Generator for tablets
-Description:
-An android signal generator with twirly knob.
-
-* Frequency range 10Hz - 25KHz
-* Level range 0dB - -80dB
-
-The frequency knob responds to finger twirling. The fine frequency and level
-sliders allow for fine adjustments of frequency and output level. The frequency
-knob is also adjustable using the left and right arrow buttons.
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/sig-gen
-
-Build:1.0,1
-    commit=v1.0
-
-Build:1.01,101
-    commit=v1.01
-
-Build:1.02,102
-    commit=v1.02
-
-Build:1.03,103
-    commit=v1.03
-
-Build:1.04,104
-    commit=v1.04
-
-Build:1.05,105
-    commit=v1.05
-
-Build:1.06,106
-    commit=v1.06
-
-Build:1.07,107
-    commit=v1.07
-    gradle=yes
-
-Build:1.08,108
-    commit=v1.08
-    gradle=yes
-
-Build:1.09,109
-    commit=v1.09
-    gradle=yes
-
-Build:1.10,110
-    commit=v1.10
-    gradle=yes
-
-Build:1.11,111
-    commit=v1.11
-    gradle=yes
-
-Build:1.12,112
-    commit=v1.12
-    gradle=yes
-
-Build:1.13,113
-    commit=v1.13
-    gradle=yes
-
-Build:1.14,114
-    commit=v1.14
-    gradle=yes
-
-Build:1.15,115
-    commit=v1.15
-    gradle=yes
-
-Build:1.16,116
-    commit=v1.16
-    gradle=yes
-
-Build:1.17,117
-    commit=v1.17
-    gradle=yes
-
-Build:1.18,118
-    commit=v1.18
-    gradle=yes
-
-Build:1.19,119
-    commit=v1.19
-    gradle=yes
-
-Build:1.20,120
-    commit=v1.20
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.20
-Current Version Code:120
diff --git a/metadata/org.billthefarmer.siggen.yml b/metadata/org.billthefarmer.siggen.yml
new file mode 100644
index 0000000000..7e646c90aa
--- /dev/null
+++ b/metadata/org.billthefarmer.siggen.yml
@@ -0,0 +1,139 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: https://github.com/billthefarmer/sig-gen/wiki
+SourceCode: https://github.com/billthefarmer/sig-gen
+IssueTracker: https://github.com/billthefarmer/sig-gen/issues
+
+AutoName: Signal Generator
+Summary: Signal Generator for tablets
+Description: |-
+    An android signal generator with twirly knob.
+
+    * Frequency range 10Hz - 25KHz
+    * Level range 0dB - -80dB
+
+    The frequency knob responds to finger twirling. The fine frequency and level
+    sliders allow for fine adjustments of frequency and output level. The frequency
+    knob is also adjustable using the left and right arrow buttons.
+
+RepoType: git
+Repo: https://github.com/billthefarmer/sig-gen
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+    gradle:
+      - yes
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+    gradle:
+      - yes
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 112
+    commit: v1.12
+    gradle:
+      - yes
+
+  - versionName: '1.13'
+    versionCode: 113
+    commit: v1.13
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 114
+    commit: v1.14
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 115
+    commit: v1.15
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 116
+    commit: v1.16
+    gradle:
+      - yes
+
+  - versionName: '1.17'
+    versionCode: 117
+    commit: v1.17
+    gradle:
+      - yes
+
+  - versionName: '1.18'
+    versionCode: 118
+    commit: v1.18
+    gradle:
+      - yes
+
+  - versionName: '1.19'
+    versionCode: 119
+    commit: v1.19
+    gradle:
+      - yes
+
+  - versionName: '1.20'
+    versionCode: 120
+    commit: v1.20
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.20'
+CurrentVersionCode: 120
diff --git a/metadata/org.billthefarmer.tuner.txt b/metadata/org.billthefarmer.tuner.txt
deleted file mode 100644
index 467f1d620a..0000000000
--- a/metadata/org.billthefarmer.tuner.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:https://github.com/billthefarmer/tuner/wiki
-Source Code:https://github.com/billthefarmer/tuner
-Issue Tracker:https://github.com/billthefarmer/tuner/issues
-Changelog:https://github.com/billthefarmer/tuner/releases
-
-Auto Name:Tuner
-Summary:Musical instrument pitch tuning
-Description:
-Accordion tuner with scope, spectrum and strobe. Can show up to eight different
-notes or reeds concurrently.
-
-Hold the phone/tablet near the instrument, play a note and observe the display.
-In portrait the app shows a scope with the input signal, a spectrum showing the
-processed signal, the main display with the note value, cents error, frequency
-error etc, a strobe display and a meter display showing the cents error. In
-landscape the app shows just the main display and the meter. There is a signal
-indicator in the action bar which is useful in landscape mode.
-.
-
-Repo Type:git
-Repo:https://github.com/billthefarmer/tuner
-
-Build:Version 1.0,1
-    commit=v1.0
-
-Build:1.01,101
-    commit=v1.01
-
-Build:1.02,102
-    commit=v1.02
-
-Build:1.03,103
-    commit=v1.03
-
-Build:1.04,104
-    commit=v1.04
-
-Build:1.05,105
-    commit=v1.05
-
-Build:1.06,106
-    commit=v1.06
-
-Build:1.07,107
-    commit=v1.07
-
-Build:1.08,108
-    commit=v1.08
-
-Build:1.09,109
-    commit=v1.09
-
-Build:1.10,110
-    commit=v1.10
-
-Build:1.11,111
-    commit=v1.11
-
-Build:1.12,112
-    commit=v1.12
-
-Build:1.13,113
-    commit=v1.13
-
-Build:1.14,114
-    commit=v1.14
-
-Build:1.15,115
-    commit=v1.15
-    gradle=yes
-
-Build:1.16,116
-    commit=v1.16
-    gradle=yes
-
-Build:1.17,117
-    commit=v1.17
-    gradle=yes
-
-Build:1.18,118
-    commit=v1.18
-    gradle=yes
-
-Build:1.19,119
-    commit=v1.19
-    gradle=yes
-
-Build:1.20,120
-    commit=v1.20
-    gradle=yes
-
-Build:1.21,121
-    commit=v1.21
-    gradle=yes
-
-Build:1.22,122
-    commit=v1.22
-    gradle=yes
-
-Build:1.23,123
-    commit=v1.23
-    gradle=yes
-
-Build:1.24,124
-    commit=v1.24
-    gradle=yes
-
-Build:1.25,125
-    commit=v1.25
-    gradle=yes
-
-Build:1.26,126
-    commit=v1.26
-    gradle=yes
-
-Build:1.27,127
-    commit=v1.27
-    gradle=yes
-
-Build:1.28,128
-    commit=v1.28
-    gradle=yes
-
-Build:1.29,129
-    commit=v1.29
-    gradle=yes
-
-Build:1.30,130
-    commit=v1.30
-    gradle=yes
-
-Build:1.31,131
-    commit=v1.31
-    gradle=yes
-
-Build:1.32,132
-    commit=v1.32
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.32
-Current Version Code:132
diff --git a/metadata/org.billthefarmer.tuner.yml b/metadata/org.billthefarmer.tuner.yml
new file mode 100644
index 0000000000..749feba39d
--- /dev/null
+++ b/metadata/org.billthefarmer.tuner.yml
@@ -0,0 +1,197 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: https://github.com/billthefarmer/tuner/wiki
+SourceCode: https://github.com/billthefarmer/tuner
+IssueTracker: https://github.com/billthefarmer/tuner/issues
+Changelog: https://github.com/billthefarmer/tuner/releases
+
+AutoName: Tuner
+Summary: Musical instrument pitch tuning
+Description: |-
+    Accordion tuner with scope, spectrum and strobe. Can show up to eight different
+    notes or reeds concurrently.
+
+    Hold the phone/tablet near the instrument, play a note and observe the display.
+    In portrait the app shows a scope with the input signal, a spectrum showing the
+    processed signal, the main display with the note value, cents error, frequency
+    error etc, a strobe display and a meter display showing the cents error. In
+    landscape the app shows just the main display and the meter. There is a signal
+    indicator in the action bar which is useful in landscape mode.
+
+RepoType: git
+Repo: https://github.com/billthefarmer/tuner
+
+Builds:
+  - versionName: Version 1.0
+    versionCode: 1
+    commit: v1.0
+
+  - versionName: '1.01'
+    versionCode: 101
+    commit: v1.01
+
+  - versionName: '1.02'
+    versionCode: 102
+    commit: v1.02
+
+  - versionName: '1.03'
+    versionCode: 103
+    commit: v1.03
+
+  - versionName: '1.04'
+    versionCode: 104
+    commit: v1.04
+
+  - versionName: '1.05'
+    versionCode: 105
+    commit: v1.05
+
+  - versionName: '1.06'
+    versionCode: 106
+    commit: v1.06
+
+  - versionName: '1.07'
+    versionCode: 107
+    commit: v1.07
+
+  - versionName: '1.08'
+    versionCode: 108
+    commit: v1.08
+
+  - versionName: '1.09'
+    versionCode: 109
+    commit: v1.09
+
+  - versionName: '1.10'
+    versionCode: 110
+    commit: v1.10
+
+  - versionName: '1.11'
+    versionCode: 111
+    commit: v1.11
+
+  - versionName: '1.12'
+    versionCode: 112
+    commit: v1.12
+
+  - versionName: '1.13'
+    versionCode: 113
+    commit: v1.13
+
+  - versionName: '1.14'
+    versionCode: 114
+    commit: v1.14
+
+  - versionName: '1.15'
+    versionCode: 115
+    commit: v1.15
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 116
+    commit: v1.16
+    gradle:
+      - yes
+
+  - versionName: '1.17'
+    versionCode: 117
+    commit: v1.17
+    gradle:
+      - yes
+
+  - versionName: '1.18'
+    versionCode: 118
+    commit: v1.18
+    gradle:
+      - yes
+
+  - versionName: '1.19'
+    versionCode: 119
+    commit: v1.19
+    gradle:
+      - yes
+
+  - versionName: '1.20'
+    versionCode: 120
+    commit: v1.20
+    gradle:
+      - yes
+
+  - versionName: '1.21'
+    versionCode: 121
+    commit: v1.21
+    gradle:
+      - yes
+
+  - versionName: '1.22'
+    versionCode: 122
+    commit: v1.22
+    gradle:
+      - yes
+
+  - versionName: '1.23'
+    versionCode: 123
+    commit: v1.23
+    gradle:
+      - yes
+
+  - versionName: '1.24'
+    versionCode: 124
+    commit: v1.24
+    gradle:
+      - yes
+
+  - versionName: '1.25'
+    versionCode: 125
+    commit: v1.25
+    gradle:
+      - yes
+
+  - versionName: '1.26'
+    versionCode: 126
+    commit: v1.26
+    gradle:
+      - yes
+
+  - versionName: '1.27'
+    versionCode: 127
+    commit: v1.27
+    gradle:
+      - yes
+
+  - versionName: '1.28'
+    versionCode: 128
+    commit: v1.28
+    gradle:
+      - yes
+
+  - versionName: '1.29'
+    versionCode: 129
+    commit: v1.29
+    gradle:
+      - yes
+
+  - versionName: '1.30'
+    versionCode: 130
+    commit: v1.30
+    gradle:
+      - yes
+
+  - versionName: '1.31'
+    versionCode: 131
+    commit: v1.31
+    gradle:
+      - yes
+
+  - versionName: '1.32'
+    versionCode: 132
+    commit: v1.32
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.32'
+CurrentVersionCode: 132