diff --git a/metadata/kiwi.root.an2linuxclient.txt b/metadata/kiwi.root.an2linuxclient.txt
deleted file mode 100644
index 4c3de8f413..0000000000
--- a/metadata/kiwi.root.an2linuxclient.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-Categories:Connectivity
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/rootkiwi/an2linuxclient
-Issue Tracker:https://github.com/rootkiwi/an2linuxclient/issues
-
-Auto Name:AN2Linux
-
-Repo Type:git
-Repo:https://github.com/rootkiwi/an2linuxclient
-
-Build:0.1,1
-    commit=f58b377ea23049a38be84b4bcf821f296a4ff392
-    subdir=app
-    gradle=yes
-
-Build:0.1.1,2
-    commit=d7ca07655aea3a6649beee6ab4feeb3825f0a909
-    subdir=app
-    gradle=yes
-
-Build:0.2.0,3
-    commit=v0.2.0
-    subdir=app
-    gradle=yes
-
-Build:0.3.0,4
-    commit=v0.3.0
-    subdir=app
-    gradle=yes
-
-Build:0.4.0,5
-    commit=v0.4.0
-    subdir=app
-    gradle=yes
-
-Build:0.5.0,6
-    commit=v0.5.0
-    subdir=app
-    gradle=yes
-
-Build:0.5.1,7
-    commit=v0.5.1
-    subdir=app
-    gradle=yes
-
-Build:0.6.0,8
-    commit=v0.6.0
-    subdir=app
-    gradle=yes
-
-Build:0.7.0,9
-    commit=v0.7.0
-    subdir=app
-    gradle=yes
-
-Build:0.8.0,10
-    disable=lintVitalRelease fails
-    commit=v0.8.0
-    subdir=app
-    gradle=yes
-
-Build:0.8.1,11
-    commit=v0.8.1
-    subdir=app
-    gradle=yes
-
-Build:0.9.0,12
-    commit=v0.9.0
-    subdir=app
-    gradle=yes
-
-Build:0.9.2,14
-    commit=v0.9.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.9.2
-Current Version Code:14
diff --git a/metadata/kiwi.root.an2linuxclient.yml b/metadata/kiwi.root.an2linuxclient.yml
new file mode 100644
index 0000000000..eb03e71eb6
--- /dev/null
+++ b/metadata/kiwi.root.an2linuxclient.yml
@@ -0,0 +1,108 @@
+Categories:
+  - Connectivity
+License: GPL-3.0-only
+SourceCode: https://github.com/rootkiwi/an2linuxclient
+IssueTracker: https://github.com/rootkiwi/an2linuxclient/issues
+
+AutoName: AN2Linux
+
+RepoType: git
+Repo: https://github.com/rootkiwi/an2linuxclient
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: f58b377ea23049a38be84b4bcf821f296a4ff392
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.1
+    versionCode: 2
+    commit: d7ca07655aea3a6649beee6ab4feeb3825f0a909
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.0
+    versionCode: 3
+    commit: v0.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.0
+    versionCode: 4
+    commit: v0.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.0
+    versionCode: 5
+    commit: v0.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.0
+    versionCode: 6
+    commit: v0.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.1
+    versionCode: 7
+    commit: v0.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.6.0
+    versionCode: 8
+    commit: v0.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.7.0
+    versionCode: 9
+    commit: v0.7.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.0
+    versionCode: 10
+    disable: lintVitalRelease fails
+    commit: v0.8.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.1
+    versionCode: 11
+    commit: v0.8.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.0
+    versionCode: 12
+    commit: v0.9.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.2
+    versionCode: 14
+    commit: v0.9.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.9.2
+CurrentVersionCode: 14
diff --git a/metadata/kmac.dejavu_fonts.txt b/metadata/kmac.dejavu_fonts.txt
deleted file mode 100644
index 2ea2e9ff52..0000000000
--- a/metadata/kmac.dejavu_fonts.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:Theming
-License:BSD-3-Clause
-Web Site:https://gitlab.com/kmacdeV/cm-dejavu-fonts
-Source Code:https://gitlab.com/kmacdeV/cm-dejavu-fonts/tree/HEAD
-Issue Tracker:https://gitlab.com/kmacdeV/cm-dejavu-fonts/issues
-
-Auto Name:DejaVu Fonts
-Summary:DejaVu Fonts Theme
-Description:
-Simple theme designed for the CyanogenMod theme engine which adds DejaVu Fonts
-(http://dejavu-fonts.org) and nothing more.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/kmacdeV/cm-dejavu-fonts.git
-
-Build:1.0,10
-    commit=92d8ebc45fb7c7eba1ca962250d57deaae8a9b77
-    subdir=theme
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.0
-Current Version Code:10
diff --git a/metadata/kmac.dejavu_fonts.yml b/metadata/kmac.dejavu_fonts.yml
new file mode 100644
index 0000000000..2348accfa9
--- /dev/null
+++ b/metadata/kmac.dejavu_fonts.yml
@@ -0,0 +1,28 @@
+Categories:
+  - Theming
+License: BSD-3-Clause
+WebSite: https://gitlab.com/kmacdeV/cm-dejavu-fonts
+SourceCode: https://gitlab.com/kmacdeV/cm-dejavu-fonts/tree/HEAD
+IssueTracker: https://gitlab.com/kmacdeV/cm-dejavu-fonts/issues
+
+AutoName: DejaVu Fonts
+Summary: DejaVu Fonts Theme
+Description: |-
+    Simple theme designed for the CyanogenMod theme engine which adds DejaVu Fonts
+    (http://dejavu-fonts.org) and nothing more.
+
+RepoType: git
+Repo: https://gitlab.com/kmacdeV/cm-dejavu-fonts.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 10
+    commit: 92d8ebc45fb7c7eba1ca962250d57deaae8a9b77
+    subdir: theme
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.0'
+CurrentVersionCode: 10
diff --git a/metadata/kvj.taskw.txt b/metadata/kvj.taskw.txt
deleted file mode 100644
index 6d21644eed..0000000000
--- a/metadata/kvj.taskw.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Categories:System,Time
-License:MIT
-Author Name:Konstantin Vorobyev
-Web Site:https://bitbucket.org/kvorobyev/taskwarriorandroid
-Source Code:https://bitbucket.org/kvorobyev/taskwarriorandroid/src
-Issue Tracker:https://bitbucket.org/kvorobyev/taskwarriorandroid/issues
-
-Auto Name:Taskwarrior
-Summary:Unofficial version of Taskwarrior - console task management tool
-Description:
-* Project is not affiliated with the authors of Taskwarrior, but original task binary is embedded into Android application
-* Because Android application uses task binary for all manipulations with tasks, in general, you can expect exactly same behaviour with original Taskwarrior
-* Synchronisation with taskd server works! See [https://bitbucket.org/kvorobyev/taskwarriorandroid/wiki/Configuration] for more information
-
-Following task features are implemented already:
-
-* See your tasks using reports
-* Add, edit, start, stop, delete tasks
-* Annotate and de-annotate
-* Run custom search queries
-* Undo your changes
-* Run custom task commands
-* Synchronisation with taskd
-
-Features below are unique to Android version:
-
-* Create shortcuts to reports and new task templates to Home screen
-* Multiple profiles support
-* Auto-syncronisation by configurable intervals
-
-Following features are not implemented at present moment:
-
-* UDAs
-* Dependencies
-
-You can reach developer on Freenode IRC #taskwarrior channel, nickname: kvj
-.
-
-Repo Type:git
-Repo:https://bitbucket.org/kvorobyev/taskwarriorandroid.git
-
-Build:0.1.160305,2
-    commit=0.1.160305
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=cp f-droid.gradle build.gradle && \
-        cd ../cli && \
-        scripts/build/build-emb-all.sh $$NDK$$ && \
-        cp -f android-output/task_* ../app/src/main/res/raw/
-    scanignore=app/src/main/res/raw/task_*,cli/*
-
-Build:0.1.160410,3
-    commit=0.1.160410
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=cp f-droid.gradle build.gradle && \
-        cd ../cli && \
-        scripts/build/build-emb-all.sh $$NDK$$ && \
-        cp -f android-output/task_* ../app/src/main/res/raw/
-    scanignore=app/src/main/res/raw/task_*,cli/*
-
-Maintainer Notes:
-Binary parts source code is distributed under same MIT licence
-and based on original taskwarrior with some patches applied
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.1.160410
-Current Version Code:3
diff --git a/metadata/kvj.taskw.yml b/metadata/kvj.taskw.yml
new file mode 100644
index 0000000000..f92f21ccf2
--- /dev/null
+++ b/metadata/kvj.taskw.yml
@@ -0,0 +1,83 @@
+Categories:
+  - System
+  - Time
+License: MIT
+AuthorName: Konstantin Vorobyev
+WebSite: https://bitbucket.org/kvorobyev/taskwarriorandroid
+SourceCode: https://bitbucket.org/kvorobyev/taskwarriorandroid/src
+IssueTracker: https://bitbucket.org/kvorobyev/taskwarriorandroid/issues
+
+AutoName: Taskwarrior
+Summary: Unofficial version of Taskwarrior - console task management tool
+Description: |-
+    * Project is not affiliated with the authors of Taskwarrior, but original task binary is embedded into Android application
+    * Because Android application uses task binary for all manipulations with tasks, in general, you can expect exactly same behaviour with original Taskwarrior
+    * Synchronisation with taskd server works! See [https://bitbucket.org/kvorobyev/taskwarriorandroid/wiki/Configuration] for more information
+
+    Following task features are implemented already:
+
+    * See your tasks using reports
+    * Add, edit, start, stop, delete tasks
+    * Annotate and de-annotate
+    * Run custom search queries
+    * Undo your changes
+    * Run custom task commands
+    * Synchronisation with taskd
+
+    Features below are unique to Android version:
+
+    * Create shortcuts to reports and new task templates to Home screen
+    * Multiple profiles support
+    * Auto-syncronisation by configurable intervals
+
+    Following features are not implemented at present moment:
+
+    * UDAs
+    * Dependencies
+
+    You can reach developer on Freenode IRC #taskwarrior channel, nickname: kvj
+
+RepoType: git
+Repo: https://bitbucket.org/kvorobyev/taskwarriorandroid.git
+
+Builds:
+  - versionName: 0.1.160305
+    versionCode: 2
+    commit: 0.1.160305
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - cp f-droid.gradle build.gradle
+      - cd ../cli
+      - scripts/build/build-emb-all.sh $$NDK$$
+      - cp -f android-output/task_* ../app/src/main/res/raw/
+    scanignore:
+      - app/src/main/res/raw/task_*
+      - cli/*
+
+  - versionName: 0.1.160410
+    versionCode: 3
+    commit: 0.1.160410
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - cp f-droid.gradle build.gradle
+      - cd ../cli
+      - scripts/build/build-emb-all.sh $$NDK$$
+      - cp -f android-output/task_* ../app/src/main/res/raw/
+    scanignore:
+      - app/src/main/res/raw/task_*
+      - cli/*
+
+MaintainerNotes: |-
+    Binary parts source code is distributed under same MIT licence
+    and based on original taskwarrior with some patches applied
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.1.160410
+CurrentVersionCode: 3
diff --git a/metadata/lanchon.sigspoof.checker.txt b/metadata/lanchon.sigspoof.checker.txt
deleted file mode 100644
index eaf04cc55b..0000000000
--- a/metadata/lanchon.sigspoof.checker.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Categories:System
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/Lanchon/sigspoof-checker
-Issue Tracker:https://github.com/Lanchon/sigspoof-checker/issues
-
-Auto Name:Signature Spoofing Checker
-Summary:Test the signature spoofing capability of your OS
-Description:
-This app tests the signature spoofing capability of your Android OS as required
-by the [https://microg.org/ microG Project]. It attempts to fake its own
-signature and reports whether it succeeds. Simply launch the app to see the
-result of the test. You can find more information about signature spoofing
-[https://github.com/microg/android_packages_apps_GmsCore/wiki/Signature-Spoofing
-here].
-.
-
-Repo Type:git
-Repo:https://github.com/Lanchon/sigspoof-checker
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/lanchon.sigspoof.checker.yml b/metadata/lanchon.sigspoof.checker.yml
new file mode 100644
index 0000000000..474e60b325
--- /dev/null
+++ b/metadata/lanchon.sigspoof.checker.yml
@@ -0,0 +1,38 @@
+Categories:
+  - System
+License: GPL-3.0-or-later
+SourceCode: https://github.com/Lanchon/sigspoof-checker
+IssueTracker: https://github.com/Lanchon/sigspoof-checker/issues
+
+AutoName: Signature Spoofing Checker
+Summary: Test the signature spoofing capability of your OS
+Description: |-
+    This app tests the signature spoofing capability of your Android OS as required
+    by the [https://microg.org/ microG Project]. It attempts to fake its own
+    signature and reports whether it succeeds. Simply launch the app to see the
+    result of the test. You can find more information about signature spoofing
+    [https://github.com/microg/android_packages_apps_GmsCore/wiki/Signature-Spoofing
+    here].
+
+RepoType: git
+Repo: https://github.com/Lanchon/sigspoof-checker
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/libretasks.app.txt b/metadata/libretasks.app.txt
deleted file mode 100644
index d2f7a00576..0000000000
--- a/metadata/libretasks.app.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/biotinker/LibreTasks/
-Issue Tracker:https://github.com/biotinker/LibreTasks/issues
-Changelog:https://github.com/biotinker/LibreTasks/blob/HEAD/CHANGELOG
-Bitcoin:193Xb3sySr2oEMuJC6bqAov444rSyVczW
-Litecoin:LYqzwVn2j2wGMNkXBmRF5T4pV5nFv1aDp3
-
-Auto Name:LibreTasks
-Summary:Trigger actions when certain events happen
-Description:
-A fork of [[edu.nyu.cs.omnidroid.app]], now maintained and with more features.
-LibreTasks will allow you to set up certain triggers, such as plugging in your
-phone or missing a call, and allow you to specify certain actions that are done
-when that trigger occurs, such as sending a SMS or pausing your media.
-.
-
-Repo Type:git
-Repo:https://github.com/biotinker/LibreTasks/
-
-Build:0.3.0,16
-    commit=02e3b976b6f9c468623e35bda5c275a89bc11584
-    subdir=LibreTasks
-
-Build:0.4.0,17
-    commit=release-0.4.0
-    subdir=LibreTasks
-
-Build:0.4.1,20
-    commit=release-0.4.1
-    subdir=LibreTasks
-
-Build:0.5.0,21
-    commit=release-0.5.0
-    subdir=LibreTasks
-
-Build:0.7.1,22
-    commit=release-0.7.1
-    subdir=LibreTasks
-
-Auto Update Mode:Version release-%v
-Update Check Mode:Tags
-Current Version:0.7.1
-Current Version Code:22
diff --git a/metadata/libretasks.app.yml b/metadata/libretasks.app.yml
new file mode 100644
index 0000000000..b683851f04
--- /dev/null
+++ b/metadata/libretasks.app.yml
@@ -0,0 +1,50 @@
+Categories:
+  - System
+License: GPL-3.0-only
+SourceCode: https://github.com/biotinker/LibreTasks/
+IssueTracker: https://github.com/biotinker/LibreTasks/issues
+Changelog: https://github.com/biotinker/LibreTasks/blob/HEAD/CHANGELOG
+Bitcoin: 193Xb3sySr2oEMuJC6bqAov444rSyVczW
+Litecoin: LYqzwVn2j2wGMNkXBmRF5T4pV5nFv1aDp3
+
+AutoName: LibreTasks
+Summary: Trigger actions when certain events happen
+Description: |-
+    A fork of [[edu.nyu.cs.omnidroid.app]], now maintained and with more features.
+    LibreTasks will allow you to set up certain triggers, such as plugging in your
+    phone or missing a call, and allow you to specify certain actions that are done
+    when that trigger occurs, such as sending a SMS or pausing your media.
+
+RepoType: git
+Repo: https://github.com/biotinker/LibreTasks/
+
+Builds:
+  - versionName: 0.3.0
+    versionCode: 16
+    commit: 02e3b976b6f9c468623e35bda5c275a89bc11584
+    subdir: LibreTasks
+
+  - versionName: 0.4.0
+    versionCode: 17
+    commit: release-0.4.0
+    subdir: LibreTasks
+
+  - versionName: 0.4.1
+    versionCode: 20
+    commit: release-0.4.1
+    subdir: LibreTasks
+
+  - versionName: 0.5.0
+    versionCode: 21
+    commit: release-0.5.0
+    subdir: LibreTasks
+
+  - versionName: 0.7.1
+    versionCode: 22
+    commit: release-0.7.1
+    subdir: LibreTasks
+
+AutoUpdateMode: Version release-%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.7.1
+CurrentVersionCode: 22
diff --git a/metadata/link.standen.michael.fatesheets.txt b/metadata/link.standen.michael.fatesheets.txt
deleted file mode 100644
index 0654fad30e..0000000000
--- a/metadata/link.standen.michael.fatesheets.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Categories:Games,Writing
-License:MIT
-Web Site:
-Source Code:https://github.com/ScreamingHawk/fate-sheets
-Issue Tracker:https://github.com/ScreamingHawk/fate-sheets/issues
-
-Auto Name:Fate Sheets
-Summary:Manage your Fate character sheets
-Description:
-Have your character sheets with you whenever inspiration strikes, by keeping
-them in a managed format on your mobile. No longer do you need to carry stacks
-of paper with you to a game. With this simple application you can edit your
-characters and track stress and consequences on the fly.
-
-Features
-
-* Add an unlimited number of characters
-* Flexibility to add any number of skills, aspects, stress or consequences
-* Designed with small screens in mind, but fully scalable to tablets
-.
-
-Repo Type:git
-Repo:https://github.com/ScreamingHawk/fate-sheets
-
-Build:0.1,1
-    commit=v0.1
-    subdir=app
-    gradle=yes
-
-Build:0.2,2
-    commit=v0.2
-    subdir=app
-    gradle=yes
-
-Build:0.4,4
-    commit=v0.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
-
-Build:0.5,5
-    commit=v0.5
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
-
-Build:1.0,6
-    commit=v1.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
-
-Build:1.1,7
-    commit=v1.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
-
-Build:1.2,8
-    commit=v1.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
-
-Maintainer Notes:
-On buildtools: https://github.com/ScreamingHawk/fate-sheets/issues/19
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2
-Current Version Code:8
diff --git a/metadata/link.standen.michael.fatesheets.yml b/metadata/link.standen.michael.fatesheets.yml
new file mode 100644
index 0000000000..bc8d53a624
--- /dev/null
+++ b/metadata/link.standen.michael.fatesheets.yml
@@ -0,0 +1,85 @@
+Categories:
+  - Games
+  - Writing
+License: MIT
+SourceCode: https://github.com/ScreamingHawk/fate-sheets
+IssueTracker: https://github.com/ScreamingHawk/fate-sheets/issues
+
+AutoName: Fate Sheets
+Summary: Manage your Fate character sheets
+Description: |-
+    Have your character sheets with you whenever inspiration strikes, by keeping
+    them in a managed format on your mobile. No longer do you need to carry stacks
+    of paper with you to a game. With this simple application you can edit your
+    characters and track stress and consequences on the fly.
+
+    Features
+
+    * Add an unlimited number of characters
+    * Flexibility to add any number of skills, aspects, stress or consequences
+    * Designed with small screens in mind, but fully scalable to tablets
+
+RepoType: git
+Repo: https://github.com/ScreamingHawk/fate-sheets
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: v0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.2'
+    versionCode: 2
+    commit: v0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 4
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
+
+  - versionName: '0.5'
+    versionCode: 5
+    commit: v0.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
+
+  - versionName: '1.0'
+    versionCode: 6
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
+
+  - versionName: '1.1'
+    versionCode: 7
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
+
+  - versionName: '1.2'
+    versionCode: 8
+    commit: v1.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/buildToolsVersion/s/26-rc1/25.0.2/g' build.gradle
+
+MaintainerNotes: 'On buildtools: https://github.com/ScreamingHawk/fate-sheets/issues/19'
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.2'
+CurrentVersionCode: 8
diff --git a/metadata/link.standen.michael.phonesaver.txt b/metadata/link.standen.michael.phonesaver.txt
deleted file mode 100644
index f78fd516bd..0000000000
--- a/metadata/link.standen.michael.phonesaver.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-Categories:System
-License:MIT
-Web Site:
-Source Code:https://github.com/ScreamingHawk/phone-saver
-Issue Tracker:https://github.com/ScreamingHawk/phone-saver/issues
-
-Auto Name:Phone Saver
-Summary:Save files via Share menu
-Description:
-Ever hit that share button and really wanted to just store the file on your
-phone? That meme that you send to your friends that would be great in your
-reaction image folder. That screenshot of that Snapchat that you want to hide in
-a secret folder.
-
-Well look no further!
-
-Set up any number of locations on your mobile, and save to them with a single
-click when using Android's share feature.
-.
-
-Repo Type:git
-Repo:https://github.com/ScreamingHawk/phone-saver
-
-Build:1.3,4
-    disable=gradle4.0, maven.google.com
-    commit=v1.3
-    subdir=app
-    gradle=yes
-
-Build:1.6,7
-    commit=v1.6
-    subdir=app
-    gradle=yes
-
-Build:1.7,8
-    commit=v1.7
-    subdir=app
-    gradle=yes
-
-Build:1.8,9
-    commit=v1.8
-    subdir=app
-    gradle=yes
-
-Build:2.0,11
-    commit=v2.0
-    subdir=app
-    gradle=yes
-
-Build:2.2,13
-    commit=v2.2
-    subdir=app
-    gradle=yes
-
-Build:2.4,15
-    commit=v2.4
-    subdir=app
-    gradle=yes
-
-Build:2.5,16
-    commit=v2.5
-    subdir=app
-    gradle=yes
-
-Build:3.0,17
-    commit=v3.0
-    subdir=app
-    gradle=yes
-
-Build:3.2,19
-    commit=v3.2
-    subdir=app
-    gradle=yes
-
-Build:3.4,21
-    commit=v3.4
-    subdir=app
-    gradle=yes
-
-Build:3.5,22
-    commit=v3.5
-    subdir=app
-    gradle=yes
-
-Build:3.7,24
-    commit=v3.7
-    subdir=app
-    gradle=yes
-
-Build:4.0.1,28
-    commit=v4.0.1
-    subdir=app
-    gradle=yes
-
-Build:4.0.2,29
-    commit=v4.0.2
-    subdir=app
-    gradle=yes
-
-Build:4.0.3,30
-    commit=v4.0.3
-    subdir=app
-    gradle=yes
-
-Build:4.1.0,31
-    commit=v4.1.0
-    subdir=app
-    gradle=yes
-
-Build:4.1.1,32
-    commit=v4.1.1
-    subdir=app
-    gradle=yes
-
-Build:5.0.0,33
-    commit=v5.0.0
-    subdir=app
-    gradle=yes
-
-Build:5.1.0,34
-    commit=v5.1.0
-    subdir=app
-    gradle=yes
-
-Build:5.1.1,35
-    commit=v5.1.1
-    subdir=app
-    gradle=yes
-
-Build:5.2.0,36
-    commit=v5.2.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:5.2.0
-Current Version Code:36
diff --git a/metadata/link.standen.michael.phonesaver.yml b/metadata/link.standen.michael.phonesaver.yml
new file mode 100644
index 0000000000..185db76370
--- /dev/null
+++ b/metadata/link.standen.michael.phonesaver.yml
@@ -0,0 +1,183 @@
+Categories:
+  - System
+License: MIT
+SourceCode: https://github.com/ScreamingHawk/phone-saver
+IssueTracker: https://github.com/ScreamingHawk/phone-saver/issues
+Donate: https://beerpay.io/ScreamingHawk/phone-saver
+
+AutoName: Phone Saver
+Summary: Save files via Share menu
+Description: |-
+    Ever hit that share button and really wanted to just store the file on your
+    phone? That meme that you send to your friends that would be great in your
+    reaction image folder. That screenshot of that Snapchat that you want to hide in
+    a secret folder.
+
+    Well look no further!
+
+    Set up any number of locations on your mobile, and save to them with a single
+    click when using Android’s share feature.
+
+RepoType: git
+Repo: https://github.com/ScreamingHawk/phone-saver
+
+Builds:
+  - versionName: '1.3'
+    versionCode: 4
+    disable: gradle4.0, maven.google.com
+    commit: v1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 7
+    commit: v1.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 8
+    commit: v1.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 9
+    commit: v1.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 11
+    commit: v2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.2'
+    versionCode: 13
+    commit: v2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.4'
+    versionCode: 15
+    commit: v2.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.5'
+    versionCode: 16
+    commit: v2.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.0'
+    versionCode: 17
+    commit: v3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.2'
+    versionCode: 19
+    commit: v3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.4'
+    versionCode: 21
+    commit: v3.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.5'
+    versionCode: 22
+    commit: v3.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.7'
+    versionCode: 24
+    commit: v3.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.1
+    versionCode: 28
+    commit: v4.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.2
+    versionCode: 29
+    commit: v4.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.3
+    versionCode: 30
+    commit: v4.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.0
+    versionCode: 31
+    commit: v4.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.1
+    versionCode: 32
+    commit: v4.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.0
+    versionCode: 33
+    commit: v5.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.0
+    versionCode: 34
+    commit: v5.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.1
+    versionCode: 35
+    commit: v5.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.2.0
+    versionCode: 36
+    commit: v5.2.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 5.2.0
+CurrentVersionCode: 36
diff --git a/metadata/link.standen.michael.slideshow.txt b/metadata/link.standen.michael.slideshow.txt
deleted file mode 100644
index c60f6d7f3e..0000000000
--- a/metadata/link.standen.michael.slideshow.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-Categories:Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/ScreamingHawk/android-slideshow
-Issue Tracker:https://github.com/ScreamingHawk/android-slideshow/issues
-
-Auto Name:Slideshow
-Summary:View a slideshow of your images
-Description:
-Slideshow is a simple way to view your favourite photos with ease. Navigate
-through your files and start a slideshow with a single tap.
-
-Share with your friends and family your favourite memories and everything in
-between too.
-
-'''Features:'''
-
-* Select any directory on your phone
-* Automatically begins playing slideshow
-* Ability to delete images from within the slideshow
-* Sequential or random display order
-* Configurable delay
-* Show / hide hidden files
-* Check the settings for hidden features. Seriously, there's a ton of stuff in there
-
-'''Un-Features:'''
-
-* No sign up
-* No internet connection
-* No requests to rate the app
-* No trail periods
-* No paid upgrades
-.
-
-Repo Type:git
-Repo:https://github.com/ScreamingHawk/android-slideshow
-
-Build:1.0,3
-    commit=93246ff9d1ed7af22728b53bd2d24c565254e367
-    subdir=app
-    gradle=yes
-
-Build:1.0,4
-    commit=1be4176ecec4101074bea5580f296733bf98a8e1
-    subdir=app
-    gradle=yes
-
-Build:1.1.1,8
-    commit=0c43fd4fc9011f4c0ef02f0d67b15ecb8e77f000
-    subdir=app
-    gradle=yes
-
-Build:1.1.3,10
-    commit=f264f18cc04a4d04808becd8b9c759b966705dd3
-    subdir=app
-    gradle=yes
-
-Build:1.1.5,12
-    commit=d1edb3e63f404af730ffb17b018a83d6a926ae4e
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:1.2.2,15
-    commit=a0848816b7543a6029b21454a219ee2a88dc61f6
-    subdir=app
-    gradle=yes
-
-Build:1.2.4,17
-    commit=b62d0cc6a1f552ba8444176e585a06c5ab94cc45
-    subdir=app
-    gradle=yes
-
-Build:1.3.0,18
-    commit=74e360129cc915d5d4d4e10c8c2b7ad8236cf3b5
-    subdir=app
-    gradle=yes
-
-Build:1.3.1,19
-    commit=66542c6f4e7e3c9bf535b3b2fbe91a599249ad12
-    subdir=app
-    gradle=yes
-
-Build:1.3.4,22
-    commit=86d1058b93260add2e802985fb0627cb05a0cef5
-    subdir=app
-    gradle=yes
-
-Build:1.5.2,27
-    commit=844fd35e2a8839a36f666993593016c8baebcbd0
-    subdir=app
-    gradle=yes
-
-Build:2.1.0,37
-    commit=v2.1.0
-    subdir=app
-    gradle=yes
-
-Build:2.2.0,38
-    commit=v2.2.0
-    subdir=app
-    gradle=yes
-
-Build:2.2.1,39
-    disable=Could not find com.android.tools.build:gradle:3.0.0
-    commit=v2.2.1
-    subdir=app
-    gradle=yes
-
-Build:2.3.0,40
-    disable=Could not find com.android.tools.build:gradle:3.0.1
-    commit=v2.3.0
-    subdir=app
-    gradle=yes
-
-Build:2.4.0,41
-    disable=Could not find com.android.tools.build:gradle:3.0.1
-    commit=v2.4.0
-    subdir=app
-    gradle=yes
-
-Build:2.5.0,42
-    commit=v2.5.0
-    subdir=app
-    gradle=yes
-
-Build:2.5.1,43
-    commit=v2.5.1
-    subdir=app
-    gradle=yes
-
-Build:2.5.3,45
-    commit=v2.5.3
-    subdir=app
-    gradle=yes
-
-Build:2.5.4,46
-    commit=v2.5.4
-    subdir=app
-    gradle=yes
-
-Build:2.6.0,47
-    commit=v2.6.0
-    subdir=app
-    gradle=yes
-
-Build:2.7.0,48
-    commit=v2.7.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.7.0
-Current Version Code:48
diff --git a/metadata/link.standen.michael.slideshow.yml b/metadata/link.standen.michael.slideshow.yml
new file mode 100644
index 0000000000..2a4fbc8674
--- /dev/null
+++ b/metadata/link.standen.michael.slideshow.yml
@@ -0,0 +1,201 @@
+Categories:
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/ScreamingHawk/android-slideshow
+IssueTracker: https://github.com/ScreamingHawk/android-slideshow/issues
+Donate: https://beerpay.io/ScreamingHawk/android-slideshow
+
+AutoName: Slideshow
+Summary: View a slideshow of your images
+Description: |-
+    Slideshow is a simple way to view your favourite photos with ease. Navigate
+    through your files and start a slideshow with a single tap.
+
+    Share with your friends and family your favourite memories and everything in
+    between too.
+
+    '''Features:'''
+
+    * Select any directory on your phone
+    * Automatically begins playing slideshow
+    * Ability to delete images from within the slideshow
+    * Sequential or random display order
+    * Configurable delay
+    * Show / hide hidden files
+    * Check the settings for hidden features. Seriously, there’s a ton of stuff in there
+
+    '''Un-Features:'''
+
+    * No sign up
+    * No internet connection
+    * No requests to rate the app
+    * No trail periods
+    * No paid upgrades
+
+RepoType: git
+Repo: https://github.com/ScreamingHawk/android-slideshow
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 3
+    commit: 93246ff9d1ed7af22728b53bd2d24c565254e367
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 4
+    commit: 1be4176ecec4101074bea5580f296733bf98a8e1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.1
+    versionCode: 8
+    commit: 0c43fd4fc9011f4c0ef02f0d67b15ecb8e77f000
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.3
+    versionCode: 10
+    commit: f264f18cc04a4d04808becd8b9c759b966705dd3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.5
+    versionCode: 12
+    commit: d1edb3e63f404af730ffb17b018a83d6a926ae4e
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 1.2.2
+    versionCode: 15
+    commit: a0848816b7543a6029b21454a219ee2a88dc61f6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.4
+    versionCode: 17
+    commit: b62d0cc6a1f552ba8444176e585a06c5ab94cc45
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 18
+    commit: 74e360129cc915d5d4d4e10c8c2b7ad8236cf3b5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.1
+    versionCode: 19
+    commit: 66542c6f4e7e3c9bf535b3b2fbe91a599249ad12
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.4
+    versionCode: 22
+    commit: 86d1058b93260add2e802985fb0627cb05a0cef5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 27
+    commit: 844fd35e2a8839a36f666993593016c8baebcbd0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.0
+    versionCode: 37
+    commit: v2.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 38
+    commit: v2.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.1
+    versionCode: 39
+    disable: Could not find com.android.tools.build:gradle:3.0.0
+    commit: v2.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.0
+    versionCode: 40
+    disable: Could not find com.android.tools.build:gradle:3.0.1
+    commit: v2.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.0
+    versionCode: 41
+    disable: Could not find com.android.tools.build:gradle:3.0.1
+    commit: v2.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.0
+    versionCode: 42
+    commit: v2.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.1
+    versionCode: 43
+    commit: v2.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.3
+    versionCode: 45
+    commit: v2.5.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.4
+    versionCode: 46
+    commit: v2.5.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.6.0
+    versionCode: 47
+    commit: v2.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.0
+    versionCode: 48
+    commit: v2.7.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 2.7.0
+CurrentVersionCode: 48
diff --git a/metadata/name.livitski.games.puzzle.android.txt b/metadata/name.livitski.games.puzzle.android.txt
deleted file mode 100644
index e659f145e9..0000000000
--- a/metadata/name.livitski.games.puzzle.android.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Games
-License:GPL-3.0-or-later
-Web Site:http://www.livitski.com/projects/n-puzzle.html
-Source Code:https://github.com/StanLivitski/n-puzzle
-Issue Tracker:
-
-Auto Name:n-Puzzle
-Summary:Classic puzzle game with custom images
-Description:
-n-Puzzle app is a classic sliding puzzle game based on the Fifteen Puzzle. It
-allows you to choose among three levels of complexity: 3×3 (8-puzzle), 4×4
-(15-puzzle), and 5×5 (24-puzzle), hence the name.
-
-In addition to standard square boards with numbers, you can choose a board with
-a picture painted on it. There are three stock pictures installed with the
-puzzle, and you can add your own pictures by pressing Menu button when the
-picture selection page is displayed. The picture you select will be split into
-equal tiles.
-.
-
-Repo Type:git
-Repo:https://github.com/StanLivitski/n-puzzle.git
-
-Build:1.1,2
-    commit=v-1.1-2
-    target=android-18
-
-Auto Update Mode:Version v-%v-%c
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/name.livitski.games.puzzle.android.yml b/metadata/name.livitski.games.puzzle.android.yml
new file mode 100644
index 0000000000..515aa27f25
--- /dev/null
+++ b/metadata/name.livitski.games.puzzle.android.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Games
+License: GPL-3.0-or-later
+WebSite: http://www.livitski.com/projects/n-puzzle.html
+SourceCode: https://github.com/StanLivitski/n-puzzle
+
+AutoName: n-Puzzle
+Summary: Classic puzzle game with custom images
+Description: |-
+    n-Puzzle app is a classic sliding puzzle game based on the Fifteen Puzzle. It
+    allows you to choose among three levels of complexity: 3×3 (8-puzzle), 4×4
+    (15-puzzle), and 5×5 (24-puzzle), hence the name.
+
+    In addition to standard square boards with numbers, you can choose a board with
+    a picture painted on it. There are three stock pictures installed with the
+    puzzle, and you can add your own pictures by pressing Menu button when the
+    picture selection page is displayed. The picture you select will be split into
+    equal tiles.
+
+RepoType: git
+Repo: https://github.com/StanLivitski/n-puzzle.git
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v-1.1-2
+    target: android-18
+
+AutoUpdateMode: Version v-%v-%c
+UpdateCheckMode: Tags
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/name.myigel.fahrplan.eh17.txt b/metadata/name.myigel.fahrplan.eh17.txt
deleted file mode 100644
index c0bf72edab..0000000000
--- a/metadata/name.myigel.fahrplan.eh17.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Categories:Time
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/MyIgel/EH17Fahrplan
-Issue Tracker:https://github.com/MyIgel/EH17Fahrplan/issues
-
-Auto Name:EH17 FahrPlan
-Summary:Schedule (aka Fahrplan) of the EH17
-Description:
-Conference app for the EH17 (EasterHegg 2017)
-.
-
-Repo Type:git
-Repo:https://github.com/MyIgel/EH17Fahrplan.git
-
-Build:1.33.15,53
-    commit=1.33.15
-    subdir=app
-    gradle=ccceh17
-    prebuild=sed -i '/android-sdk-manager/d' build.gradle
-
-Build:1.33.16,54
-    commit=1.33.16
-    subdir=app
-    gradle=ccceh17
-    prebuild=sed -i '/android-sdk-manager/d' build.gradle
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.33.16
-Current Version Code:54
diff --git a/metadata/name.myigel.fahrplan.eh17.yml b/metadata/name.myigel.fahrplan.eh17.yml
new file mode 100644
index 0000000000..8cd6b2eba1
--- /dev/null
+++ b/metadata/name.myigel.fahrplan.eh17.yml
@@ -0,0 +1,35 @@
+Categories:
+  - Time
+License: Apache-2.0
+SourceCode: https://github.com/MyIgel/EH17Fahrplan
+IssueTracker: https://github.com/MyIgel/EH17Fahrplan/issues
+
+AutoName: EH17 FahrPlan
+Summary: Schedule (aka Fahrplan) of the EH17
+Description: Conference app for the EH17 (EasterHegg 2017)
+
+RepoType: git
+Repo: https://github.com/MyIgel/EH17Fahrplan.git
+
+Builds:
+  - versionName: 1.33.15
+    versionCode: 53
+    commit: 1.33.15
+    subdir: app
+    gradle:
+      - ccceh17
+    prebuild: sed -i '/android-sdk-manager/d' build.gradle
+
+  - versionName: 1.33.16
+    versionCode: 54
+    commit: 1.33.16
+    subdir: app
+    gradle:
+      - ccceh17
+    prebuild: sed -i '/android-sdk-manager/d' build.gradle
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.33.16
+CurrentVersionCode: 54