diff --git a/metadata/cz.martykan.forecastie.txt b/metadata/cz.martykan.forecastie.txt
deleted file mode 100644
index e9a3d6178d..0000000000
--- a/metadata/cz.martykan.forecastie.txt
+++ /dev/null
@@ -1,184 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/martykan/forecastie
-Issue Tracker:https://github.com/martykan/forecastie/issues
-Changelog:https://github.com/martykan/forecastie/releases
-
-Auto Name:Forecastie
-Summary:Show weather information from OpenWeatherMap
-Description:
-Show weather information. Data is gathered from [http://openweathermap.org/
-OpenWeatherMap], via their public API.
-
-Features:
-
-* Simple design
-* Detailed 5 day forecast
-* Multiple units
-* Works with any city in the world
-* Offline functionality
-
-''NonFreeNet:'' OpenWeatherMap service itself is not open source.
-.
-
-Repo Type:git
-Repo:https://github.com/martykan/forecastie
-
-Build:1.0,1
-    disable=wrong tag
-    commit=v0.1
-    subdir=app
-    gradle=yes
-
-Build:0.2,2
-    commit=v0.2
-    subdir=app
-    gradle=yes
-
-Build:0.3,3
-    commit=v0.3
-    subdir=app
-    gradle=yes
-
-Build:0.4,4
-    commit=v0.4
-    subdir=app
-    gradle=yes
-
-Build:0.5,5
-    commit=v0.5
-    subdir=app
-    gradle=yes
-
-Build:0.6,6
-    commit=v0.6
-    subdir=app
-    gradle=yes
-
-Build:0.7,7
-    commit=v0.7
-    subdir=app
-    gradle=yes
-
-Build:0.8,8
-    commit=v0.8
-    subdir=app
-    gradle=yes
-
-Build:0.9,9
-    commit=v0.9
-    subdir=app
-    gradle=yes
-
-Build:0.9.1,10
-    commit=v0.9.1
-    subdir=app
-    gradle=yes
-
-Build:1.0,12
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,13
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:1.2,14
-    commit=v1.2
-    subdir=app
-    gradle=yes
-
-Build:1.3,15
-    disable=failing
-    commit=v1.3
-    subdir=app
-    gradle=yes
-
-Build:1.4,16
-    commit=v1.4
-    subdir=app
-    gradle=yes
-
-Build:1.4.1,17
-    commit=v1.4.1
-    subdir=app
-    gradle=yes
-
-Build:1.5,18
-    commit=v1.5
-    subdir=app
-    gradle=yes
-
-Build:1.6,19
-    commit=v1.6
-    subdir=app
-    gradle=yes
-
-Build:1.6.1,20
-    commit=v1.6.1
-    subdir=app
-    gradle=yes
-
-Build:1.6.2,21
-    commit=v1.6.2
-    subdir=app
-    gradle=yes
-
-Build:1.6.4,23
-    commit=v1.6.4
-    subdir=app
-    gradle=yes
-
-Build:1.7,24
-    commit=v1.7
-    subdir=app
-    gradle=yes
-
-Build:1.7.2,25
-    commit=v1.7.2
-    subdir=app
-    gradle=yes
-
-Build:1.8,26
-    commit=v1.8
-    subdir=app
-    gradle=yes
-
-Build:1.9.1,28
-    commit=v1.9.1
-    subdir=app
-    gradle=yes
-
-Build:1.10,29
-    commit=v1.10
-    subdir=app
-    gradle=yes
-
-Build:1.10.1,30
-    commit=v1.10.1
-    subdir=app
-    gradle=yes
-
-Build:1.10.2,31
-    commit=v1.10.2
-    subdir=app
-    gradle=yes
-
-Build:1.10.3,32
-    commit=v1.10.3
-    subdir=app
-    gradle=yes
-
-Build:1.10.4,33
-    commit=v1.10.4
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.10.4
-Current Version Code:33
diff --git a/metadata/cz.martykan.forecastie.yml b/metadata/cz.martykan.forecastie.yml
new file mode 100644
index 0000000000..f989ff1a9a
--- /dev/null
+++ b/metadata/cz.martykan.forecastie.yml
@@ -0,0 +1,245 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+SourceCode: https://github.com/martykan/forecastie
+IssueTracker: https://github.com/martykan/forecastie/issues
+Changelog: https://github.com/martykan/forecastie/releases
+
+AutoName: Forecastie
+Summary: Show weather information from OpenWeatherMap
+Description: |-
+    Show weather information. Data is gathered from [http://openweathermap.org/
+    OpenWeatherMap], via their public API.
+
+    Features:
+
+    * Simple design
+    * Detailed 5 day forecast
+    * Multiple units
+    * Works with any city in the world
+    * Offline functionality
+
+    ''NonFreeNet:'' OpenWeatherMap service itself is not open source.
+
+RepoType: git
+Repo: https://github.com/martykan/forecastie
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    disable: wrong tag
+    commit: v0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.2'
+    versionCode: 2
+    commit: v0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.3'
+    versionCode: 3
+    commit: v0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 4
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.5'
+    versionCode: 5
+    commit: v0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.6'
+    versionCode: 6
+    commit: v0.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.7'
+    versionCode: 7
+    commit: v0.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.8'
+    versionCode: 8
+    commit: v0.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.9'
+    versionCode: 9
+    commit: v0.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.1
+    versionCode: 10
+    commit: v0.9.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 12
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 13
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 14
+    commit: v1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 15
+    disable: failing
+    commit: v1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 16
+    commit: v1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 17
+    commit: v1.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 18
+    commit: v1.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 19
+    commit: v1.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.1
+    versionCode: 20
+    commit: v1.6.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.2
+    versionCode: 21
+    commit: v1.6.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.4
+    versionCode: 23
+    commit: v1.6.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 24
+    commit: v1.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.2
+    versionCode: 25
+    commit: v1.7.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 26
+    commit: v1.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.1
+    versionCode: 28
+    commit: v1.9.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 29
+    commit: v1.10
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.1
+    versionCode: 30
+    commit: v1.10.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.2
+    versionCode: 31
+    commit: v1.10.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.3
+    versionCode: 32
+    commit: v1.10.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.4
+    versionCode: 33
+    commit: v1.10.4
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.10.4
+CurrentVersionCode: 33
diff --git a/metadata/cz.martykan.webtube.txt b/metadata/cz.martykan.webtube.txt
deleted file mode 100644
index 37d7886884..0000000000
--- a/metadata/cz.martykan.webtube.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Multimedia,Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/martykan/webTube
-Issue Tracker:https://github.com/martykan/webTube/issues
-Changelog:https://github.com/martykan/webTube/releases
-
-Auto Name:WebTube
-Summary:Play YouTube videos
-Description:
-Lightweight YouTube frontend that's supposed to be used without the proprietary
-YouTube-API or any of Google's (proprietary) play-services.
-.
-
-Repo Type:git
-Repo:https://github.com/martykan/webTube
-
-Build:0.3.1,4
-    commit=v0.3.1
-    subdir=app
-    gradle=yes
-
-Build:0.4,5
-    commit=v0.4
-    subdir=app
-    gradle=yes
-
-Build:0.5,6
-    commit=v0.5
-    subdir=app
-    gradle=yes
-
-Build:0.6,7
-    commit=v0.6
-    subdir=app
-    gradle=yes
-
-Build:0.7,8
-    commit=v0.7
-    subdir=app
-    gradle=yes
-
-Build:0.8,9
-    commit=v0.8
-    subdir=app
-    gradle=yes
-
-Build:0.9,10
-    commit=v0.9
-    subdir=app
-    gradle=yes
-
-Build:1.0,11
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.1,12
-    commit=v1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.1,13
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:1.1.2,15
-    disable=Could not find com.android.tools.build:gradle:3.1.3
-    commit=v1.1.2
-    subdir=app
-    gradle=yes
-
-Build:1.1.3,16
-    disable=Could not find com.android.support:appcompat-v7:28.0.0-alpha3
-    commit=v1.1.3
-    subdir=app
-    gradle=yes
-
-Build:1.2,17
-    commit=v1.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2
-Current Version Code:17
diff --git a/metadata/cz.martykan.webtube.yml b/metadata/cz.martykan.webtube.yml
new file mode 100644
index 0000000000..f9658f65d4
--- /dev/null
+++ b/metadata/cz.martykan.webtube.yml
@@ -0,0 +1,117 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Multimedia
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/martykan/webTube
+IssueTracker: https://github.com/martykan/webTube/issues
+Changelog: https://github.com/martykan/webTube/releases
+
+AutoName: WebTube
+Summary: Play YouTube videos
+Description: |-
+    Lightweight YouTube frontend that's supposed to be used without the proprietary
+    YouTube-API or any of Google's (proprietary) play-services.
+
+RepoType: git
+Repo: https://github.com/martykan/webTube
+
+Builds:
+  - versionName: 0.3.1
+    versionCode: 4
+    commit: v0.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 5
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.5'
+    versionCode: 6
+    commit: v0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.6'
+    versionCode: 7
+    commit: v0.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.7'
+    versionCode: 8
+    commit: v0.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.8'
+    versionCode: 9
+    commit: v0.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.9'
+    versionCode: 10
+    commit: v0.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 11
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 12
+    commit: v1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 13
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.2
+    versionCode: 15
+    disable: Could not find com.android.tools.build:gradle:3.1.3
+    commit: v1.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.3
+    versionCode: 16
+    disable: Could not find com.android.support:appcompat-v7:28.0.0-alpha3
+    commit: v1.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 17
+    commit: v1.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.2'
+CurrentVersionCode: 17
diff --git a/metadata/damo.three.ie.txt b/metadata/damo.three.ie.txt
deleted file mode 100644
index c34f5e85f9..0000000000
--- a/metadata/damo.three.ie.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/DamienOReilly/PrepayCredit
-Issue Tracker:https://github.com/DamienOReilly/PrepayCredit/issues
-
-Auto Name:Prepay Credit
-Summary:Info for Irish cell network
-Description:
-For prepay (3pay) customers of 3 Ireland: fetches and displays your My3 3pay
-usage information.
-
-It can work when you are on 3's GSM network and also when on Wi-Fi.
-
-The app requires your My3 login credentials; the app shows how to set up an
-account and provides a way for obtaining your SIM serial (ICCID) which is
-required to register.
-
-Neither the app nor its author is affiliated with Hutchison 3G Ireland.
-.
-
-Repo Type:git
-Repo:https://github.com/DamienOReilly/PrepayCredit.git
-
-Build:0.8,8
-    commit=ab4f06d899
-    subdir=My3Android
-    maven=yes
-
-Build:0.9,9
-    commit=v0.9
-    subdir=PrepayCreditAndroid
-    maven=yes
-
-Build:0.12,14
-    commit=v0.12-gradle
-    subdir=PrepayCreditAndroid
-    gradle=yes
-
-Build:0.13,15
-    commit=0.13
-    subdir=PrepayCreditAndroid
-    gradle=yes
-
-Build:0.14,16
-    commit=v0.14
-    subdir=PrepayCreditAndroid
-    gradle=yes
-
-Build:0.15,17
-    commit=v0.15
-    subdir=PrepayCreditAndroid
-    gradle=yes
-
-Build:0.16,18
-    disable=build outputs non-utf8 bytes
-    commit=v0.16
-    subdir=PrepayCreditAndroid
-    gradle=yes
-
-Build:0.17,19
-    commit=v0.17
-    subdir=PrepayCreditAndroid
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.17
-Current Version Code:19
diff --git a/metadata/damo.three.ie.yml b/metadata/damo.three.ie.yml
new file mode 100644
index 0000000000..22ff44741a
--- /dev/null
+++ b/metadata/damo.three.ie.yml
@@ -0,0 +1,84 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/DamienOReilly/PrepayCredit
+IssueTracker: https://github.com/DamienOReilly/PrepayCredit/issues
+Changelog: https://github.com/DamienOReilly/PrepayCredit/releases
+
+AutoName: Prepay Credit
+Summary: Info for Irish cell network
+Description: |-
+    For prepay (3pay) customers of 3 Ireland: fetches and displays your My3 3pay
+    usage information.
+
+    It can work when you are on 3’s GSM network and also when on Wi-Fi.
+
+    The app requires your My3 login credentials; the app shows how to set up an
+    account and provides a way for obtaining your SIM serial (ICCID) which is
+    required to register.
+
+    Neither the app nor its author is affiliated with Hutchison 3G Ireland.
+
+RepoType: git
+Repo: https://github.com/DamienOReilly/PrepayCredit.git
+
+Builds:
+  - versionName: '0.8'
+    versionCode: 8
+    commit: ab4f06d899
+    subdir: My3Android
+    maven: 'yes'
+
+  - versionName: '0.9'
+    versionCode: 9
+    commit: v0.9
+    subdir: PrepayCreditAndroid
+    maven: 'yes'
+
+  - versionName: '0.12'
+    versionCode: 14
+    commit: v0.12-gradle
+    subdir: PrepayCreditAndroid
+    gradle:
+      - yes
+
+  - versionName: '0.13'
+    versionCode: 15
+    commit: '0.13'
+    subdir: PrepayCreditAndroid
+    gradle:
+      - yes
+
+  - versionName: '0.14'
+    versionCode: 16
+    commit: v0.14
+    subdir: PrepayCreditAndroid
+    gradle:
+      - yes
+
+  - versionName: '0.15'
+    versionCode: 17
+    commit: v0.15
+    subdir: PrepayCreditAndroid
+    gradle:
+      - yes
+
+  - versionName: '0.16'
+    versionCode: 18
+    disable: build outputs non-utf8 bytes
+    commit: v0.16
+    subdir: PrepayCreditAndroid
+    gradle:
+      - yes
+
+  - versionName: '0.17'
+    versionCode: 19
+    commit: v0.17
+    subdir: PrepayCreditAndroid
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '0.17'
+CurrentVersionCode: 19
diff --git a/metadata/de.arnefeil.bewegungsmelder.txt b/metadata/de.arnefeil.bewegungsmelder.txt
deleted file mode 100644
index 182a01f346..0000000000
--- a/metadata/de.arnefeil.bewegungsmelder.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:http://arnef.github.io/bewegungsmelder-android
-Source Code:https://github.com/arnef/bewegungsmelder-android
-Issue Tracker:https://github.com/arnef/bewegungsmelder-android/issues
-
-Auto Name:Bewegungsmelder
-Summary:Get event information for Hamburg, Germany
-Description:
-Companion app for [https://bewegungsmelder.org/ Bewegungsmelder], a website
-focusing on concerts and other events around Hamburg, Germany.
-.
-
-Repo Type:git
-Repo:https://github.com/arnef/bewegungsmelder-android
-
-Build:2.0.0,140102
-    commit=e58eb7f9b30ccac0f47c3a374240545629ff584c
-    gradle=yes
-
-Build:2.0.2,140629
-    commit=48f4228b9beaab054bd6c549e5c92bb1dbbecce1
-    gradle=yes
-
-Build:2.0.2,140630
-    commit=bbad9688f9ceff52086a80ece1fbca4e8fec20a6
-    gradle=yes
-
-Build:2.0.3,140632
-    commit=668c2bba8bc2a0c557a95cba84919a7137570b86
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.0.3
-Current Version Code:140632
diff --git a/metadata/de.arnefeil.bewegungsmelder.yml b/metadata/de.arnefeil.bewegungsmelder.yml
new file mode 100644
index 0000000000..3620bcda14
--- /dev/null
+++ b/metadata/de.arnefeil.bewegungsmelder.yml
@@ -0,0 +1,45 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: http://arnef.github.io/bewegungsmelder-android
+SourceCode: https://github.com/arnef/bewegungsmelder-android
+IssueTracker: https://github.com/arnef/bewegungsmelder-android/issues
+
+AutoName: Bewegungsmelder
+Summary: Get event information for Hamburg, Germany
+Description: |-
+    Companion app for [https://bewegungsmelder.org/ Bewegungsmelder], a website
+    focusing on concerts and other events around Hamburg, Germany.
+
+RepoType: git
+Repo: https://github.com/arnef/bewegungsmelder-android
+
+Builds:
+  - versionName: 2.0.0
+    versionCode: 140102
+    commit: e58eb7f9b30ccac0f47c3a374240545629ff584c
+    gradle:
+      - yes
+
+  - versionName: 2.0.2
+    versionCode: 140629
+    commit: 48f4228b9beaab054bd6c549e5c92bb1dbbecce1
+    gradle:
+      - yes
+
+  - versionName: 2.0.2
+    versionCode: 140630
+    commit: bbad9688f9ceff52086a80ece1fbca4e8fec20a6
+    gradle:
+      - yes
+
+  - versionName: 2.0.3
+    versionCode: 140632
+    commit: 668c2bba8bc2a0c557a95cba84919a7137570b86
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.0.3
+CurrentVersionCode: 140632
diff --git a/metadata/de.arnowelzel.android.periodical.txt b/metadata/de.arnowelzel.android.periodical.txt
deleted file mode 100644
index e639599e25..0000000000
--- a/metadata/de.arnowelzel.android.periodical.txt
+++ /dev/null
@@ -1,206 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-or-later
-Web Site:https://arnowelzel.de/wiki/android/app/periodical
-Source Code:https://github.com/arnowelzel/periodical
-Issue Tracker:https://github.com/arnowelzel/periodical/issues
-Changelog:http://arnowelzel.de/wiki/en/android/app/periodical
-
-Auto Name:Periodical
-Summary:Menstrual/period calendar
-Description:
-This application calculates the days of fertility according to Knaus-Ogino. The
-data can be backed up on a memory card, if present.
-
-WARNING: It is not recommended to use this calendar to avoid pregnancy! There
-are more accurate methods, like measuring the basal body temperature.
-
-If you have any further questions or want to help translating the app, please
-[http://arnowelzel.de/wiki/en/arno contact upstream].
-.
-
-Repo Type:git
-Repo:https://github.com/arnowelzel/periodical.git
-
-Build:0.9,9
-    commit=0.9
-    target=android-15
-
-Build:0.10,10
-    commit=0.10
-    target=android-15
-
-Build:0.13,13
-    commit=0.13
-    target=android-17
-
-Build:0.14,14
-    commit=0.14
-    target=android-19
-
-Build:0.16,16
-    commit=0.16
-    target=android-19
-
-Build:0.17,17
-    commit=0.17
-    target=android-19
-
-Build:0.18,18
-    commit=0.18
-    target=android-19
-
-Build:0.19,19
-    commit=0.19
-    target=android-19
-
-Build:0.21,21
-    commit=0.21
-    target=android-19
-
-Build:0.22,22
-    commit=0.22
-    target=android-19
-
-Build:0.23,23
-    commit=0.23
-    target=android-19
-
-Build:0.27,27
-    commit=0.27
-    subdir=app
-    gradle=yes
-
-Build:0.28,28
-    commit=0.28
-    subdir=app
-    gradle=yes
-
-Build:0.29,29
-    commit=0.29
-    subdir=app
-    gradle=yes
-
-Build:0.30,30
-    commit=0.30
-    subdir=app
-    gradle=yes
-
-Build:0.31,31
-    commit=0.31
-    subdir=app
-    gradle=yes
-
-Build:0.32,32
-    commit=0.32
-    subdir=app
-    gradle=yes
-
-Build:0.33,33
-    commit=0.33
-    subdir=app
-    gradle=yes
-
-Build:0.35,35
-    commit=0.35
-    subdir=app
-    gradle=yes
-
-Build:1.04,48
-    commit=1.04
-    subdir=app
-    gradle=yes
-
-Build:1.05,49
-    commit=1.05
-    subdir=app
-    gradle=yes
-
-Build:1.06,50
-    commit=1.06
-    subdir=app
-    gradle=yes
-
-Build:1.11,52
-    commit=1.11
-    subdir=app
-    gradle=yes
-
-Build:1.12,53
-    commit=1.12
-    subdir=app
-    gradle=yes
-
-Build:1.13,55
-    commit=1.13
-    subdir=app
-    gradle=yes
-
-Build:1.14,56
-    commit=1.14
-    subdir=app
-    gradle=yes
-
-Build:1.15,57
-    commit=1.15
-    subdir=app
-    gradle=yes
-
-Build:1.16,58
-    commit=1.16
-    subdir=app
-    gradle=yes
-
-Build:1.18,60
-    commit=1.18
-    subdir=app
-    gradle=yes
-
-Build:1.20,62
-    commit=1.20
-    subdir=app
-    gradle=yes
-
-Build:1.22,64
-    commit=1.22
-    subdir=app
-    gradle=yes
-
-Build:1.23,65
-    commit=1.23
-    subdir=app
-    gradle=yes
-
-Build:1.30,66
-    commit=1.30
-    subdir=app
-    gradle=yes
-
-Build:1.31,67
-    commit=1.31
-    subdir=app
-    gradle=yes
-
-Build:1.32,68
-    commit=1.32
-    subdir=app
-    gradle=yes
-
-Build:1.40,70
-    commit=1.40
-    subdir=app
-    gradle=yes
-
-Build:1.41,71
-    commit=1.41
-    subdir=app
-    gradle=yes
-
-Build:1.42,72
-    commit=1.42
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.42
-Current Version Code:72
diff --git a/metadata/de.arnowelzel.android.periodical.yml b/metadata/de.arnowelzel.android.periodical.yml
new file mode 100644
index 0000000000..b805d3f636
--- /dev/null
+++ b/metadata/de.arnowelzel.android.periodical.yml
@@ -0,0 +1,272 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-or-later
+WebSite: https://arnowelzel.de/wiki/android/app/periodical
+SourceCode: https://github.com/arnowelzel/periodical
+IssueTracker: https://github.com/arnowelzel/periodical/issues
+Changelog: http://arnowelzel.de/wiki/en/android/app/periodical
+
+AutoName: Periodical
+Summary: Menstrual/period calendar
+Description: |-
+    This application calculates the days of fertility according to Knaus-Ogino. The
+    data can be backed up on a memory card, if present.
+
+    WARNING: It is not recommended to use this calendar to avoid pregnancy! There
+    are more accurate methods, like measuring the basal body temperature.
+
+    If you have any further questions or want to help translating the app, please
+    [http://arnowelzel.de/wiki/en/arno contact upstream].
+
+RepoType: git
+Repo: https://github.com/arnowelzel/periodical.git
+
+Builds:
+  - versionName: '0.9'
+    versionCode: 9
+    commit: '0.9'
+    target: android-15
+
+  - versionName: '0.10'
+    versionCode: 10
+    commit: '0.10'
+    target: android-15
+
+  - versionName: '0.13'
+    versionCode: 13
+    commit: '0.13'
+    target: android-17
+
+  - versionName: '0.14'
+    versionCode: 14
+    commit: '0.14'
+    target: android-19
+
+  - versionName: '0.16'
+    versionCode: 16
+    commit: '0.16'
+    target: android-19
+
+  - versionName: '0.17'
+    versionCode: 17
+    commit: '0.17'
+    target: android-19
+
+  - versionName: '0.18'
+    versionCode: 18
+    commit: '0.18'
+    target: android-19
+
+  - versionName: '0.19'
+    versionCode: 19
+    commit: '0.19'
+    target: android-19
+
+  - versionName: '0.21'
+    versionCode: 21
+    commit: '0.21'
+    target: android-19
+
+  - versionName: '0.22'
+    versionCode: 22
+    commit: '0.22'
+    target: android-19
+
+  - versionName: '0.23'
+    versionCode: 23
+    commit: '0.23'
+    target: android-19
+
+  - versionName: '0.27'
+    versionCode: 27
+    commit: '0.27'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.28'
+    versionCode: 28
+    commit: '0.28'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.29'
+    versionCode: 29
+    commit: '0.29'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.30'
+    versionCode: 30
+    commit: '0.30'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.31'
+    versionCode: 31
+    commit: '0.31'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.32'
+    versionCode: 32
+    commit: '0.32'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.33'
+    versionCode: 33
+    commit: '0.33'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.35'
+    versionCode: 35
+    commit: '0.35'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.04'
+    versionCode: 48
+    commit: '1.04'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.05'
+    versionCode: 49
+    commit: '1.05'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.06'
+    versionCode: 50
+    commit: '1.06'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 52
+    commit: '1.11'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 53
+    commit: '1.12'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.13'
+    versionCode: 55
+    commit: '1.13'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 56
+    commit: '1.14'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 57
+    commit: '1.15'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 58
+    commit: '1.16'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.18'
+    versionCode: 60
+    commit: '1.18'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.20'
+    versionCode: 62
+    commit: '1.20'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.22'
+    versionCode: 64
+    commit: '1.22'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.23'
+    versionCode: 65
+    commit: '1.23'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.30'
+    versionCode: 66
+    commit: '1.30'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.31'
+    versionCode: 67
+    commit: '1.31'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.32'
+    versionCode: 68
+    commit: '1.32'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.40'
+    versionCode: 70
+    commit: '1.40'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.41'
+    versionCode: 71
+    commit: '1.41'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.42'
+    versionCode: 72
+    commit: '1.42'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.42'
+CurrentVersionCode: 72
diff --git a/metadata/de.audioattack.openlink.txt b/metadata/de.audioattack.openlink.txt
deleted file mode 100644
index 30abbca771..0000000000
--- a/metadata/de.audioattack.openlink.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Author Name:Marc Nause
-Web Site:https://gitlab.com/marc.nause/openlink
-Source Code:https://gitlab.com/marc.nause/openlink/tree/HEAD
-Issue Tracker:https://gitlab.com/marc.nause/openlink/issues
-Changelog:https://gitlab.com/marc.nause/openlink/raw/HEAD/changelog.txt
-Donate:https://paypal.me/nause
-LiberapayID:12290
-
-Auto Name:Easy Open Link
-Summary:Open URLs via select and share
-Description:
-Easy Open Link makes it easy to open links from text documents via the share
-function of many apps. No more cumbersome copy and paste. Easy Open Link also
-allows you to open several links at the same time.
-
-* Roughly select the URL(s). It does not matter if the selection also contains additional text or white spaces.
-* Press the "share" symbol.
-* Select "open link"
-
-The share function has become a common feature in more recent versions of
-Android. This app requires Android 1.5 or newer, but is most useful with Android
-4.0 or later.
-
-The app does not add an icon to the launcher since this is not necessary. The
-complete functionality of the app is accessed via the "share" menu. Copyright
-information can be displayed via the "start" button of the F-Droid app.
-
-The permission RECEIVE_BOOT_COMPLETED is required to check if browser which
-supports opening links in incognito mode (Firefox 55+, Fennec 55+, Jelly) is
-installed.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/marc.nause/openlink.git
-
-Build:1.0.2,3
-    commit=r1.0.2
-
-Build:1.1,4
-    commit=r1.1
-
-Build:1.2,5
-    commit=r1.2
-
-Build:1.2.1,6
-    commit=r1.2.1
-
-Build:1.3,7
-    commit=r1.3
-
-Build:1.3.1,8
-    commit=r1.3.1
-
-Build:1.4.0,9
-    commit=r1.4.0
-    subdir=app
-    gradle=yes
-
-Build:1.4.1,10
-    commit=r1.4.1
-    subdir=app
-    gradle=yes
-
-Build:1.4.2,11
-    commit=r1.4.2
-    subdir=app
-    gradle=yes
-
-Build:1.4.3,12
-    commit=r1.4.3
-    subdir=app
-    gradle=yes
-
-Build:1.4.4,13
-    disable=uses com.android.tools.build:gradle:3.0.0-alpha3
-    commit=r1.4.4
-    subdir=app
-    gradle=yes
-
-Build:1.4.4.2,14
-    commit=r1.4.4.2
-    subdir=app
-    gradle=yes
-
-Build:1.4.5,15
-    commit=r1.4.5
-    subdir=app
-    gradle=yes
-
-Build:1.4.6,16
-    commit=r1.4.6
-    subdir=app
-    gradle=yes
-
-Build:1.5.1,18
-    disable=Could not find com.android.tools.build:gradle:3.0.1
-    commit=r1.5.1
-    subdir=app
-    gradle=yes
-
-Build:1.5.2,19
-    commit=r1.5.2
-    subdir=app
-    gradle=yes
-
-Build:1.5.4,21
-    commit=r1.5.4
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version r%v
-Update Check Mode:Tags
-Current Version:1.5.4
-Current Version Code:21
diff --git a/metadata/de.audioattack.openlink.yml b/metadata/de.audioattack.openlink.yml
new file mode 100644
index 0000000000..c6fb8b2fe4
--- /dev/null
+++ b/metadata/de.audioattack.openlink.yml
@@ -0,0 +1,145 @@
+Categories:
+  - System
+License: GPL-3.0-only
+AuthorName: Marc Nause
+WebSite: https://gitlab.com/marc.nause/openlink
+SourceCode: https://gitlab.com/marc.nause/openlink
+IssueTracker: https://gitlab.com/marc.nause/openlink/issues
+Changelog: https://gitlab.com/marc.nause/openlink/raw/HEAD/changelog.txt
+Donate: https://paypal.me/nause
+LiberapayID: '12290'
+
+AutoName: Easy Open Link
+Summary: Open URLs via select and share
+Description: |-
+    Easy Open Link makes it easy to open links from text documents via the share
+    function of many apps. No more cumbersome copy and paste. Easy Open Link also
+    allows you to open several links at the same time.
+
+    * Roughly select the URL(s). It does not matter if the selection also contains additional text or white spaces.
+    * Press the "share" symbol.
+    * Select "open link"
+
+    The share function has become a common feature in more recent versions of
+    Android. This app requires Android 1.5 or newer, but is most useful with Android
+    4.0 or later.
+
+    The app does not add an icon to the launcher since this is not necessary. The
+    complete functionality of the app is accessed via the "share" menu. Copyright
+    information can be displayed via the "start" button of the F-Droid app.
+
+    The permission RECEIVE_BOOT_COMPLETED is required to check if browser which
+    supports opening links in incognito mode (Firefox 55+, Fennec 55+, Jelly) is
+    installed.
+
+RepoType: git
+Repo: https://gitlab.com/marc.nause/openlink.git
+
+Builds:
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: r1.0.2
+
+  - versionName: '1.1'
+    versionCode: 4
+    commit: r1.1
+
+  - versionName: '1.2'
+    versionCode: 5
+    commit: r1.2
+
+  - versionName: 1.2.1
+    versionCode: 6
+    commit: r1.2.1
+
+  - versionName: '1.3'
+    versionCode: 7
+    commit: r1.3
+
+  - versionName: 1.3.1
+    versionCode: 8
+    commit: r1.3.1
+
+  - versionName: 1.4.0
+    versionCode: 9
+    commit: r1.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 10
+    commit: r1.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.2
+    versionCode: 11
+    commit: r1.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.3
+    versionCode: 12
+    commit: r1.4.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.4
+    versionCode: 13
+    disable: uses com.android.tools.build:gradle:3.0.0-alpha3
+    commit: r1.4.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.4.2
+    versionCode: 14
+    commit: r1.4.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.5
+    versionCode: 15
+    commit: r1.4.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.6
+    versionCode: 16
+    commit: r1.4.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.1
+    versionCode: 18
+    disable: Could not find com.android.tools.build:gradle:3.0.1
+    commit: r1.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 19
+    commit: r1.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.4
+    versionCode: 21
+    commit: r1.5.4
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version r%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.5.4
+CurrentVersionCode: 21
diff --git a/metadata/de.audioattack.yacy32c3search.txt b/metadata/de.audioattack.yacy32c3search.txt
deleted file mode 100644
index 3e728d0fce..0000000000
--- a/metadata/de.audioattack.yacy32c3search.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/yacy/yacy_search_androidclient
-Issue Tracker:https://github.com/yacy/yacy_search_androidclient/issues
-
-Auto Name:32c3 Search
-Summary:Search a 32C3 related YaCy node
-Description:
-Yacy is a decentralized, specialized, peer-to-peer search engine. This app
-defaults to use [http://32c3.yacy.net/], a search node related to the 32C3
-congress.
-.
-
-Repo Type:git
-Repo:https://github.com/yacy/yacy_search_androidclient.git
-
-Build:1.0,1
-    commit=1.0.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/android {/alintOptions {\nabortOnError false\n}\n' build.gradle
-
-Build:1.0.1,2
-    commit=1.0.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/android {/alintOptions {\nabortOnError false\n}\n' build.gradle
-
-Build:1.1.0,3
-    commit=1.1.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/android {/alintOptions {\nabortOnError false\n}\n' build.gradle
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.1.0
-Current Version Code:3
diff --git a/metadata/de.audioattack.yacy32c3search.yml b/metadata/de.audioattack.yacy32c3search.yml
new file mode 100644
index 0000000000..fd6052963a
--- /dev/null
+++ b/metadata/de.audioattack.yacy32c3search.yml
@@ -0,0 +1,46 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/yacy/yacy_search_androidclient
+IssueTracker: https://github.com/yacy/yacy_search_androidclient/issues
+
+AutoName: 32c3 Search
+Summary: Search a 32C3 related YaCy node
+Description: |-
+    Yacy is a decentralized, specialized, peer-to-peer search engine. This app
+    defaults to use [http://32c3.yacy.net/], a search node related to the 32C3
+    congress.
+
+RepoType: git
+Repo: https://github.com/yacy/yacy_search_androidclient.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 1.0.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/android {/alintOptions {\nabortOnError false\n}\n' build.gradle
+
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 1.0.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/android {/alintOptions {\nabortOnError false\n}\n' build.gradle
+
+  - versionName: 1.1.0
+    versionCode: 3
+    commit: 1.1.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/android {/alintOptions {\nabortOnError false\n}\n' build.gradle
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.1.0
+CurrentVersionCode: 3
diff --git a/metadata/de.azapps.mirakel.dashclock.txt b/metadata/de.azapps.mirakel.dashclock.txt
deleted file mode 100644
index 6524cd291c..0000000000
--- a/metadata/de.azapps.mirakel.dashclock.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-Categories:Theming
-License:GPL-3.0-or-later
-Web Site:http://mirakel.azapps.de
-Source Code:https://github.com/MirakelX/mirakel-android
-Issue Tracker:https://mirakel.atlassian.net/issues
-Donate:http://mirakel.azapps.de/help_us.html#donate
-FlattrID:2188714
-
-Auto Name:Mirakel-Dashclock
-Summary:Dashclock extension for Mirakel
-Description:
-Extension for [[net.nurik.roman.dashclock]] that integrates with
-[[de.azapps.mirakelandroid]].
-.
-
-Repo Type:git
-Repo:https://github.com/MirakelX/mirakel-android.git
-
-Build:1.1,4
-    disable=repo change
-    commit=v1.1
-
-Build:1.2,5
-    disable=repo change
-    commit=v1.2
-
-Build:1.3,7
-    disable=repo change
-    commit=42e2cd3f4
-
-Build:1.4,8
-    disable=repo change
-    commit=v1.4
-
-Build:1.5,9
-    disable=repo change
-    commit=v1.5
-
-Build:2.0,11
-    commit=v2.0-dashclock
-    subdir=dashclock
-    gradle=yes
-    rm=appcompat,dashclock/libs/*,model/libs/*,helper/libs/*
-
-Build:2.1,12
-    commit=v2.1-dashclock
-    subdir=dashclock
-    gradle=yes
-    rm=appcompat,dashclock/libs/*,model/libs/*,helper/libs/*
-
-Build:2.2,13
-    commit=v2.2-dashclock
-    subdir=dashclock
-    gradle=yes
-    rm=appcompat,dashclock/libs/*,model/libs/*,helper/libs/*
-
-Maintainer Notes:
-:helper provides joda-time:joda-time:2.4
-:model provides com.google.code.gson:gson:2.2.2
-.
-
-Auto Update Mode:Version v%v-dashclock
-Update Check Mode:Tags ^v[0-9.]*-dashclock$
-Current Version:2.2
-Current Version Code:13
diff --git a/metadata/de.azapps.mirakel.dashclock.yml b/metadata/de.azapps.mirakel.dashclock.yml
new file mode 100644
index 0000000000..651b1ac899
--- /dev/null
+++ b/metadata/de.azapps.mirakel.dashclock.yml
@@ -0,0 +1,89 @@
+Categories:
+  - Theming
+License: GPL-3.0-or-later
+WebSite: http://mirakel.azapps.de
+SourceCode: https://github.com/MirakelX/mirakel-android
+IssueTracker: https://mirakel.atlassian.net/issues
+Changelog: https://github.com/MirakelX/mirakel-android/releases
+Donate: http://mirakel.azapps.de/help_us.html#donate
+FlattrID: '2188714'
+
+AutoName: Mirakel-Dashclock
+Summary: Dashclock extension for Mirakel
+Description: |-
+    Extension for [[net.nurik.roman.dashclock]] that integrates with
+    [[de.azapps.mirakelandroid]].
+
+RepoType: git
+Repo: https://github.com/MirakelX/mirakel-android.git
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 4
+    disable: repo change
+    commit: v1.1
+
+  - versionName: '1.2'
+    versionCode: 5
+    disable: repo change
+    commit: v1.2
+
+  - versionName: '1.3'
+    versionCode: 7
+    disable: repo change
+    commit: 42e2cd3f4
+
+  - versionName: '1.4'
+    versionCode: 8
+    disable: repo change
+    commit: v1.4
+
+  - versionName: '1.5'
+    versionCode: 9
+    disable: repo change
+    commit: v1.5
+
+  - versionName: '2.0'
+    versionCode: 11
+    commit: v2.0-dashclock
+    subdir: dashclock
+    gradle:
+      - yes
+    rm:
+      - appcompat
+      - dashclock/libs/*
+      - model/libs/*
+      - helper/libs/*
+
+  - versionName: '2.1'
+    versionCode: 12
+    commit: v2.1-dashclock
+    subdir: dashclock
+    gradle:
+      - yes
+    rm:
+      - appcompat
+      - dashclock/libs/*
+      - model/libs/*
+      - helper/libs/*
+
+  - versionName: '2.2'
+    versionCode: 13
+    commit: v2.2-dashclock
+    subdir: dashclock
+    gradle:
+      - yes
+    rm:
+      - appcompat
+      - dashclock/libs/*
+      - model/libs/*
+      - helper/libs/*
+
+MaintainerNotes: |-
+    :helper provides joda-time:joda-time:2.4
+    :model provides com.google.code.gson:gson:2.2.2
+
+AutoUpdateMode: Version v%v-dashclock
+UpdateCheckMode: Tags ^v[0-9.]*-dashclock$
+CurrentVersion: '2.2'
+CurrentVersionCode: 13
diff --git a/metadata/de.azapps.mirakelandroid.txt b/metadata/de.azapps.mirakelandroid.txt
deleted file mode 100644
index 2e97881168..0000000000
--- a/metadata/de.azapps.mirakelandroid.txt
+++ /dev/null
@@ -1,212 +0,0 @@
-Categories:Writing
-License:GPL-3.0-or-later
-Web Site:http://mirakel.azapps.de
-Source Code:https://github.com/MirakelX/mirakel-android
-Issue Tracker:https://mirakel.atlassian.net/issues
-Changelog:http://mirakel.azapps.de/changelog.html
-Donate:http://mirakel.azapps.de/help_us.html#donate
-FlattrID:2188714
-
-Auto Name:Mirakel
-Summary:Decentralized TODO list
-Description:
-Mirakel is a simple but powerful tool for managing your TODO-lists. You can sync
-your lists with your own server! Features:
-
-* Manage your tasks in lists
-* Simple, but powerful User Interface
-* Tablet-UI
-* Nice little widget
-* Sort your tasks in different ways
-* Fully configurable
-* Notifications & Reminders
-* Easy Backup and Import
-* Import your tasks from Astrid
-* Sync with Taskwarrior
-* Sync with CalDAV
-.
-
-Repo Type:git
-Repo:https://github.com/MirakelX/mirakel-android.git
-
-Build:1.0.0,2
-    commit=v1.0
-
-Build:1.0.1,3
-    commit=v1.0.1.1
-
-Build:1.1.0,4
-    commit=v1.1.0
-
-Build:1.1.1,5
-    commit=v1.1.1
-
-Build:2.0,6
-    commit=v2.0
-
-Build:2.1,7
-    commit=v2.1
-
-Build:2.1.1,8
-    commit=v2.1.1
-
-Build:2.1.2,10
-    commit=v2.1.2
-
-Build:2.1.3,16
-    commit=v2.1.3
-
-Build:2.1.4,17
-    commit=v2.1.4
-
-Build:2.2.0,29
-    disable=old failing build
-    commit=v2.2.0
-
-Build:2.2.1,31
-    commit=v2.2.1
-
-Build:2.3.0,38
-    commit=v2.3.0
-
-Build:2.3.1,40
-    commit=v2.3.1
-
-Build:2.3.2,43
-    commit=v2.3.2
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.4.0,50
-    commit=v2.4.0
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.4.0R2,51
-    commit=v2.4.0R2
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.4.1,52
-    commit=v2.4.1
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.5-beta1,54
-    commit=v2.5-beta1
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.5-beta2,55
-    commit=v2.5-beta2
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.5,56
-    commit=v2.5
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.6,61
-    disable=bash step fails
-    commit=v2.6
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.6.1,62
-    commit=v2.6.1
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.6.2,63
-    commit=v2.6.2
-    subdir=main
-    gradle=fdroid
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin
-
-Build:2.7-beta1,64
-    commit=v2.7-beta1
-    subdir=main
-    gradle=FdroidNormal
-    prebuild=cd ../ && \
-        cp build/*.gradle . && \
-        rm -r appcompat/bin && \
-        for buildfile in 'build.gradle' 'main/build.gradle' 'new_ui/build.gradle'; do sed -i -e '/srcDir "res-l"/d' -e '/minSdkVersion \"L\"/d' -e '/targetSdkVersion \"L\"/d' -e '/compileSdkVersion \"android-L\"/d' "${buildfile}"; done
-
-Build:2.7,67
-    disable=invalid target L
-    commit=v2.7
-    subdir=main
-    gradle=FdroidNormal
-    rm=dashclock/libs/*jar,helper/libs/*jar
-    scandelete=appcompat
-
-Build:2.7.1,68
-    commit=v2.7.1
-    subdir=main
-    gradle=FdroidNormal
-    rm=dashclock/libs/*jar,helper/libs/*jar
-    scandelete=appcompat
-
-Build:2.8,71
-    commit=v2.8
-    subdir=main
-    gradle=Fdroid
-    rm=dashclock/libs/*jar,helper/libs/*jar
-    scandelete=appcompat
-
-Build:2.8.1,72
-    commit=v2.8.1
-    subdir=main
-    gradle=Fdroid
-    rm=dashclock/libs/*jar,helper/libs/*jar
-    scandelete=appcompat
-
-Build:2.8.2,74
-    commit=v2.8.2
-    subdir=main
-    gradle=Fdroid
-    rm=dashclock/libs/*jar,helper/libs/*jar
-    scandelete=appcompat
-
-Build:3.0,82
-    commit=v3.0
-    subdir=new_ui
-    gradle=fdroid
-    prebuild=sed -i -e '/analytics.trackingid/d' -e '/googleCompile/d' -e '/testCompile/d' build.gradle && \
-        sed -i -e '/mavenCentral/amaven { url "https://jitpack.io" }\n' ../build.gradle
-
-Archive Policy:6 versions
-Auto Update Mode:Version v%v
-Update Check Mode:Tags ^v[0-9.]*$
-Current Version:3.0
-Current Version Code:82
diff --git a/metadata/de.azapps.mirakelandroid.yml b/metadata/de.azapps.mirakelandroid.yml
new file mode 100644
index 0000000000..606c3b7275
--- /dev/null
+++ b/metadata/de.azapps.mirakelandroid.yml
@@ -0,0 +1,291 @@
+Categories:
+  - Writing
+License: GPL-3.0-or-later
+WebSite: http://mirakel.azapps.de
+SourceCode: https://github.com/MirakelX/mirakel-android
+IssueTracker: https://mirakel.atlassian.net/issues
+Changelog: http://mirakel.azapps.de/changelog.html
+Donate: http://mirakel.azapps.de/help_us.html#donate
+FlattrID: '2188714'
+
+AutoName: Mirakel
+Summary: Decentralized TODO list
+Description: |-
+    Mirakel is a simple but powerful tool for managing your TODO-lists. You can sync
+    your lists with your own server! Features:
+
+    * Manage your tasks in lists
+    * Simple, but powerful User Interface
+    * Tablet-UI
+    * Nice little widget
+    * Sort your tasks in different ways
+    * Fully configurable
+    * Notifications & Reminders
+    * Easy Backup and Import
+    * Import your tasks from Astrid
+    * Sync with Taskwarrior
+    * Sync with CalDAV
+
+RepoType: git
+Repo: https://github.com/MirakelX/mirakel-android.git
+
+Builds:
+  - versionName: 1.0.0
+    versionCode: 2
+    commit: v1.0
+
+  - versionName: 1.0.1
+    versionCode: 3
+    commit: v1.0.1.1
+
+  - versionName: 1.1.0
+    versionCode: 4
+    commit: v1.1.0
+
+  - versionName: 1.1.1
+    versionCode: 5
+    commit: v1.1.1
+
+  - versionName: '2.0'
+    versionCode: 6
+    commit: v2.0
+
+  - versionName: '2.1'
+    versionCode: 7
+    commit: v2.1
+
+  - versionName: 2.1.1
+    versionCode: 8
+    commit: v2.1.1
+
+  - versionName: 2.1.2
+    versionCode: 10
+    commit: v2.1.2
+
+  - versionName: 2.1.3
+    versionCode: 16
+    commit: v2.1.3
+
+  - versionName: 2.1.4
+    versionCode: 17
+    commit: v2.1.4
+
+  - versionName: 2.2.0
+    versionCode: 29
+    disable: old failing build
+    commit: v2.2.0
+
+  - versionName: 2.2.1
+    versionCode: 31
+    commit: v2.2.1
+
+  - versionName: 2.3.0
+    versionCode: 38
+    commit: v2.3.0
+
+  - versionName: 2.3.1
+    versionCode: 40
+    commit: v2.3.1
+
+  - versionName: 2.3.2
+    versionCode: 43
+    commit: v2.3.2
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.4.0
+    versionCode: 50
+    commit: v2.4.0
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.4.0R2
+    versionCode: 51
+    commit: v2.4.0R2
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.4.1
+    versionCode: 52
+    commit: v2.4.1
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.5-beta1
+    versionCode: 54
+    commit: v2.5-beta1
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.5-beta2
+    versionCode: 55
+    commit: v2.5-beta2
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: '2.5'
+    versionCode: 56
+    commit: v2.5
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: '2.6'
+    versionCode: 61
+    disable: bash step fails
+    commit: v2.6
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.6.1
+    versionCode: 62
+    commit: v2.6.1
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.6.2
+    versionCode: 63
+    commit: v2.6.2
+    subdir: main
+    gradle:
+      - fdroid
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+
+  - versionName: 2.7-beta1
+    versionCode: 64
+    commit: v2.7-beta1
+    subdir: main
+    gradle:
+      - FdroidNormal
+    prebuild:
+      - cd ../
+      - cp build/*.gradle .
+      - rm -r appcompat/bin
+      - for buildfile in 'build.gradle' 'main/build.gradle' 'new_ui/build.gradle';
+        do sed -i -e '/srcDir "res-l"/d' -e '/minSdkVersion \"L\"/d' -e '/targetSdkVersion
+        \"L\"/d' -e '/compileSdkVersion \"android-L\"/d' "${buildfile}"; done
+
+  - versionName: '2.7'
+    versionCode: 67
+    disable: invalid target L
+    commit: v2.7
+    subdir: main
+    gradle:
+      - FdroidNormal
+    rm:
+      - dashclock/libs/*jar
+      - helper/libs/*jar
+    scandelete:
+      - appcompat
+
+  - versionName: 2.7.1
+    versionCode: 68
+    commit: v2.7.1
+    subdir: main
+    gradle:
+      - FdroidNormal
+    rm:
+      - dashclock/libs/*jar
+      - helper/libs/*jar
+    scandelete:
+      - appcompat
+
+  - versionName: '2.8'
+    versionCode: 71
+    commit: v2.8
+    subdir: main
+    gradle:
+      - Fdroid
+    rm:
+      - dashclock/libs/*jar
+      - helper/libs/*jar
+    scandelete:
+      - appcompat
+
+  - versionName: 2.8.1
+    versionCode: 72
+    commit: v2.8.1
+    subdir: main
+    gradle:
+      - Fdroid
+    rm:
+      - dashclock/libs/*jar
+      - helper/libs/*jar
+    scandelete:
+      - appcompat
+
+  - versionName: 2.8.2
+    versionCode: 74
+    commit: v2.8.2
+    subdir: main
+    gradle:
+      - Fdroid
+    rm:
+      - dashclock/libs/*jar
+      - helper/libs/*jar
+    scandelete:
+      - appcompat
+
+  - versionName: '3.0'
+    versionCode: 82
+    commit: v3.0
+    subdir: new_ui
+    gradle:
+      - fdroid
+    prebuild:
+      - sed -i -e '/analytics.trackingid/d' -e '/googleCompile/d' -e '/testCompile/d'
+        build.gradle
+      - sed -i -e '/mavenCentral/amaven { url "https://jitpack.io" }\n' ../build.gradle
+
+ArchivePolicy: 6 versions
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags ^v[0-9.]*$
+CurrentVersion: '3.0'
+CurrentVersionCode: 82
diff --git a/metadata/de.b0nk.fp1_epo_autoupdate.txt b/metadata/de.b0nk.fp1_epo_autoupdate.txt
deleted file mode 100644
index 17ff70d1c4..0000000000
--- a/metadata/de.b0nk.fp1_epo_autoupdate.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Navigation,System
-License:GPL-3.0-or-later
-Web Site:https://gitlab.com/sn0b/fp1-epo-autoupdate/wikis/home
-Source Code:https://gitlab.com/sn0b/fp1-epo-autoupdate
-Issue Tracker:https://gitlab.com/sn0b/fp1-epo-autoupdate/issues
-
-Auto Name:FP1-EPO-Autoupdate
-Summary:Automatically updates the EPO.DAT on the Fairphone
-Description:
-Automatically updates the EPO.DAT file on the Fairphone 1 within a given
-interval (defaults to 5 days). This fixes the 'EPO update failure' problem
-permanently, so no need to update it manually every 30 days. For information on
-why EPO.MD5 isn't fetched as well, see 'Background' below.
-
-Usage:
-
-* You need to have EPO enabled first (in System Settings or EngineeringMode).
-* Download and run the app, click on 'Enable' and allow permanent root access.
-* If an update is required, it will be downloaded now. This may take a minute
-
-and you will see notifications while this happens.
-
-* Wait for the status bar to become green and to display the current time.
-* Disable the original 'Auto download' to avoid problems (in System Settings or
-
-EngineeringMode).
-
-Tested with:
-
-* Fairphone FP1 with the 'Stock Android' and busybox
-* Alcatel Onetouch 997D with Android 4.1
-
-Permissions: Needs root access in order to write the new EPO.DAT to /data/misc
-and to adjust permissions.
-
-Background: The built-in EPO updater of the Fairphone (or other Mediatek phones)
-downloads the two EPO.dat and the checksum from an FTP server from Mediatek.
-However, the checksum is often calculated wrong by Mediatek. Therefore, the
-check of the .DAT file fails and the 'EPO update failure' occurs. See
-[http://forum.xda-developers.com/showthread.php?t=1975500 XDA Developer].
-
-AntiFeature: Downloads and installs non-free binary/firmware provided by
-Mediatek.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://gitlab.com/sn0b/fp1-epo-autoupdate.git
-
-Build:0.7.1-alpha,71
-    commit=0.7.1-alpha
-    subdir=app
-    gradle=yes
-    srclibs=RootTools@3.5
-    rm=app/libs/*
-    prebuild=cp -R $$RootTools$$/src/com src/main/java/
-
-Build:0.8.0-beta,80
-    commit=0.8.0-beta
-    subdir=app
-    gradle=yes
-    srclibs=RootTools@3.5
-    rm=app/libs/*
-    prebuild=cp -R $$RootTools$$/src/com src/main/java/
-
-Build:0.8.1-beta,81
-    commit=0.8.1-beta
-    subdir=app
-    gradle=yes
-    srclibs=RootTools@3.5
-    rm=app/libs/*
-    prebuild=cp -R $$RootTools$$/src/com src/main/java/
-
-Build:0.8.2-rc1,82
-    commit=0.8.2-rc1
-    subdir=app
-    gradle=yes
-    srclibs=RootTools@3.5
-    rm=app/libs/*
-    prebuild=cp -R $$RootTools$$/src/com src/main/java/
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.8.2-rc1
-Current Version Code:82
diff --git a/metadata/de.b0nk.fp1_epo_autoupdate.yml b/metadata/de.b0nk.fp1_epo_autoupdate.yml
new file mode 100644
index 0000000000..80d39f1b20
--- /dev/null
+++ b/metadata/de.b0nk.fp1_epo_autoupdate.yml
@@ -0,0 +1,106 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Navigation
+  - System
+License: GPL-3.0-or-later
+WebSite: https://gitlab.com/sn0b/fp1-epo-autoupdate/wikis/home
+SourceCode: https://gitlab.com/sn0b/fp1-epo-autoupdate
+IssueTracker: https://gitlab.com/sn0b/fp1-epo-autoupdate/issues
+
+AutoName: FP1-EPO-Autoupdate
+Summary: Automatically updates the EPO.DAT on the Fairphone
+Description: |-
+    Automatically updates the EPO.DAT file on the Fairphone 1 within a given
+    interval (defaults to 5 days). This fixes the 'EPO update failure' problem
+    permanently, so no need to update it manually every 30 days. For information on
+    why EPO.MD5 isn't fetched as well, see 'Background' below.
+
+    Usage:
+
+    * You need to have EPO enabled first (in System Settings or EngineeringMode).
+    * Download and run the app, click on 'Enable' and allow permanent root access.
+    * If an update is required, it will be downloaded now. This may take a minute
+
+    and you will see notifications while this happens.
+
+    * Wait for the status bar to become green and to display the current time.
+    * Disable the original 'Auto download' to avoid problems (in System Settings or
+
+    EngineeringMode).
+
+    Tested with:
+
+    * Fairphone FP1 with the 'Stock Android' and busybox
+    * Alcatel Onetouch 997D with Android 4.1
+
+    Permissions: Needs root access in order to write the new EPO.DAT to /data/misc
+    and to adjust permissions.
+
+    Background: The built-in EPO updater of the Fairphone (or other Mediatek phones)
+    downloads the two EPO.dat and the checksum from an FTP server from Mediatek.
+    However, the checksum is often calculated wrong by Mediatek. Therefore, the
+    check of the .DAT file fails and the 'EPO update failure' occurs. See
+    [http://forum.xda-developers.com/showthread.php?t=1975500 XDA Developer].
+
+    AntiFeature: Downloads and installs non-free binary/firmware provided by
+    Mediatek.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://gitlab.com/sn0b/fp1-epo-autoupdate.git
+
+Builds:
+  - versionName: 0.7.1-alpha
+    versionCode: 71
+    commit: 0.7.1-alpha
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - RootTools@3.5
+    rm:
+      - app/libs/*
+    prebuild: cp -R $$RootTools$$/src/com src/main/java/
+
+  - versionName: 0.8.0-beta
+    versionCode: 80
+    commit: 0.8.0-beta
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - RootTools@3.5
+    rm:
+      - app/libs/*
+    prebuild: cp -R $$RootTools$$/src/com src/main/java/
+
+  - versionName: 0.8.1-beta
+    versionCode: 81
+    commit: 0.8.1-beta
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - RootTools@3.5
+    rm:
+      - app/libs/*
+    prebuild: cp -R $$RootTools$$/src/com src/main/java/
+
+  - versionName: 0.8.2-rc1
+    versionCode: 82
+    commit: 0.8.2-rc1
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - RootTools@3.5
+    rm:
+      - app/libs/*
+    prebuild: cp -R $$RootTools$$/src/com src/main/java/
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.8.2-rc1
+CurrentVersionCode: 82
diff --git a/metadata/de.baumann.browser.txt b/metadata/de.baumann.browser.txt
deleted file mode 100644
index 8e61cbec56..0000000000
--- a/metadata/de.baumann.browser.txt
+++ /dev/null
@@ -1,330 +0,0 @@
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/scoute-dich/browser
-Issue Tracker:https://github.com/scoute-dich/browser/issues
-Changelog:https://github.com/scoute-dich/browser/blob/HEAD/CHANGELOG.md
-
-Auto Name:FOSS Browser
-Summary:Browse the web
-Description:
-Simple browser based on Android's WebView. The base is
-[https://github.com/mthli/Ninja Ninja]. The intention is to provide a simple and
-light wight but powerful browser with a nice looking user interface.
-
-'''Some nice extra features:'''
-
-* full oreo support
-* search on site
-* open links in background
-* Websearch (from marked text context menu)
-* screenshots of the whole website
-* build in file browser (open, share, delete files)
-* open links in other apps (for example YouTube)
-.
-
-Repo Type:git
-Repo:https://github.com/scoute-dich/browser
-
-Build:1.4,5
-    commit=v1.4
-    subdir=app
-    gradle=yes
-
-Build:1.5,6
-    commit=v1.5
-    subdir=app
-    gradle=yes
-
-Build:1.6,7
-    commit=v1.6
-    subdir=app
-    gradle=yes
-
-Build:1.7,10
-    commit=v1.7
-    subdir=app
-    gradle=yes
-
-Build:1.8,11
-    commit=v1.8
-    subdir=app
-    gradle=yes
-
-Build:1.8.1,12
-    commit=v1.8.1
-    subdir=app
-    gradle=yes
-
-Build:1.9,13
-    disable=old failing build (scanner error)
-    commit=v1.9
-    subdir=app
-    gradle=yes
-
-Build:2.0,15
-    commit=v2.0
-    subdir=app
-    gradle=yes
-
-Build:2.2,16
-    commit=v2.2
-    subdir=app
-    gradle=yes
-
-Build:2.3,17
-    commit=v2.3
-    subdir=app
-    gradle=yes
-
-Build:2.5,21
-    commit=v2.5
-    subdir=app
-    gradle=yes
-
-Build:2.7,26
-    commit=v2.7
-    subdir=app
-    gradle=yes
-
-Build:2.8,27
-    commit=v2.8
-    subdir=app
-    gradle=yes
-
-Build:2.9,28
-    disable=lint issues
-    commit=v2.9
-    subdir=app
-    gradle=yes
-
-Build:3.0,29
-    commit=v3.0
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:3.1,30
-    commit=v3.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:3.2,31
-    commit=v3.2
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:3.4,35
-    commit=v3.4
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:3.5,36
-    commit=v3.5
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:3.6,41
-    commit=v3.6
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:3.7,42
-    commit=v3.7
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:3.8.1,45
-    commit=v3.8.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:4.0,50
-    commit=v4.0
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:4.1,55
-    commit=v4.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:4.3,58
-    commit=v4.3
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:4.4,59
-    commit=v4.4
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:4.5.1,61
-    disable=missing some resource files
-    commit=v4.5.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:5.0,65
-    disable=unknown maven repo
-    commit=v5.0
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:5.0.1,67
-    disable=can't find gradle plugin
-    commit=v5.0.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:5.1,68
-    commit=v5.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.1.1,69
-    commit=v5.1.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.2,70
-    commit=v5.2
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.3.1,72
-    commit=v5.3.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.4,73
-    commit=v5.4
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.5.1,75
-    commit=v5.5.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.6,76
-    commit=v5.6
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.7,77
-    commit=v5.7
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.8,80
-    commit=v5.8
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:5.9,81
-    commit=v5.9
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.0,83
-    commit=v6.0
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.1,84
-    commit=v6.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.1.1,87
-    commit=v6.1.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.2,88
-    commit=v6.2
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.3,89
-    commit=v6.3
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.3.2,91
-    commit=v6.3.2
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.4,92
-    commit=v6.4
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.5,96
-    commit=v6.5
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Build:6.6.1,98
-    commit=v6.6.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle && \
-        sed -i -e '/jitpack.de/d' ../build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:6.6.1
-Current Version Code:98
diff --git a/metadata/de.baumann.browser.yml b/metadata/de.baumann.browser.yml
new file mode 100644
index 0000000000..a1397728c2
--- /dev/null
+++ b/metadata/de.baumann.browser.yml
@@ -0,0 +1,479 @@
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+SourceCode: https://github.com/scoute-dich/browser
+IssueTracker: https://github.com/scoute-dich/browser/issues
+Changelog: https://github.com/scoute-dich/browser/blob/HEAD/CHANGELOG.md
+
+AutoName: FOSS Browser
+Summary: Browse the web
+Description: |-
+    Simple browser based on Android's WebView. The base is
+    [https://github.com/mthli/Ninja Ninja]. The intention is to provide a simple and
+    light wight but powerful browser with a nice looking user interface.
+
+    '''Some nice extra features:'''
+
+    * full oreo support
+    * search on site
+    * open links in background
+    * Websearch (from marked text context menu)
+    * screenshots of the whole website
+    * build in file browser (open, share, delete files)
+    * open links in other apps (for example YouTube)
+
+RepoType: git
+Repo: https://github.com/scoute-dich/browser
+
+Builds:
+  - versionName: '1.4'
+    versionCode: 5
+    commit: v1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 6
+    commit: v1.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 7
+    commit: v1.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 10
+    commit: v1.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 11
+    commit: v1.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.1
+    versionCode: 12
+    commit: v1.8.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 13
+    disable: old failing build (scanner error)
+    commit: v1.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 15
+    commit: v2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.2'
+    versionCode: 16
+    commit: v2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.3'
+    versionCode: 17
+    commit: v2.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.5'
+    versionCode: 21
+    commit: v2.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.7'
+    versionCode: 26
+    commit: v2.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.8'
+    versionCode: 27
+    commit: v2.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.9'
+    versionCode: 28
+    disable: lint issues
+    commit: v2.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.0'
+    versionCode: 29
+    commit: v3.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '3.1'
+    versionCode: 30
+    commit: v3.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '3.2'
+    versionCode: 31
+    commit: v3.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '3.4'
+    versionCode: 35
+    commit: v3.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '3.5'
+    versionCode: 36
+    commit: v3.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '3.6'
+    versionCode: 41
+    commit: v3.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '3.7'
+    versionCode: 42
+    commit: v3.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 3.8.1
+    versionCode: 45
+    commit: v3.8.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '4.0'
+    versionCode: 50
+    commit: v4.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '4.1'
+    versionCode: 55
+    commit: v4.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '4.3'
+    versionCode: 58
+    commit: v4.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '4.4'
+    versionCode: 59
+    commit: v4.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 4.5.1
+    versionCode: 61
+    disable: missing some resource files
+    commit: v4.5.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '5.0'
+    versionCode: 65
+    disable: unknown maven repo
+    commit: v5.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 5.0.1
+    versionCode: 67
+    disable: can't find gradle plugin
+    commit: v5.0.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: '5.1'
+    versionCode: 68
+    commit: v5.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: 5.1.1
+    versionCode: 69
+    commit: v5.1.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '5.2'
+    versionCode: 70
+    commit: v5.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: 5.3.1
+    versionCode: 72
+    commit: v5.3.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '5.4'
+    versionCode: 73
+    commit: v5.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: 5.5.1
+    versionCode: 75
+    commit: v5.5.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '5.6'
+    versionCode: 76
+    commit: v5.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '5.7'
+    versionCode: 77
+    commit: v5.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '5.8'
+    versionCode: 80
+    commit: v5.8
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '5.9'
+    versionCode: 81
+    commit: v5.9
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '6.0'
+    versionCode: 83
+    commit: v6.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '6.1'
+    versionCode: 84
+    commit: v6.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: 6.1.1
+    versionCode: 87
+    commit: v6.1.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '6.2'
+    versionCode: 88
+    commit: v6.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '6.3'
+    versionCode: 89
+    commit: v6.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: 6.3.2
+    versionCode: 91
+    commit: v6.3.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '6.4'
+    versionCode: 92
+    commit: v6.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: '6.5'
+    versionCode: 96
+    commit: v6.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+  - versionName: 6.6.1
+    versionCode: 98
+    commit: v6.6.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+      - sed -i -e '/jitpack.de/d' ../build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 6.6.1
+CurrentVersionCode: 98
diff --git a/metadata/de.baumann.hhsmoodle.txt b/metadata/de.baumann.hhsmoodle.txt
deleted file mode 100644
index fa6fd5fcca..0000000000
--- a/metadata/de.baumann.hhsmoodle.txt
+++ /dev/null
@@ -1,194 +0,0 @@
-Categories:Time,Science & Education
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/scoute-dich/HHSMoodle
-Issue Tracker:https://github.com/scoute-dich/HHSMoodle/issues
-Changelog:https://github.com/scoute-dich/HHSMoodle/blob/HEAD/CHANGELOG.md
-
-Auto Name:HHS Moodle
-Summary:Interact with HHS moodle instance
-Description:
-Interact with the Moodle instance of the [http://huebsch.karlsruhe.de/
-Heinrich-Huebsch-Schule] in Karlsruhe, Germany.
-
-[https://github.com/scoute-dich/HHSMoodle/blob/HEAD/SCREENSHOTS.md Screenshots]
-.
-
-Repo Type:git
-Repo:https://github.com/scoute-dich/HHSMoodle
-
-Build:1.0,2
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,5
-    commit=v1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.0.3,8
-    commit=v1.0.3
-    subdir=app
-    gradle=yes
-
-Build:1.1,9
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:2.0,10
-    commit=v2.0
-    subdir=app
-    gradle=yes
-
-Build:2.1,11
-    commit=v2.1
-    subdir=app
-    gradle=yes
-
-Build:2.2,14
-    commit=v2.2
-    subdir=app
-    gradle=yes
-
-Build:2.3.1,16
-    commit=v2.3.1
-    subdir=app
-    gradle=yes
-
-Build:2.3.3,18
-    commit=v2.3.3
-    subdir=app
-    gradle=yes
-
-Build:2.4.1,21
-    commit=v2.4.1
-    subdir=app
-    gradle=yes
-
-Build:2.4.2,22
-    commit=v2.4.2
-    subdir=app
-    gradle=yes
-
-Build:2.4.3,23
-    commit=v2.4.3
-    subdir=app
-    gradle=yes
-
-Build:2.5.2,27
-    commit=v2.5.2
-    subdir=app
-    gradle=yes
-
-Build:2.7.1,31
-    commit=v2.7.1
-    subdir=app
-    gradle=yes
-
-Build:2.7.2,32
-    commit=v2.7.2
-    subdir=app
-    gradle=yes
-
-Build:2.7.3,33
-    commit=v2.7.3
-    subdir=app
-    gradle=yes
-
-Build:2.8,34
-    commit=v2.8
-    subdir=app
-    gradle=yes
-
-Build:2.9.1,36
-    disable=scanning error
-    commit=v2.9.1
-    subdir=app
-    gradle=yes
-
-Build:3.0,40
-    commit=v3.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.1,41
-    commit=v3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.1,42
-    commit=v3.1
-    subdir=app
-    gradle=yes
-
-Build:3.2,43
-    commit=v3.2
-    subdir=app
-    gradle=yes
-
-Build:3.3,45
-    commit=v3.3
-    subdir=app
-    gradle=yes
-
-Build:3.4,46
-    commit=v3.4
-    subdir=app
-    gradle=yes
-
-Build:3.5,47
-    commit=v3.5
-    subdir=app
-    gradle=yes
-
-Build:3.6,48
-    commit=v3.6
-    subdir=app
-    gradle=yes
-
-Build:3.7,49
-    commit=v3.7
-    subdir=app
-    gradle=yes
-
-Build:3.9,51
-    commit=v3.9
-    subdir=app
-    gradle=yes
-
-Build:4.0,52
-    commit=v4.0
-    subdir=app
-    gradle=yes
-
-Build:4.1,53
-    commit=v4.1
-    subdir=app
-    gradle=yes
-
-Build:4.2,54
-    commit=v4.2
-    subdir=app
-    gradle=yes
-
-Build:4.3,55
-    commit=v4.3
-    subdir=app
-    gradle=yes
-
-Build:4.4,56
-    commit=v4.4
-    subdir=app
-    gradle=yes
-
-Build:4.5,57
-    commit=v4.5
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:4.5
-Current Version Code:57
diff --git a/metadata/de.baumann.hhsmoodle.yml b/metadata/de.baumann.hhsmoodle.yml
new file mode 100644
index 0000000000..a60e466d47
--- /dev/null
+++ b/metadata/de.baumann.hhsmoodle.yml
@@ -0,0 +1,263 @@
+Categories:
+  - Time
+  - Science & Education
+License: GPL-3.0-or-later
+SourceCode: https://github.com/scoute-dich/HHSMoodle
+IssueTracker: https://github.com/scoute-dich/HHSMoodle/issues
+Changelog: https://github.com/scoute-dich/HHSMoodle/blob/HEAD/CHANGELOG.md
+
+AutoName: HHS Moodle
+Summary: Interact with HHS moodle instance
+Description: |-
+    Interact with the Moodle instance of the [http://huebsch.karlsruhe.de/
+    Heinrich-Huebsch-Schule] in Karlsruhe, Germany.
+
+    [https://github.com/scoute-dich/HHSMoodle/blob/HEAD/SCREENSHOTS.md Screenshots]
+
+RepoType: git
+Repo: https://github.com/scoute-dich/HHSMoodle
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 2
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 5
+    commit: v1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 8
+    commit: v1.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 9
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: v2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.1'
+    versionCode: 11
+    commit: v2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.2'
+    versionCode: 14
+    commit: v2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.1
+    versionCode: 16
+    commit: v2.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.3
+    versionCode: 18
+    commit: v2.3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.1
+    versionCode: 21
+    commit: v2.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.2
+    versionCode: 22
+    commit: v2.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.3
+    versionCode: 23
+    commit: v2.4.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.2
+    versionCode: 27
+    commit: v2.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.1
+    versionCode: 31
+    commit: v2.7.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.2
+    versionCode: 32
+    commit: v2.7.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.3
+    versionCode: 33
+    commit: v2.7.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.8'
+    versionCode: 34
+    commit: v2.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.9.1
+    versionCode: 36
+    disable: scanning error
+    commit: v2.9.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.0'
+    versionCode: 40
+    commit: v3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 41
+    commit: v3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.1'
+    versionCode: 42
+    commit: v3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.2'
+    versionCode: 43
+    commit: v3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.3'
+    versionCode: 45
+    commit: v3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.4'
+    versionCode: 46
+    commit: v3.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.5'
+    versionCode: 47
+    commit: v3.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.6'
+    versionCode: 48
+    commit: v3.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.7'
+    versionCode: 49
+    commit: v3.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.9'
+    versionCode: 51
+    commit: v3.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.0'
+    versionCode: 52
+    commit: v4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.1'
+    versionCode: 53
+    commit: v4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.2'
+    versionCode: 54
+    commit: v4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.3'
+    versionCode: 55
+    commit: v4.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.4'
+    versionCode: 56
+    commit: v4.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.5'
+    versionCode: 57
+    commit: v4.5
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '4.5'
+CurrentVersionCode: 57