diff --git a/metadata/z4pp3r.flashlightwidget.txt b/metadata/z4pp3r.flashlightwidget.txt
deleted file mode 100644
index 645df75fed..0000000000
--- a/metadata/z4pp3r.flashlightwidget.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:Theming,System
-License:GPL-2.0-only
-Web Site:
-Source Code:https://github.com/fs1995/FlashlightWidget
-Issue Tracker:https://github.com/fs1995/FlashlightWidget/issues
-
-Auto Name:Flashlight Widget
-Summary:Control your LED flash
-Description:
-Widget to control your back-LED.
-.
-
-Repo Type:git
-Repo:https://github.com/fs1995/FlashlightWidget
-
-Build:0.1,1
-    commit=f133eb5da94ab1aacd259d1e9a7fdf4a40d63b7a
-    subdir=src
-    prebuild=mv java src
-    target=android-21
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:0.1
-Current Version Code:1
diff --git a/metadata/z4pp3r.flashlightwidget.yml b/metadata/z4pp3r.flashlightwidget.yml
new file mode 100644
index 0000000000..5e92f1eeb0
--- /dev/null
+++ b/metadata/z4pp3r.flashlightwidget.yml
@@ -0,0 +1,26 @@
+Categories:
+  - Theming
+  - System
+License: GPL-2.0-only
+SourceCode: https://github.com/fs1995/FlashlightWidget
+IssueTracker: https://github.com/fs1995/FlashlightWidget/issues
+
+AutoName: Flashlight Widget
+Summary: Control your LED flash
+Description: Widget to control your back-LED.
+
+RepoType: git
+Repo: https://github.com/fs1995/FlashlightWidget
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: f133eb5da94ab1aacd259d1e9a7fdf4a40d63b7a
+    subdir: src
+    prebuild: mv java src
+    target: android-21
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '0.1'
+CurrentVersionCode: 1
diff --git a/metadata/za.co.lukestonehm.logicaldefence.txt b/metadata/za.co.lukestonehm.logicaldefence.txt
deleted file mode 100644
index 5d9a67765c..0000000000
--- a/metadata/za.co.lukestonehm.logicaldefence.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-Categories:Reading
-License:GPL-2.0-or-later
-Web Site:
-Source Code:https://github.com/LukeStonehm/LogicalDefence
-Issue Tracker:https://github.com/LukeStonehm/LogicalDefence/issues
-
-Auto Name:Logical Defence
-Summary:Encyclopedia of logical fallacies
-Description:
-View a list of logical fallacies. Steel yourselves, and begin to defend your
-mind from the language used against you by the sophists of the world.
-
-Some features:
-
-* Left drawer that houses categories.
-* Share function -> Long press a fallacy to share it.
-* Nice about screen.
-* Language selection function.
-.
-
-Repo Type:git
-Repo:https://github.com/LukeStonehm/LogicalDefence
-
-Build:1.0.1,2
-    commit=b375b6d11e3fae55cad0fd0761ec261cc5b9e576
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,3
-    commit=727db678d9c3f4459c2f94d4fdc7064031ea1714
-    subdir=app
-    gradle=yes
-
-Build:1.0.3,4
-    commit=c732d52560b525aaa9f50f621a117a8ea909c534
-    subdir=app
-    gradle=yes
-
-Build:1.0.4,5
-    commit=0fe4ad23caff1584b6857dc6d4192b5fda49ba87
-    subdir=app
-    gradle=yes
-
-Build:1.0.5,6
-    commit=b9b5768d10c776a611f291d7ecbd913a5fbb9455
-    subdir=app
-    gradle=yes
-
-Build:1.0.6,7
-    commit=c09823232456186457e97bbae5a9e12ef6b06e50
-    subdir=app
-    gradle=yes
-
-Build:1.0.7,8
-    commit=423d21efa0f2177d36c58a356155755df23b9821
-    subdir=app
-    gradle=yes
-
-Build:1.1.0,9
-    commit=1d3772ac5f161e52b78e83d204b3d8058fe972a2
-    subdir=app
-    gradle=yes
-
-Build:1.1.1,10
-    commit=5aec1436b009b87db1532b0a9ae68ff4d3546deb
-    subdir=app
-    gradle=yes
-
-Build:1.1.2,11
-    commit=217284a1de8e4b4cf325731bd4e800aaa4f4a52f
-    subdir=app
-    gradle=yes
-
-Build:1.2.0,12
-    commit=218585e100ffafb196ae85f0808497db3fceef5b
-    subdir=app
-    gradle=yes
-
-Build:1.2.1,13
-    commit=64f52da3d3201ce0935c6b4b7231aa429b58c0bb
-    subdir=app
-    gradle=yes
-
-Build:1.3.2,16
-    commit=7b775dbdb972d74d6077c4d1d82ce386eec70be6
-    subdir=app
-    gradle=yes
-
-Build:1.3.3,17
-    commit=5359189c027fb8bc8b7793d0f2a26f709b563f86
-    subdir=app
-    gradle=yes
-
-Build:1.3.4,18
-    commit=654ad82cf84ae1a191ab1e4b6ff667f3f860e0e9
-    subdir=app
-    gradle=yes
-
-Build:1.4.0,19
-    commit=73f84971354624acac7c7ae5559c34bb92393589
-    subdir=app
-    gradle=yes
-
-Build:1.4.1,20
-    commit=85e8baad4376e77a5ec722248cbd956179151b51
-    subdir=app
-    gradle=yes
-
-Build:1.5.0,21
-    commit=fd6b68d4ea58e818b578e53b416029d9c907d5ea
-    subdir=app
-    gradle=yes
-
-Build:1.5.1,22
-    commit=b637aa73f9d5a82b8d372487e734bb12ed10215d
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5.1
-Current Version Code:22
diff --git a/metadata/za.co.lukestonehm.logicaldefence.yml b/metadata/za.co.lukestonehm.logicaldefence.yml
new file mode 100644
index 0000000000..49f9a617ba
--- /dev/null
+++ b/metadata/za.co.lukestonehm.logicaldefence.yml
@@ -0,0 +1,160 @@
+Categories:
+  - Reading
+License: GPL-2.0-or-later
+SourceCode: https://github.com/LukeStonehm/LogicalDefence
+IssueTracker: https://github.com/LukeStonehm/LogicalDefence/issues
+
+AutoName: Logical Defence
+Summary: Encyclopedia of logical fallacies
+Description: |-
+    View a list of logical fallacies. Steel yourselves, and begin to defend your
+    mind from the language used against you by the sophists of the world.
+
+    Some features:
+
+    * Left drawer that houses categories.
+    * Share function -> Long press a fallacy to share it.
+    * Nice about screen.
+    * Language selection function.
+
+RepoType: git
+Repo: https://github.com/LukeStonehm/LogicalDefence
+
+Builds:
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: b375b6d11e3fae55cad0fd0761ec261cc5b9e576
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: 727db678d9c3f4459c2f94d4fdc7064031ea1714
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 4
+    commit: c732d52560b525aaa9f50f621a117a8ea909c534
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.4
+    versionCode: 5
+    commit: 0fe4ad23caff1584b6857dc6d4192b5fda49ba87
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.5
+    versionCode: 6
+    commit: b9b5768d10c776a611f291d7ecbd913a5fbb9455
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.6
+    versionCode: 7
+    commit: c09823232456186457e97bbae5a9e12ef6b06e50
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.7
+    versionCode: 8
+    commit: 423d21efa0f2177d36c58a356155755df23b9821
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 9
+    commit: 1d3772ac5f161e52b78e83d204b3d8058fe972a2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.1
+    versionCode: 10
+    commit: 5aec1436b009b87db1532b0a9ae68ff4d3546deb
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.2
+    versionCode: 11
+    commit: 217284a1de8e4b4cf325731bd4e800aaa4f4a52f
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 12
+    commit: 218585e100ffafb196ae85f0808497db3fceef5b
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.1
+    versionCode: 13
+    commit: 64f52da3d3201ce0935c6b4b7231aa429b58c0bb
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.2
+    versionCode: 16
+    commit: 7b775dbdb972d74d6077c4d1d82ce386eec70be6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.3
+    versionCode: 17
+    commit: 5359189c027fb8bc8b7793d0f2a26f709b563f86
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.4
+    versionCode: 18
+    commit: 654ad82cf84ae1a191ab1e4b6ff667f3f860e0e9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 19
+    commit: 73f84971354624acac7c7ae5559c34bb92393589
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 20
+    commit: 85e8baad4376e77a5ec722248cbd956179151b51
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 21
+    commit: fd6b68d4ea58e818b578e53b416029d9c907d5ea
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.1
+    versionCode: 22
+    commit: b637aa73f9d5a82b8d372487e734bb12ed10215d
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.5.1
+CurrentVersionCode: 22
diff --git a/metadata/za.co.neilson.alarm.txt b/metadata/za.co.neilson.alarm.txt
deleted file mode 100644
index 7affadc2d8..0000000000
--- a/metadata/za.co.neilson.alarm.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Categories:Time
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/SheldonNeilson/Android-Alarm-Clock
-Issue Tracker:
-
-Auto Name:Alarm Clock
-Summary:Disable alarm by solving a math problem
-Description:
-A simple alarm clock application that requires that you solve a math problem to
-deactivate the alarm.
-.
-
-Build:1.3,4
-    commit=15f5ea1db539fcb5c0982a55f30b32f3464abea3
-    srclibs=1:Support/v7/appcompat@android-5.0.1_r1
-    extlibs=android/android-support-v4.jar
-    prebuild=echo -e 'java.source=1.7\njava.target=1.7' | tee $$Support$$/ant.properties > ant.properties && \
-        cp libs/android-support-v4.jar $$Support$$/libs/
-    target=android-21
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.3
-Current Version Code:4
-
-No Source Since:1.4
diff --git a/metadata/za.co.neilson.alarm.yml b/metadata/za.co.neilson.alarm.yml
new file mode 100644
index 0000000000..05b75c1df9
--- /dev/null
+++ b/metadata/za.co.neilson.alarm.yml
@@ -0,0 +1,31 @@
+Categories:
+  - Time
+License: Apache-2.0
+SourceCode: https://github.com/SheldonNeilson/Android-Alarm-Clock
+
+AutoName: Alarm Clock
+Summary: Disable alarm by solving a math problem
+Description: |-
+    A simple alarm clock application that requires that you solve a math problem to
+    deactivate the alarm.
+
+Builds:
+  - versionName: '1.3'
+    versionCode: 4
+    commit: 15f5ea1db539fcb5c0982a55f30b32f3464abea3
+    srclibs:
+      - 1:Support/v7/appcompat@android-5.0.1_r1
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - echo -e 'java.source=1.7\njava.target=1.7' | tee $$Support$$/ant.properties
+        > ant.properties
+      - cp libs/android-support-v4.jar $$Support$$/libs/
+    target: android-21
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: '1.3'
+CurrentVersionCode: 4
+
+NoSourceSince: '1.4'
diff --git a/metadata/zame.GloomyDungeons.opensource.game.txt b/metadata/zame.GloomyDungeons.opensource.game.txt
deleted file mode 100644
index f5bb02d695..0000000000
--- a/metadata/zame.GloomyDungeons.opensource.game.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-AntiFeatures:Ads,UpstreamNonFree
-Categories:Games
-License:MIT
-Web Site:http://mobile.zame-dev.org/gloomy/index.php
-Source Code:https://github.com/restorer/gloomy-dungeons-3d
-Issue Tracker:https://github.com/restorer/gloomy-dungeons-3d/issues
-
-Name:Gloomy Dungeons
-Summary:First-person shooter
-Description:
-If you loved Doom and Wolfenstein 3D and want to go to back to gaming in the
-early 90s, Gloomy Dungeons 3D is for you! The game has so many features that you
-will be glued to your phone for hours. Watch out for sore fingers!
-
-You can change control scheme in settings. There are 6 control schemes. Press
-hardware button "Menu" at any moment, than press "Options" in menu
-
-* Virtual world simulation with 3D visuals
-* Different types of enemies
-* Travel through immense graphically detailed mazes
-* More than 5 hours of game play
-* 25 different shooting locations
-* Unlock new weapons, skills and spill more blood
-* Optimized to run even on 1st Gen Android phones
-* All resources are free as in freedom
-
-In f-droid.org version Zeemote isn't supported and analytics was removed.
-Non-personalized promo ads (of new games made by EightSines) can be shown on
-menu screen.
-.
-
-Repo Type:git
-Repo:https://github.com/restorer/gloomy-dungeons-3d
-
-Build:2013.03.07.0416,1362629775
-    disable=broken apk
-    commit=05e6bb5422
-    subdir=.build
-    init=cd .. && \
-        sed -i '54,57d' source/AndroidManifest.xml && \
-        sed -i 's@\$NDKBUILDTOOL@$$NDK$$/ndk-build@g' tools/builder/build-fdroid.sh && \
-        rm source/libs/libGoogleAnalytics.jar && \
-        ./f-build opensource
-    srclibs=NoAnalytics@158a4a
-    prebuild=echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
-    scanignore=tools/builder/additional-libs/armeabi/libZControllerLib_Android.so
-    novcheck=yes
-
-Build:2014.10.26.1200,1414314000
-    commit=224781247acaac201be80d1b71ec0c6cc31457b8
-    init=rm src/withanalytics/libs/libGoogleAnalytics.jar
-    gradle=FdroidnormalNormalWithoutanalyticsWithoutzeemoteWithoutrateoffer
-    novcheck=yes
-
-Build:2018.07.02,1807020000
-    commit=a85fdf8fa2fe13129a5939ad9d52c749dfc7fb29
-    init=rm src/withzeemote/libs/zc-strings-1.9.2.jar && \
-        rm src/withzeemote/libs/ZControllerLib-android-1.9.2.jar && \
-        rm src/withzeemote/libs/ZControllerLib-android-ui-1.9.2.jar && \
-        rm src/withzeemote/libs/ZControllerLib-common-1.9.2.jar && \
-        sed -i.bak -e '/maven.fabric.io/d' build.gradle && \
-        sed -i.bak -e '/maven.gameanalytics.com/d' build.gradle && \
-        sed -i.bak -e '/io.fabric.tools/d' build.gradle && \
-        rm build.gradle.bak
-    gradle=FdroidnormalNormalWithoutanalyticsWithoutzeemoteWithoutrateoffer
-    novcheck=yes
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:2018.07.02
-Current Version Code:1807020000
diff --git a/metadata/zame.GloomyDungeons.opensource.game.yml b/metadata/zame.GloomyDungeons.opensource.game.yml
new file mode 100644
index 0000000000..bdf8f8fc89
--- /dev/null
+++ b/metadata/zame.GloomyDungeons.opensource.game.yml
@@ -0,0 +1,83 @@
+AntiFeatures:
+  - Ads
+  - UpstreamNonFree
+Categories:
+  - Games
+License: MIT
+WebSite: http://mobile.zame-dev.org/gloomy/index.php
+SourceCode: https://github.com/restorer/gloomy-dungeons-3d
+IssueTracker: https://github.com/restorer/gloomy-dungeons-3d/issues
+
+Name: Gloomy Dungeons
+Summary: First-person shooter
+Description: |-
+    If you loved Doom and Wolfenstein 3D and want to go to back to gaming in the
+    early 90s, Gloomy Dungeons 3D is for you! The game has so many features that you
+    will be glued to your phone for hours. Watch out for sore fingers!
+
+    You can change control scheme in settings. There are 6 control schemes. Press
+    hardware button "Menu" at any moment, than press "Options" in menu
+
+    * Virtual world simulation with 3D visuals
+    * Different types of enemies
+    * Travel through immense graphically detailed mazes
+    * More than 5 hours of game play
+    * 25 different shooting locations
+    * Unlock new weapons, skills and spill more blood
+    * Optimized to run even on 1st Gen Android phones
+    * All resources are free as in freedom
+
+    In f-droid.org version Zeemote isn't supported and analytics was removed.
+    Non-personalized promo ads (of new games made by EightSines) can be shown on
+    menu screen.
+
+RepoType: git
+Repo: https://github.com/restorer/gloomy-dungeons-3d
+
+Builds:
+  - versionName: 2013.03.07.0416
+    versionCode: 1362629775
+    disable: broken apk
+    commit: 05e6bb5422
+    subdir: .build
+    init:
+      - cd ..
+      - sed -i '54,57d' source/AndroidManifest.xml
+      - sed -i 's@\$NDKBUILDTOOL@$$NDK$$/ndk-build@g' tools/builder/build-fdroid.sh
+      - rm source/libs/libGoogleAnalytics.jar
+      - ./f-build opensource
+    srclibs:
+      - NoAnalytics@158a4a
+    prebuild: echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
+    scanignore:
+      - tools/builder/additional-libs/armeabi/libZControllerLib_Android.so
+    novcheck: true
+
+  - versionName: 2014.10.26.1200
+    versionCode: 1414314000
+    commit: 224781247acaac201be80d1b71ec0c6cc31457b8
+    init: rm src/withanalytics/libs/libGoogleAnalytics.jar
+    gradle:
+      - FdroidnormalNormalWithoutanalyticsWithoutzeemoteWithoutrateoffer
+    novcheck: true
+
+  - versionName: 2018.07.02
+    versionCode: 1807020000
+    commit: a85fdf8fa2fe13129a5939ad9d52c749dfc7fb29
+    init:
+      - rm src/withzeemote/libs/zc-strings-1.9.2.jar
+      - rm src/withzeemote/libs/ZControllerLib-android-1.9.2.jar
+      - rm src/withzeemote/libs/ZControllerLib-android-ui-1.9.2.jar
+      - rm src/withzeemote/libs/ZControllerLib-common-1.9.2.jar
+      - sed -i.bak -e '/maven.fabric.io/d' build.gradle
+      - sed -i.bak -e '/maven.gameanalytics.com/d' build.gradle
+      - sed -i.bak -e '/io.fabric.tools/d' build.gradle
+      - rm build.gradle.bak
+    gradle:
+      - FdroidnormalNormalWithoutanalyticsWithoutzeemoteWithoutrateoffer
+    novcheck: true
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: 2018.07.02
+CurrentVersionCode: 1807020000