diff --git a/metadata/io.github.mthli.Ninja.txt b/metadata/io.github.mthli.Ninja.txt
deleted file mode 100644
index 4b4c52f6db..0000000000
--- a/metadata/io.github.mthli.Ninja.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Categories:Internet
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/mthli/Ninja
-Issue Tracker:https://github.com/mthli/Ninja/issues
-Changelog:https://github.com/mthli/Ninja/releases
-
-Auto Name:Ninja
-Summary:Open links from other apps in the background
-Description:
-Browser based on WebView. It allows you to open links in other apps without
-switching to the browser app (and thus minimizing the currently used one).
-.
-
-Repo Type:git
-Repo:https://github.com/mthli/Ninja
-
-Build:1.3.2,24
-    commit=v1.3.2
-    subdir=Ninja
-    prebuild=echo -e 'java.source=1.7\njava.target=1.7' > ant.properties && \
-        touch proguard.cfg
-
-Build:1.3.4,26
-    commit=v1.3.4
-    subdir=Ninja
-    prebuild=echo -e 'java.source=1.7\njava.target=1.7' > ant.properties && \
-        touch proguard.cfg
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.3.4
-Current Version Code:26
diff --git a/metadata/io.github.mthli.Ninja.yml b/metadata/io.github.mthli.Ninja.yml
new file mode 100644
index 0000000000..c3554d855f
--- /dev/null
+++ b/metadata/io.github.mthli.Ninja.yml
@@ -0,0 +1,37 @@
+Categories:
+  - Internet
+License: Apache-2.0
+SourceCode: https://github.com/mthli/Ninja
+IssueTracker: https://github.com/mthli/Ninja/issues
+Changelog: https://github.com/mthli/Ninja/releases
+
+AutoName: Ninja
+Summary: Open links from other apps in the background
+Description: |-
+    Browser based on WebView. It allows you to open links in other apps without
+    switching to the browser app (and thus minimizing the currently used one).
+
+RepoType: git
+Repo: https://github.com/mthli/Ninja
+
+Builds:
+  - versionName: 1.3.2
+    versionCode: 24
+    commit: v1.3.2
+    subdir: Ninja
+    prebuild:
+      - echo -e 'java.source=1.7\njava.target=1.7' > ant.properties
+      - touch proguard.cfg
+
+  - versionName: 1.3.4
+    versionCode: 26
+    commit: v1.3.4
+    subdir: Ninja
+    prebuild:
+      - echo -e 'java.source=1.7\njava.target=1.7' > ant.properties
+      - touch proguard.cfg
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.3.4
+CurrentVersionCode: 26
diff --git a/metadata/io.github.phora.aeondroid.txt b/metadata/io.github.phora.aeondroid.txt
deleted file mode 100644
index 220c2753d3..0000000000
--- a/metadata/io.github.phora.aeondroid.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/phora/AeonDroid
-Issue Tracker:https://github.com/phora/AeonDroid/issues
-
-Auto Name:AeonDroid
-Summary:Planetary hours and astrological transit app
-Description:
-Planetary hours and astrological transit app. Also keeps track of Void of Course
-moons and moon phases.
-.
-
-Repo Type:git
-Repo:https://github.com/phora/AeonDroid
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.1,2
-    commit=1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,3
-    commit=1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.0.3,4
-    commit=1.0.3
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags ^[0-9\.]+$
-Current Version:1.0.3
-Current Version Code:4
diff --git a/metadata/io.github.phora.aeondroid.yml b/metadata/io.github.phora.aeondroid.yml
new file mode 100644
index 0000000000..2626179ebd
--- /dev/null
+++ b/metadata/io.github.phora.aeondroid.yml
@@ -0,0 +1,48 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+SourceCode: https://github.com/phora/AeonDroid
+IssueTracker: https://github.com/phora/AeonDroid/issues
+
+AutoName: AeonDroid
+Summary: Planetary hours and astrological transit app
+Description: |-
+    Planetary hours and astrological transit app. Also keeps track of Void of Course
+    moons and moon phases.
+
+RepoType: git
+Repo: https://github.com/phora/AeonDroid
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: 1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 4
+    commit: 1.0.3
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags ^[0-9\.]+$
+CurrentVersion: 1.0.3
+CurrentVersionCode: 4
diff --git a/metadata/io.github.phora.androptpb.txt b/metadata/io.github.phora.androptpb.txt
deleted file mode 100644
index 7d409d59de..0000000000
--- a/metadata/io.github.phora.androptpb.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/phora/AndroPTPB
-Issue Tracker:https://github.com/phora/AndroPTPB/issues
-
-Auto Name:AndroPTPB
-Summary:Post snippets and files with the ptpb service
-Description:
-Client for the pastebin service located at ptpb.pw. Lets you quickly upload code
-snippets and small binary files. Also can replace the contents of pastes you've
-uploaded earlier if you need to and can edit mimetype/highlighting hints for
-your pastes.
-.
-
-Repo Type:git
-Repo:https://github.com/phora/AndroPTPB
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=1.1
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-https://ptpb.pw is permanantly closed since March 10, 2019.
-.
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags ^[0-9\.]+$
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/io.github.phora.androptpb.yml b/metadata/io.github.phora.androptpb.yml
new file mode 100644
index 0000000000..a5fd9ddd38
--- /dev/null
+++ b/metadata/io.github.phora.androptpb.yml
@@ -0,0 +1,39 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/phora/AndroPTPB
+IssueTracker: https://github.com/phora/AndroPTPB/issues
+
+AutoName: AndroPTPB
+Summary: Post snippets and files with the ptpb service
+Description: |-
+    Client for the pastebin service located at ptpb.pw. Lets you quickly upload code
+    snippets and small binary files. Also can replace the contents of pastes you've
+    uploaded earlier if you need to and can edit mimetype/highlighting hints for
+    your pastes.
+
+RepoType: git
+Repo: https://github.com/phora/AndroPTPB
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: '1.1'
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: https://ptpb.pw is permanantly closed since March 10, 2019.
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags ^[0-9\.]+$
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/io.github.powerinside.scrollsocket.txt b/metadata/io.github.powerinside.scrollsocket.txt
deleted file mode 100644
index ae54a1f672..0000000000
--- a/metadata/io.github.powerinside.scrollsocket.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Categories:Connectivity
-License:MIT
-Author Name:Mohammed Irfan
-Web Site:http://powerinside.github.io/ScrollSocket/
-Source Code:https://github.com/mo3rfan/ScrollSocket
-Issue Tracker:https://github.com/mo3rfan/ScrollSocket/issues
-Donate:http://powerinside.github.io/ScrollSocket/donate
-FlattrID:7e9ba74ef32f6581ca63260607917324
-Bitcoin:16E1hn96zg9h16VCrxSG6p7b72vyNh64ft
-
-Auto Name:ScrollSocket
-Summary:Scroll wirelessly using touchscreen
-Description:
-ScrollSocket sends mouse wheel events to the computer as you move your finger
-over the android touchscreen. Requires a small driver to be running on the
-computer.  See [http://powerinside.github.io/ScrollSocket/ website] for more
-details on building the driver from source.
-
-* Currently supports only linux with uinput kernel module.
-* Horizontal scrolling not yet added.
-
-This is a fork of the much awesome [[at.bitfire.gfxtablet]] app.
-.
-
-Repo Type:git
-Repo:https://github.com/mo3rfan/ScrollSocket
-
-Build:1.0,1
-    commit=1.0
-    subdir=app-android/app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/io.github.powerinside.scrollsocket.yml b/metadata/io.github.powerinside.scrollsocket.yml
new file mode 100644
index 0000000000..d326b3d132
--- /dev/null
+++ b/metadata/io.github.powerinside.scrollsocket.yml
@@ -0,0 +1,39 @@
+Categories:
+  - Connectivity
+License: MIT
+AuthorName: Mohammed Irfan
+WebSite: http://powerinside.github.io/ScrollSocket/
+SourceCode: https://github.com/mo3rfan/ScrollSocket
+IssueTracker: https://github.com/mo3rfan/ScrollSocket/issues
+Donate: http://powerinside.github.io/ScrollSocket/donate
+FlattrID: 7e9ba74ef32f6581ca63260607917324
+Bitcoin: 16E1hn96zg9h16VCrxSG6p7b72vyNh64ft
+
+AutoName: ScrollSocket
+Summary: Scroll wirelessly using touchscreen
+Description: |-
+    ScrollSocket sends mouse wheel events to the computer as you move your finger
+    over the android touchscreen. Requires a small driver to be running on the
+    computer.  See [http://powerinside.github.io/ScrollSocket/ website] for more
+    details on building the driver from source.
+
+    * Currently supports only linux with uinput kernel module.
+    * Horizontal scrolling not yet added.
+
+    This is a fork of the much awesome [[at.bitfire.gfxtablet]] app.
+
+RepoType: git
+Repo: https://github.com/mo3rfan/ScrollSocket
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: app-android/app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
diff --git a/metadata/io.github.powerinside.syncplay.txt b/metadata/io.github.powerinside.syncplay.txt
deleted file mode 100644
index 216e77b240..0000000000
--- a/metadata/io.github.powerinside.syncplay.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Categories:Connectivity
-License:Apache-2.0
-Author Name:Mohammed Irfan
-Web Site:
-Source Code:https://github.com/mo3rfan/syncplayer
-Issue Tracker:https://github.com/mo3rfan/syncplayer/issues
-Bitcoin:16E1hn96zg9h16VCrxSG6p7b72vyNh64ft
-Litecoin:LQ88aMidLv4bkgLZ8ExZPYtMDrFbkwJL97
-
-Auto Name:SyncPlayer
-Summary:Unofficial syncplay client
-Description:
-SyncPlayer is an unofficial client that implements the syncplay protocol. It
-connects to Syncplay servers to sync video playback between two or more users.
-Use it to watch videos with your friends online. Just add a server, pick a video
-and make sure your friends join the same server and room.
-
-Please note: SyncPlayer does not stream or transmit the video data in any way
-whatsoever. It only synchronizes video playback between users.
-
-Syncplay clients are also available for Windows and Linux.
-.
-
-Repo Type:git
-Repo:https://github.com/mo3rfan/syncplayer
-
-Build:1.6.2,16
-    commit=1.6.2
-    subdir=app
-    submodules=yes
-    gradle=prod
-    prebuild=sed -i -e 's/com.android.support.constraint:constraint-layout:1.0.0-beta4/com.android.support.constraint:constraint-layout:1.0.2/g' build.gradle
-
-Build:1.6.3,17
-    disable=uses pre-release gradle 
-    commit=1.6.3
-    subdir=app
-    submodules=yes
-    gradle=prod
-    prebuild=sed -i -e 's/com.android.support.constraint:constraint-layout:1.0.0-beta4/com.android.support.constraint:constraint-layout:1.0.2/g' build.gradle
-
-Build:1.6.4,18
-    commit=1.6.4
-    subdir=app
-    submodules=yes
-    gradle=prod
-    prebuild=sed -i -e 's/com.android.support.constraint:constraint-layout:1.0.0-beta4/com.android.support.constraint:constraint-layout:1.0.2/g' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.6.4
-Current Version Code:18
diff --git a/metadata/io.github.powerinside.syncplay.yml b/metadata/io.github.powerinside.syncplay.yml
new file mode 100644
index 0000000000..ef8364c77a
--- /dev/null
+++ b/metadata/io.github.powerinside.syncplay.yml
@@ -0,0 +1,61 @@
+Categories:
+  - Connectivity
+License: Apache-2.0
+AuthorName: Mohammed Irfan
+SourceCode: https://github.com/mo3rfan/syncplayer
+IssueTracker: https://github.com/mo3rfan/syncplayer/issues
+Bitcoin: 16E1hn96zg9h16VCrxSG6p7b72vyNh64ft
+Litecoin: LQ88aMidLv4bkgLZ8ExZPYtMDrFbkwJL97
+
+AutoName: SyncPlayer
+Summary: Unofficial syncplay client
+Description: |-
+    SyncPlayer is an unofficial client that implements the syncplay protocol. It
+    connects to Syncplay servers to sync video playback between two or more users.
+    Use it to watch videos with your friends online. Just add a server, pick a video
+    and make sure your friends join the same server and room.
+
+    Please note: SyncPlayer does not stream or transmit the video data in any way
+    whatsoever. It only synchronizes video playback between users.
+
+    Syncplay clients are also available for Windows and Linux.
+
+RepoType: git
+Repo: https://github.com/mo3rfan/syncplayer
+
+Builds:
+  - versionName: 1.6.2
+    versionCode: 16
+    commit: 1.6.2
+    subdir: app
+    submodules: true
+    gradle:
+      - prod
+    prebuild: sed -i -e 's/com.android.support.constraint:constraint-layout:1.0.0-beta4/com.android.support.constraint:constraint-layout:1.0.2/g'
+        build.gradle
+
+  - versionName: 1.6.3
+    versionCode: 17
+    disable: 'uses pre-release gradle '
+    commit: 1.6.3
+    subdir: app
+    submodules: true
+    gradle:
+      - prod
+    prebuild: sed -i -e 's/com.android.support.constraint:constraint-layout:1.0.0-beta4/com.android.support.constraint:constraint-layout:1.0.2/g'
+        build.gradle
+
+  - versionName: 1.6.4
+    versionCode: 18
+    commit: 1.6.4
+    subdir: app
+    submodules: true
+    gradle:
+      - prod
+    prebuild: sed -i -e 's/com.android.support.constraint:constraint-layout:1.0.0-beta4/com.android.support.constraint:constraint-layout:1.0.2/g'
+        build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.6.4
+CurrentVersionCode: 18
diff --git a/metadata/io.github.tjg1.nori.txt b/metadata/io.github.tjg1.nori.txt
deleted file mode 100644
index b9d5016b14..0000000000
--- a/metadata/io.github.tjg1.nori.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-Categories:Multimedia
-License:GPL-2.0-only
-Author Name:Tomasz Jan Góralczyk
-Author Email:tomg@fastmail.uk
-Web Site:https://twitter.com/Nori_Android
-Source Code:https://github.com/tjg1/nori
-Issue Tracker:https://github.com/tjg1/nori/issues
-Changelog:https://raw.githubusercontent.com/tjg1/nori/HEAD/CHANGELOG
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FSVJZBNKMVZ9J
-Bitcoin:1NHUsSzj3N7TE8rykUYk8rqqLWWSmTVzdp
-
-Auto Name:Nori
-Summary:Online tag-based image archive viewer
-Description:
-Connect to *booru tag-based image archives and browse by tags.
-
-Note that the images there are usually of high quality and though the app is
-fast, a lot of data will be downloaded.
-.
-
-Repo Type:git
-Repo:https://github.com/tjg1/nori.git
-
-Build:2.1.1,3
-    commit=v2.1.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.2.0,4
-    commit=v2.2.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.2.1,5
-    commit=v2.2.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.3.0,6
-    commit=v2.3.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:3.0.0,7
-    commit=v3.0.0
-    subdir=app
-    submodules=yes
-    gradle=fdroid
-
-Build:3.1.0,8
-    commit=v3.1.0
-    subdir=app
-    submodules=yes
-    gradle=fdroid
-
-Build:3.1.1,9
-    commit=v3.1.1
-    subdir=app
-    submodules=yes
-    gradle=fdroid
-
-Build:2017.06.1,13
-    commit=v2017.06.1
-    subdir=app
-    gradle=fdroid
-
-Build:2018.06,14
-    disable=ProGuard fails: there were 2 unresolved references to classes or interfaces
-    commit=v2018.06
-    subdir=app
-    gradle=fdroid
-
-Build:2019.08,15
-    commit=v2019.08
-    subdir=app
-    gradle=fdroid
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2019.08
-Current Version Code:15
diff --git a/metadata/io.github.tjg1.nori.yml b/metadata/io.github.tjg1.nori.yml
new file mode 100644
index 0000000000..621a3bbf3f
--- /dev/null
+++ b/metadata/io.github.tjg1.nori.yml
@@ -0,0 +1,106 @@
+Categories:
+  - Multimedia
+License: GPL-2.0-only
+AuthorName: Tomasz Jan Góralczyk
+AuthorEmail: tomg@fastmail.uk
+WebSite: https://twitter.com/Nori_Android
+SourceCode: https://github.com/tjg1/nori
+IssueTracker: https://github.com/tjg1/nori/issues
+Changelog: https://raw.githubusercontent.com/tjg1/nori/HEAD/CHANGELOG
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FSVJZBNKMVZ9J
+Bitcoin: 1NHUsSzj3N7TE8rykUYk8rqqLWWSmTVzdp
+
+AutoName: Nori
+Summary: Online tag-based image archive viewer
+Description: |-
+    Connect to *booru tag-based image archives and browse by tags.
+
+    Note that the images there are usually of high quality and though the app is
+    fast, a lot of data will be downloaded.
+
+RepoType: git
+Repo: https://github.com/tjg1/nori.git
+
+Builds:
+  - versionName: 2.1.1
+    versionCode: 3
+    commit: v2.1.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 4
+    commit: v2.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.2.1
+    versionCode: 5
+    commit: v2.2.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.3.0
+    versionCode: 6
+    commit: v2.3.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 3.0.0
+    versionCode: 7
+    commit: v3.0.0
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+
+  - versionName: 3.1.0
+    versionCode: 8
+    commit: v3.1.0
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+
+  - versionName: 3.1.1
+    versionCode: 9
+    commit: v3.1.1
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+
+  - versionName: 2017.06.1
+    versionCode: 13
+    commit: v2017.06.1
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: '2018.06'
+    versionCode: 14
+    disable: 'ProGuard fails: there were 2 unresolved references to classes or interfaces'
+    commit: v2018.06
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: '2019.08'
+    versionCode: 15
+    commit: v2019.08
+    subdir: app
+    gradle:
+      - fdroid
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '2019.08'
+CurrentVersionCode: 15
diff --git a/metadata/io.github.trytonvanmeer.libretrivia.txt b/metadata/io.github.trytonvanmeer.libretrivia.txt
deleted file mode 100644
index 61812e4e59..0000000000
--- a/metadata/io.github.trytonvanmeer.libretrivia.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Categories:Games
-License:GPL-3.0-or-later
-Web Site:https://tryton-vanmeer.github.io/projects/LibreTrivia
-Source Code:https://github.com/tryton-vanmeer/LibreTrivia
-Issue Tracker:https://github.com/tryton-vanmeer/LibreTrivia/issues
-Changelog:https://github.com/tryton-vanmeer/LibreTrivia/releases
-
-Auto Name:LibreTrivia
-
-Repo Type:git
-Repo:https://github.com/tryton-vanmeer/LibreTrivia
-
-Build:0.1.0,1
-    commit=v0.1.0
-    subdir=app
-    gradle=yes
-
-Build:0.2.3,2
-    commit=v0.2.3
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.2.3
-Current Version Code:2
diff --git a/metadata/io.github.trytonvanmeer.libretrivia.yml b/metadata/io.github.trytonvanmeer.libretrivia.yml
new file mode 100644
index 0000000000..83dbd02fcf
--- /dev/null
+++ b/metadata/io.github.trytonvanmeer.libretrivia.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Games
+License: GPL-3.0-or-later
+WebSite: https://tryton-vanmeer.github.io/projects/LibreTrivia
+SourceCode: https://github.com/tryton-vanmeer/LibreTrivia
+IssueTracker: https://github.com/tryton-vanmeer/LibreTrivia/issues
+Changelog: https://github.com/tryton-vanmeer/LibreTrivia/releases
+
+AutoName: LibreTrivia
+
+RepoType: git
+Repo: https://github.com/tryton-vanmeer/LibreTrivia
+
+Builds:
+  - versionName: 0.1.0
+    versionCode: 1
+    commit: v0.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.3
+    versionCode: 2
+    commit: v0.2.3
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.2.3
+CurrentVersionCode: 2
diff --git a/metadata/io.gitlab.allenb1.todolist.txt b/metadata/io.gitlab.allenb1.todolist.txt
deleted file mode 100644
index 410e80c79d..0000000000
--- a/metadata/io.gitlab.allenb1.todolist.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Categories:Writing
-License:MIT
-Web Site:
-Source Code:https://gitlab.com/AllenB1/taskeeper
-Issue Tracker:https://gitlab.com/AllenB1/taskeeper/issues
-
-Auto Name:Taskkeeper
-Summary:Keep track of to-dos
-Description:
-Task manager. Create, view, and edit tasks. Organize tasks into projects.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/AllenB1/taskeeper.git
-
-Build:1.2.2,6
-    commit=v1.2.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2.2
-Current Version Code:6
diff --git a/metadata/io.gitlab.allenb1.todolist.yml b/metadata/io.gitlab.allenb1.todolist.yml
new file mode 100644
index 0000000000..ddfbe2892d
--- /dev/null
+++ b/metadata/io.gitlab.allenb1.todolist.yml
@@ -0,0 +1,25 @@
+Categories:
+  - Writing
+License: MIT
+SourceCode: https://gitlab.com/AllenB1/taskeeper
+IssueTracker: https://gitlab.com/AllenB1/taskeeper/issues
+
+AutoName: Taskkeeper
+Summary: Keep track of to-dos
+Description: Task manager. Create, view, and edit tasks. Organize tasks into projects.
+
+RepoType: git
+Repo: https://gitlab.com/AllenB1/taskeeper.git
+
+Builds:
+  - versionName: 1.2.2
+    versionCode: 6
+    commit: v1.2.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.2
+CurrentVersionCode: 6
diff --git a/metadata/io.gresse.hugo.anecdote.txt b/metadata/io.gresse.hugo.anecdote.txt
deleted file mode 100644
index 36baaf2a2f..0000000000
--- a/metadata/io.gresse.hugo.anecdote.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-AntiFeatures:Tracking,NonFreeAssets
-Categories:Reading,Internet
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/HugoGresse/Anecdote
-Issue Tracker:https://github.com/HugoGresse/Anecdote/issues
-Changelog:https://github.com/HugoGresse/Anecdote/releases
-FlattrID:a819229e365698639727db15164b8bbf
-
-Auto Name:Anecdote
-Summary:Read your latest quote and feed in a lite app
-Description:
-Anecdote is a simple yet powerful application to read your favorites quotes
-websites. It's very light, not intrusive, fast and simple.
-
-Features:
-
-* 9GAG feed (image and video)
-* quotes feeds from fmylife.com (FML), Bash.org, viedemerde.fr (VDM), danstonchat.com (DTC) and more
-* infinite scroll and pull to refresh
-* no strange permissions, no background tasks, no ad
-* add your own website with some HTML knowledge
-
-The content displayed in the application do not belongs to Anecdote. Crash and
-some usage informations (such as the share of an item) are sent to upstream's
-own Countly server.
-.
-
-Repo Type:git
-Repo:https://github.com/HugoGresse/Anecdote.git
-
-Build:1.1.1,19
-    commit=v1.1.1
-    subdir=app
-    gradle=oss
-    srclibs=Countly@16.06.04
-    prebuild=cp -r $$Countly$$ ../ && \
-        echo -e "\ninclude ':sdk'" >> ../settings.gradle && \
-        sed -i -e '/fileTree/acompile project(":sdk")' build.gradle && \
-        sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d' -e '/ossCompile/d' build.gradle
-
-Build:1.1.2,20
-    commit=v1.1.2
-    subdir=app
-    gradle=oss
-    srclibs=Countly@16.06.04
-    prebuild=cp -r $$Countly$$ ../ && \
-        echo -e "\ninclude ':sdk'" >> ../settings.gradle && \
-        sed -i -e '/fileTree/acompile project(":sdk")' build.gradle && \
-        sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d' -e '/ossCompile/d' build.gradle
-
-Build:1.1.3,21
-    commit=v1.1.3
-    subdir=app
-    gradle=oss
-    srclibs=Countly@16.06.04
-    prebuild=cp -r $$Countly$$ ../ && \
-        echo -e "\ninclude ':sdk'" >> ../settings.gradle && \
-        sed -i -e '/fileTree/acompile project(":sdk")' build.gradle && \
-        sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d' -e '/ossCompile/d' build.gradle
-
-Build:1.1.4,22
-    commit=v1.1.4
-    subdir=app
-    gradle=oss
-    srclibs=Countly@16.06.04
-    prebuild=cp -r $$Countly$$ ../ && \
-        echo -e "\ninclude ':sdk'" >> ../settings.gradle && \
-        sed -i -e '/fileTree/acompile project(":sdk")' build.gradle && \
-        sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d' -e '/ossCompile/d' build.gradle
-
-Build:1.1.5,23
-    commit=v1.1.5
-    subdir=app
-    gradle=oss
-    srclibs=Countly@16.06.04
-    prebuild=cp -r $$Countly$$ ../ && \
-        sed -i -e '/buildToolsVersion/s/24.0.2/25.0.0/' ../sdk/build.gradle && \
-        echo -e "\ninclude ':sdk'" >> ../settings.gradle && \
-        sed -i -e '/fileTree/acompile project(":sdk")' build.gradle && \
-        sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d' -e '/ossCompile/d' build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1.5
-Current Version Code:23
diff --git a/metadata/io.gresse.hugo.anecdote.yml b/metadata/io.gresse.hugo.anecdote.yml
new file mode 100644
index 0000000000..c4a5711719
--- /dev/null
+++ b/metadata/io.gresse.hugo.anecdote.yml
@@ -0,0 +1,114 @@
+AntiFeatures:
+  - Tracking
+  - NonFreeAssets
+Categories:
+  - Reading
+  - Internet
+License: Apache-2.0
+SourceCode: https://github.com/HugoGresse/Anecdote
+IssueTracker: https://github.com/HugoGresse/Anecdote/issues
+Changelog: https://github.com/HugoGresse/Anecdote/releases
+FlattrID: a819229e365698639727db15164b8bbf
+
+AutoName: Anecdote
+Summary: Read your latest quote and feed in a lite app
+Description: |-
+    Anecdote is a simple yet powerful application to read your favorites quotes
+    websites. It's very light, not intrusive, fast and simple.
+
+    Features:
+
+    * 9GAG feed (image and video)
+    * quotes feeds from fmylife.com (FML), Bash.org, viedemerde.fr (VDM), danstonchat.com (DTC) and more
+    * infinite scroll and pull to refresh
+    * no strange permissions, no background tasks, no ad
+    * add your own website with some HTML knowledge
+
+    The content displayed in the application do not belongs to Anecdote. Crash and
+    some usage informations (such as the share of an item) are sent to upstream's
+    own Countly server.
+
+RepoType: git
+Repo: https://github.com/HugoGresse/Anecdote.git
+
+Builds:
+  - versionName: 1.1.1
+    versionCode: 19
+    commit: v1.1.1
+    subdir: app
+    gradle:
+      - oss
+    srclibs:
+      - Countly@16.06.04
+    prebuild:
+      - cp -r $$Countly$$ ../
+      - echo -e "\ninclude ':sdk'" >> ../settings.gradle
+      - sed -i -e '/fileTree/acompile project(":sdk")' build.gradle
+      - sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d'
+        -e '/ossCompile/d' build.gradle
+
+  - versionName: 1.1.2
+    versionCode: 20
+    commit: v1.1.2
+    subdir: app
+    gradle:
+      - oss
+    srclibs:
+      - Countly@16.06.04
+    prebuild:
+      - cp -r $$Countly$$ ../
+      - echo -e "\ninclude ':sdk'" >> ../settings.gradle
+      - sed -i -e '/fileTree/acompile project(":sdk")' build.gradle
+      - sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d'
+        -e '/ossCompile/d' build.gradle
+
+  - versionName: 1.1.3
+    versionCode: 21
+    commit: v1.1.3
+    subdir: app
+    gradle:
+      - oss
+    srclibs:
+      - Countly@16.06.04
+    prebuild:
+      - cp -r $$Countly$$ ../
+      - echo -e "\ninclude ':sdk'" >> ../settings.gradle
+      - sed -i -e '/fileTree/acompile project(":sdk")' build.gradle
+      - sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d'
+        -e '/ossCompile/d' build.gradle
+
+  - versionName: 1.1.4
+    versionCode: 22
+    commit: v1.1.4
+    subdir: app
+    gradle:
+      - oss
+    srclibs:
+      - Countly@16.06.04
+    prebuild:
+      - cp -r $$Countly$$ ../
+      - echo -e "\ninclude ':sdk'" >> ../settings.gradle
+      - sed -i -e '/fileTree/acompile project(":sdk")' build.gradle
+      - sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d'
+        -e '/ossCompile/d' build.gradle
+
+  - versionName: 1.1.5
+    versionCode: 23
+    commit: v1.1.5
+    subdir: app
+    gradle:
+      - oss
+    srclibs:
+      - Countly@16.06.04
+    prebuild:
+      - cp -r $$Countly$$ ../
+      - sed -i -e '/buildToolsVersion/s/24.0.2/25.0.0/' ../sdk/build.gradle
+      - echo -e "\ninclude ':sdk'" >> ../settings.gradle
+      - sed -i -e '/fileTree/acompile project(":sdk")' build.gradle
+      - sed -i -e '/repositories/ajcenter()' -e '/fabric/d' -e '/bintray/d' -e '/googleCompile/,+3d'
+        -e '/ossCompile/d' build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.1.5
+CurrentVersionCode: 23
diff --git a/metadata/io.homeassistant.android.txt b/metadata/io.homeassistant.android.txt
deleted file mode 100644
index 31f0611981..0000000000
--- a/metadata/io.homeassistant.android.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:https://home-assistant.io
-Source Code:https://github.com/Maxr1998/home-assistant-Android
-Issue Tracker:https://github.com/Maxr1998/home-assistant-Android/issues
-
-Auto Name:Home Assistant
-Summary:Control your HomeAssistant instance
-Description:
-Home Assistant is an open-source home automation platform running on Python 3.
-Track and control all devices at home and automate control. Perfect to run on a
-Raspberry Pi.
-
-This is the (currently unofficial) Android app for Home Assistant.
-.
-
-Repo Type:git
-Repo:https://github.com/Maxr1998/home-assistant-Android.git
-
-Build:0.2,2
-    commit=v0.2
-    subdir=app
-    gradle=yes
-    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "3.4.1" }' >> build.gradle
-
-Build:1.0-RC1,3
-    disable=uses com.android.tools.build:gradle:2.4.0-alpha6
-    commit=aaedca4a24f92af6823c37bd1d2d0ebb75ed2b7d
-    subdir=app
-    gradle=fdroid
-    prebuild=sed -i -e '/gmsImplementation/d' build.gradle
-
-Build:1.0-fdroid,4
-    commit=v1.0
-    subdir=app
-    gradle=phone,fdroid
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.0
-Current Version Code:4
diff --git a/metadata/io.homeassistant.android.yml b/metadata/io.homeassistant.android.yml
new file mode 100644
index 0000000000..b9ddb0256b
--- /dev/null
+++ b/metadata/io.homeassistant.android.yml
@@ -0,0 +1,52 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: https://home-assistant.io
+SourceCode: https://github.com/Maxr1998/home-assistant-Android
+IssueTracker: https://github.com/Maxr1998/home-assistant-Android/issues
+Translation: https://crowdin.com/project/home-assistant-android
+Changelog: https://github.com/Maxr1998/home-assistant-Android/releases
+
+AutoName: Home Assistant
+Summary: Control your HomeAssistant instance
+Description: |-
+    Home Assistant is an open-source home automation platform running on Python 3.
+    Track and control all devices at home and automate control. Perfect to run on a
+    Raspberry Pi.
+
+    This is the (currently unofficial) Android app for Home Assistant.
+
+RepoType: git
+Repo: https://github.com/Maxr1998/home-assistant-Android.git
+
+Builds:
+  - versionName: '0.2'
+    versionCode: 2
+    commit: v0.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"3.4.1\" }' >>\
+        \ build.gradle"
+
+  - versionName: 1.0-RC1
+    versionCode: 3
+    disable: uses com.android.tools.build:gradle:2.4.0-alpha6
+    commit: aaedca4a24f92af6823c37bd1d2d0ebb75ed2b7d
+    subdir: app
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/gmsImplementation/d' build.gradle
+
+  - versionName: 1.0-fdroid
+    versionCode: 4
+    commit: v1.0
+    subdir: app
+    gradle:
+      - phone
+      - fdroid
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.0'
+CurrentVersionCode: 4