diff --git a/metadata/com.morlunk.mountie.txt b/metadata/com.morlunk.mountie.txt
deleted file mode 100644
index aa1dc2b553..0000000000
--- a/metadata/com.morlunk.mountie.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:https://www.morlunk.com/pages/mountie.html
-Source Code:https://www.github.com/Morlunk/Mountie
-Issue Tracker:https://www.github.com/Morlunk/Mountie/issues
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HZU3JS7MMDGBY
-FlattrID:1706423
-Bitcoin:1ySD4UzFDtPLq9agRg9eiFtWmz6DJ7bBf
-
-Auto Name:Mountie
-Summary:Automount USB external storage
-Description:
-* Automatically detects and mounts newly attached USB storage
-* Rich notification displaying mounted storage devices
-* Mounts in the "mountie" directory on your data partition
-* Requires a device supporting USB OTG
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/Morlunk/Mountie.git
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/com.morlunk.mountie.yml b/metadata/com.morlunk.mountie.yml
new file mode 100644
index 0000000000..208c568810
--- /dev/null
+++ b/metadata/com.morlunk.mountie.yml
@@ -0,0 +1,35 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: https://www.morlunk.com/pages/mountie.html
+SourceCode: https://www.github.com/Morlunk/Mountie
+IssueTracker: https://www.github.com/Morlunk/Mountie/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HZU3JS7MMDGBY
+FlattrID: '1706423'
+Bitcoin: 1ySD4UzFDtPLq9agRg9eiFtWmz6DJ7bBf
+
+AutoName: Mountie
+Summary: Automount USB external storage
+Description: |-
+    * Automatically detects and mounts newly attached USB storage
+    * Rich notification displaying mounted storage devices
+    * Mounts in the "mountie" directory on your data partition
+    * Requires a device supporting USB OTG
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/Morlunk/Mountie.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
diff --git a/metadata/com.morlunk.mumbleclient.txt b/metadata/com.morlunk.mumbleclient.txt
deleted file mode 100644
index 7d15674bf1..0000000000
--- a/metadata/com.morlunk.mumbleclient.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-Categories:Internet
-License:GPL-3.0-only
-Web Site:https://www.morlunk.com
-Source Code:https://github.com/acomminos/Plumble
-Issue Tracker:https://github.com/acomminos/Plumble/issues
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HZU3JS7MMDGBY
-FlattrID:1706423
-
-Auto Name:Plumble
-Summary:Voice chat for Mumble servers
-Description:
-* Opus, CELT, and Speex codec support
-* Certificates
-* Voice activity
-* Bluetooth
-* Public servers
-* Comments
-* Administration
-* Overlay
-* Theming
-* Notifications
-* Orbot integration
-.
-
-Repo Type:git
-Repo:https://github.com/acomminos/Plumble.git
-
-Build:3.0.0-beta2,54
-    commit=3.0.0-beta2
-    subdir=Plumble
-    submodules=yes
-    gradle=official
-    prebuild=rm -rf libraries/Jumble/libs/armeabi/* libraries/Jumble/obj/*
-    buildjni=libraries/Jumble/jni
-
-Build:3.0.0-beta3,55
-    commit=3.0.0-beta3
-    subdir=Plumble
-    submodules=yes
-    gradle=official
-    prebuild=rm -rf libraries/Jumble/libs/armeabi/* libraries/Jumble/obj/*
-    buildjni=libraries/Jumble/jni
-
-Build:3.0.0-beta4,56
-    commit=3.0.0-beta4
-    subdir=Plumble
-    submodules=yes
-    gradle=official
-    prebuild=rm -rf libraries/Jumble/libs/armeabi/* libraries/Jumble/obj/*
-    buildjni=libraries/Jumble/jni
-
-Build:3.0.1,58
-    commit=3.0.1
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.0.2,59
-    commit=3.0.2
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.0.3,60
-    commit=3.0.3
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.0.4,62
-    commit=3.0.4
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.0.5,63
-    commit=3.0.5
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.0.6,64
-    commit=3.0.6
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.1.1,66
-    commit=3.1.1
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.1.2,67
-    commit=3.1.2
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.1.3,68
-    commit=3.1.3
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.1.4,69
-    commit=3.1.4
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.1.5,70
-    commit=3.1.5
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.2.0,71
-    disable=retagged
-    commit=3.2.0
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.2.0,72
-    commit=3.2.0
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Build:3.3.0-rc1,73
-    commit=3.3.0-rc1
-    subdir=app
-    submodules=yes
-    gradle=official
-    buildjni=../libraries/Jumble/src/main/jni
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:3.3.0-rc1
-Current Version Code:73
diff --git a/metadata/com.morlunk.mumbleclient.yml b/metadata/com.morlunk.mumbleclient.yml
new file mode 100644
index 0000000000..66cdbc6738
--- /dev/null
+++ b/metadata/com.morlunk.mumbleclient.yml
@@ -0,0 +1,208 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+WebSite: https://www.morlunk.com
+SourceCode: https://github.com/acomminos/Plumble
+IssueTracker: https://github.com/acomminos/Plumble/issues
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HZU3JS7MMDGBY
+FlattrID: '1706423'
+
+AutoName: Plumble
+Summary: Voice chat for Mumble servers
+Description: |-
+    '''NOTE:''' This app is no longer maintained.
+
+    * Opus, CELT, and Speex codec support
+    * Certificates
+    * Voice activity
+    * Bluetooth
+    * Public servers
+    * Comments
+    * Administration
+    * Overlay
+    * Theming
+    * Notifications
+    * Orbot integration
+
+RepoType: git
+Repo: https://github.com/acomminos/Plumble.git
+
+Builds:
+  - versionName: 3.0.0-beta2
+    versionCode: 54
+    commit: 3.0.0-beta2
+    subdir: Plumble
+    submodules: true
+    gradle:
+      - official
+    prebuild: rm -rf libraries/Jumble/libs/armeabi/* libraries/Jumble/obj/*
+    buildjni:
+      - libraries/Jumble/jni
+
+  - versionName: 3.0.0-beta3
+    versionCode: 55
+    commit: 3.0.0-beta3
+    subdir: Plumble
+    submodules: true
+    gradle:
+      - official
+    prebuild: rm -rf libraries/Jumble/libs/armeabi/* libraries/Jumble/obj/*
+    buildjni:
+      - libraries/Jumble/jni
+
+  - versionName: 3.0.0-beta4
+    versionCode: 56
+    commit: 3.0.0-beta4
+    subdir: Plumble
+    submodules: true
+    gradle:
+      - official
+    prebuild: rm -rf libraries/Jumble/libs/armeabi/* libraries/Jumble/obj/*
+    buildjni:
+      - libraries/Jumble/jni
+
+  - versionName: 3.0.1
+    versionCode: 58
+    commit: 3.0.1
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.0.2
+    versionCode: 59
+    commit: 3.0.2
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.0.3
+    versionCode: 60
+    commit: 3.0.3
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.0.4
+    versionCode: 62
+    commit: 3.0.4
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.0.5
+    versionCode: 63
+    commit: 3.0.5
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.0.6
+    versionCode: 64
+    commit: 3.0.6
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.1.1
+    versionCode: 66
+    commit: 3.1.1
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.1.2
+    versionCode: 67
+    commit: 3.1.2
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.1.3
+    versionCode: 68
+    commit: 3.1.3
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.1.4
+    versionCode: 69
+    commit: 3.1.4
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.1.5
+    versionCode: 70
+    commit: 3.1.5
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.2.0
+    versionCode: 71
+    disable: retagged
+    commit: 3.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.2.0
+    versionCode: 72
+    commit: 3.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+  - versionName: 3.3.0-rc1
+    versionCode: 73
+    commit: 3.3.0-rc1
+    subdir: app
+    submodules: true
+    gradle:
+      - official
+    buildjni:
+      - ../libraries/Jumble/src/main/jni
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 3.3.0-rc1
+CurrentVersionCode: 73
diff --git a/metadata/com.morphoss.acal.txt b/metadata/com.morphoss.acal.txt
deleted file mode 100644
index 4a1580cfb8..0000000000
--- a/metadata/com.morphoss.acal.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:http://acal.me
-Source Code:https://gitorious.org/acal/acal
-Issue Tracker:
-Donate:http://acal.me/wiki/Donating
-FlattrID:163438
-Bitcoin:1C7ChLNbwiQNWS6BLCPNU5TzX3ve7Xup2m
-
-Auto Name:aCal
-Summary:CalDAV Calendar & Tasks client
-Description:
-A CalDAV client, allowing you to directly access a calendar on a CalDAV server.
-aCal includes support for VEVENT & VTODO (Events and Tasks) and can also
-synchronize your contacts from an addressbook collection on a CardDAV server.
-
-Note: Project dissapeared, source mirror is at
-[https://gitlab.com/f-droid-mirrors/acal].
-.
-
-Repo Type:git
-Repo:https://gitorious.org/acal/acal.git
-
-Build:1.05,14
-    commit=r1.05
-
-Build:1.06,15
-    commit=r1.06
-
-Build:1.07,16
-    commit=r1.07
-
-Build:1.11,18
-    commit=r1.11
-
-Build:1.20,27
-    commit=r1.20
-
-Build:1.21,28
-    commit=c0fbf54b2b94bbcadf010741c34947f9f3198e60
-
-Build:1.23,30
-    commit=fae3e5f0f54fe5a2f46480481b39f9566ee9c67b
-
-Build:1.3),32
-    commit=r1.3
-    target=android-8
-
-Build:1.31,33
-    commit=r1.31
-    target=android-8
-
-Build:1.32,34
-    commit=r1.32
-    target=android-8
-
-Build:1.33,35
-    commit=r1.33
-    target=android-8
-
-Build:1.34,36
-    commit=r1.34
-    target=android-8
-
-Build:1.35,37
-    commit=r1.35
-    target=android-8
-
-Build:1.36,38
-    commit=r1.36
-    target=android-8
-
-Build:1.53,53
-    commit=9933536cb926ca457d5fa4e6cf827b063fbab709
-    target=android-8
-
-Build:1.54,54
-    commit=r1.54
-    target=android-8
-
-Build:1.55,55
-    commit=r1.55
-    target=android-8
-
-Build:1.56,56
-    commit=r1.56
-    target=android-8
-
-Build:1.57,57
-    commit=r1.57
-    target=android-8
-
-Build:1.58,58
-    commit=r1.58
-    target=android-8
-
-Build:1.59,59
-    commit=r1.59
-    target=android-8
-
-Build:1.60,60
-    commit=r1.60
-    target=android-8
-
-Build:1.61,61
-    commit=r1.61
-    target=android-11
-
-Build:1.62,62
-    commit=r1.62
-
-Build:1.63,63
-    commit=r1.63
-
-Archive Policy:0 versions
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.63
-Current Version Code:63
diff --git a/metadata/com.morphoss.acal.yml b/metadata/com.morphoss.acal.yml
new file mode 100644
index 0000000000..abb839c6cb
--- /dev/null
+++ b/metadata/com.morphoss.acal.yml
@@ -0,0 +1,143 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: http://acal.me
+SourceCode: https://gitorious.org/acal/acal
+Donate: http://acal.me/wiki/Donating
+FlattrID: '163438'
+Bitcoin: 1C7ChLNbwiQNWS6BLCPNU5TzX3ve7Xup2m
+
+AutoName: aCal
+Summary: CalDAV Calendar & Tasks client
+Description: |-
+    A CalDAV client, allowing you to directly access a calendar on a CalDAV server.
+    aCal includes support for VEVENT & VTODO (Events and Tasks) and can also
+    synchronize your contacts from an addressbook collection on a CardDAV server.
+
+    Note: Project dissapeared, source mirror is at
+    [https://gitlab.com/f-droid-mirrors/acal].
+
+Builds:
+  - versionName: '1.05'
+    versionCode: 14
+    commit: r1.05
+
+  - versionName: '1.06'
+    versionCode: 15
+    commit: r1.06
+
+  - versionName: '1.07'
+    versionCode: 16
+    commit: r1.07
+
+  - versionName: '1.11'
+    versionCode: 18
+    commit: r1.11
+
+  - versionName: '1.20'
+    versionCode: 27
+    commit: r1.20
+
+  - versionName: '1.21'
+    versionCode: 28
+    commit: c0fbf54b2b94bbcadf010741c34947f9f3198e60
+
+  - versionName: '1.23'
+    versionCode: 30
+    commit: fae3e5f0f54fe5a2f46480481b39f9566ee9c67b
+
+  - versionName: 1.3)
+    versionCode: 32
+    commit: r1.3
+    target: android-8
+
+  - versionName: '1.31'
+    versionCode: 33
+    commit: r1.31
+    target: android-8
+
+  - versionName: '1.32'
+    versionCode: 34
+    commit: r1.32
+    target: android-8
+
+  - versionName: '1.33'
+    versionCode: 35
+    commit: r1.33
+    target: android-8
+
+  - versionName: '1.34'
+    versionCode: 36
+    commit: r1.34
+    target: android-8
+
+  - versionName: '1.35'
+    versionCode: 37
+    commit: r1.35
+    target: android-8
+
+  - versionName: '1.36'
+    versionCode: 38
+    commit: r1.36
+    target: android-8
+
+  - versionName: '1.53'
+    versionCode: 53
+    commit: 9933536cb926ca457d5fa4e6cf827b063fbab709
+    target: android-8
+
+  - versionName: '1.54'
+    versionCode: 54
+    commit: r1.54
+    target: android-8
+
+  - versionName: '1.55'
+    versionCode: 55
+    commit: r1.55
+    target: android-8
+
+  - versionName: '1.56'
+    versionCode: 56
+    commit: r1.56
+    target: android-8
+
+  - versionName: '1.57'
+    versionCode: 57
+    commit: r1.57
+    target: android-8
+
+  - versionName: '1.58'
+    versionCode: 58
+    commit: r1.58
+    target: android-8
+
+  - versionName: '1.59'
+    versionCode: 59
+    commit: r1.59
+    target: android-8
+
+  - versionName: '1.60'
+    versionCode: 60
+    commit: r1.60
+    target: android-8
+
+  - versionName: '1.61'
+    versionCode: 61
+    commit: r1.61
+    target: android-11
+
+  - versionName: '1.62'
+    versionCode: 62
+    commit: r1.62
+
+  - versionName: '1.63'
+    versionCode: 63
+    commit: r1.63
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: '1.63'
+CurrentVersionCode: 63
+
+NoSourceSince: '1.63'
diff --git a/metadata/com.mrbimc.selinux.txt b/metadata/com.mrbimc.selinux.txt
deleted file mode 100644
index 49a9eb9ef6..0000000000
--- a/metadata/com.mrbimc.selinux.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Categories:Security
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/MrBIMC/SELinuxModeChanger
-Issue Tracker:https://github.com/MrBIMC/SELinuxModeChanger/issues
-
-Auto Name:SELinuxModeChanger
-Summary:Set SELinux mode on boot
-Description:
-Sets SELinux into desired mode on each boot.
-.
-
-Repo Type:git
-Repo:https://github.com/MrBIMC/SELinuxModeChanger
-
-Build:3.0.1,31
-    commit=1b341fe7fbb979f1ead671ed41f488c792f6d4ec
-    subdir=app
-    gradle=yes
-    srclibs=RootShell@1.3
-    rm=app/libs/*
-    prebuild=cp -fR $$RootShell$$/src/com src/main/java/
-
-Build:3.2,42
-    commit=3.2
-    subdir=app
-    gradle=yes
-    srclibs=RootTools@3.4
-    rm=app/libs/*
-    prebuild=cp -fR $$RootTools$$/RootTools/src/main/java src/main/ && \
-        sed -i -e '/RootTools/d' build.gradle
-
-Build:10.0,20170724
-    commit=10.0
-    subdir=app
-    gradle=yes
-
-Build:11.0,20171031
-    commit=11.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:11.0
-Current Version Code:20171031
diff --git a/metadata/com.mrbimc.selinux.yml b/metadata/com.mrbimc.selinux.yml
new file mode 100644
index 0000000000..7ee374e9b0
--- /dev/null
+++ b/metadata/com.mrbimc.selinux.yml
@@ -0,0 +1,58 @@
+Categories:
+  - Security
+License: GPL-3.0-only
+SourceCode: https://github.com/MrBIMC/SELinuxModeChanger
+IssueTracker: https://github.com/MrBIMC/SELinuxModeChanger/issues
+
+AutoName: SELinuxModeChanger
+Summary: Set SELinux mode on boot
+Description: Sets SELinux into desired mode on each boot.
+
+RepoType: git
+Repo: https://github.com/MrBIMC/SELinuxModeChanger
+
+Builds:
+  - versionName: 3.0.1
+    versionCode: 31
+    commit: 1b341fe7fbb979f1ead671ed41f488c792f6d4ec
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - RootShell@1.3
+    rm:
+      - app/libs/*
+    prebuild: cp -fR $$RootShell$$/src/com src/main/java/
+
+  - versionName: '3.2'
+    versionCode: 42
+    commit: '3.2'
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - RootTools@3.4
+    rm:
+      - app/libs/*
+    prebuild:
+      - cp -fR $$RootTools$$/RootTools/src/main/java src/main/
+      - sed -i -e '/RootTools/d' build.gradle
+
+  - versionName: '10.0'
+    versionCode: 20170724
+    commit: '10.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '11.0'
+    versionCode: 20171031
+    commit: '11.0'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '11.0'
+CurrentVersionCode: 20171031
diff --git a/metadata/com.mschlauch.comfortreader.txt b/metadata/com.mschlauch.comfortreader.txt
deleted file mode 100644
index 532e409676..0000000000
--- a/metadata/com.mschlauch.comfortreader.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:http://comfortreader.rhizomaticdesign.net/
-Source Code:https://github.com/mschlauch/comfortreader
-Issue Tracker:https://github.com/mschlauch/comfortreader/issues
-
-Auto Name:Comfort Reader
-Summary:Streams text directly to your eyes
-Description:
-Comfort Reader makes reading easier for you. It streams any text directly to
-your eyes. Smart text processing and colored letter animation help you to
-recognize and understand text faster and better. Reading a book will seem just
-like watching a film, at the speed that works best for you.   Main features
-include:   supported file formats: txt and pdf displays; just the current phrase
-you are about to read; makes sure that associated words won't get chopped
-randomly (as in conventional Speed Reading Apps with Rapid Serial Visual
-Presentation); creates a fluent stream of text at your desired speed; colored
-letter animation stimulates better concentration and comprehension; trains your
-reading, reduces regression and expands your vision span; fully costumizable
-text appearance and reading configuration
-.
-
-Repo Type:git
-Repo:https://github.com/mschlauch/comfortreader
-
-Build:1.9alpha,6
-    commit=v1.9
-    subdir=app
-    gradle=yes
-
-Build:1.9beta,7
-    disable=Tag is missing
-    commit=v1.9beta
-    subdir=app
-    gradle=yes
-
-Build:1.9.3,9
-    disable=Could not find com.android.tools.build:gradle:3.0.1
-    commit=v1.9.3
-    subdir=app
-    gradle=yes
-
-Build:1.9.4,10
-    commit=v1.9.4
-    subdir=app
-    gradle=yes
-
-Build:1.9.5,11
-    commit=v1.9.5
-    subdir=app
-    gradle=yes
-
-Build:1.9.5,12
-    commit=cbce2d01e4f5ffccb4f5418a9c7412d99e20fbdb
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.9.5
-Current Version Code:12
diff --git a/metadata/com.mschlauch.comfortreader.yml b/metadata/com.mschlauch.comfortreader.yml
new file mode 100644
index 0000000000..f86bfabf93
--- /dev/null
+++ b/metadata/com.mschlauch.comfortreader.yml
@@ -0,0 +1,74 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+WebSite: http://comfortreader.rhizomaticdesign.net/
+SourceCode: https://github.com/mschlauch/comfortreader
+IssueTracker: https://github.com/mschlauch/comfortreader/issues
+
+AutoName: Comfort Reader
+Summary: Streams text directly to your eyes
+Description: |-
+    Comfort Reader makes reading easier for you. It streams any text directly to
+    your eyes. Smart text processing and colored letter animation help you to
+    recognize and understand text faster and better. Reading a book will seem just
+    like watching a film, at the speed that works best for you.   Main features
+    include:   supported file formats: txt and pdf displays; just the current phrase
+    you are about to read; makes sure that associated words won't get chopped
+    randomly (as in conventional Speed Reading Apps with Rapid Serial Visual
+    Presentation); creates a fluent stream of text at your desired speed; colored
+    letter animation stimulates better concentration and comprehension; trains your
+    reading, reduces regression and expands your vision span; fully costumizable
+    text appearance and reading configuration
+
+RepoType: git
+Repo: https://github.com/mschlauch/comfortreader
+
+Builds:
+  - versionName: 1.9alpha
+    versionCode: 6
+    commit: v1.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9beta
+    versionCode: 7
+    disable: Tag is missing
+    commit: v1.9beta
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.3
+    versionCode: 9
+    disable: Could not find com.android.tools.build:gradle:3.0.1
+    commit: v1.9.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.4
+    versionCode: 10
+    commit: v1.9.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.5
+    versionCode: 11
+    commit: v1.9.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.5
+    versionCode: 12
+    commit: cbce2d01e4f5ffccb4f5418a9c7412d99e20fbdb
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.9.5
+CurrentVersionCode: 12
diff --git a/metadata/com.mykola.lexinproject.txt b/metadata/com.mykola.lexinproject.txt
deleted file mode 100644
index 1d5e1ac63e..0000000000
--- a/metadata/com.mykola.lexinproject.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Categories:Reading
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/cmykola/Lexin
-Issue Tracker:https://github.com/cmykola/Lexin/issues
-
-Auto Name:LexinProject
-Summary:Swedish dictionary for learners
-Description:
-Currently supported: albanska; amhariska; arabiska; azerbajdzjanska; bosniska;
-engelskt; finska; grekiska; kroatiska; nordkurdiska; pashto; persiska; ryska;
-serbiska (latinskt); serbiska (kyrilliskt); somaliska; spanska; sydkurdiska;
-turkiska.
-.
-
-Repo Type:git
-Repo:https://github.com/cmykola/Lexin.git
-
-Build:1.5,6
-    commit=efb7ade05b24ab
-    srclibs=1:ActionBarSherlock@4.2.0
-    prebuild=mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5
-Current Version Code:6
diff --git a/metadata/com.mykola.lexinproject.yml b/metadata/com.mykola.lexinproject.yml
new file mode 100644
index 0000000000..f69273ac07
--- /dev/null
+++ b/metadata/com.mykola.lexinproject.yml
@@ -0,0 +1,28 @@
+Categories:
+  - Reading
+License: Apache-2.0
+SourceCode: https://github.com/cmykola/Lexin
+IssueTracker: https://github.com/cmykola/Lexin/issues
+
+AutoName: LexinProject
+Summary: Swedish dictionary for learners
+Description: |-
+    Currently supported: albanska; amhariska; arabiska; azerbajdzjanska; bosniska;
+    engelskt; finska; grekiska; kroatiska; nordkurdiska; pashto; persiska; ryska;
+    serbiska (latinskt); serbiska (kyrilliskt); somaliska; spanska; sydkurdiska;
+    turkiska.
+
+Builds:
+  - versionName: '1.5'
+    versionCode: 6
+    commit: efb7ade05b24ab
+    srclibs:
+      - 1:ActionBarSherlock@4.2.0
+    prebuild: mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.5'
+CurrentVersionCode: 6
+
+NoSourceSince: '1.5'
diff --git a/metadata/com.nagopy.android.disablemanager2.txt b/metadata/com.nagopy.android.disablemanager2.txt
deleted file mode 100644
index 00da050fb9..0000000000
--- a/metadata/com.nagopy.android.disablemanager2.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:http://blog.nagopy.com
-Source Code:https://github.com/75py/DisableManager
-Issue Tracker:https://github.com/75py/DisableManager/issues
-Changelog:https://github.com/75py/DisableManager/commits/HEAD
-
-Auto Name:Disable Manager
-Summary:Assists the disabling of pre-installed apps
-Description:
-Assists in the disabling of pre-installed apps. You can show lists of apps
-installed apps and can disable/enable them. Please do at your own risk.
-.
-
-Repo Type:git
-Repo:https://github.com/75py/DisableManager.git
-
-Build:2.0.2,20002
-    commit=e7ffb0ffaabdcfd98eed404af34639cc21e3f567
-    subdir=app
-    gradle=yes
-    rm=uiautomator,libs
-    prebuild=echo sdk.dir=$$SDK$$ >> ../ViewPagerIndicator/local.properties && \
-        sed -i -e "/include ':uiautomator'/d" ../settings.gradle
-
-Build:2.0.3,20003
-    commit=2.0.3
-    subdir=app
-    gradle=yes
-    rm=uiautomator,libs
-    prebuild=echo sdk.dir=$$SDK$$ >> ../ViewPagerIndicator/local.properties && \
-        sed -i -e "/include ':uiautomator'/d" ../settings.gradle
-
-Build:2.0.4,20004
-    commit=2.0.4
-    subdir=app
-    gradle=yes
-    rm=uiautomator,libs
-    prebuild=echo sdk.dir=$$SDK$$ >> ../ViewPagerIndicator/local.properties && \
-        sed -i -e "/include ':uiautomator'/d" ../settings.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.0.4
-Current Version Code:20004
diff --git a/metadata/com.nagopy.android.disablemanager2.yml b/metadata/com.nagopy.android.disablemanager2.yml
new file mode 100644
index 0000000000..83835863f7
--- /dev/null
+++ b/metadata/com.nagopy.android.disablemanager2.yml
@@ -0,0 +1,61 @@
+Categories:
+  - System
+License: Apache-2.0
+WebSite: http://blog.nagopy.com
+SourceCode: https://github.com/75py/DisableManager
+IssueTracker: https://github.com/75py/DisableManager/issues
+Changelog: https://github.com/75py/DisableManager/commits/HEAD
+
+AutoName: Disable Manager
+Summary: Assists the disabling of pre-installed apps
+Description: |-
+    Assists in the disabling of pre-installed apps. You can show lists of apps
+    installed apps and can disable/enable them. Please do at your own risk.
+
+RepoType: git
+Repo: https://github.com/75py/DisableManager.git
+
+Builds:
+  - versionName: 2.0.2
+    versionCode: 20002
+    commit: e7ffb0ffaabdcfd98eed404af34639cc21e3f567
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - uiautomator
+      - libs
+    prebuild:
+      - echo sdk.dir=$$SDK$$ >> ../ViewPagerIndicator/local.properties
+      - sed -i -e "/include ':uiautomator'/d" ../settings.gradle
+
+  - versionName: 2.0.3
+    versionCode: 20003
+    commit: 2.0.3
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - uiautomator
+      - libs
+    prebuild:
+      - echo sdk.dir=$$SDK$$ >> ../ViewPagerIndicator/local.properties
+      - sed -i -e "/include ':uiautomator'/d" ../settings.gradle
+
+  - versionName: 2.0.4
+    versionCode: 20004
+    commit: 2.0.4
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - uiautomator
+      - libs
+    prebuild:
+      - echo sdk.dir=$$SDK$$ >> ../ViewPagerIndicator/local.properties
+      - sed -i -e "/include ':uiautomator'/d" ../settings.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.0.4
+CurrentVersionCode: 20004
diff --git a/metadata/com.namelessdev.mpdroid.txt b/metadata/com.namelessdev.mpdroid.txt
deleted file mode 100644
index 0661454bea..0000000000
--- a/metadata/com.namelessdev.mpdroid.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-Categories:Multimedia
-License:Apache-2.0
-Web Site:https://github.com/abarisain/dmix/wiki
-Source Code:https://github.com/abarisain/dmix
-Issue Tracker:https://github.com/abarisain/dmix/issues
-Changelog:https://github.com/abarisain/dmix/releases
-
-Auto Name:MPDroid
-Summary:MPD (Music Player Daemon) client
-Description:
-An MPD client which supports streaming. Can fetch cover art from last.fm.
-
-You can browse your library, control the current song and playlist, manage your
-outputs, and stream music right to your mobile device. And all of this wrapped
-up in a beautiful modern Holo design!
-.
-
-Repo Type:git
-Repo:https://github.com/abarisain/dmix.git
-
-Build:0.7,18
-    commit=e3bcfaa4e4
-    subdir=MPDroid
-    prebuild=mkdir libs/ && \
-        cd ../JMPDComm/ && \
-        ant && \
-        cp JMPDComm.jar ../MPDroid/libs/ && \
-        cd ../MPDroid && \
-        cp -r ../lastfm-java/src/net/ src/
-
-Build:1.0,20
-    commit=63a363a2ccc13232f4d80f5f857ab19b40fb5469
-    subdir=MPDroid
-    prebuild=mv lib/ libs/ && \
-        cd ../JMPDComm/ && \
-        ant && \
-        cp JMPDComm.jar ../MPDroid/libs/ && \
-        cd ../MPDroid && \
-        cp -r ../lastfm-java/src/net/ src/
-    target=android-13
-
-Build:1.02,24
-    commit=e244b51aaa
-    subdir=MPDroid
-    update=.,../ActionBarSherlock
-
-Build:1.03.1,26
-    commit=8758a34
-    subdir=MPDroid
-    update=.,../ActionBarSherlock
-
-Build:1.05,30
-    disable=failing
-    commit=5438917
-    subdir=MPDroid
-    update=.,../ActionBarSherlock,../JMPDComm
-
-Build:1.06,31
-    disable=9508bb7f79
-    commit=unknown - see disabled
-    subdir=MPDroid
-    init=rm -rf Screenshots/ Website/ icons/ JmDMS/ LastFM-java/
-    update=.,../ActionBarSherlock,../JMPDComm
-
-Build:1.06 beta 2,33
-    commit=109cfe14
-    subdir=MPDroid
-    init=rm -rf Screenshots/ Website/ icons/
-    update=.,../ActionBarSherlock,../JMPDComm
-
-Build:1.06 Beta 7,38
-    commit=1_06_b7
-    subdir=MPDroid
-    init=rm -rf Screenshots/ Website/ icons/
-
-Build:1.06,40
-    commit=1_06_final
-    subdir=MPDroid
-    init=rm -rf Screenshots/ Website/ icons/
-
-Build:1.07.2,54
-    commit=1_07_2_final
-    subdir=MPDroid
-    gradle=foss
-    forceversion=yes
-    prebuild=sed -i '/crashlytics/d' build.gradle
-
-Build:1.08 Beta 4,58
-    commit=1_08_b4
-    subdir=MPDroid
-    patch=0001-remove-fabric.io-and-crashlytics.patch,0002-remove-versionName-logic.patch
-    gradle=foss
-
-Maintainer Notes:
-From version 1.08 forceversion doesn't work because it replaces to much in
-build.gradle, so we use a patch that removes the unwanted version calculation
-logic from the file instead.
-.
-
-Auto Update Mode:None
-Update Check Mode:Tags ^[0-9_]*[^b]*$
-Current Version:1.07.2 Final
-Current Version Code:54
diff --git a/metadata/com.namelessdev.mpdroid.yml b/metadata/com.namelessdev.mpdroid.yml
new file mode 100644
index 0000000000..78e706686f
--- /dev/null
+++ b/metadata/com.namelessdev.mpdroid.yml
@@ -0,0 +1,133 @@
+Categories:
+  - Multimedia
+License: Apache-2.0
+WebSite: https://github.com/abarisain/dmix/wiki
+SourceCode: https://github.com/abarisain/dmix
+IssueTracker: https://github.com/abarisain/dmix/issues
+Changelog: https://github.com/abarisain/dmix/releases
+
+AutoName: MPDroid
+Summary: MPD (Music Player Daemon) client
+Description: |-
+    An MPD client which supports streaming. Can fetch cover art from last.fm.
+
+    You can browse your library, control the current song and playlist, manage your
+    outputs, and stream music right to your mobile device. And all of this wrapped
+    up in a beautiful modern Holo design!
+
+RepoType: git
+Repo: https://github.com/abarisain/dmix.git
+
+Builds:
+  - versionName: '0.7'
+    versionCode: 18
+    commit: e3bcfaa4e4
+    subdir: MPDroid
+    prebuild:
+      - mkdir libs/
+      - cd ../JMPDComm/
+      - ant
+      - cp JMPDComm.jar ../MPDroid/libs/
+      - cd ../MPDroid
+      - cp -r ../lastfm-java/src/net/ src/
+
+  - versionName: '1.0'
+    versionCode: 20
+    commit: 63a363a2ccc13232f4d80f5f857ab19b40fb5469
+    subdir: MPDroid
+    prebuild:
+      - mv lib/ libs/
+      - cd ../JMPDComm/
+      - ant
+      - cp JMPDComm.jar ../MPDroid/libs/
+      - cd ../MPDroid
+      - cp -r ../lastfm-java/src/net/ src/
+    target: android-13
+
+  - versionName: '1.02'
+    versionCode: 24
+    commit: e244b51aaa
+    subdir: MPDroid
+    androidupdate:
+      - .
+      - ../ActionBarSherlock
+
+  - versionName: 1.03.1
+    versionCode: 26
+    commit: 8758a34
+    subdir: MPDroid
+    androidupdate:
+      - .
+      - ../ActionBarSherlock
+
+  - versionName: '1.05'
+    versionCode: 30
+    disable: failing
+    commit: '5438917'
+    subdir: MPDroid
+    androidupdate:
+      - .
+      - ../ActionBarSherlock
+      - ../JMPDComm
+
+  - versionName: '1.06'
+    versionCode: 31
+    disable: 9508bb7f79
+    commit: unknown - see disabled
+    subdir: MPDroid
+    init: rm -rf Screenshots/ Website/ icons/ JmDMS/ LastFM-java/
+    androidupdate:
+      - .
+      - ../ActionBarSherlock
+      - ../JMPDComm
+
+  - versionName: 1.06 beta 2
+    versionCode: 33
+    commit: 109cfe14
+    subdir: MPDroid
+    init: rm -rf Screenshots/ Website/ icons/
+    androidupdate:
+      - .
+      - ../ActionBarSherlock
+      - ../JMPDComm
+
+  - versionName: 1.06 Beta 7
+    versionCode: 38
+    commit: 1_06_b7
+    subdir: MPDroid
+    init: rm -rf Screenshots/ Website/ icons/
+
+  - versionName: '1.06'
+    versionCode: 40
+    commit: 1_06_final
+    subdir: MPDroid
+    init: rm -rf Screenshots/ Website/ icons/
+
+  - versionName: 1.07.2
+    versionCode: 54
+    commit: 1_07_2_final
+    subdir: MPDroid
+    gradle:
+      - foss
+    forceversion: true
+    prebuild: sed -i '/crashlytics/d' build.gradle
+
+  - versionName: 1.08 Beta 4
+    versionCode: 58
+    commit: 1_08_b4
+    subdir: MPDroid
+    patch:
+      - 0001-remove-fabric.io-and-crashlytics.patch
+      - 0002-remove-versionName-logic.patch
+    gradle:
+      - foss
+
+MaintainerNotes: |-
+    From version 1.08 forceversion doesn't work because it replaces to much in
+    build.gradle, so we use a patch that removes the unwanted version calculation
+    logic from the file instead.
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags ^[0-9_]*[^b]*$
+CurrentVersion: 1.07.2 Final
+CurrentVersionCode: 54
diff --git a/metadata/com.nathanosman.chronosnap.txt b/metadata/com.nathanosman.chronosnap.txt
deleted file mode 100644
index 359ab003d1..0000000000
--- a/metadata/com.nathanosman.chronosnap.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Categories:Multimedia,Graphics
-License:MIT
-Web Site:
-Source Code:https://github.com/nathan-osman/chronosnap
-Issue Tracker:https://github.com/nathan-osman/chronosnap/issues
-
-Auto Name:ChronoSnap
-Summary:Take photos in intervals
-Description:
-Capture a sequence of photos at regular intervals.
-
-Features:
-
-* Customize the capture interval
-* Set a limit on the number of images captured
-* Capture images with the screen turned off
-* Persistent notification during capture
-* Interface uses material design guidelines
-.
-
-Repo Type:git
-Repo:https://github.com/nathan-osman/chronosnap
-
-Build:1.0.4,5
-    commit=v1.0.4
-    subdir=app
-    gradle=yes
-
-Build:1.0.5,6
-    commit=v1.0.5
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.0.5
-Current Version Code:6
diff --git a/metadata/com.nathanosman.chronosnap.yml b/metadata/com.nathanosman.chronosnap.yml
new file mode 100644
index 0000000000..3c556d180e
--- /dev/null
+++ b/metadata/com.nathanosman.chronosnap.yml
@@ -0,0 +1,42 @@
+Categories:
+  - Multimedia
+  - Graphics
+License: MIT
+SourceCode: https://github.com/nathan-osman/chronosnap
+IssueTracker: https://github.com/nathan-osman/chronosnap/issues
+
+AutoName: ChronoSnap
+Summary: Take photos in intervals
+Description: |-
+    Capture a sequence of photos at regular intervals.
+
+    Features:
+
+    * Customize the capture interval
+    * Set a limit on the number of images captured
+    * Capture images with the screen turned off
+    * Persistent notification during capture
+    * Interface uses material design guidelines
+
+RepoType: git
+Repo: https://github.com/nathan-osman/chronosnap
+
+Builds:
+  - versionName: 1.0.4
+    versionCode: 5
+    commit: v1.0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.5
+    versionCode: 6
+    commit: v1.0.5
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.0.5
+CurrentVersionCode: 6
diff --git a/metadata/com.nbossard.packlist.txt b/metadata/com.nbossard.packlist.txt
deleted file mode 100644
index 1f263bbddc..0000000000
--- a/metadata/com.nbossard.packlist.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-Categories:Writing
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/nbossard/packlist
-Issue Tracker:https://github.com/nbossard/packlist/issues
-Changelog:https://github.com/nbossard/packlist/releases
-
-Auto Name:packlist
-Summary:Manage packing lists
-Description:
-Helps in planning trips and organizing packing lists.
-.
-
-Repo Type:git
-Repo:https://github.com/nbossard/packlist
-
-Build:0.6,7
-    commit=e42378749705fe90f7ac1f8a37a7cfb573c0b8cf
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.7.1,9
-    commit=0.7.1
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-    prebuild=sed -i -e '/versionNameSuffix/d' build.gradle
-
-Build:0.8,11
-    commit=0.8
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.8.1,12
-    commit=0.8.1
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.9,13
-    commit=0.9
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.10,14
-    commit=0.10
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.10.1,15
-    commit=0.10.1
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.10.2,16
-    commit=0.10.2
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.11,17
-    commit=0.11
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.12,18
-    commit=0.12
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Build:0.13,19
-    commit=0.13
-    subdir=app
-    gradle=yes
-    rm=gradle.properties
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.13
-Current Version Code:19
diff --git a/metadata/com.nbossard.packlist.yml b/metadata/com.nbossard.packlist.yml
new file mode 100644
index 0000000000..0e16698231
--- /dev/null
+++ b/metadata/com.nbossard.packlist.yml
@@ -0,0 +1,119 @@
+Categories:
+  - Writing
+License: Apache-2.0
+SourceCode: https://github.com/nbossard/packlist
+IssueTracker: https://github.com/nbossard/packlist/issues
+Changelog: https://github.com/nbossard/packlist/releases
+
+AutoName: packlist
+Summary: Manage packing lists
+Description: Helps in planning trips and organizing packing lists.
+
+RepoType: git
+Repo: https://github.com/nbossard/packlist
+
+Builds:
+  - versionName: '0.6'
+    versionCode: 7
+    commit: e42378749705fe90f7ac1f8a37a7cfb573c0b8cf
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: 0.7.1
+    versionCode: 9
+    commit: 0.7.1
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+    prebuild: sed -i -e '/versionNameSuffix/d' build.gradle
+
+  - versionName: '0.8'
+    versionCode: 11
+    commit: '0.8'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: 0.8.1
+    versionCode: 12
+    commit: 0.8.1
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: '0.9'
+    versionCode: 13
+    commit: '0.9'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: '0.10'
+    versionCode: 14
+    commit: '0.10'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: 0.10.1
+    versionCode: 15
+    commit: 0.10.1
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: 0.10.2
+    versionCode: 16
+    commit: 0.10.2
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: '0.11'
+    versionCode: 17
+    commit: '0.11'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: '0.12'
+    versionCode: 18
+    commit: '0.12'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+  - versionName: '0.13'
+    versionCode: 19
+    commit: '0.13'
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle.properties
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '0.13'
+CurrentVersionCode: 19
diff --git a/metadata/com.nextgis.mobile.txt b/metadata/com.nextgis.mobile.txt
deleted file mode 100644
index 367db67d00..0000000000
--- a/metadata/com.nextgis.mobile.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Categories:Navigation
-License:GPL-3.0-or-later
-Web Site:http://nextgis.ru/en/nextgis-mobile
-Source Code:https://github.com/nextgis/android_gisapp
-Issue Tracker:https://github.com/nextgis/android_gisapp/issues
-
-Auto Name:NextGIS Mobile
-Summary:GIS that lets you create, edit and export geodata, both online and offline
-Description:
-NextGIS Mobile allows to:
-
-* show multi-layer map (layers can come from online and offline sources);
-* change visibility and layers order;
-* navigate the map (panning, zoom in, zoom out);
-* collect data in the field;
-* edit vector data (both geometries and attributes) online and offline;
-* record tracks;
-* show coordinates, speed, elevation etc.
-
-'''Note:''' This app will currently not see updates in F-Droid as it introduced
-proprietary components to its source.
-.
-
-Repo Type:git
-Repo:https://github.com/nextgis/android_gisapp
-
-Build:2.3,13
-    commit=3ceca6fbf27dd10f030c1910eb225b3f29c30afa
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i "s/\(buildscript {\)/\1\n System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'/" ../build.gradle
-
-Build:2.4,16
-    commit=v2.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i "s/\(buildscript {\)/\1\n System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'/" ../build.gradle
-
-Build:2.5,19
-    disable=Google Repository
-    commit=v2.5
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i "s/\(buildscript {\)/\1\n System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true'/" ../build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.5
-Current Version Code:19
diff --git a/metadata/com.nextgis.mobile.yml b/metadata/com.nextgis.mobile.yml
new file mode 100644
index 0000000000..2795dd4531
--- /dev/null
+++ b/metadata/com.nextgis.mobile.yml
@@ -0,0 +1,62 @@
+Categories:
+  - Navigation
+License: GPL-3.0-or-later
+WebSite: http://nextgis.ru/en/nextgis-mobile
+SourceCode: https://github.com/nextgis/android_gisapp
+IssueTracker: https://github.com/nextgis/android_gisapp/issues
+
+AutoName: NextGIS Mobile
+Summary: GIS that lets you create, edit and export geodata, both online and offline
+Description: |-
+    NextGIS Mobile allows to:
+
+    * show multi-layer map (layers can come from online and offline sources);
+    * change visibility and layers order;
+    * navigate the map (panning, zoom in, zoom out);
+    * collect data in the field;
+    * edit vector data (both geometries and attributes) online and offline;
+    * record tracks;
+    * show coordinates, speed, elevation etc.
+
+    '''Note:''' This app will currently not see updates in F-Droid as it introduced
+    proprietary components to its source.
+
+RepoType: git
+Repo: https://github.com/nextgis/android_gisapp
+
+Builds:
+  - versionName: '2.3'
+    versionCode: 13
+    commit: 3ceca6fbf27dd10f030c1910eb225b3f29c30afa
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild: sed -i "s/\(buildscript {\)/\1\n System.properties['com.android.build.gradle.overrideVersionCheck']
+        = 'true'/" ../build.gradle
+
+  - versionName: '2.4'
+    versionCode: 16
+    commit: v2.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild: sed -i "s/\(buildscript {\)/\1\n System.properties['com.android.build.gradle.overrideVersionCheck']
+        = 'true'/" ../build.gradle
+
+  - versionName: '2.5'
+    versionCode: 19
+    disable: Google Repository
+    commit: v2.5
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild: sed -i "s/\(buildscript {\)/\1\n System.properties['com.android.build.gradle.overrideVersionCheck']
+        = 'true'/" ../build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '2.5'
+CurrentVersionCode: 19
diff --git a/metadata/com.nhellfire.kerneladiutor.txt b/metadata/com.nhellfire.kerneladiutor.txt
deleted file mode 100644
index 34c592e68f..0000000000
--- a/metadata/com.nhellfire.kerneladiutor.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-Categories:System
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/NHellFire/KernelAdiutor
-Issue Tracker:https://github.com/NHellFire/KernelAdiutor/issues
-
-Auto Name:Kernel Adiutor
-Summary:Manage kernel parameters
-Description:
-Tweak and monitor kernel parameters. Depending on the device and kernel used,
-this includes:
-
-* CPU (Frequency, Governor)
-* I/O Scheduler
-* Kernel Samepage Merging
-* Low Memory Killer (Minfree settings)
-* Virtual Memory
-* Flash/Backup
-* Build prop Editor
-* Recovery (Flash, Wipe)
-* Init.d editor
-* Saving Profiles
-* and a lot more...
-
-Features which aren't supported by your device won't show up in the first place.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/NHellFire/KernelAdiutor
-
-Build:0.9.73.1,243
-    commit=v0.9.73.1
-    subdir=app
-    gradle=yes
-
-Build:0.9.73.1.1,244
-    commit=v0.9.73.1.1
-    subdir=app
-    gradle=yes
-
-Build:0.9.73.1.2,245
-    commit=v0.9.73.1.2
-    subdir=app
-    gradle=yes
-
-Build:0.9.73.1.3,246
-    commit=v0.9.73.1.3
-    subdir=app
-    gradle=yes
-
-Build:0.9.73.3-fdroid0,248
-    commit=v0.9.73.3-fdroid0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.9.73.3-fdroid0
-Current Version Code:248
diff --git a/metadata/com.nhellfire.kerneladiutor.yml b/metadata/com.nhellfire.kerneladiutor.yml
new file mode 100644
index 0000000000..6d7fdf1810
--- /dev/null
+++ b/metadata/com.nhellfire.kerneladiutor.yml
@@ -0,0 +1,71 @@
+Categories:
+  - System
+License: GPL-3.0-or-later
+SourceCode: https://github.com/NHellFire/KernelAdiutor
+IssueTracker: https://github.com/NHellFire/KernelAdiutor/issues
+
+AutoName: Kernel Adiutor
+Summary: Manage kernel parameters
+Description: |-
+    Tweak and monitor kernel parameters. Depending on the device and kernel used,
+    this includes:
+
+    * CPU (Frequency, Governor)
+    * I/O Scheduler
+    * Kernel Samepage Merging
+    * Low Memory Killer (Minfree settings)
+    * Virtual Memory
+    * Flash/Backup
+    * Build prop Editor
+    * Recovery (Flash, Wipe)
+    * Init.d editor
+    * Saving Profiles
+    * and a lot more...
+
+    Features which aren't supported by your device won't show up in the first place.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/NHellFire/KernelAdiutor
+
+Builds:
+  - versionName: 0.9.73.1
+    versionCode: 243
+    commit: v0.9.73.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.73.1.1
+    versionCode: 244
+    commit: v0.9.73.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.73.1.2
+    versionCode: 245
+    commit: v0.9.73.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.73.1.3
+    versionCode: 246
+    commit: v0.9.73.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.73.3-fdroid0
+    versionCode: 248
+    commit: v0.9.73.3-fdroid0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.9.73.3-fdroid0
+CurrentVersionCode: 248
diff --git a/metadata/com.nicolasbrailo.vlcfreemote.txt b/metadata/com.nicolasbrailo.vlcfreemote.txt
deleted file mode 100644
index f58a4b69b8..0000000000
--- a/metadata/com.nicolasbrailo.vlcfreemote.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/nicolasbrailo/VlcFreemote
-Issue Tracker:https://github.com/nicolasbrailo/VlcFreemote/issues
-
-Auto Name:VlcFreemote
-Summary:Remotely control a VLC server
-Description:
-Simple & easy to use VLC remote control. Setup VLC to use its HTTP interface and
-VlcFreemote will automatically detect it. Intuitive interface to play media,
-manage the play queue, bookmarks, etc.
-.
-
-Repo Type:git
-Repo:https://github.com/nicolasbrailo/VlcFreemote.git
-
-Build:1.6,6
-    commit=V1.6
-    subdir=app
-    gradle=yes
-
-Build:1.7,7
-    commit=V1.7
-    subdir=app
-    gradle=yes
-
-Build:1.8,8
-    commit=V1.8
-    subdir=app
-    gradle=yes
-
-Build:1.10,10
-    commit=V1.10
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version V%v
-Update Check Mode:Tags
-Current Version:1.10
-Current Version Code:10
diff --git a/metadata/com.nicolasbrailo.vlcfreemote.yml b/metadata/com.nicolasbrailo.vlcfreemote.yml
new file mode 100644
index 0000000000..6fd450a102
--- /dev/null
+++ b/metadata/com.nicolasbrailo.vlcfreemote.yml
@@ -0,0 +1,49 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-or-later
+SourceCode: https://github.com/nicolasbrailo/VlcFreemote
+IssueTracker: https://github.com/nicolasbrailo/VlcFreemote/issues
+
+AutoName: VlcFreemote
+Summary: Remotely control a VLC server
+Description: |-
+    Simple & easy to use VLC remote control. Setup VLC to use its HTTP interface and
+    VlcFreemote will automatically detect it. Intuitive interface to play media,
+    manage the play queue, bookmarks, etc.
+
+RepoType: git
+Repo: https://github.com/nicolasbrailo/VlcFreemote.git
+
+Builds:
+  - versionName: '1.6'
+    versionCode: 6
+    commit: V1.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 7
+    commit: V1.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 8
+    commit: V1.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 10
+    commit: V1.10
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version V%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.10'
+CurrentVersionCode: 10
diff --git a/metadata/com.nkanaev.comics.txt b/metadata/com.nkanaev.comics.txt
deleted file mode 100644
index 2e002a7dda..0000000000
--- a/metadata/com.nkanaev.comics.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-Categories:Reading,Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/nkanaev/bubble
-Issue Tracker:https://github.com/nkanaev/bubble/issues
-
-Auto Name:Bubble
-Summary:View comic books
-Description:
-* Optimized for tablets
-* Supports CBZ/ZIP and CBR/RAR
-* Advanced zoom and scaling modes
-* Library management with automatic bookmarks
-* Simple file browser
-.
-
-Repo Type:git
-Repo:https://github.com/nkanaev/bubble.git
-
-Build:1.0.2,1
-    commit=v1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.1.0,2
-    commit=v1.1.0
-    subdir=app
-    gradle=yes
-
-Build:1.2.0,3
-    commit=v1.2.0
-    subdir=app
-    gradle=yes
-
-Build:1.3.0,4
-    commit=v1.3.0
-    subdir=app
-    gradle=yes
-
-Build:1.4.0,5
-    commit=v1.4.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.0,6
-    commit=v1.5.0
-    subdir=app
-    gradle=yes
-
-Build:1.6.0,7
-    commit=v1.6.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.6.0
-Current Version Code:7
diff --git a/metadata/com.nkanaev.comics.yml b/metadata/com.nkanaev.comics.yml
new file mode 100644
index 0000000000..78355ae3f1
--- /dev/null
+++ b/metadata/com.nkanaev.comics.yml
@@ -0,0 +1,75 @@
+Categories:
+  - Reading
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/nkanaev/bubble
+IssueTracker: https://github.com/nkanaev/bubble/issues
+
+AutoName: Bubble
+Summary: View comic books
+Description: |-
+    '''NOTE:''' This app is no longer maintained.
+
+    * Optimized for tablets
+    * Supports CBZ/ZIP and CBR/RAR
+    * Advanced zoom and scaling modes
+    * Library management with automatic bookmarks
+    * Simple file browser
+
+RepoType: git
+Repo: https://github.com/nkanaev/bubble.git
+
+Builds:
+  - versionName: 1.0.2
+    versionCode: 1
+    commit: v1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 2
+    commit: v1.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 3
+    commit: v1.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 4
+    commit: v1.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 5
+    commit: v1.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 6
+    commit: v1.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.0
+    versionCode: 7
+    commit: v1.6.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.6.0
+CurrentVersionCode: 7