diff --git a/metadata/com.adonai.manman.txt b/metadata/com.adonai.manman.txt
deleted file mode 100644
index ad05bda204..0000000000
--- a/metadata/com.adonai.manman.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Development,System
-License:GPL-3.0-only
-Author Web Site:https://plus.google.com/102332121455682860724
-Web Site:
-Source Code:https://github.com/Adonai/Man-Man
-Issue Tracker:https://github.com/Adonai/Man-Man/issues
-Donate:https://www.patreon.com/kanedias
-
-Auto Name:Man Man
-Summary:View, download and search Linux manpages
-Description:
-Convenient tool for any Linux enthusiast familiar with manpages. Provides a fast
-way to search, browse and save manpages via [http://www.mankier.com/
-mankier.com].
-
-AntiFeature described applies only to http exchange with mankier.com website.
-All cached and local manpage search/view works without it as well.
-
-Features:
-
-* Supports searching for a single command
-* Supports explaining command one-liners
-* Supports browsing and indexing of man chapters
-* Supports caching of man pages that were previously accessed
-* Supports downloading local archive for offline work
-* Has dark theme :)
-.
-
-Repo Type:git
-Repo:https://github.com/Adonai/Man-Man
-
-Build:1.0.1 Beta,101
-    commit=1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.0.2 Beta,102
-    commit=fa561214d97e9cb67f73b9dc7c6e301f65d99e5f
-    subdir=app
-    gradle=yes
-
-Build:1.2.0,120
-    commit=1.2.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
-
-Build:1.2.2,122
-    commit=1.2.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
-
-Build:1.2.3,123
-    commit=1.2.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
-
-Build:1.2.5,125
-    commit=1.2.5
-    subdir=app
-    gradle=fdroid
-
-Build:1.2.7,127
-    commit=1.2.7
-    subdir=app
-    gradle=fdroid
-
-Build:1.2.8,128
-    commit=1.2.8
-    subdir=app
-    gradle=fdroid
-
-Build:1.3.0,130
-    commit=1.3.0
-    subdir=app
-    gradle=fdroid
-
-Build:1.3.1,131
-    commit=1.3.1
-    subdir=app
-    gradle=fdroid
-
-Build:1.4.0,140
-    commit=1.4.0
-    subdir=app
-    gradle=fdroid
-
-Build:1.5.0,150
-    commit=1.5.0
-    subdir=app
-    gradle=fdroid
-
-Build:1.5.1,151
-    disable=lint runs and fails
-    commit=1.5.1
-    subdir=app
-    gradle=fdroid
-
-Build:1.5.2,152
-    commit=1.5.2
-    subdir=app
-    gradle=fdroid
-
-Build:1.6.1,161
-    commit=1.6.1
-    subdir=app
-    gradle=fdroid
-
-Build:1.6.2,162
-    commit=1.6.2
-    subdir=app
-    gradle=fdroid
-
-Build:1.7.0,170
-    commit=1.7.0
-    subdir=app
-    gradle=fdroid
-
-Build:1.7.1,171
-    commit=1.7.1
-    subdir=app
-    gradle=fdroid
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.7.1
-Current Version Code:171
diff --git a/metadata/com.adonai.manman.yml b/metadata/com.adonai.manman.yml
new file mode 100644
index 0000000000..684f3bc3fe
--- /dev/null
+++ b/metadata/com.adonai.manman.yml
@@ -0,0 +1,168 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Development
+  - System
+License: GPL-3.0-only
+AuthorWebSite: https://plus.google.com/102332121455682860724
+SourceCode: https://github.com/Adonai/Man-Man
+IssueTracker: https://github.com/Adonai/Man-Man/issues
+Donate: https://www.patreon.com/kanedias
+
+AutoName: Man Man
+Summary: View, download and search Linux manpages
+Description: |-
+    Convenient tool for any Linux enthusiast familiar with manpages. Provides a fast
+    way to search, browse and save manpages via [http://www.mankier.com/
+    mankier.com].
+
+    AntiFeature described applies only to http exchange with mankier.com website.
+    All cached and local manpage search/view works without it as well.
+
+    Features:
+
+    * Supports searching for a single command
+    * Supports explaining command one-liners
+    * Supports browsing and indexing of man chapters
+    * Supports caching of man pages that were previously accessed
+    * Supports downloading local archive for offline work
+    * Has dark theme :)
+
+RepoType: git
+Repo: https://github.com/Adonai/Man-Man
+
+Builds:
+  - versionName: 1.0.1 Beta
+    versionCode: 101
+    commit: 1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2 Beta
+    versionCode: 102
+    commit: fa561214d97e9cb67f73b9dc7c6e301f65d99e5f
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 120
+    commit: 1.2.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
+
+  - versionName: 1.2.2
+    versionCode: 122
+    commit: 1.2.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
+
+  - versionName: 1.2.3
+    versionCode: 123
+    commit: 1.2.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e 's/v4:21.0.2/v4:21.0.+/g' build.gradle
+
+  - versionName: 1.2.5
+    versionCode: 125
+    commit: 1.2.5
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.2.7
+    versionCode: 127
+    commit: 1.2.7
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.2.8
+    versionCode: 128
+    commit: 1.2.8
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.3.0
+    versionCode: 130
+    commit: 1.3.0
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.3.1
+    versionCode: 131
+    commit: 1.3.1
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.4.0
+    versionCode: 140
+    commit: 1.4.0
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.5.0
+    versionCode: 150
+    commit: 1.5.0
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.5.1
+    versionCode: 151
+    disable: lint runs and fails
+    commit: 1.5.1
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.5.2
+    versionCode: 152
+    commit: 1.5.2
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.6.1
+    versionCode: 161
+    commit: 1.6.1
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.6.2
+    versionCode: 162
+    commit: 1.6.2
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.7.0
+    versionCode: 170
+    commit: 1.7.0
+    subdir: app
+    gradle:
+      - fdroid
+
+  - versionName: 1.7.1
+    versionCode: 171
+    commit: 1.7.1
+    subdir: app
+    gradle:
+      - fdroid
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.7.1
+CurrentVersionCode: 171
diff --git a/metadata/com.adstrosoftware.launchappops.txt b/metadata/com.adstrosoftware.launchappops.txt
deleted file mode 100644
index 8127917e0d..0000000000
--- a/metadata/com.adstrosoftware.launchappops.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/adstro/launch-app-ops
-Issue Tracker:https://github.com/adstro/launch-app-ops/issues
-
-Auto Name:Launch App Ops
-Summary:Show a hidden screen
-Description:
-In Android 4.3 there is a new activity/screen, not accessible from settings,
-called App Ops, where you can manage permissions for different apps. This app
-simply allows you to launch this activity.
-.
-
-Repo Type:git
-Repo:https://github.com/adstro/launch-app-ops.git
-
-Build:1.0,1
-    commit=6c1b72946
-    subdir=app
-    gradle=yes
-    prebuild=sed -i 's/18.0.1/18.0.1/g' build.gradle
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/com.adstrosoftware.launchappops.yml b/metadata/com.adstrosoftware.launchappops.yml
new file mode 100644
index 0000000000..79aeac5a07
--- /dev/null
+++ b/metadata/com.adstrosoftware.launchappops.yml
@@ -0,0 +1,29 @@
+Categories:
+  - System
+License: Apache-2.0
+SourceCode: https://github.com/adstro/launch-app-ops
+IssueTracker: https://github.com/adstro/launch-app-ops/issues
+
+AutoName: Launch App Ops
+Summary: Show a hidden screen
+Description: |-
+    In Android 4.3 there is a new activity/screen, not accessible from settings,
+    called App Ops, where you can manage permissions for different apps. This app
+    simply allows you to launch this activity.
+
+RepoType: git
+Repo: https://github.com/adstro/launch-app-ops.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 6c1b72946
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i 's/18.0.1/18.0.1/g' build.gradle
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
diff --git a/metadata/com.afollestad.nocknock.txt b/metadata/com.afollestad.nocknock.txt
deleted file mode 100644
index 07dabc050d..0000000000
--- a/metadata/com.afollestad.nocknock.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-Categories:Internet,Development
-License:Apache-2.0
-Author Name:Aidan Follestad
-Web Site:
-Source Code:https://github.com/afollestad/nock-nock
-Issue Tracker:https://github.com/afollestad/nock-nock/issues
-
-Summary:Monitor your websites for maximum uptime
-Description:
-The app will automatically knock on the door of your websites (or web servers)
-on a chosen interval to make sure they are up and responding successfully. If
-something is wrong, you get a notification telling you so.
-
-How does it check if your server is up? An HTTP GET request is made, the
-response code is checked. Nock Nock can also do custom validation on the
-response, by searching for a term, or even by executing a custom block of
-JavaScript.
-.
-
-Repo Type:git
-Repo:https://github.com/afollestad/nock-nock
-
-Build:0.1.3.0,13
-    commit=0.1.3.0
-    subdir=app
-    gradle=yes
-    rm=app/libs/rhino-1.7.7.1.jar
-    prebuild=sed -i -e "s|files('libs/rhino-1.7.7.1.jar')|'org.mozilla:rhino:1.7.7.1'|" build.gradle
-
-Build:0.8.1,30
-    commit=0.8.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/drummer-aidan/d' ../build.gradle
-
-Maintainer Notes:
-Crashlytics introduced in 0.8.2
-.
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:0.8.1
-Current Version Code:30
-
-No Source Since: 0.8.2
diff --git a/metadata/com.afollestad.nocknock.yml b/metadata/com.afollestad.nocknock.yml
new file mode 100644
index 0000000000..deeba79a96
--- /dev/null
+++ b/metadata/com.afollestad.nocknock.yml
@@ -0,0 +1,50 @@
+Categories:
+  - Internet
+  - Development
+License: Apache-2.0
+AuthorName: Aidan Follestad
+SourceCode: https://github.com/afollestad/nock-nock
+IssueTracker: https://github.com/afollestad/nock-nock/issues
+
+Summary: Monitor your websites for maximum uptime
+Description: |-
+    The app will automatically knock on the door of your websites (or web servers)
+    on a chosen interval to make sure they are up and responding successfully. If
+    something is wrong, you get a notification telling you so.
+
+    How does it check if your server is up? An HTTP GET request is made, the
+    response code is checked. Nock Nock can also do custom validation on the
+    response, by searching for a term, or even by executing a custom block of
+    JavaScript.
+
+RepoType: git
+Repo: https://github.com/afollestad/nock-nock
+
+Builds:
+  - versionName: 0.1.3.0
+    versionCode: 13
+    commit: 0.1.3.0
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/rhino-1.7.7.1.jar
+    prebuild: sed -i -e "s|files('libs/rhino-1.7.7.1.jar')|'org.mozilla:rhino:1.7.7.1'|"
+        build.gradle
+
+  - versionName: 0.8.1
+    versionCode: 30
+    commit: 0.8.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/drummer-aidan/d' ../build.gradle
+
+MaintainerNotes: Crashlytics introduced in 0.8.2
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 0.8.1
+CurrentVersionCode: 30
+
+NoSourceSince: ' 0.8.2'
diff --git a/metadata/com.agateau.catgenerator.txt b/metadata/com.agateau.catgenerator.txt
deleted file mode 100644
index ddb73ba6f4..0000000000
--- a/metadata/com.agateau.catgenerator.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Categories:Multimedia
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/agateau/cat-avatar-generator-app
-Issue Tracker:https://github.com/agateau/cat-avatar-generator-app/issues
-Changelog:https://github.com/agateau/cat-avatar-generator-app/blob/HEAD/CHANGELOG.md
-
-Auto Name:Cat Avatar Generator
-Summary:Generate cat avatars
-Description:
-Generate avatar and profile pictures based on
-[http://www.peppercarrot.com/extras/html/2016_cat-generator/index.php Pepper and
-Carrot] by David Revoy.
-.
-
-Repo Type:git
-Repo:https://github.com/agateau/cat-avatar-generator-app
-
-Build:0.1.0,1
-    commit=b5932276947ce50c5b85538b748769878f6f25c7
-    subdir=app
-    gradle=yes
-
-Build:0.2.0,2
-    commit=0.2.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.2.0
-Current Version Code:2
diff --git a/metadata/com.agateau.catgenerator.yml b/metadata/com.agateau.catgenerator.yml
new file mode 100644
index 0000000000..f4b161ce9a
--- /dev/null
+++ b/metadata/com.agateau.catgenerator.yml
@@ -0,0 +1,36 @@
+Categories:
+  - Multimedia
+License: Apache-2.0
+SourceCode: https://github.com/agateau/cat-avatar-generator-app
+IssueTracker: https://github.com/agateau/cat-avatar-generator-app/issues
+Changelog: https://github.com/agateau/cat-avatar-generator-app/blob/HEAD/CHANGELOG.md
+
+AutoName: Cat Avatar Generator
+Summary: Generate cat avatars
+Description: |-
+    Generate avatar and profile pictures based on
+    [http://www.peppercarrot.com/extras/html/2016_cat-generator/index.php Pepper and
+    Carrot] by David Revoy.
+
+RepoType: git
+Repo: https://github.com/agateau/cat-avatar-generator-app
+
+Builds:
+  - versionName: 0.1.0
+    versionCode: 1
+    commit: b5932276947ce50c5b85538b748769878f6f25c7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.0
+    versionCode: 2
+    commit: 0.2.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.2.0
+CurrentVersionCode: 2
diff --git a/metadata/com.agnibho.android.solarcompass.txt b/metadata/com.agnibho.android.solarcompass.txt
deleted file mode 100644
index 5f8bd45851..0000000000
--- a/metadata/com.agnibho.android.solarcompass.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Categories:Navigation
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/agnibho/solarcompass
-Issue Tracker:https://github.com/agnibho/solarcompass/issues
-
-Auto Name:Solar Compass
-Summary:Find directions using the position of the sun
-Description:
-Find directions using the position of the sun in the sky.
-
-Usage:
-
-Start the app and place your device horizontally. Now touch the sun icon on the
-screen and rotate it towards the position of the sun in the sky. The compass
-will automatically rotate to point the directions once you release the sun icon.
-
-Tips: To properly find the direction of the sun place your finger vertically on
-a horizontal surface. The direction of the shadow will be the exact opposite
-direction of the sun.
-
-The left upper corner of the screen contains your location information. You can
-touch the button by its side to enter a location manually.
-
-The right upper corner contains the help button. Clicking it will open a help
-screen detailing the usage instructions.
-.
-
-Repo Type:git
-Repo:https://github.com/agnibho/solarcompass
-
-Build:1.0,1
-    commit=1.0
-    subdir=solarcompass
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/com.agnibho.android.solarcompass.yml b/metadata/com.agnibho.android.solarcompass.yml
new file mode 100644
index 0000000000..0b9c85109b
--- /dev/null
+++ b/metadata/com.agnibho.android.solarcompass.yml
@@ -0,0 +1,44 @@
+Categories:
+  - Navigation
+License: GPL-3.0-or-later
+SourceCode: https://github.com/agnibho/solarcompass
+IssueTracker: https://github.com/agnibho/solarcompass/issues
+
+AutoName: Solar Compass
+Summary: Find directions using the position of the sun
+Description: |-
+    Find directions using the position of the sun in the sky.
+
+    '''Usage:'''
+
+    Start the app and place your device horizontally. Now touch the sun icon on the
+    screen and rotate it towards the position of the sun in the sky. The compass
+    will automatically rotate to point the directions once you release the sun icon.
+
+    '''Tips:'''
+
+    To properly find the direction of the sun place your finger vertically on
+    a horizontal surface. The direction of the shadow will be the exact opposite
+    direction of the sun.
+
+    The left upper corner of the screen contains your location information. You can
+    touch the button by its side to enter a location manually.
+
+    The right upper corner contains the help button. Clicking it will open a help
+    screen detailing the usage instructions.
+
+RepoType: git
+Repo: https://github.com/agnibho/solarcompass
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: solarcompass
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
diff --git a/metadata/com.aidinhut.simpletextcrypt.txt b/metadata/com.aidinhut.simpletextcrypt.txt
deleted file mode 100644
index d5f94a4d1d..0000000000
--- a/metadata/com.aidinhut.simpletextcrypt.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Categories:Security
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/aidin36/simpletextcrypt
-Issue Tracker:https://github.com/aidin36/simpletextcrypt/issues
-Changelog:https://github.com/aidin36/simpletextcrypt/releases/
-
-Auto Name:SimpleTextCrypt
-Summary:Encrypts plain text using AES256
-Description:
-This app does not claim any permissions, so you can trust that it cannot send
-any of your private data to anyone.
-
-'''Can You Trust it?''' Messages produces by this app is secure and can be
-confidently send over a network, for example. It uses AES in CBC mode with PKCS5
-padding for encryption, and uses PBKDF2 with HMAC, SHA1 and a random Salt in
-order to derive a secure key from the entered password. This is a very powerful
-encryption. Also it encrypts its settings before storing them on the device.
-
-However, the app itself may not be very secure, and probably vulnerable to some
-attacks. Although it is secure enough to stand attacks from non-expert crackers,
-e.g. normal users, it should not be used for serious data encryption.
-
-'''Important Note:''' If you are updating from version 3.X to 4.X, please clean
-your data after upgrade. (Settings -> App -> SimpleTextCrypt -> Clear Data). Or
-else, the app won't work.
-.
-
-Repo Type:git
-Repo:https://github.com/aidin36/simpletextcrypt.git
-
-Build:3.2,7
-    commit=v3.2
-    subdir=app
-    gradle=yes
-
-Build:3.3,8
-    commit=v3.3
-    subdir=app
-    gradle=yes
-
-Build:4.1,9
-    commit=v4.1
-    subdir=app
-    gradle=yes
-
-Build:4.2,10
-    commit=v4.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:4.2
-Current Version Code:10
diff --git a/metadata/com.aidinhut.simpletextcrypt.yml b/metadata/com.aidinhut.simpletextcrypt.yml
new file mode 100644
index 0000000000..52b8c28029
--- /dev/null
+++ b/metadata/com.aidinhut.simpletextcrypt.yml
@@ -0,0 +1,63 @@
+Categories:
+  - Security
+License: GPL-3.0-or-later
+SourceCode: https://github.com/aidin36/simpletextcrypt
+IssueTracker: https://github.com/aidin36/simpletextcrypt/issues
+Changelog: https://github.com/aidin36/simpletextcrypt/releases/
+
+AutoName: SimpleTextCrypt
+Summary: Encrypts plain text using AES256
+Description: |-
+    This app does not claim any permissions, so you can trust that it cannot send
+    any of your private data to anyone.
+
+    '''Can You Trust it?''' Messages produces by this app is secure and can be
+    confidently send over a network, for example. It uses AES in CBC mode with PKCS5
+    padding for encryption, and uses PBKDF2 with HMAC, SHA1 and a random Salt in
+    order to derive a secure key from the entered password. This is a very powerful
+    encryption. Also it encrypts its settings before storing them on the device.
+
+    However, the app itself may not be very secure, and probably vulnerable to some
+    attacks. Although it is secure enough to stand attacks from non-expert crackers,
+    e.g. normal users, it should not be used for serious data encryption.
+
+    '''Important Note:''' If you are updating from version 3.X to 4.X, please clean
+    your data after upgrade. (Settings -> App -> SimpleTextCrypt -> Clear Data). Or
+    else, the app won't work.
+
+RepoType: git
+Repo: https://github.com/aidin36/simpletextcrypt.git
+
+Builds:
+  - versionName: '3.2'
+    versionCode: 7
+    commit: v3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '3.3'
+    versionCode: 8
+    commit: v3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.1'
+    versionCode: 9
+    commit: v4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '4.2'
+    versionCode: 10
+    commit: v4.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '4.2'
+CurrentVersionCode: 10
diff --git a/metadata/com.akop.bach.txt b/metadata/com.akop.bach.txt
deleted file mode 100644
index d981ca02a2..0000000000
--- a/metadata/com.akop.bach.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Games
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/0xe1f/Spark360
-Issue Tracker:https://github.com/0xe1f/Spark360/issues
-
-Auto Name:Spark 360
-Summary:Gaming client
-Description:
-Supports Xbox Live and the PlayStation Network. The app allows you to monitor
-your achievements, trophies, friends' statuses, and includes many other
-features, such as trophy/achievement comparisons, messaging (Xbox Live), home
-screen widgets, notifications, and much more.
-
-Spark 360 is an unofficial application, and not supported, endorsed, or
-affiliated with Microsoft Corporation or Sony Corporation.
-.
-
-Repo Type:git
-Repo:https://github.com/0xe1f/Spark360.git
-
-Build:6.20,116
-    commit=v6.20
-
-Build:6.30,119
-    commit=v6.30
-
-Build:6.50,120
-    commit=v6.50
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:6.50
-Current Version Code:120
diff --git a/metadata/com.akop.bach.yml b/metadata/com.akop.bach.yml
new file mode 100644
index 0000000000..03c3e3b76b
--- /dev/null
+++ b/metadata/com.akop.bach.yml
@@ -0,0 +1,42 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Games
+License: GPL-3.0-only
+SourceCode: https://github.com/0xe1f/Spark360
+IssueTracker: https://github.com/0xe1f/Spark360/issues
+
+AutoName: Spark 360
+Summary: Gaming client
+Description: |-
+    Supports Xbox Live and the PlayStation Network. The app allows you to monitor
+    your achievements, trophies, friends' statuses, and includes many other
+    features, such as trophy/achievement comparisons, messaging (Xbox Live), home
+    screen widgets, notifications, and much more.
+
+    Spark 360 is an unofficial application, and not supported, endorsed, or
+    affiliated with Microsoft Corporation or Sony Corporation.
+
+RepoType: git
+Repo: https://github.com/0xe1f/Spark360.git
+
+Builds:
+  - versionName: '6.20'
+    versionCode: 116
+    commit: v6.20
+
+  - versionName: '6.30'
+    versionCode: 119
+    commit: v6.30
+
+  - versionName: '6.50'
+    versionCode: 120
+    commit: v6.50
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '6.50'
+CurrentVersionCode: 120
diff --git a/metadata/com.alaskalinuxuser.criticalvelocity.txt b/metadata/com.alaskalinuxuser.criticalvelocity.txt
deleted file mode 100644
index bd01af35e9..0000000000
--- a/metadata/com.alaskalinuxuser.criticalvelocity.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-Categories:Games
-License:Apache-2.0
-Web Site:https://thealaskalinuxuser.wordpress.com/
-Source Code:https://github.com/alaskalinuxuser/app_critical_velocity
-Issue Tracker:https://github.com/alaskalinuxuser/app_critical_velocity/issues
-
-Auto Name:Critical Velocity
-Summary:Side scrolling arcade style game
-Description:
-Captain! The planet is collapsing! We have to get out of this tunnel, but we've
-been hit! Our thrusters are failing....
-
-So begins your journey back to the surface! Watch out for barriers and obstacles
-in this open source side scrolling arcade style game! Once you reach 25000
-points, you will find the exit to the surface and save the lives of your crew,
-but after passing each obstacle, your vessel picks up speed, making the journey
-more difficult! Can you make it, Captain?
-.
-
-Repo Type:git
-Repo:https://github.com/alaskalinuxuser/app_critical_velocity
-
-Build:1.0,1
-    commit=052342f8014c5c0721a82a41bf8c72e0798a85b2
-    subdir=android
-    gradle=yes
-    scandelete=android/libs/*
-
-Build:2.0,10
-    commit=205656bf79a4728a0caac3045c99cf9bed2cfcaf
-    subdir=android
-    gradle=yes
-    scandelete=android/libs/*
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:3.0
-Current Version Code:20
diff --git a/metadata/com.alaskalinuxuser.criticalvelocity.yml b/metadata/com.alaskalinuxuser.criticalvelocity.yml
new file mode 100644
index 0000000000..8a0e172c4a
--- /dev/null
+++ b/metadata/com.alaskalinuxuser.criticalvelocity.yml
@@ -0,0 +1,45 @@
+Categories:
+  - Games
+License: Apache-2.0
+WebSite: https://thealaskalinuxuser.wordpress.com/
+SourceCode: https://github.com/alaskalinuxuser/app_critical_velocity
+IssueTracker: https://github.com/alaskalinuxuser/app_critical_velocity/issues
+
+AutoName: Critical Velocity
+Summary: Side scrolling arcade style game
+Description: |-
+    Captain! The planet is collapsing! We have to get out of this tunnel, but we've
+    been hit! Our thrusters are failing....
+
+    So begins your journey back to the surface! Watch out for barriers and obstacles
+    in this open source side scrolling arcade style game! Once you reach 25000
+    points, you will find the exit to the surface and save the lives of your crew,
+    but after passing each obstacle, your vessel picks up speed, making the journey
+    more difficult! Can you make it, Captain?
+
+RepoType: git
+Repo: https://github.com/alaskalinuxuser/app_critical_velocity
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 052342f8014c5c0721a82a41bf8c72e0798a85b2
+    subdir: android
+    gradle:
+      - yes
+    scandelete:
+      - android/libs/*
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: 205656bf79a4728a0caac3045c99cf9bed2cfcaf
+    subdir: android
+    gradle:
+      - yes
+    scandelete:
+      - android/libs/*
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '3.0'
+CurrentVersionCode: 20
diff --git a/metadata/com.alaskalinuxuser.hourglass.txt b/metadata/com.alaskalinuxuser.hourglass.txt
deleted file mode 100644
index 42885cedab..0000000000
--- a/metadata/com.alaskalinuxuser.hourglass.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-Categories:Time
-License:Apache-2.0
-Web Site:https://thealaskalinuxuser.wordpress.com/
-Source Code:https://github.com/alaskalinuxuser/app_hourglass
-Issue Tracker:https://github.com/alaskalinuxuser/app_hourglass/issues
-
-Auto Name:Hourglass
-Summary:Set variable timers with audible alarm and vibration
-Description:
-A simple application that can be used to start a timer from one second to one
-hour. The app can then be closed or left open, while a status bar notification
-reminds you that you have a timer in progress.
-
-Upon reaching 00:00, an audible bell as well as a short vibration and visual
-pop-up will indicate that your timer has ended.
-
-Great for reminding yourself to do something, or for use while playing games
-that require timers!
-.
-
-Repo Type:git
-Repo:https://github.com/alaskalinuxuser/app_hourglass
-
-Build:1.0,1
-    commit=241927d83d3643d54fceb45d1caedf00536320a6
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=1e11a32eb10f90d47a020bec070d4266d44d505c
-    subdir=app
-    gradle=yes
-
-Build:1.2,3
-    commit=d9a2e0c7389fcb672823989cce4326ba23252e4a
-    subdir=app
-    gradle=yes
-
-Build:1.4,4
-    commit=62e9cff431237e6d7ec5b1cd68006be13529df72
-    subdir=app
-    gradle=yes
-
-Build:1.5,5
-    commit=2317f71a04b619ecafa56e282d63baeac72ba420
-    subdir=app
-    gradle=yes
-
-Build:1.6,6
-    commit=fb28250c74e59582e887ede69cf75c1f061caf3c
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.9
-Current Version Code:9
diff --git a/metadata/com.alaskalinuxuser.hourglass.yml b/metadata/com.alaskalinuxuser.hourglass.yml
new file mode 100644
index 0000000000..c02f5d2e1e
--- /dev/null
+++ b/metadata/com.alaskalinuxuser.hourglass.yml
@@ -0,0 +1,70 @@
+Categories:
+  - Time
+License: Apache-2.0
+WebSite: https://thealaskalinuxuser.wordpress.com/
+SourceCode: https://github.com/alaskalinuxuser/app_hourglass
+IssueTracker: https://github.com/alaskalinuxuser/app_hourglass/issues
+
+AutoName: Hourglass
+Summary: Set variable timers with audible alarm and vibration
+Description: |-
+    A simple application that can be used to start a timer from one second to one
+    hour. The app can then be closed or left open, while a status bar notification
+    reminds you that you have a timer in progress.
+
+    Upon reaching 00:00, an audible bell as well as a short vibration and visual
+    pop-up will indicate that your timer has ended.
+
+    Great for reminding yourself to do something, or for use while playing games
+    that require timers!
+
+RepoType: git
+Repo: https://github.com/alaskalinuxuser/app_hourglass
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 241927d83d3643d54fceb45d1caedf00536320a6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: 1e11a32eb10f90d47a020bec070d4266d44d505c
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: d9a2e0c7389fcb672823989cce4326ba23252e4a
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 4
+    commit: 62e9cff431237e6d7ec5b1cd68006be13529df72
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 5
+    commit: 2317f71a04b619ecafa56e282d63baeac72ba420
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 6
+    commit: fb28250c74e59582e887ede69cf75c1f061caf3c
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.9'
+CurrentVersionCode: 9
diff --git a/metadata/com.alaskalinuxuser.justchess.txt b/metadata/com.alaskalinuxuser.justchess.txt
deleted file mode 100644
index 5925755987..0000000000
--- a/metadata/com.alaskalinuxuser.justchess.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Categories:Games
-License:Apache-2.0
-Web Site:
-Source Code:https://gitlab.com/alaskalinuxuser/app_JustChess
-Issue Tracker:https://gitlab.com/alaskalinuxuser/app_JustChess/issues
-
-Auto Name:JustChess
-Summary:Chess for one or two players
-Description:
-Play chess against a very simple author written chess engine, or against  a
-friend in pass and play mode.
-
-Simple features include:
-
-* One or Two player
-* Move suggestion
-* Piece move highlighting
-* A 3 ply open source chess engine written by the author
-
-This game is not hard to beat. It was a learning curve to create a chess engine,
-but is playable, and supports two players in a pass and play fashion. All of the
-material is available for use from the source files.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/alaskalinuxuser/app_JustChess.git
-
-Build:1.7,7
-    commit=1.7
-    subdir=app
-    gradle=yes
-
-Build:2.0,10
-    commit=2.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.0
-Current Version Code:10
diff --git a/metadata/com.alaskalinuxuser.justchess.yml b/metadata/com.alaskalinuxuser.justchess.yml
new file mode 100644
index 0000000000..a53b191995
--- /dev/null
+++ b/metadata/com.alaskalinuxuser.justchess.yml
@@ -0,0 +1,45 @@
+Categories:
+  - Games
+License: Apache-2.0
+SourceCode: https://gitlab.com/alaskalinuxuser/app_JustChess
+IssueTracker: https://gitlab.com/alaskalinuxuser/app_JustChess/issues
+
+AutoName: JustChess
+Summary: Chess for one or two players
+Description: |-
+    Play chess against a very simple author written chess engine, or against  a
+    friend in pass and play mode.
+
+    Simple features include:
+
+    * One or Two player
+    * Move suggestion
+    * Piece move highlighting
+    * A 3 ply open source chess engine written by the author
+
+    This game is not hard to beat. It was a learning curve to create a chess engine,
+    but is playable, and supports two players in a pass and play fashion. All of the
+    material is available for use from the source files.
+
+RepoType: git
+Repo: https://gitlab.com/alaskalinuxuser/app_JustChess.git
+
+Builds:
+  - versionName: '1.7'
+    versionCode: 7
+    commit: '1.7'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: '2.0'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '2.0'
+CurrentVersionCode: 10
diff --git a/metadata/com.alaskalinuxuser.justcraigslist.txt b/metadata/com.alaskalinuxuser.justcraigslist.txt
deleted file mode 100644
index 782cd1881c..0000000000
--- a/metadata/com.alaskalinuxuser.justcraigslist.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Categories:Internet,Money
-License:Apache-2.0
-Web Site:https://thealaskalinuxuser.wordpress.com
-Source Code:https://gitlab.com/alaskalinuxuser/app_justcraigslist
-Issue Tracker:https://gitlab.com/alaskalinuxuser/app_justcraigslist/issues
-
-Auto Name:Just Craigslist
-Summary:Search posts on Craigslist
-Description:
-Search [https://www.craigslist.org Craigslist] and save on bandwidth at the same
-time. The search is only text, which presents you with a list of your search
-criteria. Then, when you select a posting that you wish to see, it will be
-displayed as normal in a special web view window. With simple colors and
-controls, this helps you focus on what is really important: the posts!
-.
-
-Repo Type:git
-Repo:https://gitlab.com/alaskalinuxuser/app_justcraigslist
-
-Build:1.1,1
-    disable=pre-release constraint layout
-    commit=62664edf440cf0246854a10a1482da50665b57f4
-    subdir=app
-    gradle=yes
-
-Build:1.5,5
-    disable=pre-release constraint layout
-    commit=0904b9328c2198f54974c11191a6196b12480fed
-    subdir=app
-    gradle=yes
-
-Build:1.6,6
-    disable=pre-release constraint layout
-    commit=27badb5f7c9dd5a3a217e4f069e45930cc04f09c
-    subdir=app
-    gradle=yes
-
-Build:1.7,7
-    commit=8d133c08c9a75cdc7471dbcf906573e616dee310
-    subdir=app
-    gradle=yes
-
-Build:1.9,9
-    commit=137539ebb9b820cf9d57b22afb25838fdcb010ef
-    subdir=app
-    gradle=yes
-
-Build:2.0,10
-    commit=a5a55fb94e179c9c14afa7398793633c607b9fe2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.0
-Current Version Code:10
diff --git a/metadata/com.alaskalinuxuser.justcraigslist.yml b/metadata/com.alaskalinuxuser.justcraigslist.yml
new file mode 100644
index 0000000000..461ba4d4ac
--- /dev/null
+++ b/metadata/com.alaskalinuxuser.justcraigslist.yml
@@ -0,0 +1,70 @@
+Categories:
+  - Internet
+  - Money
+License: Apache-2.0
+WebSite: https://thealaskalinuxuser.wordpress.com
+SourceCode: https://gitlab.com/alaskalinuxuser/app_justcraigslist
+IssueTracker: https://gitlab.com/alaskalinuxuser/app_justcraigslist/issues
+
+AutoName: Just Craigslist
+Summary: Search posts on Craigslist
+Description: |-
+    Search [https://www.craigslist.org Craigslist] and save on bandwidth at the same
+    time. The search is only text, which presents you with a list of your search
+    criteria. Then, when you select a posting that you wish to see, it will be
+    displayed as normal in a special web view window. With simple colors and
+    controls, this helps you focus on what is really important: the posts!
+
+RepoType: git
+Repo: https://gitlab.com/alaskalinuxuser/app_justcraigslist
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 1
+    disable: pre-release constraint layout
+    commit: 62664edf440cf0246854a10a1482da50665b57f4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 5
+    disable: pre-release constraint layout
+    commit: 0904b9328c2198f54974c11191a6196b12480fed
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 6
+    disable: pre-release constraint layout
+    commit: 27badb5f7c9dd5a3a217e4f069e45930cc04f09c
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 7
+    commit: 8d133c08c9a75cdc7471dbcf906573e616dee310
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 9
+    commit: 137539ebb9b820cf9d57b22afb25838fdcb010ef
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: a5a55fb94e179c9c14afa7398793633c607b9fe2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '2.0'
+CurrentVersionCode: 10
diff --git a/metadata/com.alaskalinuxuser.justnotes.txt b/metadata/com.alaskalinuxuser.justnotes.txt
deleted file mode 100644
index 029af04849..0000000000
--- a/metadata/com.alaskalinuxuser.justnotes.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-Categories:Writing
-License:Apache-2.0
-Web Site:https://thealaskalinuxuser.wordpress.com/
-Source Code:https://gitlab.com/alaskalinuxuser/app_justnotes
-Issue Tracker:https://gitlab.com/alaskalinuxuser/app_justnotes/issues
-Changelog:https://gitlab.com/alaskalinuxuser/app_justnotes/tags
-
-Auto Name:Just Notes
-Summary:Take notes with import and export features
-Description:
-This is a no frills, simple, easy to use note taking application for those times
-that you just want to get straight to the point. Make and take notes, as well as
-save and delete old notes. A confirmation box will open before you delete a note
-to make sure that you really want to get rid of it.
-
-You can also change the colors of your notes, as well as import and export your
-notes as text files on your phone!
-
-If you are just starting out on app design, feel free to check out my "just"
-apps and "small" apps for easy to understand and usable code.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/alaskalinuxuser/app_justnotes
-
-Build:1.0,1
-    commit=26003a90a5c0e73f4adbd4fa89867f402cc226f6
-    subdir=app
-    gradle=yes
-
-Build:1.2,2
-    commit=70f9f147251aa93f40295bb31dc7250be5839445
-    subdir=app
-    gradle=yes
-
-Build:1.3,3
-    commit=f763a558930b7aca935f606142026ab216e571d4
-    subdir=app
-    gradle=yes
-
-Build:1.4,4
-    disable=pre-release constraint layout
-    commit=00cf7450512281f21e22f735ec530b22b8307090
-    subdir=app
-    gradle=yes
-
-Build:1.5,5
-    disable=pre-release constraint layout
-    commit=e4621d81c66be989435367742b920c191c4b18f9
-    subdir=app
-    gradle=yes
-
-Build:1.6,6
-    disable=pre-release constraint layout
-    commit=c45777996d5ba49af92789de82db4b68231a02bd
-    subdir=app
-    gradle=yes
-
-Build:1.7,7
-    commit=1a6ae5a1647fb49f13c691f9aee0c9de5dea1a28
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/constraint-layout/s/1.0.0-alpha9/1.0.2/g' build.gradle
-
-Build:1.9,9
-    commit=174c6f1ee661a902daba9d5a098d82c0cf228f85
-    subdir=app
-    gradle=yes
-
-Build:2.0,10
-    commit=2.0
-    subdir=app
-    gradle=yes
-
-Build:2.1,11
-    commit=2.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.1
-Current Version Code:11
diff --git a/metadata/com.alaskalinuxuser.justnotes.yml b/metadata/com.alaskalinuxuser.justnotes.yml
new file mode 100644
index 0000000000..659bbc892b
--- /dev/null
+++ b/metadata/com.alaskalinuxuser.justnotes.yml
@@ -0,0 +1,104 @@
+Categories:
+  - Writing
+License: Apache-2.0
+WebSite: https://thealaskalinuxuser.wordpress.com/
+SourceCode: https://gitlab.com/alaskalinuxuser/app_justnotes
+IssueTracker: https://gitlab.com/alaskalinuxuser/app_justnotes/issues
+Changelog: https://gitlab.com/alaskalinuxuser/app_justnotes/tags
+
+AutoName: Just Notes
+Summary: Take notes with import and export features
+Description: |-
+    This is a no frills, simple, easy to use note taking application for those times
+    that you just want to get straight to the point. Make and take notes, as well as
+    save and delete old notes. A confirmation box will open before you delete a note
+    to make sure that you really want to get rid of it.
+
+    You can also change the colors of your notes, as well as import and export your
+    notes as text files on your phone!
+
+    If you are just starting out on app design, feel free to check out my "just"
+    apps and "small" apps for easy to understand and usable code.
+
+RepoType: git
+Repo: https://gitlab.com/alaskalinuxuser/app_justnotes
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 26003a90a5c0e73f4adbd4fa89867f402cc226f6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 2
+    commit: 70f9f147251aa93f40295bb31dc7250be5839445
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 3
+    commit: f763a558930b7aca935f606142026ab216e571d4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 4
+    disable: pre-release constraint layout
+    commit: 00cf7450512281f21e22f735ec530b22b8307090
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 5
+    disable: pre-release constraint layout
+    commit: e4621d81c66be989435367742b920c191c4b18f9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 6
+    disable: pre-release constraint layout
+    commit: c45777996d5ba49af92789de82db4b68231a02bd
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 7
+    commit: 1a6ae5a1647fb49f13c691f9aee0c9de5dea1a28
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/constraint-layout/s/1.0.0-alpha9/1.0.2/g' build.gradle
+
+  - versionName: '1.9'
+    versionCode: 9
+    commit: 174c6f1ee661a902daba9d5a098d82c0cf228f85
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: '2.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.1'
+    versionCode: 11
+    commit: '2.1'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '2.1'
+CurrentVersionCode: 11