diff --git a/metadata/com.github.axet.darknessimmunity.txt b/metadata/com.github.axet.darknessimmunity.txt
deleted file mode 100644
index 400bb8c841..0000000000
--- a/metadata/com.github.axet.darknessimmunity.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Categories:Theming
-License:GPL-3.0-only
-Web Site:
-Source Code:https://gitlab.com/axet/android-darkness-immunity
-Issue Tracker:https://gitlab.com/axet/android-darkness-immunity/issues
-
-Auto Name:Darkness Immunity
-Summary:Darkness Immunity Digital Amulet
-Description:
-Darkness Immunity Digital Amulet. Works like a charm!
-
-Works even when phone is turned off (since values are still presents in current
-physical reality of phone memory module, you just can't see them when phone has
-no power).
-
-DON'T PANIC!
-
-You can handle it all. It just a dream. Love is the only one truth.
-
-(reality)<-(lie)<-(love)->(lie)->(reality)
-.
-
-Repo Type:git
-Repo:https://gitlab.com/axet/android-darkness-immunity.git
-
-Build:1.2.17,25
-    commit=darknessimmunity-1.2.17
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '3\.3'/gradleVersion = '4.1'/; /jcenter/a\        maven { url 'https://maven.google.com' }" ../build.gradle
-
-Build:1.2.19,27
-    commit=darknessimmunity-1.2.19
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '3\.3'/gradleVersion = '4.1'/; /jcenter/a\        maven { url 'https://maven.google.com' }" ../build.gradle
-
-Build:1.2.20,28
-    commit=darknessimmunity-1.2.20
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '3\.3'/gradleVersion = '4.1'/; /jcenter/a\        maven { url 'https://maven.google.com' }" ../build.gradle
-
-Auto Update Mode:Version darknessimmunity-%v
-Update Check Mode:Tags
-Current Version:1.2.20
-Current Version Code:28
diff --git a/metadata/com.github.axet.darknessimmunity.yml b/metadata/com.github.axet.darknessimmunity.yml
new file mode 100644
index 0000000000..dafe1c96d6
--- /dev/null
+++ b/metadata/com.github.axet.darknessimmunity.yml
@@ -0,0 +1,56 @@
+Categories:
+  - Theming
+License: GPL-3.0-only
+SourceCode: https://gitlab.com/axet/android-darkness-immunity
+IssueTracker: https://gitlab.com/axet/android-darkness-immunity/issues
+
+AutoName: Darkness Immunity
+Summary: Darkness Immunity Digital Amulet
+Description: |-
+    Darkness Immunity Digital Amulet. Works like a charm!
+
+    Works even when phone is turned off (since values are still presents in current
+    physical reality of phone memory module, you just can't see them when phone has
+    no power).
+
+    DON'T PANIC!
+
+    You can handle it all. It just a dream. Love is the only one truth.
+
+    (reality)<-(lie)<-(love)->(lie)->(reality)
+
+RepoType: git
+Repo: https://gitlab.com/axet/android-darkness-immunity.git
+
+Builds:
+  - versionName: 1.2.17
+    versionCode: 25
+    commit: darknessimmunity-1.2.17
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '3\.3'/gradleVersion = '4.1'/; /jcenter/a\        maven
+        { url 'https://maven.google.com' }" ../build.gradle
+
+  - versionName: 1.2.19
+    versionCode: 27
+    commit: darknessimmunity-1.2.19
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '3\.3'/gradleVersion = '4.1'/; /jcenter/a\        maven
+        { url 'https://maven.google.com' }" ../build.gradle
+
+  - versionName: 1.2.20
+    versionCode: 28
+    commit: darknessimmunity-1.2.20
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '3\.3'/gradleVersion = '4.1'/; /jcenter/a\        maven
+        { url 'https://maven.google.com' }" ../build.gradle
+
+AutoUpdateMode: Version darknessimmunity-%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.20
+CurrentVersionCode: 28
diff --git a/metadata/com.github.axet.hourlyreminder.txt b/metadata/com.github.axet.hourlyreminder.txt
deleted file mode 100644
index 33c0577324..0000000000
--- a/metadata/com.github.axet.hourlyreminder.txt
+++ /dev/null
@@ -1,470 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:https://gitlab.com/axet/android-hourly-reminder
-Source Code:https://gitlab.com/axet/android-hourly-reminder/tree/HEAD
-Issue Tracker:https://gitlab.com/axet/android-hourly-reminder/issues
-LiberapayID:1370123
-
-Auto Name:Hourly Reminder
-Summary:Remind you about hours passed
-Description:
-Never miss an alarm: This app reminds you about hours passed. Application will
-pronounce current time on user specified hours. You can choice alarm types:
-beep, speech or custom wav/ogg files.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/axet/android-hourly-reminder.git
-
-Build:2.2.15,239
-    commit=hourlyreminder-2.2.15
-    subdir=app
-    gradle=yes
-
-Build:2.2.17,241
-    commit=hourlyreminder-2.2.17
-    subdir=app
-    gradle=yes
-
-Build:2.3.4,246
-    commit=hourlyreminder-2.3.4
-    subdir=app
-    gradle=yes
-
-Build:2.3.7,249
-    commit=hourlyreminder-2.3.7
-    subdir=app
-    gradle=yes
-
-Build:2.3.9,251
-    commit=hourlyreminder-2.3.9
-    subdir=app
-    gradle=yes
-
-Build:3.0.3,255
-    commit=hourlyreminder-3.0.3
-    subdir=app
-    gradle=yes
-
-Build:3.0.5,257
-    commit=hourlyreminder-3.0.5
-    subdir=app
-    gradle=yes
-
-Build:3.0.14,266
-    disable=doesnt build
-    commit=hourlyreminder-3.0.14
-    subdir=app
-    gradle=yes
-
-Build:3.0.19,271
-    commit=hourlyreminder-3.0.19
-    subdir=app
-    gradle=yes
-
-Build:3.0.22,274
-    commit=hourlyreminder-3.0.22
-    subdir=app
-    gradle=yes
-
-Build:3.0.25,277
-    commit=hourlyreminder-3.0.25
-    subdir=app
-    gradle=yes
-
-Build:3.0.30,282
-    commit=hourlyreminder-3.0.30
-    subdir=app
-    gradle=yes
-
-Build:3.0.31,283
-    commit=hourlyreminder-3.0.31
-    subdir=app
-    gradle=yes
-
-Build:3.0.32,284
-    commit=hourlyreminder-3.0.32
-    subdir=app
-    gradle=yes
-
-Build:3.0.33,285
-    commit=hourlyreminder-3.0.33
-    subdir=app
-    gradle=yes
-
-Build:3.0.35,287
-    commit=hourlyreminder-3.0.35
-    subdir=app
-    gradle=yes
-
-Build:3.0.36,288
-    commit=hourlyreminder-3.0.36
-    subdir=app
-    gradle=yes
-
-Build:3.0.37,289
-    commit=hourlyreminder-3.0.37
-    subdir=app
-    gradle=yes
-
-Build:3.0.42,294
-    commit=hourlyreminder-3.0.42
-    subdir=app
-    gradle=yes
-
-Build:3.0.43,295
-    commit=hourlyreminder-3.0.43
-    subdir=app
-    gradle=yes
-
-Build:3.0.45,297
-    commit=hourlyreminder-3.0.45
-    subdir=app
-    gradle=yes
-
-Build:3.0.47,299
-    commit=hourlyreminder-3.0.47
-    subdir=app
-    gradle=yes
-
-Build:3.0.49,301
-    commit=hourlyreminder-3.0.49
-    subdir=app
-    gradle=yes
-
-Build:3.0.50,302
-    commit=hourlyreminder-3.0.50
-    subdir=app
-    gradle=yes
-
-Build:3.0.51,303
-    commit=hourlyreminder-3.0.51
-    subdir=app
-    gradle=yes
-
-Build:3.0.52,304
-    commit=hourlyreminder-3.0.52
-    subdir=app
-    gradle=yes
-
-Build:3.0.53,305
-    commit=hourlyreminder-3.0.53
-    subdir=app
-    gradle=yes
-
-Build:3.0.54,306
-    commit=hourlyreminder-3.0.54
-    subdir=app
-    gradle=yes
-
-Build:3.0.55,307
-    commit=hourlyreminder-3.0.55
-    subdir=app
-    gradle=yes
-
-Build:3.0.56,308
-    commit=hourlyreminder-3.0.56
-    subdir=app
-    gradle=yes
-
-Build:3.0.59,311
-    commit=hourlyreminder-3.0.59
-    subdir=app
-    gradle=yes
-
-Build:3.0.61,313
-    commit=hourlyreminder-3.0.61
-    subdir=app
-    gradle=yes
-
-Build:3.0.64,316
-    commit=hourlyreminder-3.0.64
-    subdir=app
-    gradle=yes
-
-Build:3.0.67,319
-    commit=hourlyreminder-3.0.67
-    subdir=app
-    gradle=yes
-
-Build:3.0.68,320
-    commit=hourlyreminder-3.0.68
-    subdir=app
-    gradle=yes
-
-Build:3.1.5,326
-    commit=hourlyreminder-3.1.5
-    subdir=app
-    gradle=yes
-
-Build:3.1.7,328
-    commit=hourlyreminder-3.1.7
-    subdir=app
-    gradle=yes
-
-Build:3.1.8,329
-    commit=hourlyreminder-3.1.8
-    subdir=app
-    gradle=yes
-
-Build:3.1.15,336
-    commit=hourlyreminder-3.1.15
-    subdir=app
-    gradle=yes
-
-Build:3.1.16,337
-    commit=hourlyreminder-3.1.16
-    subdir=app
-    gradle=yes
-
-Build:3.1.17,338
-    commit=hourlyreminder-3.1.17
-    subdir=app
-    gradle=yes
-
-Build:3.1.18,339
-    commit=hourlyreminder-3.1.18
-    subdir=app
-    gradle=yes
-
-Build:3.1.20,341
-    commit=hourlyreminder-3.1.20
-    subdir=app
-    gradle=yes
-
-Build:3.1.21,342
-    commit=hourlyreminder-3.1.21
-    subdir=app
-    gradle=yes
-
-Build:3.1.22,343
-    commit=hourlyreminder-3.1.22
-    subdir=app
-    gradle=yes
-
-Build:3.1.23,344
-    disable=Wrong Gradle version
-    commit=hourlyreminder-3.1.23
-    subdir=app
-    gradle=yes
-
-Build:3.1.24,345
-    commit=hourlyreminder-3.1.24
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.1.25,346
-    commit=hourlyreminder-3.1.25
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.1.26,347
-    commit=hourlyreminder-3.1.26
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.2,350
-    commit=hourlyreminder-3.2.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.3,351
-    commit=hourlyreminder-3.2.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.4,352
-    commit=hourlyreminder-3.2.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.7,355
-    commit=hourlyreminder-3.2.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.9,357
-    commit=hourlyreminder-3.2.9
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.13,361
-    commit=hourlyreminder-3.2.13
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.14,362
-    commit=hourlyreminder-3.2.14
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.18,366
-    commit=hourlyreminder-3.2.18
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.20,368
-    commit=hourlyreminder-3.2.20
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.22,370
-    commit=hourlyreminder-3.2.22
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.24,372
-    commit=hourlyreminder-3.2.24
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.25,373
-    commit=hourlyreminder-3.2.25
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.27,375
-    commit=hourlyreminder-3.2.27
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.30,378
-    commit=hourlyreminder-3.2.30
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.32,380
-    commit=hourlyreminder-3.2.32
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.36,384
-    commit=hourlyreminder-3.2.36
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.37,385
-    commit=hourlyreminder-3.2.37
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.38,386
-    commit=hourlyreminder-3.2.38
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.39,387
-    commit=hourlyreminder-3.2.39
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.41,389
-    commit=hourlyreminder-3.2.41
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.44,392
-    commit=hourlyreminder-3.2.44
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.45,393
-    commit=hourlyreminder-3.2.45
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.49,397
-    commit=hourlyreminder-3.2.49
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.51,399
-    commit=hourlyreminder-3.2.51
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.52,400
-    commit=hourlyreminder-3.2.52
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.2.54,402
-    commit=hourlyreminder-3.2.54
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.3.1,404
-    commit=hourlyreminder-3.3.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.3.2,405
-    commit=hourlyreminder-3.3.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.3.3,406
-    commit=hourlyreminder-3.3.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.3.4,407
-    commit=hourlyreminder-3.3.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.3.5,408
-    commit=hourlyreminder-3.3.5
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.3.6,409
-    commit=hourlyreminder-3.3.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Build:3.3.7,410
-    commit=hourlyreminder-3.3.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-
-Auto Update Mode:Version hourlyreminder-%v
-Update Check Mode:Tags
-Current Version:3.3.7
-Current Version Code:410
diff --git a/metadata/com.github.axet.hourlyreminder.yml b/metadata/com.github.axet.hourlyreminder.yml
new file mode 100644
index 0000000000..c56122e3c7
--- /dev/null
+++ b/metadata/com.github.axet.hourlyreminder.yml
@@ -0,0 +1,635 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+WebSite: https://gitlab.com/axet/android-hourly-reminder
+SourceCode: https://gitlab.com/axet/android-hourly-reminder/tree/HEAD
+IssueTracker: https://gitlab.com/axet/android-hourly-reminder/issues
+LiberapayID: '1370123'
+
+AutoName: Hourly Reminder
+Summary: Remind you about hours passed
+Description: |-
+    Never miss an alarm: This app reminds you about hours passed. Application will
+    pronounce current time on user specified hours. You can choice alarm types:
+    beep, speech or custom wav/ogg files.
+
+RepoType: git
+Repo: https://gitlab.com/axet/android-hourly-reminder.git
+
+Builds:
+  - versionName: 2.2.15
+    versionCode: 239
+    commit: hourlyreminder-2.2.15
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.17
+    versionCode: 241
+    commit: hourlyreminder-2.2.17
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.4
+    versionCode: 246
+    commit: hourlyreminder-2.3.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.7
+    versionCode: 249
+    commit: hourlyreminder-2.3.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.9
+    versionCode: 251
+    commit: hourlyreminder-2.3.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.3
+    versionCode: 255
+    commit: hourlyreminder-3.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.5
+    versionCode: 257
+    commit: hourlyreminder-3.0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.14
+    versionCode: 266
+    disable: doesnt build
+    commit: hourlyreminder-3.0.14
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.19
+    versionCode: 271
+    commit: hourlyreminder-3.0.19
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.22
+    versionCode: 274
+    commit: hourlyreminder-3.0.22
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.25
+    versionCode: 277
+    commit: hourlyreminder-3.0.25
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.30
+    versionCode: 282
+    commit: hourlyreminder-3.0.30
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.31
+    versionCode: 283
+    commit: hourlyreminder-3.0.31
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.32
+    versionCode: 284
+    commit: hourlyreminder-3.0.32
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.33
+    versionCode: 285
+    commit: hourlyreminder-3.0.33
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.35
+    versionCode: 287
+    commit: hourlyreminder-3.0.35
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.36
+    versionCode: 288
+    commit: hourlyreminder-3.0.36
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.37
+    versionCode: 289
+    commit: hourlyreminder-3.0.37
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.42
+    versionCode: 294
+    commit: hourlyreminder-3.0.42
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.43
+    versionCode: 295
+    commit: hourlyreminder-3.0.43
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.45
+    versionCode: 297
+    commit: hourlyreminder-3.0.45
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.47
+    versionCode: 299
+    commit: hourlyreminder-3.0.47
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.49
+    versionCode: 301
+    commit: hourlyreminder-3.0.49
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.50
+    versionCode: 302
+    commit: hourlyreminder-3.0.50
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.51
+    versionCode: 303
+    commit: hourlyreminder-3.0.51
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.52
+    versionCode: 304
+    commit: hourlyreminder-3.0.52
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.53
+    versionCode: 305
+    commit: hourlyreminder-3.0.53
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.54
+    versionCode: 306
+    commit: hourlyreminder-3.0.54
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.55
+    versionCode: 307
+    commit: hourlyreminder-3.0.55
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.56
+    versionCode: 308
+    commit: hourlyreminder-3.0.56
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.59
+    versionCode: 311
+    commit: hourlyreminder-3.0.59
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.61
+    versionCode: 313
+    commit: hourlyreminder-3.0.61
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.64
+    versionCode: 316
+    commit: hourlyreminder-3.0.64
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.67
+    versionCode: 319
+    commit: hourlyreminder-3.0.67
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.68
+    versionCode: 320
+    commit: hourlyreminder-3.0.68
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.5
+    versionCode: 326
+    commit: hourlyreminder-3.1.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.7
+    versionCode: 328
+    commit: hourlyreminder-3.1.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.8
+    versionCode: 329
+    commit: hourlyreminder-3.1.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.15
+    versionCode: 336
+    commit: hourlyreminder-3.1.15
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.16
+    versionCode: 337
+    commit: hourlyreminder-3.1.16
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.17
+    versionCode: 338
+    commit: hourlyreminder-3.1.17
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.18
+    versionCode: 339
+    commit: hourlyreminder-3.1.18
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.20
+    versionCode: 341
+    commit: hourlyreminder-3.1.20
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.21
+    versionCode: 342
+    commit: hourlyreminder-3.1.21
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.22
+    versionCode: 343
+    commit: hourlyreminder-3.1.22
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.23
+    versionCode: 344
+    disable: Wrong Gradle version
+    commit: hourlyreminder-3.1.23
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.24
+    versionCode: 345
+    commit: hourlyreminder-3.1.24
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.1.25
+    versionCode: 346
+    commit: hourlyreminder-3.1.25
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.1.26
+    versionCode: 347
+    commit: hourlyreminder-3.1.26
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.2
+    versionCode: 350
+    commit: hourlyreminder-3.2.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.3
+    versionCode: 351
+    commit: hourlyreminder-3.2.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.4
+    versionCode: 352
+    commit: hourlyreminder-3.2.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.7
+    versionCode: 355
+    commit: hourlyreminder-3.2.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.9
+    versionCode: 357
+    commit: hourlyreminder-3.2.9
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.13
+    versionCode: 361
+    commit: hourlyreminder-3.2.13
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.14
+    versionCode: 362
+    commit: hourlyreminder-3.2.14
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.18
+    versionCode: 366
+    commit: hourlyreminder-3.2.18
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.20
+    versionCode: 368
+    commit: hourlyreminder-3.2.20
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.22
+    versionCode: 370
+    commit: hourlyreminder-3.2.22
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.24
+    versionCode: 372
+    commit: hourlyreminder-3.2.24
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.25
+    versionCode: 373
+    commit: hourlyreminder-3.2.25
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.27
+    versionCode: 375
+    commit: hourlyreminder-3.2.27
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.30
+    versionCode: 378
+    commit: hourlyreminder-3.2.30
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.32
+    versionCode: 380
+    commit: hourlyreminder-3.2.32
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.36
+    versionCode: 384
+    commit: hourlyreminder-3.2.36
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.37
+    versionCode: 385
+    commit: hourlyreminder-3.2.37
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.38
+    versionCode: 386
+    commit: hourlyreminder-3.2.38
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.39
+    versionCode: 387
+    commit: hourlyreminder-3.2.39
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.41
+    versionCode: 389
+    commit: hourlyreminder-3.2.41
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.44
+    versionCode: 392
+    commit: hourlyreminder-3.2.44
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.45
+    versionCode: 393
+    commit: hourlyreminder-3.2.45
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.49
+    versionCode: 397
+    commit: hourlyreminder-3.2.49
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.51
+    versionCode: 399
+    commit: hourlyreminder-3.2.51
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.52
+    versionCode: 400
+    commit: hourlyreminder-3.2.52
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.2.54
+    versionCode: 402
+    commit: hourlyreminder-3.2.54
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.3.1
+    versionCode: 404
+    commit: hourlyreminder-3.3.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.3.2
+    versionCode: 405
+    commit: hourlyreminder-3.3.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.3.3
+    versionCode: 406
+    commit: hourlyreminder-3.3.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.3.4
+    versionCode: 407
+    commit: hourlyreminder-3.3.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.3.5
+    versionCode: 408
+    commit: hourlyreminder-3.3.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.3.6
+    versionCode: 409
+    commit: hourlyreminder-3.3.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+  - versionName: 3.3.7
+    versionCode: 410
+    commit: hourlyreminder-3.3.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+
+AutoUpdateMode: Version hourlyreminder-%v
+UpdateCheckMode: Tags
+CurrentVersion: 3.3.7
+CurrentVersionCode: 410
diff --git a/metadata/com.github.axet.mover.txt b/metadata/com.github.axet.mover.txt
deleted file mode 100644
index d572f0fa54..0000000000
--- a/metadata/com.github.axet.mover.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:https://gitlab.com/axet/android-media-merger
-Source Code:https://gitlab.com/axet/android-media-merger/tree/HEAD
-Issue Tracker:https://gitlab.com/axet/android-media-merger/issues
-LiberapayID:1370123
-
-Auto Name:Media Merger
-Summary:Merge media files, open-source
-Description:
-Utitily moves /sdcard/DCIM/* and /sdcard/Pictures/Screenshots to user specified
-folder.
-
-Android friendly. Application waits for event from ContentObserver, and only
-then scan for new files, no ads, open-source, GPLv3.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/axet/android-media-merger.git
-
-Build:1.2.45,59
-    commit=mover-1.2.45
-    subdir=app
-    gradle=yes
-
-Build:1.2.46,60
-    commit=mover-1.2.46
-    subdir=app
-    gradle=yes
-
-Build:1.2.52,66
-    commit=mover-1.2.52
-    subdir=app
-    gradle=yes
-
-Build:1.2.54,68
-    commit=mover-1.2.54
-    subdir=app
-    gradle=yes
-
-Build:1.2.56,70
-    commit=mover-1.2.56
-    subdir=app
-    gradle=yes
-
-Build:1.2.57,71
-    commit=mover-1.2.57
-    subdir=app
-    gradle=yes
-
-Build:1.2.58,72
-    commit=mover-1.2.58
-    subdir=app
-    gradle=yes
-
-Build:1.2.65,78
-    commit=mover-1.2.65
-    subdir=app
-    gradle=yes
-
-Build:1.2.66,79
-    commit=mover-1.2.66
-    subdir=app
-    gradle=yes
-
-Build:1.2.67,80
-    commit=mover-1.2.67
-    subdir=app
-    gradle=yes
-
-Build:1.2.68,81
-    commit=mover-1.2.68
-    subdir=app
-    gradle=yes
-
-Build:1.2.69,82
-    commit=mover-1.2.69
-    subdir=app
-    gradle=yes
-
-Build:1.2.70,83
-    commit=mover-1.2.70
-    subdir=app
-    gradle=yes
-
-Build:1.2.73,86
-    commit=mover-1.2.73
-    subdir=app
-    gradle=yes
-
-Build:1.2.75,88
-    commit=mover-1.2.75
-    subdir=app
-    gradle=yes
-
-Build:1.2.77,90
-    commit=mover-1.2.77
-    subdir=app
-    gradle=yes
-
-Build:1.2.78,91
-    commit=mover-1.2.78
-    subdir=app
-    gradle=yes
-
-Build:1.2.80,93
-    commit=mover-1.2.80
-    subdir=app
-    gradle=yes
-
-Build:1.2.81,94
-    commit=mover-1.2.81
-    subdir=app
-    gradle=yes
-
-Build:1.2.82,95
-    commit=mover-1.2.82
-    subdir=app
-    gradle=yes
-
-Build:1.2.83,96
-    commit=mover-1.2.83
-    subdir=app
-    gradle=yes
-
-Build:1.2.85,99
-    commit=mover-1.2.85
-    subdir=app
-    gradle=yes
-
-Build:1.2.86,100
-    commit=mover-1.2.86
-    subdir=app
-    gradle=yes
-
-Build:1.2.90,104
-    commit=mover-1.2.90
-    subdir=app
-    gradle=yes
-
-Build:1.2.91,105
-    commit=mover-1.2.91
-    subdir=app
-    gradle=yes
-
-Build:1.2.94,108
-    commit=mover-1.2.94
-    subdir=app
-    gradle=yes
-
-Build:1.2.95,109
-    commit=mover-1.2.95
-    subdir=app
-    gradle=yes
-
-Build:1.2.98,112
-    commit=mover-1.2.98
-    subdir=app
-    gradle=yes
-
-Build:1.2.99,113
-    commit=mover-1.2.99
-    subdir=app
-    gradle=yes
-
-Build:1.2.100,114
-    commit=mover-1.2.100
-    subdir=app
-    gradle=yes
-
-Build:1.2.101,115
-    commit=mover-1.2.101
-    subdir=app
-    gradle=yes
-
-Build:1.2.103,117
-    commit=mover-1.2.103
-    subdir=app
-    gradle=yes
-
-Build:1.2.104,118
-    commit=mover-1.2.104
-    subdir=app
-    gradle=yes
-
-Build:1.2.106,120
-    commit=mover-1.2.106
-    subdir=app
-    gradle=yes
-
-Build:1.2.107,121
-    commit=mover-1.2.107
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version mover-%v
-Update Check Mode:Tags
-Current Version:1.2.107
-Current Version Code:121
diff --git a/metadata/com.github.axet.mover.yml b/metadata/com.github.axet.mover.yml
new file mode 100644
index 0000000000..c6de7ce5e3
--- /dev/null
+++ b/metadata/com.github.axet.mover.yml
@@ -0,0 +1,270 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: https://gitlab.com/axet/android-media-merger
+SourceCode: https://gitlab.com/axet/android-media-merger/tree/HEAD
+IssueTracker: https://gitlab.com/axet/android-media-merger/issues
+LiberapayID: '1370123'
+
+AutoName: Media Merger
+Summary: Merge media files, open-source
+Description: |-
+    Utitily moves /sdcard/DCIM/* and /sdcard/Pictures/Screenshots to user specified
+    folder.
+
+    Android friendly. Application waits for event from ContentObserver, and only
+    then scan for new files, no ads, open-source, GPLv3.
+
+RepoType: git
+Repo: https://gitlab.com/axet/android-media-merger.git
+
+Builds:
+  - versionName: 1.2.45
+    versionCode: 59
+    commit: mover-1.2.45
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.46
+    versionCode: 60
+    commit: mover-1.2.46
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.52
+    versionCode: 66
+    commit: mover-1.2.52
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.54
+    versionCode: 68
+    commit: mover-1.2.54
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.56
+    versionCode: 70
+    commit: mover-1.2.56
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.57
+    versionCode: 71
+    commit: mover-1.2.57
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.58
+    versionCode: 72
+    commit: mover-1.2.58
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.65
+    versionCode: 78
+    commit: mover-1.2.65
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.66
+    versionCode: 79
+    commit: mover-1.2.66
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.67
+    versionCode: 80
+    commit: mover-1.2.67
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.68
+    versionCode: 81
+    commit: mover-1.2.68
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.69
+    versionCode: 82
+    commit: mover-1.2.69
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.70
+    versionCode: 83
+    commit: mover-1.2.70
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.73
+    versionCode: 86
+    commit: mover-1.2.73
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.75
+    versionCode: 88
+    commit: mover-1.2.75
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.77
+    versionCode: 90
+    commit: mover-1.2.77
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.78
+    versionCode: 91
+    commit: mover-1.2.78
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.80
+    versionCode: 93
+    commit: mover-1.2.80
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.81
+    versionCode: 94
+    commit: mover-1.2.81
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.82
+    versionCode: 95
+    commit: mover-1.2.82
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.83
+    versionCode: 96
+    commit: mover-1.2.83
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.85
+    versionCode: 99
+    commit: mover-1.2.85
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.86
+    versionCode: 100
+    commit: mover-1.2.86
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.90
+    versionCode: 104
+    commit: mover-1.2.90
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.91
+    versionCode: 105
+    commit: mover-1.2.91
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.94
+    versionCode: 108
+    commit: mover-1.2.94
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.95
+    versionCode: 109
+    commit: mover-1.2.95
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.98
+    versionCode: 112
+    commit: mover-1.2.98
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.99
+    versionCode: 113
+    commit: mover-1.2.99
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.100
+    versionCode: 114
+    commit: mover-1.2.100
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.101
+    versionCode: 115
+    commit: mover-1.2.101
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.103
+    versionCode: 117
+    commit: mover-1.2.103
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.104
+    versionCode: 118
+    commit: mover-1.2.104
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.106
+    versionCode: 120
+    commit: mover-1.2.106
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.107
+    versionCode: 121
+    commit: mover-1.2.107
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version mover-%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.107
+CurrentVersionCode: 121
diff --git a/metadata/com.github.axet.tonegenerator.txt b/metadata/com.github.axet.tonegenerator.txt
deleted file mode 100644
index 386d5a785d..0000000000
--- a/metadata/com.github.axet.tonegenerator.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:https://gitlab.com/axet/android-tone-generator
-Source Code:https://gitlab.com/axet/android-tone-generator/tree/HEAD
-Issue Tracker:https://gitlab.com/axet/android-tone-generator/issues
-LiberapayID:1370123
-
-Auto Name:ToneGenerator.class
-Summary:ToneGenerator class preview app, open-source
-Description:
-Help utility allow you to listen to
-[https://developer.android.com/reference/android/media/ToneGenerator.html
-android ToneGenerator] constant sounds, no ads, open-source, GPLv3.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/axet/android-tone-generator.git
-
-Build:1.0.9,12
-    commit=tonegenerator-1.0.9
-    subdir=app
-    gradle=yes
-
-Build:1.0.11,13
-    commit=tonegenerator-1.0.11
-    subdir=app
-    gradle=yes
-
-Build:1.0.12,14
-    commit=tonegenerator-1.0.12
-    subdir=app
-    gradle=yes
-
-Build:1.0.13,15
-    commit=tonegenerator-1.0.13
-    subdir=app
-    gradle=yes
-
-Build:1.0.15,17
-    commit=tonegenerator-1.0.15
-    subdir=app
-    gradle=yes
-
-Build:1.0.17,18
-    commit=tonegenerator-1.0.17
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version tonegenerator-%v
-Update Check Mode:Tags
-Current Version:1.0.17
-Current Version Code:18
diff --git a/metadata/com.github.axet.tonegenerator.yml b/metadata/com.github.axet.tonegenerator.yml
new file mode 100644
index 0000000000..18ce228d0d
--- /dev/null
+++ b/metadata/com.github.axet.tonegenerator.yml
@@ -0,0 +1,65 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: https://gitlab.com/axet/android-tone-generator
+SourceCode: https://gitlab.com/axet/android-tone-generator/tree/HEAD
+IssueTracker: https://gitlab.com/axet/android-tone-generator/issues
+LiberapayID: '1370123'
+
+AutoName: ToneGenerator.class
+Summary: ToneGenerator class preview app, open-source
+Description: |-
+    Help utility allow you to listen to
+    [https://developer.android.com/reference/android/media/ToneGenerator.html
+    android ToneGenerator] constant sounds, no ads, open-source, GPLv3.
+
+RepoType: git
+Repo: https://gitlab.com/axet/android-tone-generator.git
+
+Builds:
+  - versionName: 1.0.9
+    versionCode: 12
+    commit: tonegenerator-1.0.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.11
+    versionCode: 13
+    commit: tonegenerator-1.0.11
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.12
+    versionCode: 14
+    commit: tonegenerator-1.0.12
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.13
+    versionCode: 15
+    commit: tonegenerator-1.0.13
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.15
+    versionCode: 17
+    commit: tonegenerator-1.0.15
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.17
+    versionCode: 18
+    commit: tonegenerator-1.0.17
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version tonegenerator-%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.0.17
+CurrentVersionCode: 18
diff --git a/metadata/com.github.characterdog.bmicalculator.txt b/metadata/com.github.characterdog.bmicalculator.txt
deleted file mode 100644
index ea52633599..0000000000
--- a/metadata/com.github.characterdog.bmicalculator.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Categories:Sports & Health
-License:GPL-3.0-or-later
-Author Name:CharacterDog
-Web Site:
-Source Code:https://github.com/characterdog/bmi-calculator
-Issue Tracker:https://github.com/characterdog/bmi-calculator/issues
-Translation:https://crowdin.com/project/characterdog-bmi-calculator
-
-Auto Name:BMI Calculator
-
-Repo Type:git
-Repo:https://github.com/characterdog/bmi-calculator.git
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=1.1
-    subdir=app
-    gradle=yes
-
-Build:1.3,3
-    commit=1.3
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:3
diff --git a/metadata/com.github.characterdog.bmicalculator.yml b/metadata/com.github.characterdog.bmicalculator.yml
new file mode 100644
index 0000000000..adaf8faff2
--- /dev/null
+++ b/metadata/com.github.characterdog.bmicalculator.yml
@@ -0,0 +1,39 @@
+Categories:
+  - Sports & Health
+License: GPL-3.0-or-later
+AuthorName: CharacterDog
+SourceCode: https://github.com/characterdog/bmi-calculator
+IssueTracker: https://github.com/characterdog/bmi-calculator/issues
+Translation: https://crowdin.com/project/characterdog-bmi-calculator
+
+AutoName: BMI Calculator
+
+RepoType: git
+Repo: https://github.com/characterdog/bmi-calculator.git
+
+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.3'
+    versionCode: 3
+    commit: '1.3'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.3'
+CurrentVersionCode: 3
diff --git a/metadata/com.github.characterdog.share_my_number.txt b/metadata/com.github.characterdog.share_my_number.txt
deleted file mode 100644
index 2108586477..0000000000
--- a/metadata/com.github.characterdog.share_my_number.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Phone & SMS,Connectivity
-License:GPL-3.0-or-later
-Author Name:CharacterDog
-Web Site:
-Source Code:https://github.com/characterdog/share-my-number
-Issue Tracker:https://github.com/characterdog/share-my-number/issues
-
-Auto Name:Share my number
-
-Repo Type:git
-Repo:https://github.com/characterdog/share-my-number
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.2,2
-    commit=1.2
-    subdir=app
-    gradle=yes
-
-Build:1.3,3
-    commit=1.3
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.3
-Current Version Code:3
diff --git a/metadata/com.github.characterdog.share_my_number.yml b/metadata/com.github.characterdog.share_my_number.yml
new file mode 100644
index 0000000000..c700fd585d
--- /dev/null
+++ b/metadata/com.github.characterdog.share_my_number.yml
@@ -0,0 +1,39 @@
+Categories:
+  - Phone & SMS
+  - Connectivity
+License: GPL-3.0-or-later
+AuthorName: CharacterDog
+SourceCode: https://github.com/characterdog/share-my-number
+IssueTracker: https://github.com/characterdog/share-my-number/issues
+
+AutoName: Share my number
+
+RepoType: git
+Repo: https://github.com/characterdog/share-my-number
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 2
+    commit: '1.2'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 3
+    commit: '1.3'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.3'
+CurrentVersionCode: 3
diff --git a/metadata/com.github.cythara.txt b/metadata/com.github.cythara.txt
deleted file mode 100644
index f240d21224..0000000000
--- a/metadata/com.github.cythara.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/gstraube/cythara
-Issue Tracker:https://github.com/gstraube/cythara/issues
-Changelog:https://github.com/gstraube/cythara/releases
-
-Auto Name:Cythara
-Summary:Musical instrument tuner
-Description:
-Provides tunings for various instruments and supports chromatic tuning. Displays
-deviation between reference and detected pitch.
-
-Changes background color from red to green to indicate that the pitch is in tune
-(with a tolerance of 10 cents).
-
-Displays deviations between -60 and 60 cents. Supports scientific pitch notation
-and Solfège.
-.
-
-Repo Type:git
-Repo:https://github.com/gstraube/cythara
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:1.2,3
-    commit=v1.2
-    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
-
-Build:1.9,10
-    commit=v1.9
-    subdir=app
-    gradle=yes
-
-Build:2.0,11
-    commit=v2.0
-    subdir=app
-    gradle=yes
-
-Build:2.1,12
-    disable=Unexpected version/version code in output
-    commit=v2.1
-    subdir=app
-    gradle=yes
-
-Build:2.2,13
-    commit=v2.2
-    subdir=app
-    gradle=yes
-
-Build:2.3,14
-    commit=v2.3
-    subdir=app
-    gradle=yes
-
-Build:2.4,15
-    commit=v2.4
-    subdir=app
-    gradle=yes
-
-Build:2.5,16
-    commit=v2.5
-    subdir=app
-    gradle=yes
-
-Build:2.6,17
-    commit=v2.6
-    subdir=app
-    gradle=yes
-
-Build:2.7,18
-    commit=v2.7
-    subdir=app
-    gradle=yes
-
-Build:2.8,19
-    commit=v2.8
-    subdir=app
-    gradle=yes
-
-Build:2.9,20
-    commit=v2.9
-    subdir=app
-    gradle=yes
-
-Build:3.0,21
-    commit=v3.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/5.2-rc-1-/5.1-/' ../gradle/wrapper/gradle-wrapper.properties
-
-Build:3.1,22
-    commit=v3.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/5.2-rc-1-/5.1-/' ../gradle/wrapper/gradle-wrapper.properties
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:3.1
-Current Version Code:22
diff --git a/metadata/com.github.cythara.yml b/metadata/com.github.cythara.yml
new file mode 100644
index 0000000000..ee74055af1
--- /dev/null
+++ b/metadata/com.github.cythara.yml
@@ -0,0 +1,184 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://github.com/gstraube/cythara
+IssueTracker: https://github.com/gstraube/cythara/issues
+Changelog: https://github.com/gstraube/cythara/releases
+
+AutoName: Cythara
+Summary: Musical instrument tuner
+Description: |-
+    Provides tunings for various instruments and supports chromatic tuning. Displays
+    deviation between reference and detected pitch.
+
+    Changes background color from red to green to indicate that the pitch is in tune
+    (with a tolerance of 10 cents).
+
+    Displays deviations between -60 and 60 cents. Supports scientific pitch notation
+    and Solfège.
+
+RepoType: git
+Repo: https://github.com/gstraube/cythara
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    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
+
+  - versionName: '1.9'
+    versionCode: 10
+    commit: v1.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 11
+    commit: v2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.1'
+    versionCode: 12
+    disable: Unexpected version/version code in output
+    commit: v2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.2'
+    versionCode: 13
+    commit: v2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.3'
+    versionCode: 14
+    commit: v2.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.4'
+    versionCode: 15
+    commit: v2.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.5'
+    versionCode: 16
+    commit: v2.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.6'
+    versionCode: 17
+    commit: v2.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.7'
+    versionCode: 18
+    commit: v2.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.8'
+    versionCode: 19
+    commit: v2.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.9'
+    versionCode: 20
+    commit: v2.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.0'
+    versionCode: 21
+    commit: v3.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/5.2-rc-1-/5.1-/' ../gradle/wrapper/gradle-wrapper.properties
+
+  - versionName: '3.1'
+    versionCode: 22
+    commit: v3.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/5.2-rc-1-/5.1-/' ../gradle/wrapper/gradle-wrapper.properties
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '3.1'
+CurrentVersionCode: 22
diff --git a/metadata/com.github.darthjoey91.hangman.txt b/metadata/com.github.darthjoey91.hangman.txt
deleted file mode 100644
index 851a11b1f9..0000000000
--- a/metadata/com.github.darthjoey91.hangman.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-Categories:Games
-License:MIT
-Web Site:
-Source Code:https://github.com/darthjoey91/Hangman-Android
-Issue Tracker:https://github.com/darthjoey91/Hangman-Android/issues
-Changelog:https://github.com/josephmoyer/Hangman-Android/releases
-
-Auto Name:Hangman
-Summary:English language Hangman game
-Description:
-A Hangman game that uses 40000 English words.
-
-To Play:
-
-* Pressing the gallows resets the game.
-* Pressing the blanks submits a letter.
-* Wrong letters appear to the right.
-* Only single characters are allowed to be submitted.
-.
-
-Repo Type:git
-Repo:https://github.com/darthjoey91/Hangman-Android.git
-
-Build:1.0,1
-    disable=this is not 1.0
-    commit=v0.1-alpha
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/repo1/d' -e '/repo1/amavenCentral()' build.gradle ../build.gradle
-
-Build:0.2-alpha,2
-    commit=v0.2-alpha
-    subdir=app
-    gradle=yes
-
-Build:0.3-alpha,3
-    commit=v0.3-alpha
-    subdir=app
-    gradle=yes
-
-Build:0.3.1-alpha,4
-    commit=v0.3.1-alpha
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.3.1-alpha
-Current Version Code:4
diff --git a/metadata/com.github.darthjoey91.hangman.yml b/metadata/com.github.darthjoey91.hangman.yml
new file mode 100644
index 0000000000..794f89681c
--- /dev/null
+++ b/metadata/com.github.darthjoey91.hangman.yml
@@ -0,0 +1,57 @@
+Categories:
+  - Games
+License: MIT
+SourceCode: https://github.com/darthjoey91/Hangman-Android
+IssueTracker: https://github.com/darthjoey91/Hangman-Android/issues
+Changelog: https://github.com/josephmoyer/Hangman-Android/releases
+
+AutoName: Hangman
+Summary: English language Hangman game
+Description: |-
+    A Hangman game that uses 40000 English words.
+
+    To Play:
+
+    * Pressing the gallows resets the game.
+    * Pressing the blanks submits a letter.
+    * Wrong letters appear to the right.
+    * Only single characters are allowed to be submitted.
+
+RepoType: git
+Repo: https://github.com/darthjoey91/Hangman-Android.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    disable: this is not 1.0
+    commit: v0.1-alpha
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/repo1/d' -e '/repo1/amavenCentral()' build.gradle ../build.gradle
+
+  - versionName: 0.2-alpha
+    versionCode: 2
+    commit: v0.2-alpha
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3-alpha
+    versionCode: 3
+    commit: v0.3-alpha
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.1-alpha
+    versionCode: 4
+    commit: v0.3.1-alpha
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.3.1-alpha
+CurrentVersionCode: 4
diff --git a/metadata/com.github.dfa.diaspora_android.txt b/metadata/com.github.dfa.diaspora_android.txt
deleted file mode 100644
index 7d2d5c9407..0000000000
--- a/metadata/com.github.dfa.diaspora_android.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:https://diasp.org/people/48b78420923501341ef3782bcb452bd5
-Source Code:https://github.com/gsantner/dandelion
-Issue Tracker:https://github.com/gsantner/dandelion/issues
-Changelog:https://github.com/gsantner/dandelion/blob/HEAD/CHANGELOG.md
-Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TVV24QBGMN23C&source=self.gsantner.net%2Fcom.github.dfa.diaspora_android
-LiberapayID:13079
-Bitcoin:1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5
-Litecoin:LSC2NUiXmnsJiaRczq9AKceX6CEHQHP39w
-
-Auto Name:dandelion*
-
-Repo Type:git
-Repo:https://github.com/gsantner/dandelion
-
-Build:0.1.0,1
-    commit=45cb50111a201e58ba8ba657828d6b42b442d23a
-    subdir=app
-    gradle=yes
-
-Build:0.1.1,2
-    commit=v0.1.1
-    subdir=app
-    gradle=yes
-
-Build:0.1.2,3
-    commit=v0.1.2
-    subdir=app
-    gradle=yes
-
-Build:0.1.3,4
-    commit=v0.1.3
-    subdir=app
-    gradle=yes
-
-Build:0.1.4,5
-    commit=v0.1.4
-    subdir=app
-    gradle=yes
-
-Build:0.1.5,6
-    commit=v0.1.5
-    subdir=app
-    gradle=yes
-
-Build:0.1.6,8
-    commit=v0.1.6
-    subdir=app
-    gradle=yes
-
-Build:0.2.0,9
-    disable=failing build
-    commit=v0.2.0
-    subdir=app
-    gradle=yes
-
-Build:0.2.0a,10
-    commit=v0.2.0a
-    subdir=app
-    gradle=yes
-
-Build:0.2.1,11
-    commit=v0.2.1
-    subdir=app
-    gradle=yes
-
-Build:0.2.2,12
-    commit=v0.2.2
-    subdir=app
-    gradle=yes
-
-Build:0.2.3,13
-    commit=v0.2.3
-    subdir=app
-    gradle=FlavorDandelion
-
-Build:0.2.4,14
-    commit=v0.2.4
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.2.5,15
-    commit=v0.2.5
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.2.6,16
-    commit=v0.2.6
-    subdir=app
-    gradle=FlavorDefault
-
-Build:0.2.7,17
-    commit=v0.2.7
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.0.0,20
-    commit=v1.0.0
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.0.1,21
-    commit=v1.0.1
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.0.2,22
-    commit=v1.0.2
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.0.3,23
-    commit=v1.0.3
-    subdir=app
-    submodules=yes
-    gradle=FlavorDefault
-
-Build:1.0.4,24
-    commit=v1.0.4
-    subdir=app
-    submodules=yes
-    gradle=FlavorDefault
-
-Build:1.0.6,26
-    commit=v1.0.6
-    subdir=app
-    submodules=yes
-    gradle=FlavorDefault
-
-Build:1.0.8,28
-    commit=v1.0.8
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.1.0,29
-    commit=v1.1.0
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.1.1,30
-    commit=v1.1.1
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.1.2,31
-    commit=v1.1.2
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.1.3,32
-    commit=v1.1.3
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.2.0,33
-    commit=v1.2.0
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.2.1,34
-    commit=v1.2.1
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.2.2,35
-    commit=v1.2.2
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.2.3,36
-    commit=v1.2.3
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.2.4,37
-    commit=v1.2.4
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.2.5,40
-    commit=v1.2.5
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.3.0,41
-    commit=v1.3.0
-    subdir=app
-    gradle=FlavorDefault
-
-Build:1.3.1,42
-    commit=v1.3.1
-    subdir=app
-    gradle=FlavorDefault
-
-Maintainer Notes:
-Description and summary in app git repository
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.3.1
-Current Version Code:42
diff --git a/metadata/com.github.dfa.diaspora_android.yml b/metadata/com.github.dfa.diaspora_android.yml
new file mode 100644
index 0000000000..85574df881
--- /dev/null
+++ b/metadata/com.github.dfa.diaspora_android.yml
@@ -0,0 +1,273 @@
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+WebSite: https://diasp.org/people/48b78420923501341ef3782bcb452bd5
+SourceCode: https://github.com/gsantner/dandelion
+IssueTracker: https://github.com/gsantner/dandelion/issues
+Changelog: https://github.com/gsantner/dandelion/blob/HEAD/CHANGELOG.md
+Donate: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TVV24QBGMN23C&source=self.gsantner.net%2Fcom.github.dfa.diaspora_android
+LiberapayID: '13079'
+Bitcoin: 1B9ZyYdQoY9BxMe9dRUEKaZbJWsbQqfXU5
+Litecoin: LSC2NUiXmnsJiaRczq9AKceX6CEHQHP39w
+
+AutoName: dandelion*
+
+RepoType: git
+Repo: https://github.com/gsantner/dandelion
+
+Builds:
+  - versionName: 0.1.0
+    versionCode: 1
+    commit: 45cb50111a201e58ba8ba657828d6b42b442d23a
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.1
+    versionCode: 2
+    commit: v0.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.2
+    versionCode: 3
+    commit: v0.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.3
+    versionCode: 4
+    commit: v0.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.4
+    versionCode: 5
+    commit: v0.1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.5
+    versionCode: 6
+    commit: v0.1.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.6
+    versionCode: 8
+    commit: v0.1.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.0
+    versionCode: 9
+    disable: failing build
+    commit: v0.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.0a
+    versionCode: 10
+    commit: v0.2.0a
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.1
+    versionCode: 11
+    commit: v0.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.2
+    versionCode: 12
+    commit: v0.2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.3
+    versionCode: 13
+    commit: v0.2.3
+    subdir: app
+    gradle:
+      - FlavorDandelion
+
+  - versionName: 0.2.4
+    versionCode: 14
+    commit: v0.2.4
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.2.5
+    versionCode: 15
+    commit: v0.2.5
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.2.6
+    versionCode: 16
+    commit: v0.2.6
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 0.2.7
+    versionCode: 17
+    commit: v0.2.7
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.0.0
+    versionCode: 20
+    commit: v1.0.0
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.0.1
+    versionCode: 21
+    commit: v1.0.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.0.2
+    versionCode: 22
+    commit: v1.0.2
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.0.3
+    versionCode: 23
+    commit: v1.0.3
+    subdir: app
+    submodules: true
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.0.4
+    versionCode: 24
+    commit: v1.0.4
+    subdir: app
+    submodules: true
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.0.6
+    versionCode: 26
+    commit: v1.0.6
+    subdir: app
+    submodules: true
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.0.8
+    versionCode: 28
+    commit: v1.0.8
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.1.0
+    versionCode: 29
+    commit: v1.1.0
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.1.1
+    versionCode: 30
+    commit: v1.1.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.1.2
+    versionCode: 31
+    commit: v1.1.2
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.1.3
+    versionCode: 32
+    commit: v1.1.3
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.2.0
+    versionCode: 33
+    commit: v1.2.0
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.2.1
+    versionCode: 34
+    commit: v1.2.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.2.2
+    versionCode: 35
+    commit: v1.2.2
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.2.3
+    versionCode: 36
+    commit: v1.2.3
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.2.4
+    versionCode: 37
+    commit: v1.2.4
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.2.5
+    versionCode: 40
+    commit: v1.2.5
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.3.0
+    versionCode: 41
+    commit: v1.3.0
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+  - versionName: 1.3.1
+    versionCode: 42
+    commit: v1.3.1
+    subdir: app
+    gradle:
+      - FlavorDefault
+
+MaintainerNotes: Description and summary in app git repository
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.3.1
+CurrentVersionCode: 42
diff --git a/metadata/com.github.funkyg.funkytunes.txt b/metadata/com.github.funkyg.funkytunes.txt
deleted file mode 100644
index 2945365768..0000000000
--- a/metadata/com.github.funkyg.funkytunes.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/funkyg/funkytunes
-Issue Tracker:https://github.com/funkyg/funkytunes/issues
-
-Auto Name:Funkytunes
-Summary:A streaming music player using torrents
-Description:
-Funkytunes is a BitTorrent-based music app, like Spotify or Pandora.
-.
-
-Repo Type:git
-Repo:https://github.com/funkyg/funkytunes
-
-Build:0.1.0,1
-    commit=0.1.0
-    subdir=app
-    gradle=yes
-
-Build:0.1.1,2
-    commit=0.1.1
-    subdir=app
-    gradle=yes
-
-Build:0.1.3,4
-    commit=0.1.3
-    subdir=app
-    gradle=yes
-
-Build:0.1.4,5
-    commit=0.1.4
-    subdir=app
-    gradle=yes
-
-Build:0.2.0,6
-    commit=0.2.0
-    subdir=app
-    gradle=yes
-
-Build:0.2.1,7
-    commit=0.2.1
-    subdir=app
-    gradle=yes
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.2.1
-Current Version Code:7
diff --git a/metadata/com.github.funkyg.funkytunes.yml b/metadata/com.github.funkyg.funkytunes.yml
new file mode 100644
index 0000000000..0cd2720dc2
--- /dev/null
+++ b/metadata/com.github.funkyg.funkytunes.yml
@@ -0,0 +1,63 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://github.com/funkyg/funkytunes
+IssueTracker: https://github.com/funkyg/funkytunes/issues
+
+AutoName: Funkytunes
+Summary: A streaming music player using torrents
+Description: Funkytunes is a BitTorrent-based music app, like Spotify or Pandora.
+
+RepoType: git
+Repo: https://github.com/funkyg/funkytunes
+
+Builds:
+  - versionName: 0.1.0
+    versionCode: 1
+    commit: 0.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.1
+    versionCode: 2
+    commit: 0.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.3
+    versionCode: 4
+    commit: 0.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.4
+    versionCode: 5
+    commit: 0.1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.0
+    versionCode: 6
+    commit: 0.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.1
+    versionCode: 7
+    commit: 0.2.1
+    subdir: app
+    gradle:
+      - yes
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.2.1
+CurrentVersionCode: 7
diff --git a/metadata/com.github.marmalade.aRevelation.txt b/metadata/com.github.marmalade.aRevelation.txt
deleted file mode 100644
index ee30c790fe..0000000000
--- a/metadata/com.github.marmalade.aRevelation.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:Security
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/MarmaladeSky/aRevelation
-Issue Tracker:https://github.com/MarmaladeSky/aRevelation/issues
-
-Auto Name:aRevelation
-Summary:Password manager
-Description:
-Password manager using the same format as [http://revelation.olasagasti.info
-Revelation]
-.
-
-Repo Type:git
-Repo:https://github.com/MarmaladeSky/aRevelation
-
-Build:0.01b,1
-    commit=0.01b
-    gradle=yes
-    prebuild=sed -i -e '/fileTree/d' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.01b
-Current Version Code:1
diff --git a/metadata/com.github.marmalade.aRevelation.yml b/metadata/com.github.marmalade.aRevelation.yml
new file mode 100644
index 0000000000..c93859397a
--- /dev/null
+++ b/metadata/com.github.marmalade.aRevelation.yml
@@ -0,0 +1,29 @@
+Categories:
+  - Security
+License: GPL-3.0-only
+SourceCode: https://github.com/MarmaladeSky/aRevelation
+IssueTracker: https://github.com/MarmaladeSky/aRevelation/issues
+
+AutoName: aRevelation
+Summary: Password manager
+Description: |-
+    '''Note: This app is no longer maintained. Instead, use its newer fork
+    [[de.igloffstein.maik.aRevelation]].'''
+
+    Password manager using the same format as [http://revelation.olasagasti.info
+    Revelation]
+
+Builds:
+  - versionName: 0.01b
+    versionCode: 1
+    commit: 0.01b
+    gradle:
+      - yes
+    prebuild: sed -i -e '/fileTree/d' build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.01b
+CurrentVersionCode: 1
+
+NoSourceSince: 0.01b