diff --git a/metadata/com.andreasgift.totalzero.txt b/metadata/com.andreasgift.totalzero.txt
deleted file mode 100644
index dbd2675065..0000000000
--- a/metadata/com.andreasgift.totalzero.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/snufflesrea/TotalZero
-Issue Tracker:https://github.com/snufflesrea/TotalZero/issues
-Bitcoin:1Q9TinY9kWoNMWuiToHiGC9uxCk6Vd41Gb
-
-Auto Name:Total Zero
-Summary:Offline puzzle math game
-Description:
-This offline game will train your brain by using simple math. The game objective
-is to construct equation with available number and mathematical sign and get 0
-as the end result. Games are customized with easy and difficult games mode.
-.
-
-Repo Type:git
-Repo:https://github.com/snufflesrea/TotalZero.git
-
-Build:1.1,2
-    disable=uses com.android.support.constraint:constraint-layout:1.0.0-beta4
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/com.andreasgift.totalzero.yml b/metadata/com.andreasgift.totalzero.yml
new file mode 100644
index 0000000000..37e3160a58
--- /dev/null
+++ b/metadata/com.andreasgift.totalzero.yml
@@ -0,0 +1,30 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://github.com/snufflesrea/TotalZero
+IssueTracker: https://github.com/snufflesrea/TotalZero/issues
+Bitcoin: 1Q9TinY9kWoNMWuiToHiGC9uxCk6Vd41Gb
+
+AutoName: Total Zero
+Summary: Offline puzzle math game
+Description: |-
+    This offline game will train your brain by using simple math. The game objective
+    is to construct equation with available number and mathematical sign and get 0
+    as the end result. Games are customized with easy and difficult games mode.
+
+RepoType: git
+Repo: https://github.com/snufflesrea/TotalZero.git
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    disable: uses com.android.support.constraint:constraint-layout:1.0.0-beta4
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/com.anthony.deepl.openl.txt b/metadata/com.anthony.deepl.openl.txt
deleted file mode 100644
index 208600ab04..0000000000
--- a/metadata/com.anthony.deepl.openl.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Writing,Reading,Science & Education
-License:MIT
-Web Site:
-Source Code:https://github.com/Anthony-Reboul/AndroidDeepL
-Issue Tracker:https://github.com/Anthony-Reboul/AndroidDeepL/issues
-Changelog:https://github.com/Anthony-Reboul/AndroidDeepL/releases
-Bitcoin:3DetrDfft3ChjXMQUsTwQL1ozQvBXwGSsQ
-Litecoin:LXRwRuKMpqSepWobvpKaCKYFHrtwQC4bqM
-
-Summary:Unofficial application of DeepL Translator
-Description:
-OpenL Translator is an open source front-end to the high-quality DeepL machine
-translation services (available for English, German, French, Spanish, Italian,
-Dutch and Polish).
-
-Note that DeepL's terms of usage disallow submitting any text containing
-personal data, and submitted text will be retained for a certain amount of time.
-.
-
-Repo Type:git
-Repo:https://github.com/Anthony-Reboul/AndroidDeepL
-
-Build:2.0.1,5
-    commit=2.0.1
-    subdir=app
-    gradle=openlWithoutPlayServices
-    prebuild=sed -n -i -e '/maven.fabric/{s/.*//;x;N;d;};x;p;${x;p;}' ../build.gradle && \
-        sed -i -e '/io.fabric/d' ../build.gradle build.gradle && \
-        sed -i -e '/google-services/d' ../build.gradle build.gradle && \
-        sed -i -e '/withPlayServicesImplementation(.*) {/,/}/d; /withPlayServicesImplementation/d' build.gradle
-
-Build:2.1.0,6
-    commit=2.1.0
-    subdir=app
-    gradle=openlWithoutPlayServices
-    prebuild=sed -n -i -e '/maven.fabric/{s/.*//;x;N;d;};x;p;${x;p;}' ../build.gradle && \
-        sed -i -e '/io.fabric/d' ../build.gradle build.gradle && \
-        sed -i -e '/google-services/d' ../build.gradle build.gradle && \
-        sed -i -e '/withPlayServicesImplementation(.*) {/,/}/d; /withPlayServicesImplementation/d' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.1.0
-Current Version Code:6
diff --git a/metadata/com.anthony.deepl.openl.yml b/metadata/com.anthony.deepl.openl.yml
new file mode 100644
index 0000000000..94e03d055d
--- /dev/null
+++ b/metadata/com.anthony.deepl.openl.yml
@@ -0,0 +1,56 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Writing
+  - Reading
+  - Science & Education
+License: MIT
+SourceCode: https://github.com/Anthony-Reboul/AndroidDeepL
+IssueTracker: https://github.com/Anthony-Reboul/AndroidDeepL/issues
+Changelog: https://github.com/Anthony-Reboul/AndroidDeepL/releases
+Bitcoin: 3DetrDfft3ChjXMQUsTwQL1ozQvBXwGSsQ
+Litecoin: LXRwRuKMpqSepWobvpKaCKYFHrtwQC4bqM
+
+Summary: Unofficial application of DeepL Translator
+Description: |-
+    OpenL Translator is an open source front-end to the high-quality DeepL machine
+    translation services (available for English, German, French, Spanish, Italian,
+    Dutch and Polish).
+
+    Note that DeepL's terms of usage disallow submitting any text containing
+    personal data, and submitted text will be retained for a certain amount of time.
+
+RepoType: git
+Repo: https://github.com/Anthony-Reboul/AndroidDeepL
+
+Builds:
+  - versionName: 2.0.1
+    versionCode: 5
+    commit: 2.0.1
+    subdir: app
+    gradle:
+      - openlWithoutPlayServices
+    prebuild:
+      - sed -n -i -e '/maven.fabric/{s/.*//;x;N;d;};x;p;${x;p;}' ../build.gradle
+      - sed -i -e '/io.fabric/d' ../build.gradle build.gradle
+      - sed -i -e '/google-services/d' ../build.gradle build.gradle
+      - sed -i -e '/withPlayServicesImplementation(.*) {/,/}/d; /withPlayServicesImplementation/d'
+        build.gradle
+
+  - versionName: 2.1.0
+    versionCode: 6
+    commit: 2.1.0
+    subdir: app
+    gradle:
+      - openlWithoutPlayServices
+    prebuild:
+      - sed -n -i -e '/maven.fabric/{s/.*//;x;N;d;};x;p;${x;p;}' ../build.gradle
+      - sed -i -e '/io.fabric/d' ../build.gradle build.gradle
+      - sed -i -e '/google-services/d' ../build.gradle build.gradle
+      - sed -i -e '/withPlayServicesImplementation(.*) {/,/}/d; /withPlayServicesImplementation/d'
+        build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.1.0
+CurrentVersionCode: 6
diff --git a/metadata/com.antoniotari.reactiveampacheapp.txt b/metadata/com.antoniotari.reactiveampacheapp.txt
deleted file mode 100644
index 8d01290ea7..0000000000
--- a/metadata/com.antoniotari.reactiveampacheapp.txt
+++ /dev/null
@@ -1,241 +0,0 @@
-Categories:Multimedia,Internet
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://gitlab.com/antoniotari/reactive-ampache/
-Issue Tracker:https://gitlab.com/antoniotari/reactive-ampache/issues
-
-Auto Name:Power Ampache
-Summary:A material design player for Ampache
-Description:
-A player for Ampache, simply connect to your Ampache instance and enjoy your
-music. Features modern Material Design following the latest guidelines.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/antoniotari/reactive-ampache.git
-
-Build:1.09.18,28
-    commit=v1.09.18
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.22,32
-    commit=v1.09.22
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.24,34
-    commit=v1.09.24
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.26,36
-    commit=v1.09.26
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.27,37
-    commit=v1.09.27
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.29,39
-    commit=v1.09.29
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.31,41
-    disable=wrong tag
-    commit=v1.09.31
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.32,42
-    commit=v1.09.32
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.33,43
-    commit=v1.09.33
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.34,44
-    commit=v1.09.34
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.36,46
-    commit=v1.09.36
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.37,47
-    commit=v1.09.37
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.38,48
-    commit=v1.09.38
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.39,49
-    commit=v1.09.39
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.43,53
-    commit=v1.09.43
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.44,54
-    commit=v1.09.44
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.45,55
-    commit=v1.09.45
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.47,56
-    commit=v1.09.47
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.48,57
-    commit=v1.09.48
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Build:1.09.49,58
-    commit=v1.09.49
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle && \
-        sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.09.49
-Current Version Code:58
diff --git a/metadata/com.antoniotari.reactiveampacheapp.yml b/metadata/com.antoniotari.reactiveampacheapp.yml
new file mode 100644
index 0000000000..90c5383beb
--- /dev/null
+++ b/metadata/com.antoniotari.reactiveampacheapp.yml
@@ -0,0 +1,303 @@
+Categories:
+  - Multimedia
+  - Internet
+License: GPL-3.0-or-later
+SourceCode: https://gitlab.com/antoniotari/reactive-ampache/
+IssueTracker: https://gitlab.com/antoniotari/reactive-ampache/issues
+Translation: https://gitlab.com/antoniotari/reactive-ampache/blob/master/CONTRIBUTING.md#translations
+
+AutoName: Power Ampache
+Summary: A material design player for Ampache
+Description: |-
+    A player for Ampache, simply connect to your Ampache instance and enjoy your
+    music. Features modern Material Design following the latest guidelines.
+
+RepoType: git
+Repo: https://gitlab.com/antoniotari/reactive-ampache.git
+
+Builds:
+  - versionName: 1.09.18
+    versionCode: 28
+    commit: v1.09.18
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.22
+    versionCode: 32
+    commit: v1.09.22
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.24
+    versionCode: 34
+    commit: v1.09.24
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.26
+    versionCode: 36
+    commit: v1.09.26
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.27
+    versionCode: 37
+    commit: v1.09.27
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.29
+    versionCode: 39
+    commit: v1.09.29
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.31
+    versionCode: 41
+    disable: wrong tag
+    commit: v1.09.31
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.32
+    versionCode: 42
+    commit: v1.09.32
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.33
+    versionCode: 43
+    commit: v1.09.33
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.34
+    versionCode: 44
+    commit: v1.09.34
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.36
+    versionCode: 46
+    commit: v1.09.36
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.37
+    versionCode: 47
+    commit: v1.09.37
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.38
+    versionCode: 48
+    commit: v1.09.38
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.39
+    versionCode: 49
+    commit: v1.09.39
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.43
+    versionCode: 53
+    commit: v1.09.43
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.44
+    versionCode: 54
+    commit: v1.09.44
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.45
+    versionCode: 55
+    commit: v1.09.45
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.47
+    versionCode: 56
+    commit: v1.09.47
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.48
+    versionCode: 57
+    commit: v1.09.48
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+  - versionName: 1.09.49
+    versionCode: 58
+    commit: v1.09.49
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e 's/${LASTFM_API_KEY}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_URL_LOCAL}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_USERNAME}/null/g' build.gradle
+      - sed -i -e 's/${AMPACHE_PASSWORD}/null/g' build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.09.49
+CurrentVersionCode: 58
diff --git a/metadata/de.marmaro.krt.ffupdater.txt b/metadata/de.marmaro.krt.ffupdater.txt
deleted file mode 100644
index 8f8c182c40..0000000000
--- a/metadata/de.marmaro.krt.ffupdater.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-AntiFeatures:NonFreeAdd
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://notabug.org/Tobiwan/ffupdater
-Issue Tracker:https://notabug.org/Tobiwan/ffupdater/issues
-
-Auto Name:FFUpdater
-Summary:Download Firefox
-Description:
-Simple downloader for Firefox. It generates the download link matching your
-device and sends an intent to download it from
-[https://archive.mozilla.org/pub/mobile/releases/ releases directory site].
-
-This app is alpha quality.
-.
-
-Repo Type:git
-Repo:https://notabug.org/Tobiwan/ffupdater.git
-
-Build:39.0,1
-    commit=39.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:39.0,2
-    commit=e0121a69988aa67993c1bf0f099eac4535b4818b
-    subdir=ffupdater
-    gradle=yes
-
-Build:40.0-test,3
-    commit=9678242e49ac810974a5fd69aa46227eca3b7952
-    subdir=ffupdater
-    gradle=yes
-    forceversion=yes
-
-Build:40.0,4
-    commit=40.0
-    subdir=ffupdater
-    gradle=yes
-    forceversion=yes
-
-Build:40.0.3,5
-    commit=40.0.3
-    subdir=ffupdater
-    gradle=yes
-    forceversion=yes
-
-Build:41.0,6
-    commit=41.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:42.0,7
-    commit=42.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:42.0.1,8
-    commit=42.0.1
-    subdir=ffupdater
-    gradle=yes
-
-Build:43.0,10
-    commit=43.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:43.0,11
-    commit=4329cd723dd0c7ff5d25570e6d5ecd8c66abdc8f
-    subdir=ffupdater
-    gradle=yes
-
-Build:44.0,12
-    commit=44.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:45.0,13
-    commit=45.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:45.0a,14
-    commit=45.0a
-    subdir=ffupdater
-    gradle=yes
-
-Build:45.0.1,15
-    commit=45.0.1
-    subdir=ffupdater
-    gradle=yes
-
-Build:46.0,16
-    commit=46.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:git,17
-    commit=46.0
-    subdir=ffupdater
-    gradle=yes
-    forceversion=yes
-    forcevercode=yes
-
-Build:51.0,18
-    commit=51.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:52.0,19
-    commit=51.0
-    subdir=ffupdater
-    gradle=yes
-    forceversion=yes
-    forcevercode=yes
-
-Build:53.0,20
-    commit=53.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:54.0,21
-    commit=54.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:57.0,22
-    commit=57.0
-    subdir=ffupdater
-    gradle=yes
-
-Build:66.1,25
-    commit=66.1
-    subdir=ffupdater
-    gradle=yes
-
-Build:66.2,26
-    commit=66.2
-    subdir=ffupdater
-    gradle=yes
-
-Build:67.4,31
-    commit=67.4
-    subdir=ffupdater
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:67.4
-Current Version Code:31
diff --git a/metadata/de.marmaro.krt.ffupdater.yml b/metadata/de.marmaro.krt.ffupdater.yml
new file mode 100644
index 0000000000..d7b3ac1bca
--- /dev/null
+++ b/metadata/de.marmaro.krt.ffupdater.yml
@@ -0,0 +1,200 @@
+AntiFeatures:
+  - NonFreeAdd
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+SourceCode: https://notabug.org/Tobiwan/ffupdater
+IssueTracker: https://notabug.org/Tobiwan/ffupdater/issues
+
+AutoName: FFUpdater
+Summary: Download Firefox
+Description: |-
+    Simple downloader for Firefox. It generates the download link matching your
+    device and sends an intent to download it from
+    [https://archive.mozilla.org/pub/mobile/releases/ releases directory site].
+
+    This app is alpha quality.
+
+RepoType: git
+Repo: https://notabug.org/Tobiwan/ffupdater.git
+
+Builds:
+  - versionName: '39.0'
+    versionCode: 1
+    commit: '39.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '39.0'
+    versionCode: 2
+    commit: e0121a69988aa67993c1bf0f099eac4535b4818b
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: 40.0-test
+    versionCode: 3
+    commit: 9678242e49ac810974a5fd69aa46227eca3b7952
+    subdir: ffupdater
+    gradle:
+      - yes
+    forceversion: true
+
+  - versionName: '40.0'
+    versionCode: 4
+    commit: '40.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+    forceversion: true
+
+  - versionName: 40.0.3
+    versionCode: 5
+    commit: 40.0.3
+    subdir: ffupdater
+    gradle:
+      - yes
+    forceversion: true
+
+  - versionName: '41.0'
+    versionCode: 6
+    commit: '41.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '42.0'
+    versionCode: 7
+    commit: '42.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: 42.0.1
+    versionCode: 8
+    commit: 42.0.1
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '43.0'
+    versionCode: 10
+    commit: '43.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '43.0'
+    versionCode: 11
+    commit: 4329cd723dd0c7ff5d25570e6d5ecd8c66abdc8f
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '44.0'
+    versionCode: 12
+    commit: '44.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '45.0'
+    versionCode: 13
+    commit: '45.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: 45.0a
+    versionCode: 14
+    commit: 45.0a
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: 45.0.1
+    versionCode: 15
+    commit: 45.0.1
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '46.0'
+    versionCode: 16
+    commit: '46.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: git
+    versionCode: 17
+    commit: '46.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+    forceversion: true
+    forcevercode: true
+
+  - versionName: '51.0'
+    versionCode: 18
+    commit: '51.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '52.0'
+    versionCode: 19
+    commit: '51.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+    forceversion: true
+    forcevercode: true
+
+  - versionName: '53.0'
+    versionCode: 20
+    commit: '53.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '54.0'
+    versionCode: 21
+    commit: '54.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '57.0'
+    versionCode: 22
+    commit: '57.0'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '66.1'
+    versionCode: 25
+    commit: '66.1'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '66.2'
+    versionCode: 26
+    commit: '66.2'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+  - versionName: '67.4'
+    versionCode: 31
+    commit: '67.4'
+    subdir: ffupdater
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '67.4'
+CurrentVersionCode: 31
diff --git a/metadata/de.measite.contactmerger.txt b/metadata/de.measite.contactmerger.txt
deleted file mode 100644
index c53eb642b0..0000000000
--- a/metadata/de.measite.contactmerger.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/rtreffer/ContactMerger
-Issue Tracker:https://github.com/rtreffer/ContactMerger/issues
-
-Auto Name:Contact Merger
-Summary:Index and merge contacts with Lucene
-Description:
-Index your contacts with lucene and provide a simple list of mergable contacts.
-The Service will run whenever the systems battery status is good, the data is
-old and/or the phone is plugged in.
-.
-
-Repo Type:git
-Repo:https://github.com/rtreffer/ContactMerger
-
-Build:1.1.2,7
-    commit=1.1.2
-    gradle=yes
-    prebuild=sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g' build.gradle
-
-Build:1.1.3,8
-    commit=1.1.3
-    gradle=yes
-    prebuild=sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g' build.gradle
-
-Build:1.2.0,9
-    commit=1.2.0
-    gradle=yes
-    prebuild=sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g' build.gradle
-
-Build:1.2.2,10
-    commit=1.2.2
-    gradle=yes
-    prebuild=sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.2.2
-Current Version Code:10
diff --git a/metadata/de.measite.contactmerger.yml b/metadata/de.measite.contactmerger.yml
new file mode 100644
index 0000000000..aae1e2d7f4
--- /dev/null
+++ b/metadata/de.measite.contactmerger.yml
@@ -0,0 +1,53 @@
+Categories:
+  - System
+License: Apache-2.0
+SourceCode: https://github.com/rtreffer/ContactMerger
+IssueTracker: https://github.com/rtreffer/ContactMerger/issues
+
+AutoName: Contact Merger
+Summary: Index and merge contacts with Lucene
+Description: |-
+    Index your contacts with lucene and provide a simple list of mergable contacts.
+    The Service will run whenever the systems battery status is good, the data is
+    old and/or the phone is plugged in.
+
+RepoType: git
+Repo: https://github.com/rtreffer/ContactMerger
+
+Builds:
+  - versionName: 1.1.2
+    versionCode: 7
+    commit: 1.1.2
+    gradle:
+      - yes
+    prebuild: sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g'
+        build.gradle
+
+  - versionName: 1.1.3
+    versionCode: 8
+    commit: 1.1.3
+    gradle:
+      - yes
+    prebuild: sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g'
+        build.gradle
+
+  - versionName: 1.2.0
+    versionCode: 9
+    commit: 1.2.0
+    gradle:
+      - yes
+    prebuild: sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g'
+        build.gradle
+
+  - versionName: 1.2.2
+    versionCode: 10
+    commit: 1.2.2
+    gradle:
+      - yes
+    prebuild: sed -i -e 's@com.android.support:support-v4:+@com.android.support:support-v4:20.+@g'
+        build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.2
+CurrentVersionCode: 10
diff --git a/metadata/de.meonwax.soundboard.txt b/metadata/de.meonwax.soundboard.txt
deleted file mode 100644
index 257caace8c..0000000000
--- a/metadata/de.meonwax.soundboard.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Author Name:meonwax
-Author Email:meonwax@meonwax.de
-Web Site:
-Source Code:https://github.com/meonwax/soundboard
-Issue Tracker:https://github.com/meonwax/soundboard/issues
-Changelog:https://github.com/meonwax/soundboard/releases
-
-Auto Name:Soundboard
-Summary:Play short sound samples on touch
-Description:
-Select a sound file from your storage directory and add it to the sounds list.
-It will be copied to the private application folder and can be played on touch.
-
-You can delete the original file at any time. The sound sample will still be
-available in the application until you decide to delete it.
-.
-
-Repo Type:git
-Repo:https://github.com/meonwax/soundboard.git
-
-Build:0.9.0,1
-    commit=0.9.0
-    subdir=app
-    gradle=yes
-
-Build:0.9.1,2
-    commit=0.9.1
-    subdir=app
-    gradle=yes
-
-Build:0.9.2,3
-    commit=0.9.2
-    subdir=app
-    gradle=yes
-
-Build:0.9.3,4
-    commit=0.9.3
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.9.3
-Current Version Code:4
diff --git a/metadata/de.meonwax.soundboard.yml b/metadata/de.meonwax.soundboard.yml
new file mode 100644
index 0000000000..b323d93120
--- /dev/null
+++ b/metadata/de.meonwax.soundboard.yml
@@ -0,0 +1,54 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+AuthorName: meonwax
+AuthorEmail: meonwax@meonwax.de
+SourceCode: https://github.com/meonwax/soundboard
+IssueTracker: https://github.com/meonwax/soundboard/issues
+Changelog: https://github.com/meonwax/soundboard/releases
+
+AutoName: Soundboard
+Summary: Play short sound samples on touch
+Description: |-
+    Select a sound file from your storage directory and add it to the sounds list.
+    It will be copied to the private application folder and can be played on touch.
+
+    You can delete the original file at any time. The sound sample will still be
+    available in the application until you decide to delete it.
+
+RepoType: git
+Repo: https://github.com/meonwax/soundboard.git
+
+Builds:
+  - versionName: 0.9.0
+    versionCode: 1
+    commit: 0.9.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.1
+    versionCode: 2
+    commit: 0.9.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.2
+    versionCode: 3
+    commit: 0.9.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.3
+    versionCode: 4
+    commit: 0.9.3
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.9.3
+CurrentVersionCode: 4
diff --git a/metadata/de.onyxbits.droidentify.txt b/metadata/de.onyxbits.droidentify.txt
deleted file mode 100644
index 0be8fa6f90..0000000000
--- a/metadata/de.onyxbits.droidentify.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:http://www.onyxbits.de/droidentify
-Source Code:https://github.com/onyxbits/Droidentify
-Issue Tracker:https://github.com/onyxbits/Droidentify/issues
-
-Auto Name:Droidentify
-Summary:Generate a device summary sheet
-Description:
-Generate an HTML formated description of your device and transfer this report
-over to your desktop computer for further processing.
-.
-
-Repo Type:git
-Repo:https://github.com/onyxbits/Droidentify
-
-Build:1.1,2
-    commit=b3932e52a83d97a8abc110696df7ca4e87ef1298
-    gradle=yes
-    prebuild=sed -i -e 's/22.1.0/22.0.0/g' build.gradle
-
-Build:1.2,3
-    commit=v1.2
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2
-Current Version Code:3
diff --git a/metadata/de.onyxbits.droidentify.yml b/metadata/de.onyxbits.droidentify.yml
new file mode 100644
index 0000000000..84b5085519
--- /dev/null
+++ b/metadata/de.onyxbits.droidentify.yml
@@ -0,0 +1,34 @@
+Categories:
+  - System
+License: Apache-2.0
+WebSite: http://www.onyxbits.de/droidentify
+SourceCode: https://github.com/onyxbits/Droidentify
+IssueTracker: https://github.com/onyxbits/Droidentify/issues
+
+AutoName: Droidentify
+Summary: Generate a device summary sheet
+Description: |-
+    Generate an HTML formated description of your device and transfer this report
+    over to your desktop computer for further processing.
+
+RepoType: git
+Repo: https://github.com/onyxbits/Droidentify
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    commit: b3932e52a83d97a8abc110696df7ca4e87ef1298
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/22.1.0/22.0.0/g' build.gradle
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.2'
+CurrentVersionCode: 3
diff --git a/metadata/de.onyxbits.listmyapps.txt b/metadata/de.onyxbits.listmyapps.txt
deleted file mode 100644
index dd426a319c..0000000000
--- a/metadata/de.onyxbits.listmyapps.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:http://www.onyxbits.de/listmyapps
-Source Code:https://github.com/onyxbits/listmyaps
-Issue Tracker:https://github.com/onyxbits/listmyaps/issues
-
-Auto Name:List My Apps
-Summary:List apps
-Description:
-Compiles a list of apps installed on the device, in a text format for easy
-sharing:
-
-* Plain text
-* HTML list (e.g. for blog comments)
-* BBCode list (used by many forums)
-* Markdown list (e.g. for Reddit)
-* Market URL (e.g. for direct sharing via barcode scanner app or importing in Raccoon: http://www.onyxbits.de/raccoon)
-* Any custom format, defined through the build-in template editor.
-.
-
-Repo Type:git
-Repo:https://github.com/onyxbits/listmyaps.git
-
-Build:1.2,3
-    commit=v1.2
-    rm=custom_rules.xml
-    target=android-17
-
-Build:1.3,4
-    commit=v1.3
-    rm=custom_rules.xml
-
-Build:2.0,5
-    commit=v2.0
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.1,6
-    commit=v2.1
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.2,7
-    commit=v2.2
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.3,8
-    commit=v2.3
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.4,9
-    commit=v2.4
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.0,10
-    commit=v3.0
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.1,11
-    commit=v3.1
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.2,12
-    commit=v3.2
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.3,13
-    commit=v3.3
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.4,14
-    commit=v3.4
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.5,15
-    commit=v3.5
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.6,16
-    commit=v3.6
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:3.7,17
-    commit=v3.7
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:3.7
-Current Version Code:17
diff --git a/metadata/de.onyxbits.listmyapps.yml b/metadata/de.onyxbits.listmyapps.yml
new file mode 100644
index 0000000000..9202bdf773
--- /dev/null
+++ b/metadata/de.onyxbits.listmyapps.yml
@@ -0,0 +1,145 @@
+Categories:
+  - System
+License: Apache-2.0
+WebSite: http://www.onyxbits.de/listmyapps
+SourceCode: https://github.com/onyxbits/listmyaps
+IssueTracker: https://github.com/onyxbits/listmyaps/issues
+
+AutoName: List My Apps
+Summary: List apps
+Description: |-
+    Compiles a list of apps installed on the device, in a text format for easy
+    sharing:
+
+    * Plain text
+    * HTML list (e.g. for blog comments)
+    * BBCode list (used by many forums)
+    * Markdown list (e.g. for Reddit)
+    * Market URL (e.g. for direct sharing via barcode scanner app or importing in Raccoon: http://www.onyxbits.de/raccoon)
+    * Any custom format, defined through the build-in template editor.
+
+RepoType: git
+Repo: https://github.com/onyxbits/listmyaps
+
+Builds:
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    rm:
+      - custom_rules.xml
+    target: android-17
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: v1.3
+    rm:
+      - custom_rules.xml
+
+  - versionName: '2.0'
+    versionCode: 5
+    commit: v2.0
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.1'
+    versionCode: 6
+    commit: v2.1
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.2'
+    versionCode: 7
+    commit: v2.2
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.3'
+    versionCode: 8
+    commit: v2.3
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.4'
+    versionCode: 9
+    commit: v2.4
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.0'
+    versionCode: 10
+    commit: v3.0
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.1'
+    versionCode: 11
+    commit: v3.1
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.2'
+    versionCode: 12
+    commit: v3.2
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.3'
+    versionCode: 13
+    commit: v3.3
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.4'
+    versionCode: 14
+    commit: v3.4
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.5'
+    versionCode: 15
+    commit: v3.5
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.6'
+    versionCode: 16
+    commit: v3.6
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '3.7'
+    versionCode: 17
+    commit: v3.7
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '3.7'
+CurrentVersionCode: 17
diff --git a/metadata/de.onyxbits.remotekeyboard.txt b/metadata/de.onyxbits.remotekeyboard.txt
deleted file mode 100644
index 756980737d..0000000000
--- a/metadata/de.onyxbits.remotekeyboard.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-Categories:Connectivity
-License:Apache-2.0
-Web Site:http://www.onyxbits.de/remotekeyboard
-Source Code:https://github.com/onyxbits/remotekeyboard
-Issue Tracker:https://github.com/onyxbits/remotekeyboard/issues
-
-Auto Name:Remote Keyboard
-Summary:Remote keyboard via telnet
-Description:
-The app connects your desktop computer's keyboard via wlan (can be forwarded
-over USB via ADB) to your android device so that you can control it comfortably.
-You can not only type, but also copy and paste text between the machines in both
-directions.
-.
-
-Repo Type:git
-Repo:https://github.com/onyxbits/remotekeyboard
-
-Build:1.1,2
-    commit=v1.1
-    extlibs=android/android-support-v4.jar,commons-logging/commons-logging-1.1.3.jar
-    prebuild=rm custom_rules.xml
-
-Build:1.2,3
-    commit=v1.2
-    extlibs=android/android-support-v4.jar,commons-logging/commons-logging-1.1.3.jar
-    prebuild=rm custom_rules.xml
-
-Build:1.3,4
-    commit=1.3
-    extlibs=android/android-support-v4.jar,commons-logging/commons-logging-1.1.3.jar
-    prebuild=rm custom_rules.xml
-
-Build:1.4,5
-    commit=v1.4
-    extlibs=android/android-support-v4.jar,commons-logging/commons-logging-1.1.3.jar
-    prebuild=rm custom_rules.xml
-
-Build:1.5,6
-    commit=v1.5
-    extlibs=android/android-support-v4.jar,commons-logging/commons-logging-1.1.3.jar
-    prebuild=rm custom_rules.xml
-
-Build:1.6,7
-    commit=v1.6
-    extlibs=android/android-support-v4.jar,commons-logging/commons-logging-1.1.3.jar
-    prebuild=rm custom_rules.xml
-
-Build:1.7,8
-    commit=v1.7
-    extlibs=android/android-support-v4.jar,commons-logging/commons-logging-1.1.3.jar
-    prebuild=rm custom_rules.xml
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.7
-Current Version Code:8
diff --git a/metadata/de.onyxbits.remotekeyboard.yml b/metadata/de.onyxbits.remotekeyboard.yml
new file mode 100644
index 0000000000..ec66fd46ba
--- /dev/null
+++ b/metadata/de.onyxbits.remotekeyboard.yml
@@ -0,0 +1,79 @@
+Categories:
+  - Connectivity
+License: Apache-2.0
+WebSite: http://www.onyxbits.de/remotekeyboard
+SourceCode: https://github.com/onyxbits/remotekeyboard
+IssueTracker: https://github.com/onyxbits/remotekeyboard/issues
+
+AutoName: Remote Keyboard
+Summary: Remote keyboard via telnet
+Description: |-
+    The app connects your desktop computer’s keyboard via wlan (can be forwarded
+    over USB via ADB) to your android device so that you can control it comfortably.
+    You can not only type, but also copy and paste text between the machines in both
+    directions.
+
+RepoType: git
+Repo: https://github.com/onyxbits/remotekeyboard
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1
+    extlibs:
+      - android/android-support-v4.jar
+      - commons-logging/commons-logging-1.1.3.jar
+    prebuild: rm custom_rules.xml
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    extlibs:
+      - android/android-support-v4.jar
+      - commons-logging/commons-logging-1.1.3.jar
+    prebuild: rm custom_rules.xml
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: '1.3'
+    extlibs:
+      - android/android-support-v4.jar
+      - commons-logging/commons-logging-1.1.3.jar
+    prebuild: rm custom_rules.xml
+
+  - versionName: '1.4'
+    versionCode: 5
+    commit: v1.4
+    extlibs:
+      - android/android-support-v4.jar
+      - commons-logging/commons-logging-1.1.3.jar
+    prebuild: rm custom_rules.xml
+
+  - versionName: '1.5'
+    versionCode: 6
+    commit: v1.5
+    extlibs:
+      - android/android-support-v4.jar
+      - commons-logging/commons-logging-1.1.3.jar
+    prebuild: rm custom_rules.xml
+
+  - versionName: '1.6'
+    versionCode: 7
+    commit: v1.6
+    extlibs:
+      - android/android-support-v4.jar
+      - commons-logging/commons-logging-1.1.3.jar
+    prebuild: rm custom_rules.xml
+
+  - versionName: '1.7'
+    versionCode: 8
+    commit: v1.7
+    extlibs:
+      - android/android-support-v4.jar
+      - commons-logging/commons-logging-1.1.3.jar
+    prebuild: rm custom_rules.xml
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.7'
+CurrentVersionCode: 8
diff --git a/metadata/de.onyxbits.sensorreadout.txt b/metadata/de.onyxbits.sensorreadout.txt
deleted file mode 100644
index 7bf321f4e2..0000000000
--- a/metadata/de.onyxbits.sensorreadout.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Categories:Development
-License:Apache-2.0
-Web Site:http://www.onyxbits.de/sensorreadout
-Source Code:https://github.com/onyxbits/sensorreadout
-Issue Tracker:https://github.com/onyxbits/sensorreadout/issues
-
-Auto Name:Sensor Readout
-Summary:Realtime graphs of sensor data
-Description:
-Provides low level access to the devices sensors. Readout is presented in a
-graph for easy side by side comparison with other devices.
-
-'''Usage:'''
-
-* Touch desired sensor on the list screen in order to start the readout. Long touch the sensor to show it's details. Use "Back" to close the details dialog again.
-* On readout view, touching the graph will stop the sensor from being read out. After stopping, the graph can be scrolled and or panned by a drag or pinch gesture. To restart the readout, return to the main sensor list and select the sensor again.
-.
-
-Repo Type:git
-Repo:https://github.com/onyxbits/sensorreadout.git
-
-Build:1.1,2
-    disable=source incomplete at 344afe422eb9
-    commit=344afe422eb9
-    extlibs=achartlib/achartengine-1.0.0.jar
-
-Build:1.2,3
-    commit=0d0812da8c
-    extlibs=achartlib/achartengine-1.0.0.jar
-
-Build:2.1,5
-    commit=v2.1
-    rm=custom_rules.xml
-
-Build:2.2,6
-    commit=v2.2
-    rm=custom_rules.xml
-
-Build:2.3,7
-    commit=v2.3
-    rm=custom_rules.xml
-
-Build:2.4,8
-    commit=v2.4
-    rm=custom_rules.xml
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.4
-Current Version Code:8
diff --git a/metadata/de.onyxbits.sensorreadout.yml b/metadata/de.onyxbits.sensorreadout.yml
new file mode 100644
index 0000000000..ec97abcfd1
--- /dev/null
+++ b/metadata/de.onyxbits.sensorreadout.yml
@@ -0,0 +1,63 @@
+Categories:
+  - Development
+License: Apache-2.0
+WebSite: http://www.onyxbits.de/sensorreadout
+SourceCode: https://github.com/onyxbits/sensorreadout
+IssueTracker: https://github.com/onyxbits/sensorreadout/issues
+
+AutoName: Sensor Readout
+Summary: Realtime graphs of sensor data
+Description: |-
+    Provides low level access to the devices sensors. Readout is presented in a
+    graph for easy side by side comparison with other devices.
+
+    '''Usage:'''
+
+    * Touch desired sensor on the list screen in order to start the readout. Long touch the sensor to show it's details. Use "Back" to close the details dialog again.
+    * On readout view, touching the graph will stop the sensor from being read out. After stopping, the graph can be scrolled and or panned by a drag or pinch gesture. To restart the readout, return to the main sensor list and select the sensor again.
+
+RepoType: git
+Repo: https://github.com/onyxbits/sensorreadout.git
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    disable: source incomplete at 344afe422eb9
+    commit: 344afe422eb9
+    extlibs:
+      - achartlib/achartengine-1.0.0.jar
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: 0d0812da8c
+    extlibs:
+      - achartlib/achartengine-1.0.0.jar
+
+  - versionName: '2.1'
+    versionCode: 5
+    commit: v2.1
+    rm:
+      - custom_rules.xml
+
+  - versionName: '2.2'
+    versionCode: 6
+    commit: v2.2
+    rm:
+      - custom_rules.xml
+
+  - versionName: '2.3'
+    versionCode: 7
+    commit: v2.3
+    rm:
+      - custom_rules.xml
+
+  - versionName: '2.4'
+    versionCode: 8
+    commit: v2.4
+    rm:
+      - custom_rules.xml
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '2.4'
+CurrentVersionCode: 8
diff --git a/metadata/de.onyxbits.textfiction.txt b/metadata/de.onyxbits.textfiction.txt
deleted file mode 100644
index b728dcc1df..0000000000
--- a/metadata/de.onyxbits.textfiction.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-Categories:Games
-License:Apache-2.0
-Web Site:http://www.onyxbits.de/textfiction
-Source Code:https://github.com/onyxbits/TextFiction
-Issue Tracker:https://github.com/onyxbits/TextFiction/issues
-
-Auto Name:Text Fiction
-Summary:Interactive fiction interpreter
-Description:
-ZPlet based Z-Machine interpreter for playing text-only adventures games. The
-interface is like an SMS app and there's a list of buttons for common actions as
-well as the ability to select text from the page to be an action.
-
-Supports games in Z3, Z5, Z8 format and games can be download in the app.
-Savegames are kept on the sdcard.
-.
-
-Repo Type:git
-Repo:https://github.com/onyxbits/TextFiction.git
-
-Build:1.2,3
-    commit=v1.2
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.0,4
-    commit=v2.0
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.2,6
-    commit=v2.2
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.4,8
-    commit=2.4
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.5,9
-    commit=v2.5
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.6,10
-    commit=v2.6
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Build:2.7,11
-    commit=2.7
-    rm=custom_rules.xml
-    extlibs=android/android-support-v4.jar
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.7
-Current Version Code:11
diff --git a/metadata/de.onyxbits.textfiction.yml b/metadata/de.onyxbits.textfiction.yml
new file mode 100644
index 0000000000..eea36f9856
--- /dev/null
+++ b/metadata/de.onyxbits.textfiction.yml
@@ -0,0 +1,81 @@
+Categories:
+  - Games
+License: Apache-2.0
+WebSite: http://www.onyxbits.de/textfiction
+SourceCode: https://github.com/onyxbits/TextFiction
+IssueTracker: https://github.com/onyxbits/TextFiction/issues
+
+AutoName: Text Fiction
+Summary: Interactive fiction interpreter
+Description: |-
+    ZPlet based Z-Machine interpreter for playing text-only adventures games. The
+    interface is like an SMS app and there’s a list of buttons for common actions as
+    well as the ability to select text from the page to be an action.
+
+    Supports games in Z3, Z5, Z8 format and games can be download in the app.
+    Savegames are kept on the sdcard.
+
+RepoType: git
+Repo: https://github.com/onyxbits/TextFiction
+
+Builds:
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.0'
+    versionCode: 4
+    commit: v2.0
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.2'
+    versionCode: 6
+    commit: v2.2
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.4'
+    versionCode: 8
+    commit: '2.4'
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.5'
+    versionCode: 9
+    commit: v2.5
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.6'
+    versionCode: 10
+    commit: v2.6
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+  - versionName: '2.7'
+    versionCode: 11
+    commit: '2.7'
+    rm:
+      - custom_rules.xml
+    extlibs:
+      - android/android-support-v4.jar
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '2.7'
+CurrentVersionCode: 11
diff --git a/metadata/de.perflyst.batterycalibration.txt b/metadata/de.perflyst.batterycalibration.txt
deleted file mode 100644
index a300944001..0000000000
--- a/metadata/de.perflyst.batterycalibration.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-Categories:System
-License:MIT
-Web Site:
-Source Code:https://github.com/Perflyst/BatteryCalibration
-Issue Tracker:https://github.com/Perflyst/BatteryCalibration/issues
-
-Auto Name:BatteryCalibration
-Summary:Calibrate your battery
-Description:
-This is a simple open source battery calibration app which needs super user
-rights.
-
-'''How does it calibrate your battery?''' The app resets your fuel gauge and the
-batterystats.bin file.
-
-'''Why is superuser required?''' To reset the fuel gauge it has to write into a
-/sys/class/ file. This is not possible without superuser permission.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/Perflyst/BatteryCalibration.git
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=1.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/de.perflyst.batterycalibration.yml b/metadata/de.perflyst.batterycalibration.yml
new file mode 100644
index 0000000000..e98183c558
--- /dev/null
+++ b/metadata/de.perflyst.batterycalibration.yml
@@ -0,0 +1,43 @@
+Categories:
+  - System
+License: MIT
+SourceCode: https://github.com/Perflyst/BatteryCalibration
+IssueTracker: https://github.com/Perflyst/BatteryCalibration/issues
+Changelog: https://github.com/Perflyst/BatteryCalibration/releases
+
+AutoName: BatteryCalibration
+Summary: Calibrate your battery
+Description: |-
+    This is a simple open source battery calibration app which needs super user
+    rights.
+
+    '''How does it calibrate your battery?''' The app resets your fuel gauge and the
+    batterystats.bin file.
+
+    '''Why is superuser required?''' To reset the fuel gauge it has to write into a
+    /sys/class/ file. This is not possible without superuser permission.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/Perflyst/BatteryCalibration
+
+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
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.1'
+CurrentVersionCode: 2