diff --git a/metadata/com.aselalee.trainschedule.txt b/metadata/com.aselalee.trainschedule.txt
deleted file mode 100644
index e3e50a3229..0000000000
--- a/metadata/com.aselalee.trainschedule.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-AntiFeatures:UpstreamNonFree
-Categories:Navigation
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/aselalee/sl-train-schedule
-Issue Tracker:https://github.com/aselalee/sl-train-schedule/issues
-
-Auto Name:Train Schedule
-Summary:Sri Lanka train schedules
-Description:
-A simple app to retrieve the Sri Lanka Railway train schedule by reading the
-[http://www.icta.lk Information and Communication Technology Agency of Sri
-Lanka]'s (ICTA) [http://mobile.icta.lk/services/railwayservice JSON API]. The
-aim of this application is to retrieve the schedule as quickly as possible with
-minimum user interactions.
-
-A non-free analytics library was removed.
-.
-
-Repo Type:git
-Repo:https://github.com/aselalee/sl-train-schedule
-
-Build:1.15,115
-    commit=141
-    srclibs=NoAnalytics@158a4a
-    rm=libs/libGoogleAnalytics.jar
-    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
-
-Build:1.16,116
-    commit=Release_116
-    srclibs=NoAnalytics@158a4a
-    rm=libs/libGoogleAnalytics.jar
-    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
-
-Build:1.18,118
-    commit=Release_118
-    srclibs=NoAnalytics@158a4a
-    rm=libs/libGoogleAnalytics.jar
-    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
-
-Build:1.19,119
-    commit=Release_119
-    srclibs=NoAnalytics@158a4a
-    rm=libs/libGoogleAnalytics.jar
-    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:1.19
-Current Version Code:119
diff --git a/metadata/com.aselalee.trainschedule.yml b/metadata/com.aselalee.trainschedule.yml
new file mode 100644
index 0000000000..48e05f8e21
--- /dev/null
+++ b/metadata/com.aselalee.trainschedule.yml
@@ -0,0 +1,63 @@
+AntiFeatures:
+  - UpstreamNonFree
+Categories:
+  - Navigation
+License: GPL-3.0-only
+SourceCode: https://github.com/aselalee/sl-train-schedule
+IssueTracker: https://github.com/aselalee/sl-train-schedule/issues
+
+AutoName: Train Schedule
+Summary: Sri Lanka train schedules
+Description: |-
+    A simple app to retrieve the Sri Lanka Railway train schedule by reading the
+    [http://www.icta.lk Information and Communication Technology Agency of Sri
+    Lanka]'s (ICTA) [http://mobile.icta.lk/services/railwayservice JSON API]. The
+    aim of this application is to retrieve the schedule as quickly as possible with
+    minimum user interactions.
+
+    A non-free analytics library was removed.
+
+RepoType: git
+Repo: https://github.com/aselalee/sl-train-schedule
+
+Builds:
+  - versionName: '1.15'
+    versionCode: 115
+    commit: '141'
+    srclibs:
+      - NoAnalytics@158a4a
+    rm:
+      - libs/libGoogleAnalytics.jar
+    prebuild: echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+
+  - versionName: '1.16'
+    versionCode: 116
+    commit: Release_116
+    srclibs:
+      - NoAnalytics@158a4a
+    rm:
+      - libs/libGoogleAnalytics.jar
+    prebuild: echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+
+  - versionName: '1.18'
+    versionCode: 118
+    commit: Release_118
+    srclibs:
+      - NoAnalytics@158a4a
+    rm:
+      - libs/libGoogleAnalytics.jar
+    prebuild: echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+
+  - versionName: '1.19'
+    versionCode: 119
+    commit: Release_119
+    srclibs:
+      - NoAnalytics@158a4a
+    rm:
+      - libs/libGoogleAnalytics.jar
+    prebuild: echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '1.19'
+CurrentVersionCode: 119
diff --git a/metadata/com.ath0.rpn.txt b/metadata/com.ath0.rpn.txt
deleted file mode 100644
index df4cdd4de4..0000000000
--- a/metadata/com.ath0.rpn.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-or-later
-Web Site:http://meta.ath0.com/software/rpn
-Source Code:https://github.com/lpar/RPN
-Issue Tracker:https://github.com/lpar/RPN/issues
-
-Auto Name:RPN
-Summary:Reverse Polish Notation Calculator
-Description:
-Simple fixed-point decimal arithmetic, Reverse Polish Notation calculator. RPN
-calculators may be in the minority but they are easy to learn and very
-efficient. The idea is that the operator follows the operands, so that instead
-of typing 2 + 2 =, one types 2 enter 2 enter +. The left arrow either deletes
-the last digit or drops the last item from the stack. The up arrow show a few
-other functions such as setting the number of decimal points, swapping items on
-the stack and the use of exponents.
-.
-
-Repo Type:git
-Repo:https://github.com/lpar/RPN.git
-
-Build:1.8.1,10
-    commit=199a87f7319b685e59d6847f1ff2417613f69c6e
-
-Build:2.0.1,15
-    commit=0e8ba101ab
-
-Build:2.0.3,17
-    commit=ad0277c167
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:2.0.3
-Current Version Code:17
diff --git a/metadata/com.ath0.rpn.yml b/metadata/com.ath0.rpn.yml
new file mode 100644
index 0000000000..9ef3812ec4
--- /dev/null
+++ b/metadata/com.ath0.rpn.yml
@@ -0,0 +1,38 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-or-later
+WebSite: http://meta.ath0.com/software/rpn
+SourceCode: https://github.com/lpar/RPN
+IssueTracker: https://github.com/lpar/RPN/issues
+
+AutoName: RPN
+Summary: Reverse Polish Notation Calculator
+Description: |-
+    Simple fixed-point decimal arithmetic, Reverse Polish Notation calculator. RPN
+    calculators may be in the minority but they are easy to learn and very
+    efficient. The idea is that the operator follows the operands, so that instead
+    of typing 2 + 2 =, one types 2 enter 2 enter +. The left arrow either deletes
+    the last digit or drops the last item from the stack. The up arrow show a few
+    other functions such as setting the number of decimal points, swapping items on
+    the stack and the use of exponents.
+
+RepoType: git
+Repo: https://github.com/lpar/RPN.git
+
+Builds:
+  - versionName: 1.8.1
+    versionCode: 10
+    commit: 199a87f7319b685e59d6847f1ff2417613f69c6e
+
+  - versionName: 2.0.1
+    versionCode: 15
+    commit: 0e8ba101ab
+
+  - versionName: 2.0.3
+    versionCode: 17
+    commit: ad0277c167
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 2.0.3
+CurrentVersionCode: 17
diff --git a/metadata/com.atr.tedit.txt b/metadata/com.atr.tedit.txt
deleted file mode 100644
index d1d0fdeae6..0000000000
--- a/metadata/com.atr.tedit.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-Categories:Writing
-License:0BSD
-Web Site:http://1337atr.weebly.com/tedit.html
-Source Code:https://github.com/ATryder/TEdit
-Issue Tracker:https://github.com/ATryder/TEdit/issues
-Changelog:https://github.com/ATryder/TEdit/releases
-
-Auto Name:TEdit
-Summary:A simple text editor
-Description:
-TEdit is a simple text editor for Android devices which includes a graphical
-file browser to make locating existing files and saving new files easy.
-Additionally TEdit enables you to keep multiple files open simultaneously,
-simply select the file tabs icon to be presented with a list of currently open
-documents.
-.
-
-Repo Type:git
-Repo:https://github.com/ATryder/TEdit.git
-
-Build:2.1,6
-    commit=v2.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/' build.gradle
-
-Build:2.1.1,7
-    commit=2.1.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/' build.gradle
-
-Build:2.1.2,8
-    commit=2.1.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/' build.gradle
-
-Build:2.1.3,9
-    commit=2.1.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/' build.gradle
-
-Build:2.1.5,11
-    commit=2.1.5
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/' build.gradle
-
-Build:2.2.1,13
-    commit=2.2.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.2.1
-Current Version Code:13
diff --git a/metadata/com.atr.tedit.yml b/metadata/com.atr.tedit.yml
new file mode 100644
index 0000000000..3ab5496790
--- /dev/null
+++ b/metadata/com.atr.tedit.yml
@@ -0,0 +1,79 @@
+Categories:
+  - Writing
+License: 0BSD
+WebSite: http://1337atr.weebly.com/tedit.html
+SourceCode: https://github.com/ATryder/TEdit
+IssueTracker: https://github.com/ATryder/TEdit/issues
+Changelog: https://github.com/ATryder/TEdit/releases
+
+AutoName: TEdit
+Summary: A simple text editor
+Description: |-
+    TEdit is a simple text editor for Android devices which includes a graphical
+    file browser to make locating existing files and saving new files easy.
+    Additionally TEdit enables you to keep multiple files open simultaneously,
+    simply select the file tabs icon to be presented with a list of currently open
+    documents.
+
+RepoType: git
+Repo: https://github.com/ATryder/TEdit.git
+
+Builds:
+  - versionName: '2.1'
+    versionCode: 6
+    commit: v2.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/'
+        build.gradle
+
+  - versionName: 2.1.1
+    versionCode: 7
+    commit: 2.1.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/'
+        build.gradle
+
+  - versionName: 2.1.2
+    versionCode: 8
+    commit: 2.1.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/'
+        build.gradle
+
+  - versionName: 2.1.3
+    versionCode: 9
+    commit: 2.1.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/'
+        build.gradle
+
+  - versionName: 2.1.5
+    versionCode: 11
+    commit: 2.1.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/'
+        build.gradle
+
+  - versionName: 2.2.1
+    versionCode: 13
+    commit: 2.2.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/constraint-layout:1.0.0-beta3/constraint-layout:1.0.2/'
+        build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.2.1
+CurrentVersionCode: 13
diff --git a/metadata/com.averi.worldscribe.txt b/metadata/com.averi.worldscribe.txt
deleted file mode 100644
index d4749eee48..0000000000
--- a/metadata/com.averi.worldscribe.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-Categories:Writing
-License:MIT
-Web Site:
-Source Code:https://github.com/MarquisLP/World-Scribe
-Issue Tracker:https://github.com/MarquisLP/World-Scribe/issues
-Changelog:https://github.com/MarquisLP/World-Scribe/releases
-
-Auto Name:World Scribe
-Summary:Help story writers with fictional world-building
-Description:
-Ever wanted to create a fictional setting — for your next novel, comic,
-screenplay, or what-have-you — but find it difficult to keep everything
-organized?
-
-''World Scribe'' eases the creation process by letting you keep track of every
-important element in your world, including the ways in which they're connected.
-
-Whether you're a novelist, hobby writer, or role-player, World Scribe is an
-indispensable tool for making your settings more than just fiction. Bring your
-world to life today!
-
-'''Features:'''
-
-* World elements — known as Articles — are organized into five categories for your convenience: People (your colorful cast of characters), groups (people united by blood, race, or a driving motivation), places (the varied locales and vistas your world has to offer), items (gadgets, important artifacts, and various belongings), concepts (definitions for world-specific ideas like magic systems, religions, and superpowers).
-* Any Article can possess Connections to other Articles, complete with relationship descriptions. Each Connection also acts as a link to that Article's page. Need to find a character's siblings, or the ancient artifacts on their person? You can navigate to each of them straight from that character's page.
-* Any Article can also possess Snippets, which are custom text entries unique to that Article. Want to write down an important letter or speech from one of your characters? How about a song or poem warning of a dangerous location in the world? The possibilities are endless!
-* Everything you write is stored in simple text files, so feel free to export your worlds at any time and use them in other writing projects. You can find them in the "WorldScribe" folder on your phone's external storage.
-* Have a Dropbox account? You can backup each of your worlds to your Dropbox account for easy exporting and added safety (in case the Dark Lord seizes your device). To backup, just select the "Backup to Dropbox" option from the overflow menu at any time.
-.
-
-Repo Type:git
-Repo:https://github.com/MarquisLP/World-Scribe
-
-Build:1.4.6,17
-    commit=1.4.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystorePropertiesFile/d' build.gradle
-
-Build:1.4.7,18
-    commit=1.4.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystorePropertiesFile/d' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.4.7
-Current Version Code:18
diff --git a/metadata/com.averi.worldscribe.yml b/metadata/com.averi.worldscribe.yml
new file mode 100644
index 0000000000..e22ad76444
--- /dev/null
+++ b/metadata/com.averi.worldscribe.yml
@@ -0,0 +1,53 @@
+Categories:
+  - Writing
+License: MIT
+SourceCode: https://github.com/MarquisLP/World-Scribe
+IssueTracker: https://github.com/MarquisLP/World-Scribe/issues
+Changelog: https://github.com/MarquisLP/World-Scribe/releases
+
+AutoName: World Scribe
+Summary: Help story writers with fictional world-building
+Description: |-
+    Ever wanted to create a fictional setting — for your next novel, comic,
+    screenplay, or what-have-you — but find it difficult to keep everything
+    organized?
+
+    ''World Scribe'' eases the creation process by letting you keep track of every
+    important element in your world, including the ways in which they're connected.
+
+    Whether you're a novelist, hobby writer, or role-player, World Scribe is an
+    indispensable tool for making your settings more than just fiction. Bring your
+    world to life today!
+
+    '''Features:'''
+
+    * World elements — known as Articles — are organized into five categories for your convenience: People (your colorful cast of characters), groups (people united by blood, race, or a driving motivation), places (the varied locales and vistas your world has to offer), items (gadgets, important artifacts, and various belongings), concepts (definitions for world-specific ideas like magic systems, religions, and superpowers).
+    * Any Article can possess Connections to other Articles, complete with relationship descriptions. Each Connection also acts as a link to that Article's page. Need to find a character's siblings, or the ancient artifacts on their person? You can navigate to each of them straight from that character's page.
+    * Any Article can also possess Snippets, which are custom text entries unique to that Article. Want to write down an important letter or speech from one of your characters? How about a song or poem warning of a dangerous location in the world? The possibilities are endless!
+    * Everything you write is stored in simple text files, so feel free to export your worlds at any time and use them in other writing projects. You can find them in the "WorldScribe" folder on your phone's external storage.
+    * Have a Dropbox account? You can backup each of your worlds to your Dropbox account for easy exporting and added safety (in case the Dark Lord seizes your device). To backup, just select the "Backup to Dropbox" option from the overflow menu at any time.
+
+RepoType: git
+Repo: https://github.com/MarquisLP/World-Scribe
+
+Builds:
+  - versionName: 1.4.6
+    versionCode: 17
+    commit: 1.4.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystorePropertiesFile/d' build.gradle
+
+  - versionName: 1.4.7
+    versionCode: 18
+    commit: 1.4.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystorePropertiesFile/d' build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.4.7
+CurrentVersionCode: 18
diff --git a/metadata/com.banasiak.coinflip.txt b/metadata/com.banasiak.coinflip.txt
deleted file mode 100644
index 4099e2e8a8..0000000000
--- a/metadata/com.banasiak.coinflip.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-AntiFeatures:UpstreamNonFree
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/banasiak/CoinFlip
-Issue Tracker:https://github.com/banasiak/CoinFlip/issues
-
-Auto Name:Coin Flip
-Summary:Simulate a coin flip
-Description:
-See [[com.banasiak.coinflipext.example]] for extra coins.
-
-Newer versions of this app are available elsewhere, but have properietary
-dependencies.
-.
-
-Repo Type:git
-Repo:https://github.com/banasiak/CoinFlip.git
-
-Build:5.1,25
-    commit=f4d644
-
-Build:5.2,26
-    commit=93e1497e40
-
-Build:5.2.1,27
-    commit=4a154179
-
-Build:5.3.1,29
-    commit=f5d0dfd
-
-Build:5.3.2,30
-    commit=3de8a3025
-
-Build:5.4,31
-    disable=missing drawables
-    commit=5756cefff048fa
-
-Build:5.4.1,32
-    disable=source still incomplete - see https://github.com/banasiak/CoinFlip/issues/3
-    commit=0e60aa436279
-
-Build:5.5,33
-    commit=ed98011938e4e
-
-Build:5.5.1,34
-    commit=12548396fa4c
-
-Build:5.5.2,35
-    commit=3adf4cf84
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:5.5.2
-Current Version Code:35
diff --git a/metadata/com.banasiak.coinflip.yml b/metadata/com.banasiak.coinflip.yml
new file mode 100644
index 0000000000..69b3f4ab5d
--- /dev/null
+++ b/metadata/com.banasiak.coinflip.yml
@@ -0,0 +1,66 @@
+AntiFeatures:
+  - UpstreamNonFree
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://github.com/banasiak/CoinFlip
+IssueTracker: https://github.com/banasiak/CoinFlip/issues
+
+AutoName: Coin Flip
+Summary: Simulate a coin flip
+Description: |-
+    See [[com.banasiak.coinflipext.example]] for extra coins.
+
+    Newer versions of this app are available elsewhere, but have properietary
+    dependencies.
+
+RepoType: git
+Repo: https://github.com/banasiak/CoinFlip.git
+
+Builds:
+  - versionName: '5.1'
+    versionCode: 25
+    commit: f4d644
+
+  - versionName: '5.2'
+    versionCode: 26
+    commit: 93e1497e40
+
+  - versionName: 5.2.1
+    versionCode: 27
+    commit: 4a154179
+
+  - versionName: 5.3.1
+    versionCode: 29
+    commit: f5d0dfd
+
+  - versionName: 5.3.2
+    versionCode: 30
+    commit: 3de8a3025
+
+  - versionName: '5.4'
+    versionCode: 31
+    disable: missing drawables
+    commit: 5756cefff048fa
+
+  - versionName: 5.4.1
+    versionCode: 32
+    disable: source still incomplete - see https://github.com/banasiak/CoinFlip/issues/3
+    commit: 0e60aa436279
+
+  - versionName: '5.5'
+    versionCode: 33
+    commit: ed98011938e4e
+
+  - versionName: 5.5.1
+    versionCode: 34
+    commit: 12548396fa4c
+
+  - versionName: 5.5.2
+    versionCode: 35
+    commit: 3adf4cf84
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 5.5.2
+CurrentVersionCode: 35
diff --git a/metadata/com.banasiak.coinflipext.example.txt b/metadata/com.banasiak.coinflipext.example.txt
deleted file mode 100644
index 8cb6c6c714..0000000000
--- a/metadata/com.banasiak.coinflipext.example.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/banasiak/CoinFlipExtExample
-Issue Tracker:https://github.com/banasiak/CoinFlipExtExample/issues
-
-Name:Coin Flip Addon
-Auto Name:Coin Flip Example Add-on
-Summary:Extra coins
-Description:
-Get different coins by installing this and choosing one of the new coins in the
-[[com.banasiak.coinflip]] settings.
-
-Use the template on the source code page to create your own coins.
-.
-
-Repo Type:git
-Repo:https://github.com/banasiak/CoinFlipExtExample.git
-
-Build:1.3,4
-    commit=4de70f666f
-    prebuild=mkdir src
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.3
-Current Version Code:4
diff --git a/metadata/com.banasiak.coinflipext.example.yml b/metadata/com.banasiak.coinflipext.example.yml
new file mode 100644
index 0000000000..f3ea19dc04
--- /dev/null
+++ b/metadata/com.banasiak.coinflipext.example.yml
@@ -0,0 +1,28 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://github.com/banasiak/CoinFlipExtExample
+IssueTracker: https://github.com/banasiak/CoinFlipExtExample/issues
+
+Name: Coin Flip Addon
+AutoName: Coin Flip Example Add-on
+Summary: Extra coins
+Description: |-
+    Get different coins by installing this and choosing one of the new coins in the
+    [[com.banasiak.coinflip]] settings.
+
+    Use the template on the source code page to create your own coins.
+
+RepoType: git
+Repo: https://github.com/banasiak/CoinFlipExtExample.git
+
+Builds:
+  - versionName: '1.3'
+    versionCode: 4
+    commit: 4de70f666f
+    prebuild: mkdir src
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '1.3'
+CurrentVersionCode: 4
diff --git a/metadata/com.bec3.diolite.txt b/metadata/com.bec3.diolite.txt
deleted file mode 100644
index 7fafe666a3..0000000000
--- a/metadata/com.bec3.diolite.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Categories:Development
-License:MIT
-Web Site:http://bec3.com
-Source Code:https://framagit.org/bec3/Diolite-android
-Issue Tracker:https://framagit.org/bec3/Diolite-android/issues
-
-Auto Name:DioLite
-Summary:Client for BeC3
-Description:
-This app has been superseded by [[com.bec3.mobilite]].
-
-A client for [https://bec3.com BeC3], an IoT connectivity solution. It aims to
-include Android devices in the IoT network.
-
-SECURITY WARNING: This application uses an insecure HTTP connection to exchange
-login information with the server.
-.
-
-Repo Type:git
-Repo:https://framagit.org/bec3/Diolite-android.git
-
-Build:1.1.2,10102
-    commit=v1.1.2
-    gradle=yes
-
-Build:1.1.3,10103
-    commit=v1.1.3
-    gradle=yes
-    scanignore=cordova/node_modules/*/test
-
-Build:1.1.16,10116
-    disable=old failing build
-    commit=v1.1.16
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.1.18,10118
-    commit=v1.1.18
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.1.22,10122
-    commit=v1.1.22
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.1.25,10125
-    commit=v1.1.25
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Archive Policy:0 versions
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.1.25
-Current Version Code:10125
diff --git a/metadata/com.bec3.diolite.yml b/metadata/com.bec3.diolite.yml
new file mode 100644
index 0000000000..893c0452b6
--- /dev/null
+++ b/metadata/com.bec3.diolite.yml
@@ -0,0 +1,78 @@
+Categories:
+  - Development
+License: MIT
+WebSite: http://bec3.com
+SourceCode: https://framagit.org/bec3/Diolite-android
+IssueTracker: https://framagit.org/bec3/Diolite-android/issues
+
+AutoName: DioLite
+Summary: Client for BeC3
+Description: |-
+    This app has been superseded by [[com.bec3.mobilite]].
+
+    A client for [https://bec3.com BeC3], an IoT connectivity solution. It aims to
+    include Android devices in the IoT network.
+
+    SECURITY WARNING: This application uses an insecure HTTP connection to exchange
+    login information with the server.
+
+RepoType: git
+Repo: https://framagit.org/bec3/Diolite-android.git
+
+Builds:
+  - versionName: 1.1.2
+    versionCode: 10102
+    commit: v1.1.2
+    gradle:
+      - yes
+
+  - versionName: 1.1.3
+    versionCode: 10103
+    commit: v1.1.3
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+
+  - versionName: 1.1.16
+    versionCode: 10116
+    disable: old failing build
+    commit: v1.1.16
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.1.18
+    versionCode: 10118
+    commit: v1.1.18
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.1.22
+    versionCode: 10122
+    commit: v1.1.22
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.1.25
+    versionCode: 10125
+    commit: v1.1.25
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 1.1.25
+CurrentVersionCode: 10125
diff --git a/metadata/com.bec3.mobilite.txt b/metadata/com.bec3.mobilite.txt
deleted file mode 100644
index f9d33449c2..0000000000
--- a/metadata/com.bec3.mobilite.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-Categories:Development
-License:MIT
-Web Site:http://bec3.com
-Source Code:https://framagit.org/bec3/Diolite-android
-Issue Tracker:https://framagit.org/bec3/Diolite-android/issues
-
-Auto Name:DioLite
-Summary:Client for BeC3
-Description:
-A client for [https://bec3.com BeC3], an IoT connectivity solution. It aims to
-include Android devices in the IoT network.
-
-SECURITY WARNING: This application uses an insecure HTTP connection to exchange
-login information with the server.
-.
-
-Repo Type:git
-Repo:https://framagit.org/bec3/Diolite-android.git
-
-Build:1.3.4,10304
-    commit=v1.3.4
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.3.5,10305
-    commit=v1.3.5
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.3.7,10307
-    commit=v1.3.7
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.3.8,10308
-    commit=v1.3.8
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.3.9,10309
-    commit=v1.3.9
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Build:1.3.10,10310
-    commit=v1.3.10
-    gradle=yes
-    scanignore=cordova/node_modules/*/test,assets/www/lib/Ionicons/png
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.3.10
-Current Version Code:10310
diff --git a/metadata/com.bec3.mobilite.yml b/metadata/com.bec3.mobilite.yml
new file mode 100644
index 0000000000..b7458a9154
--- /dev/null
+++ b/metadata/com.bec3.mobilite.yml
@@ -0,0 +1,78 @@
+Categories:
+  - Development
+License: MIT
+WebSite: http://bec3.com
+SourceCode: https://framagit.org/bec3/Diolite-android
+IssueTracker: https://framagit.org/bec3/Diolite-android/issues
+
+AutoName: DioLite
+Summary: Client for BeC3
+Description: |-
+    A client for [https://bec3.com BeC3], an IoT connectivity solution. It aims to
+    include Android devices in the IoT network.
+
+    SECURITY WARNING: This application uses an insecure HTTP connection to exchange
+    login information with the server.
+
+RepoType: git
+Repo: https://framagit.org/bec3/Diolite-android.git
+
+Builds:
+  - versionName: 1.3.4
+    versionCode: 10304
+    commit: v1.3.4
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.3.5
+    versionCode: 10305
+    commit: v1.3.5
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.3.7
+    versionCode: 10307
+    commit: v1.3.7
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.3.8
+    versionCode: 10308
+    commit: v1.3.8
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.3.9
+    versionCode: 10309
+    commit: v1.3.9
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+  - versionName: 1.3.10
+    versionCode: 10310
+    commit: v1.3.10
+    gradle:
+      - yes
+    scanignore:
+      - cordova/node_modules/*/test
+      - assets/www/lib/Ionicons/png
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.3.10
+CurrentVersionCode: 10310
diff --git a/metadata/com.beem.project.beem.txt b/metadata/com.beem.project.beem.txt
deleted file mode 100644
index babb9f241a..0000000000
--- a/metadata/com.beem.project.beem.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:http://www.beem-project.com
-Source Code:http://www.beem-project.com/projects/beem/repository
-Issue Tracker:http://www.beem-project.com/projects/beem/issues
-FlattrID:379457
-
-Auto Name:Beem
-Summary:XMPP Instant Messaging client
-Description:
-Beem is an XMPP (Jabber) client. Supports SASL, Proxy, DNS SRV, and OTR.
-
-It's possible to quickly sign up for an XMPP account on any one of 50-or-so
-servers from within the app itself.
-.
-
-Repo Type:hg
-Repo:http://www.beem-project.com/hg/trunk
-
-Build:0.1.5,7
-    commit=0.1.5
-
-Build:0.1.6,9
-    commit=0.1.6
-
-Build:0.1.7_rc1,10
-    commit=0.1.7_rc1
-    target=android-8
-
-Build:0.1.7_rc2,11
-    commit=0.1.7_rc2
-    target=android-8
-
-Build:0.1.7,12
-    commit=0.1.7
-    target=android-8
-
-Build:0.1.8_rc2,14
-    commit=0.1.8_rc2
-    target=android-16
-
-Build:0.1.8,15
-    commit=0.1.8
-    target=android-16
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:0.1.8
-Current Version Code:15
diff --git a/metadata/com.beem.project.beem.yml b/metadata/com.beem.project.beem.yml
new file mode 100644
index 0000000000..1487b96016
--- /dev/null
+++ b/metadata/com.beem.project.beem.yml
@@ -0,0 +1,57 @@
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+WebSite: http://www.beem-project.com
+SourceCode: http://www.beem-project.com/projects/beem/repository
+IssueTracker: http://www.beem-project.com/projects/beem/issues
+FlattrID: '379457'
+
+AutoName: Beem
+Summary: XMPP Instant Messaging client
+Description: |-
+    Beem is an XMPP (Jabber) client. Supports SASL, Proxy, DNS SRV, and OTR.
+
+    It's possible to quickly sign up for an XMPP account on any one of 50-or-so
+    servers from within the app itself.
+
+RepoType: hg
+Repo: http://www.beem-project.com/hg/trunk
+
+Builds:
+  - versionName: 0.1.5
+    versionCode: 7
+    commit: 0.1.5
+
+  - versionName: 0.1.6
+    versionCode: 9
+    commit: 0.1.6
+
+  - versionName: 0.1.7_rc1
+    versionCode: 10
+    commit: 0.1.7_rc1
+    target: android-8
+
+  - versionName: 0.1.7_rc2
+    versionCode: 11
+    commit: 0.1.7_rc2
+    target: android-8
+
+  - versionName: 0.1.7
+    versionCode: 12
+    commit: 0.1.7
+    target: android-8
+
+  - versionName: 0.1.8_rc2
+    versionCode: 14
+    commit: 0.1.8_rc2
+    target: android-16
+
+  - versionName: 0.1.8
+    versionCode: 15
+    commit: 0.1.8
+    target: android-16
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 0.1.8
+CurrentVersionCode: 15
diff --git a/metadata/com.benny.openlauncher.txt b/metadata/com.benny.openlauncher.txt
deleted file mode 100644
index d0ccd3a023..0000000000
--- a/metadata/com.benny.openlauncher.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/OpenLauncherTeam/openlauncher
-Issue Tracker:
-Changelog:https://github.com/OpenLauncherTeam/openlauncher/blob/HEAD/CHANGELOG.md
-Donate:https://github.com/OpenLauncherTeam/openlauncher/blob/HEAD/README.md#project-team
-LiberapayID:13083
-
-Auto Name:OpenLauncher
-Summary:Launch applications and manage homescreen
-Description:
-Launcher that aims to be a powerful and community driven project.
-
-'''Features:'''
-
-* Paged desktop
-* Double tab to sleep
-* Scroll-able background
-* Paged app drawer
-* Vertical app drawer
-* Search bar
-* Icon packs
-
-Support the project:
-
-* [https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fopenlauncherteam%2Fopenlauncher.git&name=OpenLauncher&mail=gro.xobliam@@rentnasg Translate] using Stringlate
-* [https://gsantner.net/android-contribution-guide/?packageid=com.benny.openlauncher&name=OpenLauncher&web=https://github.com/openlauncherteam/openlauncher Contribution] Guide (gsantner blog)
-.
-
-Repo Type:git
-Repo:https://github.com/OpenLauncherTeam/openlauncher
-
-Build:alpha1-patch1,2
-    disable=old build
-    commit=32d793ccac3380f022feb9019ee63dc381ff6bf2
-    subdir=launcher
-    gradle=yes
-
-Build:alpha1-patch2,3
-    disable=old build
-    commit=c66363c5ed14974d9e416b99ff7106899850ebfc
-    subdir=launcher
-    gradle=yes
-
-Build:alpha1-patch3,4
-    disable=old build
-    commit=13324fc4b9f2133cc6271eb78bb52c0ce781f3e5
-    subdir=launcher
-    gradle=yes
-
-Build:alpha2,5
-    disable=old build
-    commit=a2180dd217b08ca544375ac0c6e650aafa65855a
-    subdir=launcher
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:alpha2_patch1,6
-    disable=old build
-    commit=00b9280dfe483a1c0ec4a604c6dccc96e29e9fac
-    subdir=launcher
-    gradle=yes
-
-Build:alpha2_patch2,7
-    commit=eb5861ed5688d36dd123b3b48da4af14186a6fa9
-    subdir=launcher
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:alpha3,8
-    commit=e794561a0d9fefb34f1cb391eaa7fc50d87565a5
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:0.3.1,9
-    commit=v0.3.1
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.3.2,10
-    disable=old build
-    commit=v0.3.2
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.3.2.1,11
-    disable=old build
-    commit=v0.3.2.1
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.4.0,20
-    commit=v0.4.0
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.0,21
-    commit=v0.5.0
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.1,22
-    commit=v0.5.1
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.2,23
-    commit=v0.5.2
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.3,24
-    commit=v0.5.3
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.5,27
-    commit=v0.5.5
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.8(alpha),30
-    commit=v0.5.8(alpha)
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.10,33
-    commit=v0.5.10
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.5.12,35
-    commit=v0.5.12
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.6.0,36
-    commit=v0.6.0
-    subdir=app
-    gradle=FlavorDefault
-    prebuild=sed -i -e "88 idisable 'ExtraTranslation'" build.gradle
-
-Build:0.6.1,37
-    commit=v0.6.1
-    subdir=app
-    gradle=FlavorDefault
-    prebuild=sed -i -e "82 idisable 'ExtraTranslation'" build.gradle
-
-Maintainer Notes:
-checkupdates currently broken
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.6.1
-Current Version Code:37
diff --git a/metadata/com.benny.openlauncher.yml b/metadata/com.benny.openlauncher.yml
new file mode 100644
index 0000000000..1d57ab55dc
--- /dev/null
+++ b/metadata/com.benny.openlauncher.yml
@@ -0,0 +1,200 @@
+Categories:
+  - System
+License: Apache-2.0
+SourceCode: https://github.com/OpenLauncherTeam/openlauncher
+Changelog: https://github.com/OpenLauncherTeam/openlauncher/blob/HEAD/CHANGELOG.md
+Donate: https://github.com/OpenLauncherTeam/openlauncher/blob/HEAD/README.md#project-team
+LiberapayID: '13083'
+
+AutoName: OpenLauncher
+Summary: Launch applications and manage homescreen
+Description: |-
+    Launcher that aims to be a powerful and community driven project.
+
+    '''Features:'''
+
+    * Paged desktop
+    * Double tab to sleep
+    * Scroll-able background
+    * Paged app drawer
+    * Vertical app drawer
+    * Search bar
+    * Icon packs
+
+    Support the project:
+
+    * [https://lonamiwebs.github.io/stringlate/translate?git=https%3A%2F%2Fgithub.com%2Fopenlauncherteam%2Fopenlauncher.git&name=OpenLauncher&mail=gro.xobliam@@rentnasg Translate] using Stringlate
+    * [https://gsantner.net/android-contribution-guide/?packageid=com.benny.openlauncher&name=OpenLauncher&web=https://github.com/openlauncherteam/openlauncher Contribution] Guide (gsantner blog)
+
+RepoType: git
+Repo: https://github.com/OpenLauncherTeam/openlauncher
+
+Builds:
+  - versionName: alpha1-patch1
+    versionCode: 2
+    disable: old build
+    commit: 32d793ccac3380f022feb9019ee63dc381ff6bf2
+    subdir: launcher
+    gradle:
+      - yes
+
+  - versionName: alpha1-patch2
+    versionCode: 3
+    disable: old build
+    commit: c66363c5ed14974d9e416b99ff7106899850ebfc
+    subdir: launcher
+    gradle:
+      - yes
+
+  - versionName: alpha1-patch3
+    versionCode: 4
+    disable: old build
+    commit: 13324fc4b9f2133cc6271eb78bb52c0ce781f3e5
+    subdir: launcher
+    gradle:
+      - yes
+
+  - versionName: alpha2
+    versionCode: 5
+    disable: old build
+    commit: a2180dd217b08ca544375ac0c6e650aafa65855a
+    subdir: launcher
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: alpha2_patch1
+    versionCode: 6
+    disable: old build
+    commit: 00b9280dfe483a1c0ec4a604c6dccc96e29e9fac
+    subdir: launcher
+    gradle:
+      - yes
+
+  - versionName: alpha2_patch2
+    versionCode: 7
+    commit: eb5861ed5688d36dd123b3b48da4af14186a6fa9
+    subdir: launcher
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: alpha3
+    versionCode: 8
+    commit: e794561a0d9fefb34f1cb391eaa7fc50d87565a5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 0.3.1
+    versionCode: 9
+    commit: v0.3.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.3.2
+    versionCode: 10
+    disable: old build
+    commit: v0.3.2
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.3.2.1
+    versionCode: 11
+    disable: old build
+    commit: v0.3.2.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.4.0
+    versionCode: 20
+    commit: v0.4.0
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.0
+    versionCode: 21
+    commit: v0.5.0
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.1
+    versionCode: 22
+    commit: v0.5.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.2
+    versionCode: 23
+    commit: v0.5.2
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.3
+    versionCode: 24
+    commit: v0.5.3
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.5
+    versionCode: 27
+    commit: v0.5.5
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.8(alpha)
+    versionCode: 30
+    commit: v0.5.8(alpha)
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.10
+    versionCode: 33
+    commit: v0.5.10
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.5.12
+    versionCode: 35
+    commit: v0.5.12
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.6.0
+    versionCode: 36
+    commit: v0.6.0
+    subdir: app
+    gradle:
+      - FlavorDefault
+    prebuild: sed -i -e "88 idisable 'ExtraTranslation'" build.gradle
+
+  - versionName: 0.6.1
+    versionCode: 37
+    commit: v0.6.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+    prebuild: sed -i -e "82 idisable 'ExtraTranslation'" build.gradle
+
+MaintainerNotes: checkupdates currently broken
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.6.1
+CurrentVersionCode: 37