diff --git a/metadata/com.khuttun.notificationnotes.txt b/metadata/com.khuttun.notificationnotes.txt
deleted file mode 100644
index e9cc882ec0..0000000000
--- a/metadata/com.khuttun.notificationnotes.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Categories:Writing
-License:MIT
-Web Site:
-Source Code:https://github.com/khuttun/NotificationNotes
-Issue Tracker:https://github.com/khuttun/NotificationNotes/issues
-
-Auto Name:Notification Notes
-Summary:Add notes and show them as notifications
-Description:
-Simple note taking that lets you display your notes as native notifications. The
-notes are displayed as persistent low priority notifications.
-
-Features:
-
-* Save your notes to note list
-* Show/hide note's notification with a switch in note list
-* Remove note by long pressing it in the note list
-.
-
-Repo Type:git
-Repo:https://github.com/khuttun/NotificationNotes
-
-Build:1.0,1
-    commit=8bab990a6eb1b4cbc1552b00fce00437d0fa6c99
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=1.1
-    subdir=app
-    gradle=yes
-
-Build:1.2,3
-    commit=1.2
-    subdir=app
-    gradle=yes
-
-Build:1.3,4
-    commit=1.3
-    subdir=app
-    gradle=yes
-
-Build:1.4,5
-    commit=1.4
-    subdir=app
-    gradle=yes
-
-Build:1.5,6
-    commit=1.5
-    subdir=app
-    gradle=yes
-
-Build:1.7,8
-    commit=1.7
-    subdir=app
-    gradle=yes
-
-Build:1.8,9
-    commit=1.8
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.8
-Current Version Code:9
diff --git a/metadata/com.khuttun.notificationnotes.yml b/metadata/com.khuttun.notificationnotes.yml
new file mode 100644
index 0000000000..514c6be3ab
--- /dev/null
+++ b/metadata/com.khuttun.notificationnotes.yml
@@ -0,0 +1,82 @@
+Categories:
+  - Writing
+License: MIT
+SourceCode: https://github.com/khuttun/NotificationNotes
+IssueTracker: https://github.com/khuttun/NotificationNotes/issues
+
+AutoName: Notification Notes
+Summary: Add notes and show them as notifications
+Description: |-
+    Simple note taking that lets you display your notes as native notifications. The
+    notes are displayed as persistent low priority notifications.
+
+    Features:
+
+    * Save your notes to note list
+    * Show/hide note's notification with a switch in note list
+    * Remove note by long pressing it in the note list
+
+RepoType: git
+Repo: https://github.com/khuttun/NotificationNotes
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 8bab990a6eb1b4cbc1552b00fce00437d0fa6c99
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: '1.1'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: '1.2'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: '1.3'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 5
+    commit: '1.4'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 6
+    commit: '1.5'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 8
+    commit: '1.7'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 9
+    commit: '1.8'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.8'
+CurrentVersionCode: 9
diff --git a/metadata/com.kn.paper_foss_theme.txt b/metadata/com.kn.paper_foss_theme.txt
deleted file mode 100644
index 7c0eee0e17..0000000000
--- a/metadata/com.kn.paper_foss_theme.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-Categories:Theming
-License:CC-BY-SA-4.0
-Web Site:
-Source Code:https://gitlab.com/beli3ver/Paper-FOSS-Theme
-Issue Tracker:https://gitlab.com/beli3ver/Paper-FOSS-Theme/issues
-Changelog:https://gitlab.com/beli3ver/Paper-FOSS-Theme/blob/HEAD/CHANGELOG.md
-Bitcoin:1CYiRF6AncdNkxcWTRFf5Mxi7UaFhC3jFG
-
-Auto Name:Paper
-Summary:Icon theme
-Description:
-This icon theme based on the two GTK Icon Themes,
-[https://github.com/snwh/paper-icon-theme Paper from Sam Hewitt] and
-[https://github.com/PapirusDevelopmentTeam/papirus-icon-theme Papirus]. It's
-aiming to provide a consistent and minimalistic look to your device.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/beli3ver/Paper-FOSS-Theme
-
-Build:0.2,2
-    commit=04337f1af3c1cb34cef1ad6c8f856d5ec57a511a
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.3,3
-    commit=v0.3
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.5,5
-    commit=v0.5
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.6,6
-    commit=v0.6
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.6.1,7
-    commit=v0.6.1.1
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.7,9
-    commit=v0.7
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.7.2,11
-    commit=v0.7.2
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.7.3,12
-    commit=v0.7.3
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:0.7.4,13
-    commit=v0.7.4
-    subdir=theme
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:1.0.1,15
-    commit=v1.0.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:1.0.4,18
-    commit=v1.0.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:1.0.6,20
-    commit=v1.0.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:1.0.8,22
-    commit=v1.0.8
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:1.1.0,24
-    commit=v1.1.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:1.1.2,26
-    commit=v1.1.2.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
-
-Build:1.1.5.1,30
-    commit=v1.1.5.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/jcenter()/a\        google()' ../build.gradle
-
-Build:1.2.1.1,34
-    commit=v1.2.1.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/jcenter()/a\        google()' ../build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2.1.1
-Current Version Code:34
-
-No Source Since:1.1.5.2
diff --git a/metadata/com.kn.paper_foss_theme.yml b/metadata/com.kn.paper_foss_theme.yml
new file mode 100644
index 0000000000..d796a98222
--- /dev/null
+++ b/metadata/com.kn.paper_foss_theme.yml
@@ -0,0 +1,159 @@
+Categories:
+  - Theming
+License: CC-BY-SA-4.0
+SourceCode: https://gitlab.com/beli3ver/Paper-FOSS-Theme
+IssueTracker: https://gitlab.com/beli3ver/Paper-FOSS-Theme/issues
+Changelog: https://gitlab.com/beli3ver/Paper-FOSS-Theme/blob/HEAD/CHANGELOG.md
+Bitcoin: 1CYiRF6AncdNkxcWTRFf5Mxi7UaFhC3jFG
+
+AutoName: Paper
+Summary: Icon theme
+Description: |-
+    This icon theme based on the two GTK Icon Themes,
+    [https://github.com/snwh/paper-icon-theme Paper from Sam Hewitt] and
+    [https://github.com/PapirusDevelopmentTeam/papirus-icon-theme Papirus]. It’s
+    aiming to provide a consistent and minimalistic look to your device.
+
+Builds:
+  - versionName: '0.2'
+    versionCode: 2
+    commit: 04337f1af3c1cb34cef1ad6c8f856d5ec57a511a
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: '0.3'
+    versionCode: 3
+    commit: v0.3
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: '0.5'
+    versionCode: 5
+    commit: v0.5
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: '0.6'
+    versionCode: 6
+    commit: v0.6
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 0.6.1
+    versionCode: 7
+    commit: v0.6.1.1
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: '0.7'
+    versionCode: 9
+    commit: v0.7
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 0.7.2
+    versionCode: 11
+    commit: v0.7.2
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 0.7.3
+    versionCode: 12
+    commit: v0.7.3
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 0.7.4
+    versionCode: 13
+    commit: v0.7.4
+    subdir: theme
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 1.0.1
+    versionCode: 15
+    commit: v1.0.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 1.0.4
+    versionCode: 18
+    commit: v1.0.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 1.0.6
+    versionCode: 20
+    commit: v1.0.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 1.0.8
+    versionCode: 22
+    commit: v1.0.8
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 1.1.0
+    versionCode: 24
+    commit: v1.1.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 1.1.2
+    versionCode: 26
+    commit: v1.1.2.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/gradle:2.2.0-alpha3/gradle:2.1.0/g' ../build.gradle
+
+  - versionName: 1.1.5.1
+    versionCode: 30
+    commit: v1.1.5.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/jcenter()/a\        google()' ../build.gradle
+
+  - versionName: 1.2.1.1
+    versionCode: 34
+    commit: v1.2.1.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/jcenter()/a\        google()' ../build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.1.1
+CurrentVersionCode: 34
+
+NoSourceSince: 1.1.5.2
diff --git a/metadata/com.knirirr.beecount.txt b/metadata/com.knirirr.beecount.txt
deleted file mode 100644
index 4d8b7b029c..0000000000
--- a/metadata/com.knirirr.beecount.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-Categories:Writing
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/knirirr/BeeCount
-Issue Tracker:https://github.com/knirirr/BeeCount/issues
-
-Auto Name:BeeCount
-Summary:Knitting row counter
-Description:
-A knitting project helper, with the following features:
-
-* Keep track of several knitting projects.
-* For each project, track several items which need counting, e.g. rows, pattern repeats etc
-* Allow counting up, down and re-setting to zero of these counts.
-* Allow editing of projects to add, remove or change counts after project creation.
-* Link counts together so that one increments another.
-* Set row alerts and cause counts to reset at particular values.
-* Allow backing up and restoring of the entire projects database.
-.
-
-Repo Type:git
-Repo:https://github.com/knirirr/BeeCount.git
-
-Build:1.2.1,47
-    disable=repo changed
-    commit=1.2.1
-    target=android-15
-
-Build:1.2.2,48
-    disable=repo changed
-    commit=1.2.2
-    target=android-15
-
-Build:1.2.3,50
-    disable=repo changed
-    commit=1.2.3
-    target=android-15
-
-Build:1.2.5,53
-    disable=repo changed
-    commit=1.2.5
-    target=android-15
-
-Build:1.2.7,56
-    disable=repo changed
-    commit=1.2.7
-    target=android-15
-
-Build:1.2.8,59
-    disable=wrongly tagged, as is 1.2.9
-
-Build:1.2.10,62
-    disable=repo changed
-    commit=1.2.10
-    target=android-15
-
-Build:2.0.0,67
-    disable=upstream needs fixing
-    commit=2.0.0
-    subdir=beecount
-    gradle=yes
-
-Build:2.0.1,68
-    commit=2.0.1
-    subdir=beecount
-    gradle=yes
-    forceversion=yes
-
-Build:2.0.4,72
-    commit=2.0.4
-    subdir=beecount
-    gradle=yes
-
-Build:2.0.5,73
-    commit=2.0.5
-    subdir=beecount
-    gradle=yes
-
-Build:2.0.6,74
-    commit=2.0.6
-    subdir=beecount
-    gradle=yes
-
-Build:2.0.7,75
-    commit=2.0.7
-    subdir=beecount
-    gradle=yes
-
-Build:2.0.8,76
-    commit=2.0.8
-    subdir=beecount
-    gradle=yes
-
-Build:2.0.9,77
-    commit=2.0.9
-    subdir=beecount
-    gradle=yes
-
-Build:2.0.10,78
-    commit=2.0.10
-    subdir=beecount
-    gradle=yes
-
-Build:2.1.0-beta,79
-    disable=beta
-    commit=2.1.0-beta
-    subdir=beecount
-    gradle=yes
-
-Build:2.2.0,82
-    commit=2.2.0
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.0,87
-    commit=2.3.0
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.1,91
-    commit=2.3.1
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.2,92
-    commit=2.3.2
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.4,93
-    commit=2.3.4
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.5,94
-    commit=2.3.5
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.6,96
-    commit=2.3.6
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.7-r1,104
-    commit=2.3.7-r1
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.7-r2,105
-    commit=2.3.7-r2
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.8,108
-    commit=2.3.8
-    subdir=beecount
-    gradle=yes
-
-Build:2.3.9,109
-    commit=2.3.9
-    subdir=beecount
-    gradle=yes
-
-Build:2.4.1,114
-    commit=2.4.1
-    subdir=beecount
-    gradle=yes
-
-Build:2.4.2,115
-    disable=misconfigured beta plugin version
-    commit=2.4.2
-    subdir=beecount
-    gradle=yes
-
-Build:2.4.3,116
-    disable=misconfigured beta plugin version
-    commit=2.4.3
-    subdir=beecount
-    gradle=yes
-
-Build:2.4.4,117
-    commit=2.4.4-r1
-    subdir=beecount
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-
-Build:2.4.5,118
-    commit=2.4.5
-    subdir=beecount
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-
-Build:2.4.6,119
-    commit=2.4.6
-    subdir=beecount
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-
-Build:2.4.7,120
-    commit=2.4.7
-    subdir=beecount
-    init=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.14.1" }' >> ../build.gradle
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.4.7
-Current Version Code:120
diff --git a/metadata/com.knirirr.beecount.yml b/metadata/com.knirirr.beecount.yml
new file mode 100644
index 0000000000..53d1dd8d46
--- /dev/null
+++ b/metadata/com.knirirr.beecount.yml
@@ -0,0 +1,272 @@
+Categories:
+  - Writing
+License: Apache-2.0
+SourceCode: https://github.com/knirirr/BeeCount
+IssueTracker: https://github.com/knirirr/BeeCount/issues
+
+AutoName: BeeCount
+Summary: Knitting row counter
+Description: |-
+    A knitting project helper, with the following features:
+
+    * Keep track of several knitting projects.
+    * For each project, track several items which need counting, e.g. rows, pattern repeats etc
+    * Allow counting up, down and re-setting to zero of these counts.
+    * Allow editing of projects to add, remove or change counts after project creation.
+    * Link counts together so that one increments another.
+    * Set row alerts and cause counts to reset at particular values.
+    * Allow backing up and restoring of the entire projects database.
+
+RepoType: git
+Repo: https://github.com/knirirr/BeeCount.git
+
+Builds:
+  - versionName: 1.2.1
+    versionCode: 47
+    disable: repo changed
+    commit: 1.2.1
+    target: android-15
+
+  - versionName: 1.2.2
+    versionCode: 48
+    disable: repo changed
+    commit: 1.2.2
+    target: android-15
+
+  - versionName: 1.2.3
+    versionCode: 50
+    disable: repo changed
+    commit: 1.2.3
+    target: android-15
+
+  - versionName: 1.2.5
+    versionCode: 53
+    disable: repo changed
+    commit: 1.2.5
+    target: android-15
+
+  - versionName: 1.2.7
+    versionCode: 56
+    disable: repo changed
+    commit: 1.2.7
+    target: android-15
+
+  - versionName: 1.2.8
+    versionCode: 59
+    disable: wrongly tagged, as is 1.2.9
+
+  - versionName: 1.2.10
+    versionCode: 62
+    disable: repo changed
+    commit: 1.2.10
+    target: android-15
+
+  - versionName: 2.0.0
+    versionCode: 67
+    disable: upstream needs fixing
+    commit: 2.0.0
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.0.1
+    versionCode: 68
+    commit: 2.0.1
+    subdir: beecount
+    gradle:
+      - yes
+    forceversion: true
+
+  - versionName: 2.0.4
+    versionCode: 72
+    commit: 2.0.4
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.0.5
+    versionCode: 73
+    commit: 2.0.5
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.0.6
+    versionCode: 74
+    commit: 2.0.6
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.0.7
+    versionCode: 75
+    commit: 2.0.7
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.0.8
+    versionCode: 76
+    commit: 2.0.8
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.0.9
+    versionCode: 77
+    commit: 2.0.9
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.0.10
+    versionCode: 78
+    commit: 2.0.10
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.1.0-beta
+    versionCode: 79
+    disable: beta
+    commit: 2.1.0-beta
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 82
+    commit: 2.2.0
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.0
+    versionCode: 87
+    commit: 2.3.0
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.1
+    versionCode: 91
+    commit: 2.3.1
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.2
+    versionCode: 92
+    commit: 2.3.2
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.4
+    versionCode: 93
+    commit: 2.3.4
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.5
+    versionCode: 94
+    commit: 2.3.5
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.6
+    versionCode: 96
+    commit: 2.3.6
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.7-r1
+    versionCode: 104
+    commit: 2.3.7-r1
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.7-r2
+    versionCode: 105
+    commit: 2.3.7-r2
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.8
+    versionCode: 108
+    commit: 2.3.8
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.3.9
+    versionCode: 109
+    commit: 2.3.9
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.4.1
+    versionCode: 114
+    commit: 2.4.1
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.4.2
+    versionCode: 115
+    disable: misconfigured beta plugin version
+    commit: 2.4.2
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.4.3
+    versionCode: 116
+    disable: misconfigured beta plugin version
+    commit: 2.4.3
+    subdir: beecount
+    gradle:
+      - yes
+
+  - versionName: 2.4.4
+    versionCode: 117
+    commit: 2.4.4-r1
+    subdir: beecount
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+
+  - versionName: 2.4.5
+    versionCode: 118
+    commit: 2.4.5
+    subdir: beecount
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+
+  - versionName: 2.4.6
+    versionCode: 119
+    commit: 2.4.6
+    subdir: beecount
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+
+  - versionName: 2.4.7
+    versionCode: 120
+    commit: 2.4.7
+    subdir: beecount
+    init: "echo 'task wrapper(type: Wrapper) { gradleVersion = \"2.14.1\" }' >> ../build.gradle"
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.4.7
+CurrentVersionCode: 120
diff --git a/metadata/com.kunzisoft.keepass.libre.txt b/metadata/com.kunzisoft.keepass.libre.txt
deleted file mode 100644
index be87bc3f1d..0000000000
--- a/metadata/com.kunzisoft.keepass.libre.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-Categories:Security
-License:GPL-3.0-or-later
-Author Name:Kunzisoft
-Author Email:contact@kunzisoft.com
-Web Site:https://www.kunzisoft.com/KeepassDX
-Source Code:https://github.com/Kunzisoft/KeePassDX
-Issue Tracker:https://github.com/Kunzisoft/KeePassDX/issues
-Changelog:https://github.com/Kunzisoft/KeePassDX/blob/HEAD/CHANGELOG
-Donate:https://www.kunzisoft.com/donation?project=keepassdx
-LiberapayID:4971
-Bitcoin:1DSwXCk7Sob24sNsofywNoRQw2f5Qj5t2F
-Litecoin:LRmhvGbKNXFLTxyK8Q9zBxDXjBWm6Rzt34
-
-Auto Name:KeePass DX
-
-Repo Type:git
-Repo:https://github.com/Kunzisoft/KeePassDX
-
-Build:2.5.0.0beta2-libre,2
-    commit=2.5.0.0beta2
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta3-libre,3
-    commit=2.5.0.0beta3
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta4-libre,4
-    commit=2.5.0.0beta4
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta6-libre,6
-    commit=2.5.0.0beta6
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta7-libre,7
-    commit=2.5.0.0beta7
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta9-libre,9
-    commit=2.5.0.0beta9
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta11-libre,11
-    commit=2.5.0.0beta11
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta14-libre,14
-    commit=2.5.0.0beta14
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta15-libre,15
-    commit=2.5.0.0beta15
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta17-libre,17
-    commit=2.5.0.0beta17
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta18,18
-    commit=2.5.0.0beta18
-    subdir=app
-    gradle=libre
-
-Build:2.5.0.0beta22,22
-    commit=2.5.0.0beta22
-    subdir=app
-    gradle=libre
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.5.0.0beta22
-Current Version Code:22
diff --git a/metadata/com.kunzisoft.keepass.libre.yml b/metadata/com.kunzisoft.keepass.libre.yml
new file mode 100644
index 0000000000..71681a8370
--- /dev/null
+++ b/metadata/com.kunzisoft.keepass.libre.yml
@@ -0,0 +1,108 @@
+Categories:
+  - Security
+License: GPL-3.0-or-later
+AuthorName: Kunzisoft
+AuthorEmail: contact@kunzisoft.com
+WebSite: https://www.kunzisoft.com/KeepassDX
+SourceCode: https://github.com/Kunzisoft/KeePassDX
+IssueTracker: https://github.com/Kunzisoft/KeePassDX/issues
+Changelog: https://github.com/Kunzisoft/KeePassDX/blob/HEAD/CHANGELOG
+Donate: https://www.kunzisoft.com/donation?project=keepassdx
+LiberapayID: '4971'
+Bitcoin: 1DSwXCk7Sob24sNsofywNoRQw2f5Qj5t2F
+Litecoin: LRmhvGbKNXFLTxyK8Q9zBxDXjBWm6Rzt34
+
+AutoName: KeePass DX
+
+RepoType: git
+Repo: https://github.com/Kunzisoft/KeePassDX
+
+Builds:
+  - versionName: 2.5.0.0beta2-libre
+    versionCode: 2
+    commit: 2.5.0.0beta2
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta3-libre
+    versionCode: 3
+    commit: 2.5.0.0beta3
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta4-libre
+    versionCode: 4
+    commit: 2.5.0.0beta4
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta6-libre
+    versionCode: 6
+    commit: 2.5.0.0beta6
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta7-libre
+    versionCode: 7
+    commit: 2.5.0.0beta7
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta9-libre
+    versionCode: 9
+    commit: 2.5.0.0beta9
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta11-libre
+    versionCode: 11
+    commit: 2.5.0.0beta11
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta14-libre
+    versionCode: 14
+    commit: 2.5.0.0beta14
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta15-libre
+    versionCode: 15
+    commit: 2.5.0.0beta15
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta17-libre
+    versionCode: 17
+    commit: 2.5.0.0beta17
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta18
+    versionCode: 18
+    commit: 2.5.0.0beta18
+    subdir: app
+    gradle:
+      - libre
+
+  - versionName: 2.5.0.0beta22
+    versionCode: 22
+    commit: 2.5.0.0beta22
+    subdir: app
+    gradle:
+      - libre
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.5.0.0beta22
+CurrentVersionCode: 22
diff --git a/metadata/com.kunzisoft.keyboard.switcher.txt b/metadata/com.kunzisoft.keyboard.switcher.txt
deleted file mode 100644
index 93a9ecb5ac..0000000000
--- a/metadata/com.kunzisoft.keyboard.switcher.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Categories:Writing
-License:GPL-3.0-or-later
-Author Name:Kunzisoft
-Author Email:contact@kunzisoft.com
-Web Site:https://www.kunzisoft.com/
-Source Code:https://gitlab.com/kunzisoft/Android-KeyboardSwitcher
-Issue Tracker:https://gitlab.com/kunzisoft/Android-KeyboardSwitcher/issues
-Donate:https://www.kunzisoft.com/donation?project=keyboardswitcher
-LiberapayID:4971
-Bitcoin:1DSwXCk7Sob24sNsofywNoRQw2f5Qj5t2F
-Litecoin:LRmhvGbKNXFLTxyK8Q9zBxDXjBWm6Rzt34
-
-Auto Name:Keyboard Switcher
-
-Repo Type:git
-Repo:https://gitlab.com/kunzisoft/Android-KeyboardSwitcher
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=1.1
-    subdir=app
-    gradle=yes
-
-Build:1.2,3
-    commit=1.2
-    subdir=app
-    gradle=yes
-
-Build:1.3,4
-    commit=1.3
-    subdir=app
-    gradle=yes
-
-Build:1.4,5
-    commit=1.4
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.4
-Current Version Code:5
diff --git a/metadata/com.kunzisoft.keyboard.switcher.yml b/metadata/com.kunzisoft.keyboard.switcher.yml
new file mode 100644
index 0000000000..0ce1cfbb88
--- /dev/null
+++ b/metadata/com.kunzisoft.keyboard.switcher.yml
@@ -0,0 +1,58 @@
+Categories:
+  - Writing
+License: GPL-3.0-or-later
+AuthorName: Kunzisoft
+AuthorEmail: contact@kunzisoft.com
+WebSite: https://www.kunzisoft.com/
+SourceCode: https://gitlab.com/kunzisoft/Android-KeyboardSwitcher
+IssueTracker: https://gitlab.com/kunzisoft/Android-KeyboardSwitcher/issues
+Donate: https://www.kunzisoft.com/donation?project=keyboardswitcher
+LiberapayID: '4971'
+Bitcoin: 1DSwXCk7Sob24sNsofywNoRQw2f5Qj5t2F
+Litecoin: LRmhvGbKNXFLTxyK8Q9zBxDXjBWm6Rzt34
+
+AutoName: Keyboard Switcher
+
+RepoType: git
+Repo: https://gitlab.com/kunzisoft/Android-KeyboardSwitcher
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: '1.1'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: '1.2'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: '1.3'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 5
+    commit: '1.4'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.4'
+CurrentVersionCode: 5
diff --git a/metadata/com.launcher.silverfish.txt b/metadata/com.launcher.silverfish.txt
deleted file mode 100644
index edb2268047..0000000000
--- a/metadata/com.launcher.silverfish.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-Categories:System,Theming
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/stanipintjuk/Silverfish
-Issue Tracker:https://github.com/stanipintjuk/Silverfish/issues
-
-Auto Name:Silverfish
-Summary:A launcher with focus on a simple UI
-Description:
-A launcher with a "less is more" philosophy.
-
-What to expect
-
-* Only one launcher home screen page.
-* Home screen organizes application shortcuts automatically.
-* App drawer is divided into tabs with different categories.
-* Home screen has a dedicated area for one widget.
-.
-
-Repo Type:git
-Repo:https://github.com/stanipintjuk/Silverfish
-
-Build:0.1-alpha,1
-    commit=v0.1-alpha
-    subdir=app
-    gradle=yes
-
-Build:0.2-alpha,2
-    commit=v0.2-alpha
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Build:0.3,3
-    commit=v0.3
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Build:0.4,4
-    disable=java compile error
-    commit=v0.4
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Build:0.4.1,5
-    commit=v0.4.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Build:0.5,6
-    commit=v0.5
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Build:0.5.1,7
-    commit=v0.5.1
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Build:0.5.2,8
-    commit=v0.5.2
-    subdir=app
-    gradle=yes
-    rm=gradle
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.5.2
-Current Version Code:8
diff --git a/metadata/com.launcher.silverfish.yml b/metadata/com.launcher.silverfish.yml
new file mode 100644
index 0000000000..d45689c0c8
--- /dev/null
+++ b/metadata/com.launcher.silverfish.yml
@@ -0,0 +1,100 @@
+Categories:
+  - System
+  - Theming
+License: GPL-3.0-only
+SourceCode: https://github.com/stanipintjuk/Silverfish
+IssueTracker: https://github.com/stanipintjuk/Silverfish/issues
+
+AutoName: Silverfish
+Summary: A launcher with focus on a simple UI
+Description: |-
+    A launcher with a "less is more" philosophy.
+
+    What to expect
+
+    * Only one launcher home screen page.
+    * Home screen organizes application shortcuts automatically.
+    * App drawer is divided into tabs with different categories.
+    * Home screen has a dedicated area for one widget.
+
+RepoType: git
+Repo: https://github.com/stanipintjuk/Silverfish
+
+Builds:
+  - versionName: 0.1-alpha
+    versionCode: 1
+    commit: v0.1-alpha
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2-alpha
+    versionCode: 2
+    commit: v0.2-alpha
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+  - versionName: '0.3'
+    versionCode: 3
+    commit: v0.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+  - versionName: '0.4'
+    versionCode: 4
+    disable: java compile error
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+  - versionName: 0.4.1
+    versionCode: 5
+    commit: v0.4.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+  - versionName: '0.5'
+    versionCode: 6
+    commit: v0.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+  - versionName: 0.5.1
+    versionCode: 7
+    commit: v0.5.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+  - versionName: 0.5.2
+    versionCode: 8
+    commit: v0.5.2
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - gradle
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.5.2
+CurrentVersionCode: 8
diff --git a/metadata/com.lgallardo.qbittorrentclient.txt b/metadata/com.lgallardo.qbittorrentclient.txt
deleted file mode 100644
index 53877db29e..0000000000
--- a/metadata/com.lgallardo.qbittorrentclient.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:https://github.com/lgallard/qBittorrent-Client/wiki
-Source Code:https://github.com/lgallard/qBittorrent-Client
-Issue Tracker:https://github.com/lgallard/qBittorrent-Client/issues
-
-Auto Name:qBittorrent Client
-Summary:Companion app for qBittorrent client
-Description:
-Manage the queue of your qBittorrent client. Features include:
-
-* See a two panel view (fragments) for torrent list and details in the same window
-* Drawer menu for switching between All, Downloading, Completed, Paused, Active and Inactive torrent list
-* Pause or resume all torrents from the selected list
-* Auto refresh torrent list after performing an action on a torrent (pause, resume, or delete)
-* Add URL directly or by clicking the torrent link on your device's browser
-* Pause, resume, or delete individual torrents with its downloaded data
-* Set and save a connection account
-
-This app has been superseeded with [[com.lgallardo.qbittorrentclientpro]].
-.
-
-Repo Type:git
-Repo:https://github.com/lgallard/qBittorrent-Client/
-
-Build:2.0,200
-    disable=doesn't compile
-    commit=v2.0
-    subdir=qBittorrentClient
-    patch=remove_admob.diff
-    srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2
-    rm=qBittorrentClient/libs/*
-    extlibs=android/android-support-v4.jar
-    prebuild=pushd $$ApacheHttpClient$$/httpclient/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpClient$$/httpmime/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpCore$$/httpcore && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
-
-Build:2.2.0,220
-    commit=v2.2.0
-    subdir=qBittorrentClient
-    patch=remove_admob.diff,string_fix.diff
-    srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2
-    rm=qBittorrentClient/libs/*
-    extlibs=android/android-support-v4.jar
-    prebuild=pushd $$ApacheHttpClient$$/httpclient/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpClient$$/httpmime/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpCore$$/httpcore && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
-
-Build:2.7.1,271
-    disable=patches don't apply anymore
-    commit=v2.7.1
-    subdir=qBittorrentClient
-    patch=remove_admob.diff,string_fix.diff
-    srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2
-    rm=qBittorrentClient/libs/*
-    extlibs=android/android-support-v4.jar
-    prebuild=pushd $$ApacheHttpClient$$/httpclient/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpClient$$/httpmime/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpCore$$/httpcore && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
-
-Build:3.7.0,370
-    commit=5779e53c6b8b3b5634bf1a38525947b85837be52
-    subdir=qBittorrentClient
-    patch=remove_ads_370.patch
-    srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2
-    rm=qBittorrentClient/libs/*
-    extlibs=android/android-support-v4.jar
-    build=pushd $$ApacheHttpClient$$/httpclient/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpClient$$/httpmime/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpCore$$/httpcore && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
-
-Archive Policy:0 versions
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:3.7.0
-Current Version Code:370
diff --git a/metadata/com.lgallardo.qbittorrentclient.yml b/metadata/com.lgallardo.qbittorrentclient.yml
new file mode 100644
index 0000000000..8e6591271e
--- /dev/null
+++ b/metadata/com.lgallardo.qbittorrentclient.yml
@@ -0,0 +1,139 @@
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+WebSite: https://github.com/lgallard/qBittorrent-Client/wiki
+SourceCode: https://github.com/lgallard/qBittorrent-Client
+IssueTracker: https://github.com/lgallard/qBittorrent-Client/issues
+
+AutoName: qBittorrent Client
+Summary: Companion app for qBittorrent client
+Description: |-
+    Manage the queue of your qBittorrent client. Features include:
+
+    * See a two panel view (fragments) for torrent list and details in the same window
+    * Drawer menu for switching between All, Downloading, Completed, Paused, Active and Inactive torrent list
+    * Pause or resume all torrents from the selected list
+    * Auto refresh torrent list after performing an action on a torrent (pause, resume, or delete)
+    * Add URL directly or by clicking the torrent link on your device's browser
+    * Pause, resume, or delete individual torrents with its downloaded data
+    * Set and save a connection account
+
+    This app has been superseeded with [[com.lgallardo.qbittorrentclientpro]].
+
+RepoType: git
+Repo: https://github.com/lgallard/qBittorrent-Client/
+
+Builds:
+  - versionName: '2.0'
+    versionCode: 200
+    disable: doesn't compile
+    commit: v2.0
+    subdir: qBittorrentClient
+    patch:
+      - remove_admob.diff
+    srclibs:
+      - ApacheHttpClient@4.3.5
+      - ApacheHttpCore@4.3.2
+    rm:
+      - qBittorrentClient/libs/*
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - pushd $$ApacheHttpClient$$/httpclient/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpClient$$/httpmime/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpCore$$/httpcore
+      - $$MVN3$$ package
+      - popd
+      - cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar
+        $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
+
+  - versionName: 2.2.0
+    versionCode: 220
+    commit: v2.2.0
+    subdir: qBittorrentClient
+    patch:
+      - remove_admob.diff
+      - string_fix.diff
+    srclibs:
+      - ApacheHttpClient@4.3.5
+      - ApacheHttpCore@4.3.2
+    rm:
+      - qBittorrentClient/libs/*
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - pushd $$ApacheHttpClient$$/httpclient/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpClient$$/httpmime/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpCore$$/httpcore
+      - $$MVN3$$ package
+      - popd
+      - cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar
+        $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
+
+  - versionName: 2.7.1
+    versionCode: 271
+    disable: patches don't apply anymore
+    commit: v2.7.1
+    subdir: qBittorrentClient
+    patch:
+      - remove_admob.diff
+      - string_fix.diff
+    srclibs:
+      - ApacheHttpClient@4.3.5
+      - ApacheHttpCore@4.3.2
+    rm:
+      - qBittorrentClient/libs/*
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - pushd $$ApacheHttpClient$$/httpclient/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpClient$$/httpmime/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpCore$$/httpcore
+      - $$MVN3$$ package
+      - popd
+      - cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar
+        $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
+
+  - versionName: 3.7.0
+    versionCode: 370
+    commit: 5779e53c6b8b3b5634bf1a38525947b85837be52
+    subdir: qBittorrentClient
+    patch:
+      - remove_ads_370.patch
+    srclibs:
+      - ApacheHttpClient@4.3.5
+      - ApacheHttpCore@4.3.2
+    rm:
+      - qBittorrentClient/libs/*
+    extlibs:
+      - android/android-support-v4.jar
+    build:
+      - pushd $$ApacheHttpClient$$/httpclient/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpClient$$/httpmime/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpCore$$/httpcore
+      - $$MVN3$$ package
+      - popd
+      - cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar
+        $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 3.7.0
+CurrentVersionCode: 370
diff --git a/metadata/com.lgallardo.qbittorrentclientpro.txt b/metadata/com.lgallardo.qbittorrentclientpro.txt
deleted file mode 100644
index d048cd3aa8..0000000000
--- a/metadata/com.lgallardo.qbittorrentclientpro.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:https://github.com/lgallard/qBittorrent-Client/wiki
-Source Code:https://github.com/lgallard/qBittorrent-Client
-Issue Tracker:https://github.com/lgallard/qBittorrent-Client/issues
-Changelog:https://github.com/lgallard/qBittorrent-Controller/releases
-
-Auto Name:qBittorrent Client Pro
-Summary:Companion app for qBittorrent client
-Description:
-Manage the queue of your qBittorrent client. Features include:
-
-* See a two panel view (fragments) for torrent list and details in the same window
-* Drawer menu for switching between All, Downloading, Completed, Paused, Active and Inactive torrent list
-* Pause or resume all torrents from the selected list
-* Auto refresh torrent list after performing an action on a torrent (pause, resume, or delete)
-* Add URL directly or by clicking the torrent link on your device's browser
-* Pause, resume, or delete individual torrents with its downloaded data
-* Set and save a connection account
-.
-
-Repo Type:git
-Repo:https://github.com/lgallard/qBittorrent-Client/
-
-Build:3.9.0,390
-    commit=v3.9.0
-    subdir=qBittorrentClient/app
-    patch=remove_ads_390.patch
-    gradle=pro
-    srclibs=ApacheHttpClient@4.3.5,ApacheHttpCore@4.3.2
-    rm=qBittorrentClient/app/libs/*
-    prebuild=sed -i '/com.google.android.gms:play-services/d' build.gradle
-    build=pushd $$ApacheHttpClient$$/httpclient/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpClient$$/httpmime/ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$ApacheHttpCore$$/httpcore && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:4.5.8
-Current Version Code:458
diff --git a/metadata/com.lgallardo.qbittorrentclientpro.yml b/metadata/com.lgallardo.qbittorrentclientpro.yml
new file mode 100644
index 0000000000..c5bd2c1fcf
--- /dev/null
+++ b/metadata/com.lgallardo.qbittorrentclientpro.yml
@@ -0,0 +1,56 @@
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+WebSite: https://github.com/lgallard/qBittorrent-Client/wiki
+SourceCode: https://github.com/lgallard/qBittorrent-Client
+IssueTracker: https://github.com/lgallard/qBittorrent-Client/issues
+Changelog: https://github.com/lgallard/qBittorrent-Controller/releases
+
+AutoName: qBittorrent Client Pro
+Summary: Companion app for qBittorrent client
+Description: |-
+    Manage the queue of your qBittorrent client. Features include:
+
+    * See a two panel view (fragments) for torrent list and details in the same window
+    * Drawer menu for switching between All, Downloading, Completed, Paused, Active and Inactive torrent list
+    * Pause or resume all torrents from the selected list
+    * Auto refresh torrent list after performing an action on a torrent (pause, resume, or delete)
+    * Add URL directly or by clicking the torrent link on your device's browser
+    * Pause, resume, or delete individual torrents with its downloaded data
+    * Set and save a connection account
+
+RepoType: git
+Repo: https://github.com/lgallard/qBittorrent-Client/
+
+Builds:
+  - versionName: 3.9.0
+    versionCode: 390
+    commit: v3.9.0
+    subdir: qBittorrentClient/app
+    patch:
+      - remove_ads_390.patch
+    gradle:
+      - pro
+    srclibs:
+      - ApacheHttpClient@4.3.5
+      - ApacheHttpCore@4.3.2
+    rm:
+      - qBittorrentClient/app/libs/*
+    prebuild: sed -i '/com.google.android.gms:play-services/d' build.gradle
+    build:
+      - pushd $$ApacheHttpClient$$/httpclient/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpClient$$/httpmime/
+      - $$MVN3$$ package
+      - popd
+      - pushd $$ApacheHttpCore$$/httpcore
+      - $$MVN3$$ package
+      - popd
+      - cp $$ApacheHttpCore$$/httpcore/target/httpcore-4.3.2.jar $$ApacheHttpClient$$/httpclient/target/httpclient-4.3.5.jar
+        $$ApacheHttpClient$$/httpmime/target/httpmime-4.3.5.jar libs/
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 4.5.8
+CurrentVersionCode: 458
diff --git a/metadata/com.linkomnia.android.Changjie.txt b/metadata/com.linkomnia.android.Changjie.txt
deleted file mode 100644
index 4ec8168f8c..0000000000
--- a/metadata/com.linkomnia.android.Changjie.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Categories:Writing
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/wanleung/ChangjieIME
-Issue Tracker:https://github.com/wanleung/ChangjieIME/issues
-
-Auto Name:Changjie Input Method
-Summary:Chinese keyboard
-Description:
-Supported Changjie ( Cangjie ) version 3 and 5, and Quick Method, with Phases
-support.
-
-The project is based on the new ibus-cangjie based [https://github.com/Cangjians
-library] libcangjie. The dictionary is based on [http://cle.linux.org.tw/trac
-gcin].
-.
-
-Repo Type:git
-Repo:https://github.com/wanleung/ChangjieIME.git
-
-Build:0.1,3
-    commit=6b3a58f0726bfb387a
-
-Build:0.3.1,7
-    commit=v0.3.1
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.3.1
-Current Version Code:7
diff --git a/metadata/com.linkomnia.android.Changjie.yml b/metadata/com.linkomnia.android.Changjie.yml
new file mode 100644
index 0000000000..9a623fc2a7
--- /dev/null
+++ b/metadata/com.linkomnia.android.Changjie.yml
@@ -0,0 +1,32 @@
+Categories:
+  - Writing
+License: GPL-3.0-only
+SourceCode: https://github.com/wanleung/ChangjieIME
+IssueTracker: https://github.com/wanleung/ChangjieIME/issues
+
+AutoName: Changjie Input Method
+Summary: Chinese keyboard
+Description: |-
+    Supported Changjie ( Cangjie ) version 3 and 5, and Quick Method, with Phases
+    support.
+
+    The project is based on the new ibus-cangjie based [https://github.com/Cangjians
+    library] libcangjie. The dictionary is based on [http://cle.linux.org.tw/trac
+    gcin].
+
+RepoType: git
+Repo: https://github.com/wanleung/ChangjieIME.git
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 3
+    commit: 6b3a58f0726bfb387a
+
+  - versionName: 0.3.1
+    versionCode: 7
+    commit: v0.3.1
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.3.1
+CurrentVersionCode: 7
diff --git a/metadata/com.linuxcounter.lico_update_003.txt b/metadata/com.linuxcounter.lico_update_003.txt
deleted file mode 100644
index 2ceed15f49..0000000000
--- a/metadata/com.linuxcounter.lico_update_003.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Categories:Internet
-License:GPL-3.0-only
-Web Site:https://www.linuxcounter.net
-Source Code:https://github.com/alexloehner/linuxcounter.android.app
-Issue Tracker:https://github.com/alexloehner/linuxcounter.android.app/issues
-
-Auto Name:Linux Counter Updater
-Summary:Companion for LinuxCounter project
-Description:
-Companion app for the [https://en.wikipedia.org/wiki/Linux_Counter LinuxCounter]
-project (LiCo).
-.
-
-Repo Type:git
-Repo:https://github.com/alexloehner/linuxcounter.android.app
-
-Build:0.0.5,5
-    commit=2e9f3ab6fcd649b1fd1bccca8503e6bd252efecd
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/volley/d' build.gradle && \
-        sed -i -e '/support-v4/acompile "com.mcxiaoke.volley:library:1.0.+@aar"' build.gradle
-
-Build:0.0.6,6
-    commit=0.0.6
-    subdir=app
-    gradle=yes
-
-Build:0.0.8,8
-    commit=0.0.8
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.0.8
-Current Version Code:8
diff --git a/metadata/com.linuxcounter.lico_update_003.yml b/metadata/com.linuxcounter.lico_update_003.yml
new file mode 100644
index 0000000000..d5a056d9a2
--- /dev/null
+++ b/metadata/com.linuxcounter.lico_update_003.yml
@@ -0,0 +1,45 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+WebSite: https://www.linuxcounter.net
+SourceCode: https://github.com/alexloehner/linuxcounter.android.app
+IssueTracker: https://github.com/alexloehner/linuxcounter.android.app/issues
+
+AutoName: Linux Counter Updater
+Summary: Companion for LinuxCounter project
+Description: |-
+    Companion app for the [https://en.wikipedia.org/wiki/Linux_Counter LinuxCounter]
+    project (LiCo).
+
+RepoType: git
+Repo: https://github.com/alexloehner/linuxcounter.android.app
+
+Builds:
+  - versionName: 0.0.5
+    versionCode: 5
+    commit: 2e9f3ab6fcd649b1fd1bccca8503e6bd252efecd
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/volley/d' build.gradle
+      - sed -i -e '/support-v4/acompile "com.mcxiaoke.volley:library:1.0.+@aar"' build.gradle
+
+  - versionName: 0.0.6
+    versionCode: 6
+    commit: 0.0.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.0.8
+    versionCode: 8
+    commit: 0.0.8
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.0.8
+CurrentVersionCode: 8
diff --git a/metadata/com.llamacorp.equate.txt b/metadata/com.llamacorp.equate.txt
deleted file mode 100644
index 29904bcf4d..0000000000
--- a/metadata/com.llamacorp.equate.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Categories:Science & Education
-License:GPL-2.0-only
-Web Site:
-Source Code:https://github.com/EvanRespaut/Equate
-Issue Tracker:https://github.com/EvanRespaut/Equate/issues
-
-Auto Name:Equate
-Summary:Convert units
-Description:
-Unit converting calculator featuring:
-
-* clean and fast unit conversions
-* more than 10 different unit types, including real time currency
-* over 130 units to convert between
-* customizable unit buttons
-* semi-scientific calculator
-* order of operations
-* operation history, with recall
-* smart parenthesis
-.
-
-Repo Type:git
-Repo:https://github.com/EvanRespaut/Equate
-
-Build:1.0,1
-    commit=3336b86508ac235e07c54ef69e46d1220e8fad26
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=22037d0517ae2d7c7be6042ace5d72055f8b3c4a
-    subdir=app
-    gradle=yes
-
-Build:1.2,3
-    commit=fb58b90aa2370ba5ba5008715ba6d1650f3be94c
-    subdir=app
-    gradle=yes
-
-Build:1.3,4
-    commit=v1.3
-    subdir=app
-    gradle=yes
-
-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,8
-    commit=v1.7
-    subdir=app
-    gradle=yes
-
-Build:1.8,9
-    commit=v1.8
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.8
-Current Version Code:9
diff --git a/metadata/com.llamacorp.equate.yml b/metadata/com.llamacorp.equate.yml
new file mode 100644
index 0000000000..369862e34c
--- /dev/null
+++ b/metadata/com.llamacorp.equate.yml
@@ -0,0 +1,91 @@
+Categories:
+  - Science & Education
+License: GPL-2.0-only
+SourceCode: https://github.com/EvanRespaut/Equate
+IssueTracker: https://github.com/EvanRespaut/Equate/issues
+
+AutoName: Equate
+Summary: Convert units
+Description: |-
+    Unit converting calculator featuring:
+
+    * clean and fast unit conversions
+    * more than 10 different unit types, including real time currency
+    * over 130 units to convert between
+    * customizable unit buttons
+    * semi-scientific calculator
+    * order of operations
+    * operation history, with recall
+    * smart parenthesis
+
+RepoType: git
+Repo: https://github.com/EvanRespaut/Equate
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 3336b86508ac235e07c54ef69e46d1220e8fad26
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: 22037d0517ae2d7c7be6042ace5d72055f8b3c4a
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: fb58b90aa2370ba5ba5008715ba6d1650f3be94c
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: v1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - 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: 8
+    commit: v1.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 9
+    commit: v1.8
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.8'
+CurrentVersionCode: 9
diff --git a/metadata/com.log28.txt b/metadata/com.log28.txt
deleted file mode 100644
index 6c76c2c7a3..0000000000
--- a/metadata/com.log28.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Categories:Sports & Health
-License:LGPL-3.0-only
-Web Site:
-Source Code:https://github.com/zoenb/log28
-Issue Tracker:https://github.com/zoenb/log28/issues
-
-Auto Name:log28
-Summary:A simple no-frills period tracker
-Description:
-log28 is a simple no-frills period tracker.
-
-Features:
-
-* Easily view cycle progress
-* Predict future periods
-* Log symptoms and activity
-* Take daily notes
-* Backup your data or move it between devices
-.
-
-Repo Type:git
-Repo:https://github.com/zoenb/log28.git
-
-Build:0.6.0,10
-    commit=0.6.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.6.0
-Current Version Code:10
diff --git a/metadata/com.log28.yml b/metadata/com.log28.yml
new file mode 100644
index 0000000000..de70906581
--- /dev/null
+++ b/metadata/com.log28.yml
@@ -0,0 +1,34 @@
+Categories:
+  - Sports & Health
+License: LGPL-3.0-only
+SourceCode: https://github.com/zoenb/log28
+IssueTracker: https://github.com/zoenb/log28/issues
+
+AutoName: log28
+Summary: A simple no-frills period tracker
+Description: |-
+    log28 is a simple no-frills period tracker.
+
+    Features:
+
+    * Easily view cycle progress
+    * Predict future periods
+    * Log symptoms and activity
+    * Take daily notes
+    * Backup your data or move it between devices
+
+RepoType: git
+Repo: https://github.com/zoenb/log28.git
+
+Builds:
+  - versionName: 0.6.0
+    versionCode: 10
+    commit: 0.6.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.6.0
+CurrentVersionCode: 10