diff --git a/metadata/com.sevag.pitcha.txt b/metadata/com.sevag.pitcha.txt
deleted file mode 100644
index 56fd25a519..0000000000
--- a/metadata/com.sevag.pitcha.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/sevagh/Pitcha
-Issue Tracker:https://github.com/sevagh/Pitcha/issues
-
-Auto Name:Pitcha
-Summary:Pitch detector
-Description:
-'''Note:''' This app is no longer maintained.
-
-Pitch detector using the McLeod Pitch Method, adapted from
-[https://github.com/JorenSix/TarsosDSP TarsosDSP].
-.
-
-Repo Type:git
-Repo:https://github.com/sevagh/Pitcha
-
-Build:1.0,2
-    commit=f584e18f836618f057e4a6edee4c705c3f3287d0
-    subdir=app
-    gradle=yes
-
-Build:1.1,3
-    commit=6ed5e3c30442b0c7691fb0eb566dda87032d821a
-    subdir=app
-    gradle=yes
-
-Build:2.0,4
-    commit=a35c364670a205448eaaed87f297e1204080dcfa
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.0
-Current Version Code:4
diff --git a/metadata/com.sevag.pitcha.yml b/metadata/com.sevag.pitcha.yml
new file mode 100644
index 0000000000..26775ed275
--- /dev/null
+++ b/metadata/com.sevag.pitcha.yml
@@ -0,0 +1,41 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://github.com/sevagh/Pitcha
+
+AutoName: Pitcha
+Summary: Pitch detector
+Description: |-
+    '''Note:''' This app is no longer maintained.
+
+    Pitch detector using the McLeod Pitch Method, adapted from
+    [https://github.com/JorenSix/TarsosDSP TarsosDSP].
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 2
+    commit: f584e18f836618f057e4a6edee4c705c3f3287d0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 3
+    commit: 6ed5e3c30442b0c7691fb0eb566dda87032d821a
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 4
+    commit: a35c364670a205448eaaed87f297e1204080dcfa
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '2.0'
+CurrentVersionCode: 4
+
+NoSourceSince: '2.0'
diff --git a/metadata/com.sevag.unrealtracker.txt b/metadata/com.sevag.unrealtracker.txt
deleted file mode 100644
index 478222219e..0000000000
--- a/metadata/com.sevag.unrealtracker.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Categories:Reading
-License:MIT
-Web Site:
-Source Code:https://github.com/sevagh/UnrealTracker
-Issue Tracker:https://github.com/sevagh/UnrealTracker/issues
-
-Auto Name:Unreal Tracker
-Summary:Track UT and UE development
-Description:
-Displays the latest blog headlines, marketplace listings and commits of Unreal
-Engine 4 and Unreal Tournament development. There are a few different themes and
-data is refreshed when the app is reopened.
-.
-
-Repo Type:git
-Repo:https://github.com/sevagh/UnrealTracker
-
-Build:1.3,6
-    commit=5bf9b3e843d7a76dc8b8b908b72ccfcbad156766
-    subdir=app
-    gradle=yes
-    rm=app/libs/*.jar
-    prebuild=sed -i -e '/fileTree/acompile "org.jsoup:jsoup:1.8.1"' build.gradle
-
-Build:1.4,7
-    commit=076d1766a78268e72f834fafa45449f9af8673b1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.4
-Current Version Code:7
diff --git a/metadata/com.sevag.unrealtracker.yml b/metadata/com.sevag.unrealtracker.yml
new file mode 100644
index 0000000000..2cee04328a
--- /dev/null
+++ b/metadata/com.sevag.unrealtracker.yml
@@ -0,0 +1,36 @@
+Categories:
+  - Reading
+License: MIT
+SourceCode: https://github.com/sevagh/UnrealTracker
+
+AutoName: Unreal Tracker
+Summary: Track UT and UE development
+Description: |-
+    Displays the latest blog headlines, marketplace listings and commits of Unreal
+    Engine 4 and Unreal Tournament development. There are a few different themes and
+    data is refreshed when the app is reopened.
+
+Builds:
+  - versionName: '1.3'
+    versionCode: 6
+    commit: 5bf9b3e843d7a76dc8b8b908b72ccfcbad156766
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*.jar
+    prebuild: sed -i -e '/fileTree/acompile "org.jsoup:jsoup:1.8.1"' build.gradle
+
+  - versionName: '1.4'
+    versionCode: 7
+    commit: 076d1766a78268e72f834fafa45449f9af8673b1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '1.4'
+CurrentVersionCode: 7
+
+NoSourceSince: '1.4'
diff --git a/metadata/com.shadcat.secdroid.txt b/metadata/com.shadcat.secdroid.txt
deleted file mode 100644
index 88f2d87690..0000000000
--- a/metadata/com.shadcat.secdroid.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Categories:Security
-License:GPL-2.0-or-later
-Web Site:
-Source Code:https://github.com/x942/secdroid
-Issue Tracker:https://github.com/x942/secdroid/issues
-Changelog:https://github.com/x942/secdroid/wiki/Change-Log
-
-Auto Name:SecDroid
-Summary:Secure your device from attacks
-Description:
-'''Warning:''' This app cannot be uninstalled, changes cannot be reverted. Make
-a full backup first.
-
-SecDroid hardens the android kernel by disable certain binaries that have
-internet access or can be used as an attack vector and by securing the TCP Stack
-using Systctl. This helps prevent some MITM (Man-In-The-Middle) and Spoofing
-attacks. It may also prevent some DOS (Denial-Of-Service) Attacks.
-
-Disabled services include SSH, SSHD, Telnet NC (net cat), and Ping, to keep
-others from gaining access to your device via a remote terminal. SecDroid also
-disables Package Manager so that no apps can be installed remotely to your
-device (you can still install them from Market or using APK files directly on
-the device itself). Lastly, it also allows you to disable ADBD (the ADB service
-running on the device that allows you to connect to it through command line from
-a remote computer) until the next reboot.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/x942/secdroid.git
-
-Build:3,4
-    commit=6eb44e63d
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:3
-Current Version Code:4
diff --git a/metadata/com.shadcat.secdroid.yml b/metadata/com.shadcat.secdroid.yml
new file mode 100644
index 0000000000..0d7f8c55e0
--- /dev/null
+++ b/metadata/com.shadcat.secdroid.yml
@@ -0,0 +1,37 @@
+Categories:
+  - Security
+License: GPL-2.0-or-later
+SourceCode: https://github.com/x942/secdroid
+
+AutoName: SecDroid
+Summary: Secure your device from attacks
+Description: |-
+    '''Warning:''' This app cannot be uninstalled, changes cannot be reverted. Make
+    a full backup first.
+
+    SecDroid hardens the android kernel by disable certain binaries that have
+    internet access or can be used as an attack vector and by securing the TCP Stack
+    using Systctl. This helps prevent some MITM (Man-In-The-Middle) and Spoofing
+    attacks. It may also prevent some DOS (Denial-Of-Service) Attacks.
+
+    Disabled services include SSH, SSHD, Telnet NC (net cat), and Ping, to keep
+    others from gaining access to your device via a remote terminal. SecDroid also
+    disables Package Manager so that no apps can be installed remotely to your
+    device (you can still install them from Market or using APK files directly on
+    the device itself). Lastly, it also allows you to disable ADBD (the ADB service
+    running on the device that allows you to connect to it through command line from
+    a remote computer) until the next reboot.
+
+RequiresRoot: 'yes'
+
+Builds:
+  - versionName: '3'
+    versionCode: 4
+    commit: 6eb44e63d
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '3'
+CurrentVersionCode: 4
+
+NoSourceSince: '3'
diff --git a/metadata/com.shanewmiller.gorecompanion.txt b/metadata/com.shanewmiller.gorecompanion.txt
deleted file mode 100644
index e63ee5429d..0000000000
--- a/metadata/com.shanewmiller.gorecompanion.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Navigation
-License:MIT
-Web Site:
-Source Code:https://github.com/smiller393/GoreCompanion
-Issue Tracker:https://github.com/smiller393/GoreCompanion/issues
-
-Auto Name:Gore Companion
-Summary:Ski conditions for Gore Mountain
-Description:
-View trail, snow, and lift status of Gore Mountain in NY, USA.
-.
-
-Repo Type:git
-Repo:https://github.com/smiller393/GoreCompanion
-
-Build:1.0,3
-    commit=05f2f5e596db675223cc539a84dd8f973342578e
-    subdir=ProjectCode/GoreCompanionAndroid/GoreCompanion
-    srclibs=Google-Gson@1163
-    rm=ProjectCode/GoreCompanionAndroid/GoreCompanion/libs/*
-    extlibs=android/android-support-v4.jar
-    prebuild=cp -r $$Google-Gson$$/src/main/java/com/ src/
-
-Maintainer Notes:
-Source repo deleted.
-.
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:0
-Current Version Code:0
diff --git a/metadata/com.shanewmiller.gorecompanion.yml b/metadata/com.shanewmiller.gorecompanion.yml
new file mode 100644
index 0000000000..5503dec83e
--- /dev/null
+++ b/metadata/com.shanewmiller.gorecompanion.yml
@@ -0,0 +1,30 @@
+Categories:
+  - Navigation
+License: MIT
+SourceCode: https://github.com/smiller393/GoreCompanion
+
+AutoName: Gore Companion
+Summary: Ski conditions for Gore Mountain
+Description: View trail, snow, and lift status of Gore Mountain in NY, USA.
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 3
+    commit: 05f2f5e596db675223cc539a84dd8f973342578e
+    subdir: ProjectCode/GoreCompanionAndroid/GoreCompanion
+    srclibs:
+      - Google-Gson@1163
+    rm:
+      - ProjectCode/GoreCompanionAndroid/GoreCompanion/libs/*
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild: cp -r $$Google-Gson$$/src/main/java/com/ src/
+
+MaintainerNotes: Source repo deleted.
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '0'
+CurrentVersionCode: 0
+
+NoSourceSince: '1.0'
diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.txt b/metadata/com.shatteredpixel.shatteredpixeldungeon.txt
deleted file mode 100644
index 4f7684c542..0000000000
--- a/metadata/com.shatteredpixel.shatteredpixeldungeon.txt
+++ /dev/null
@@ -1,439 +0,0 @@
-Categories:Games
-License:GPL-3.0-or-later
-Web Site:http://shatteredpixel.tumblr.com
-Source Code:https://github.com/00-Evan/shattered-pixel-dungeon
-Issue Tracker:https://github.com/00-Evan/shattered-pixel-dungeon/issues
-Donate:https://www.patreon.com/ShatteredPixel
-
-Auto Name:Shattered Pixel Dungeon
-Summary:A roguelike game based on Pixel Dungeon
-Description:
-Traditional roguelike game with pixel-art graphics and simple interface. Based
-on [[com.watabou.pixeldungeon]].
-
-Every game is unique, with four different playable characters, randomized levels
-and enemies, and over 150 items to collect and use. The game is simple to get
-into, but has lots of depth. Strategy is required if you want to win!
-
-Shattered Pixel Dungeon includes:
-
-* High replayability: Randomly generated levels, enemies, and items. No two games are the same!
-* 4 hero classes: Warrior, Mage, Rogue, and Huntress. Each hero has a unique playstyle.
-* 8 subclasses: Successful heroes can refine their skills to become more powerful.
-* 5 distinct dungeon regions: each with their own enemies, traps, and quests.
-* Over 150 different items: including powerful wands, rings, weapons, and armor.
-* 50+ different enemies, 30 different traps, and 5 bosses to test your skills.
-* Unique artifacts, which grow in power as you use them.
-* Updates, with new content roughly once a month.
-.
-
-Repo Type:git
-Repo:https://github.com/00-Evan/shattered-pixel-dungeon
-
-Build:0.2.2a,14
-    commit=127c74696ade0be0c3824d9373f49b8d9b6e6179
-    srclibs=PDClasses-shattered@f2bf9c65809f50ffd372f7d5e3df181cf970f892
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.2b,15
-    commit=e58df1bc9ccb77fd3218775639650f75a5865172
-    srclibs=PDClasses-shattered@f2bf9c65809f50ffd372f7d5e3df181cf970f892
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.3a,27
-    commit=513b1213bcd7ef885c8d21980c3f4ac703fe035f
-    srclibs=PDClasses-shattered@0d890613f07b065d6f2f9b225ddf13564fdb128f
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.3c,29
-    commit=fd375b80e3a51c0811798bf34e58bc07383f3051
-    srclibs=PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.3d,30
-    commit=2119f0d1b904db819b48204edb149f32650fad13
-    srclibs=PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.3e,31
-    commit=520131fb2d3cae77a741c36cd3016121df76d0c4
-    srclibs=PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.3f,32
-    commit=11d550cbe0d4136c78574cec0bda6ddb8af2b6da
-    srclibs=PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.4b,35
-    commit=22d072f3e7e
-    srclibs=PDClasses-shattered@35fad7951a
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.4c,36
-    commit=60076db78c203f33b49be0f1f957af9821d9e306
-    srclibs=PDClasses-shattered@5c7c4238836ce468fc88f083b85a5d775877d988
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.2.4d,38
-    commit=45c92a66a9b61bea892deab7b79d18785496f967
-    srclibs=PDClasses-shattered@9dccea42ffbe25bb60866710a4e08e66b58c05fd
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.0c,44
-    commit=8c42ebda5e7cd2c223b59933980524d65d8ff7a0
-    srclibs=PDClasses-shattered@43a9126642b88bd41ea4db183bc04f75839bdca5
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.0d,45
-    commit=684c2caacb1775c98db4fb82306b5893a0c824a3
-    srclibs=PDClasses-shattered@43a9126642b88bd41ea4db183bc04f75839bdca5
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.0e,46
-    commit=f4898d903b6c837acea7d34cdacb903066bea724
-    srclibs=PDClasses-shattered@4aaeecf83ff10449614d43421258e3df236a5228
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.1a,55
-    commit=f531879f51d75d0447feb635d2d65c5f127b3c99
-    srclibs=PDClasses-shattered@77b0fbd58608b08b59e86869ebeeec0f7caf93b9
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.1c,57
-    commit=a9fa47b9422ca15e0a37479fa3341858963c8ade
-    srclibs=PDClasses-shattered@4e256b579e15fb099b4b83b608a3c78c65a4fb37
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.1d,59
-    commit=dab5499c223a1af25bac0ed89ecdb067b3fd0931
-    srclibs=PDClasses-shattered@4e256b579e15fb099b4b83b608a3c78c65a4fb37
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.2b,67
-    commit=44880cb44e098f182725300d1dfbf47337b77d21
-    srclibs=PDClasses-shattered@7acaef7924110c4b80a2b60fc883de2a8c21e927
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.3,72
-    commit=75e232a429ad03c10780aa0ca4b99900549f50fa
-    srclibs=PDClasses-shattered@1c4b560b05a0e8f5ee98b1e65b6270a7d125c3a8
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-19
-
-Build:0.3.3b,74
-    commit=v0.3.3b
-    srclibs=PDClasses-shattered@1c4b560b05a0e8f5ee98b1e65b6270a7d125c3a8
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
-    target=android-23
-
-Build:0.3.4b,92
-    commit=v0.3.4b
-    srclibs=PDClasses-shattered@52858380c095895440918ae455d5a1ce505027e3
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
-    target=android-23
-
-Build:0.3.4c,93
-    commit=v0.3.4c
-    srclibs=PDClasses-shattered@4342062c3f3948d7b6e8fb0d3bb1980b31e3c63e
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
-    target=android-23
-
-Build:0.3.5a,99
-    commit=v0.3.5a
-    srclibs=PDClasses-shattered@4df992d4b3115ab324f2c0d52aff746edd92787a
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
-    target=android-23
-
-Build:0.4.0,107
-    commit=v0.4.0
-    srclibs=PDClasses-shattered@abc43a3e3b4124972df51312d3dd7be2c1e10b6c
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
-    target=android-23
-
-Build:0.4.1a,118
-    commit=v0.4.1a
-    srclibs=PDClasses-shattered@48308cd26657e5f6eb0a79ab98b9d8bdcb52d0d3
-    prebuild=cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/ && \
-        echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
-    target=android-23
-
-Build:0.4.2a,127
-    commit=v0.4.2a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/x86/libFroyoGLES20Fix.so,SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so
-
-Build:0.4.2b,129
-    commit=v0.4.2b
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-
-Build:0.4.3,139
-    commit=0.4.3
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.4.3a,144
-    commit=v0.4.3a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.4.3c,148
-    commit=v0.4.3c
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.5.0a,158
-    commit=v0.5.0a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.5.0b,159
-    commit=v0.5.0b
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.0,181
-    commit=v0.6.0
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.0b,185
-    commit=v0.6.0b
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.1a,206
-    commit=v0.6.1a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.1b,209
-    commit=v0.6.1b
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.2a,224
-    disable=Could not find com.android.tools.build:gradle:3.0.0
-    commit=v0.6.2a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.2d,228
-    commit=v0.6.2d
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.2e,229
-    commit=v0.6.2e
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.3a,242
-    commit=v0.6.3a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.3b,245
-    commit=v0.6.3b
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.4,251
-    disable=Could not find com.android.tools.lint:lint-gradle:26.1.0
-    commit=v0.6.4
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.4a,252
-    commit=v0.6.4a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.5a,261
-    commit=v0.6.5a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.6.5c,264
-    commit=v0.6.5c
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.0a,305
-    commit=v0.7.0a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.0c,311
-    commit=v0.7.0c
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.1a,320
-    commit=v0.7.1a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.1b,321
-    commit=v0.7.1b
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.1c,322
-    commit=v0.7.1c
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.1d,323
-    commit=v0.7.1d
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.2a,335
-    commit=v0.7.2a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.2b,338
-    commit=v0.7.2b
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.2c,339
-    commit=v0.7.2c
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.2d,340
-    commit=v0.7.2d
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.3a,347
-    commit=v0.7.3a
-    subdir=core
-    gradle=yes
-    scandelete=SPD-classes/src/main/jniLibs/
-    preassemble=:SPD-classes:ndkBuild
-
-Build:0.7.4,356
-    commit=v0.7.4
-    subdir=core
-    gradle=yes
-
-Build:0.7.4c,362
-    commit=v0.7.4c
-    subdir=android
-    gradle=yes
-    scandelete=android/libs/*
-
-Build:0.7.4d,363
-    commit=v0.7.4d
-    subdir=android
-    gradle=yes
-    scandelete=android/libs/*
-
-Auto Update Mode:Version v%v
-Update Check Mode:HTTP
-Update Check Data:https://raw.githubusercontent.com/00-Evan/shattered-pixel-dungeon/master/build.gradle|appVersionCode = (.*)|.|appVersionName = ['"](.*)['"]
-Current Version:0.7.4d
-Current Version Code:363
diff --git a/metadata/com.shatteredpixel.shatteredpixeldungeon.yml b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
new file mode 100644
index 0000000000..0253e8cf96
--- /dev/null
+++ b/metadata/com.shatteredpixel.shatteredpixeldungeon.yml
@@ -0,0 +1,644 @@
+Categories:
+  - Games
+License: GPL-3.0-or-later
+WebSite: http://shatteredpixel.tumblr.com
+SourceCode: https://github.com/00-Evan/shattered-pixel-dungeon
+IssueTracker: https://github.com/00-Evan/shattered-pixel-dungeon/issues
+Donate: https://www.patreon.com/ShatteredPixel
+
+AutoName: Shattered Pixel Dungeon
+Summary: A roguelike game based on Pixel Dungeon
+Description: |-
+    Traditional roguelike game with pixel-art graphics and simple interface. Based
+    on [[com.watabou.pixeldungeon]].
+
+    Every game is unique, with four different playable characters, randomized levels
+    and enemies, and over 150 items to collect and use. The game is simple to get
+    into, but has lots of depth. Strategy is required if you want to win!
+
+    Shattered Pixel Dungeon includes:
+
+    * High replayability: Randomly generated levels, enemies, and items. No two games are the same!
+    * 4 hero classes: Warrior, Mage, Rogue, and Huntress. Each hero has a unique playstyle.
+    * 8 subclasses: Successful heroes can refine their skills to become more powerful.
+    * 5 distinct dungeon regions: each with their own enemies, traps, and quests.
+    * Over 150 different items: including powerful wands, rings, weapons, and armor.
+    * 50+ different enemies, 30 different traps, and 5 bosses to test your skills.
+    * Unique artifacts, which grow in power as you use them.
+    * Updates, with new content roughly once a month.
+
+RepoType: git
+Repo: https://github.com/00-Evan/shattered-pixel-dungeon
+
+Builds:
+  - versionName: 0.2.2a
+    versionCode: 14
+    commit: 127c74696ade0be0c3824d9373f49b8d9b6e6179
+    srclibs:
+      - PDClasses-shattered@f2bf9c65809f50ffd372f7d5e3df181cf970f892
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.2b
+    versionCode: 15
+    commit: e58df1bc9ccb77fd3218775639650f75a5865172
+    srclibs:
+      - PDClasses-shattered@f2bf9c65809f50ffd372f7d5e3df181cf970f892
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.3a
+    versionCode: 27
+    commit: 513b1213bcd7ef885c8d21980c3f4ac703fe035f
+    srclibs:
+      - PDClasses-shattered@0d890613f07b065d6f2f9b225ddf13564fdb128f
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.3c
+    versionCode: 29
+    commit: fd375b80e3a51c0811798bf34e58bc07383f3051
+    srclibs:
+      - PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.3d
+    versionCode: 30
+    commit: 2119f0d1b904db819b48204edb149f32650fad13
+    srclibs:
+      - PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.3e
+    versionCode: 31
+    commit: 520131fb2d3cae77a741c36cd3016121df76d0c4
+    srclibs:
+      - PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.3f
+    versionCode: 32
+    commit: 11d550cbe0d4136c78574cec0bda6ddb8af2b6da
+    srclibs:
+      - PDClasses-shattered@7c21c8107bd85e9c572c68018f1d7e2e2f941f50
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.4b
+    versionCode: 35
+    commit: 22d072f3e7e
+    srclibs:
+      - PDClasses-shattered@35fad7951a
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.4c
+    versionCode: 36
+    commit: 60076db78c203f33b49be0f1f957af9821d9e306
+    srclibs:
+      - PDClasses-shattered@5c7c4238836ce468fc88f083b85a5d775877d988
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.2.4d
+    versionCode: 38
+    commit: 45c92a66a9b61bea892deab7b79d18785496f967
+    srclibs:
+      - PDClasses-shattered@9dccea42ffbe25bb60866710a4e08e66b58c05fd
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.0c
+    versionCode: 44
+    commit: 8c42ebda5e7cd2c223b59933980524d65d8ff7a0
+    srclibs:
+      - PDClasses-shattered@43a9126642b88bd41ea4db183bc04f75839bdca5
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.0d
+    versionCode: 45
+    commit: 684c2caacb1775c98db4fb82306b5893a0c824a3
+    srclibs:
+      - PDClasses-shattered@43a9126642b88bd41ea4db183bc04f75839bdca5
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.0e
+    versionCode: 46
+    commit: f4898d903b6c837acea7d34cdacb903066bea724
+    srclibs:
+      - PDClasses-shattered@4aaeecf83ff10449614d43421258e3df236a5228
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.1a
+    versionCode: 55
+    commit: f531879f51d75d0447feb635d2d65c5f127b3c99
+    srclibs:
+      - PDClasses-shattered@77b0fbd58608b08b59e86869ebeeec0f7caf93b9
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.1c
+    versionCode: 57
+    commit: a9fa47b9422ca15e0a37479fa3341858963c8ade
+    srclibs:
+      - PDClasses-shattered@4e256b579e15fb099b4b83b608a3c78c65a4fb37
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.1d
+    versionCode: 59
+    commit: dab5499c223a1af25bac0ed89ecdb067b3fd0931
+    srclibs:
+      - PDClasses-shattered@4e256b579e15fb099b4b83b608a3c78c65a4fb37
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.2b
+    versionCode: 67
+    commit: 44880cb44e098f182725300d1dfbf47337b77d21
+    srclibs:
+      - PDClasses-shattered@7acaef7924110c4b80a2b60fc883de2a8c21e927
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.3
+    versionCode: 72
+    commit: 75e232a429ad03c10780aa0ca4b99900549f50fa
+    srclibs:
+      - PDClasses-shattered@1c4b560b05a0e8f5ee98b1e65b6270a7d125c3a8
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-19
+
+  - versionName: 0.3.3b
+    versionCode: 74
+    commit: v0.3.3b
+    srclibs:
+      - PDClasses-shattered@1c4b560b05a0e8f5ee98b1e65b6270a7d125c3a8
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7\njava.encoding=ISO-8859-1' >> ant.properties
+    target: android-23
+
+  - versionName: 0.3.4b
+    versionCode: 92
+    commit: v0.3.4b
+    srclibs:
+      - PDClasses-shattered@52858380c095895440918ae455d5a1ce505027e3
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
+    target: android-23
+
+  - versionName: 0.3.4c
+    versionCode: 93
+    commit: v0.3.4c
+    srclibs:
+      - PDClasses-shattered@4342062c3f3948d7b6e8fb0d3bb1980b31e3c63e
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
+    target: android-23
+
+  - versionName: 0.3.5a
+    versionCode: 99
+    commit: v0.3.5a
+    srclibs:
+      - PDClasses-shattered@4df992d4b3115ab324f2c0d52aff746edd92787a
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
+    target: android-23
+
+  - versionName: 0.4.0
+    versionCode: 107
+    commit: v0.4.0
+    srclibs:
+      - PDClasses-shattered@abc43a3e3b4124972df51312d3dd7be2c1e10b6c
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
+    target: android-23
+
+  - versionName: 0.4.1a
+    versionCode: 118
+    commit: v0.4.1a
+    srclibs:
+      - PDClasses-shattered@48308cd26657e5f6eb0a79ab98b9d8bdcb52d0d3
+    prebuild:
+      - cp -R $$PDClasses-shattered$$/com/watabou/* src/com/shatteredpixel/
+      - echo -e 'java.source=1.7\njava.target=1.7' >> ant.properties
+    target: android-23
+
+  - versionName: 0.4.2a
+    versionCode: 127
+    commit: v0.4.2a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/x86/libFroyoGLES20Fix.so
+      - SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so
+
+  - versionName: 0.4.2b
+    versionCode: 129
+    commit: v0.4.2b
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+
+  - versionName: 0.4.3
+    versionCode: 139
+    commit: 0.4.3
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.4.3a
+    versionCode: 144
+    commit: v0.4.3a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.4.3c
+    versionCode: 148
+    commit: v0.4.3c
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.5.0a
+    versionCode: 158
+    commit: v0.5.0a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.5.0b
+    versionCode: 159
+    commit: v0.5.0b
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.0
+    versionCode: 181
+    commit: v0.6.0
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.0b
+    versionCode: 185
+    commit: v0.6.0b
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.1a
+    versionCode: 206
+    commit: v0.6.1a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.1b
+    versionCode: 209
+    commit: v0.6.1b
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.2a
+    versionCode: 224
+    disable: Could not find com.android.tools.build:gradle:3.0.0
+    commit: v0.6.2a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.2d
+    versionCode: 228
+    commit: v0.6.2d
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.2e
+    versionCode: 229
+    commit: v0.6.2e
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.3a
+    versionCode: 242
+    commit: v0.6.3a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.3b
+    versionCode: 245
+    commit: v0.6.3b
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.4
+    versionCode: 251
+    disable: Could not find com.android.tools.lint:lint-gradle:26.1.0
+    commit: v0.6.4
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.4a
+    versionCode: 252
+    commit: v0.6.4a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.5a
+    versionCode: 261
+    commit: v0.6.5a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.6.5c
+    versionCode: 264
+    commit: v0.6.5c
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.0a
+    versionCode: 305
+    commit: v0.7.0a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.0c
+    versionCode: 311
+    commit: v0.7.0c
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.1a
+    versionCode: 320
+    commit: v0.7.1a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.1b
+    versionCode: 321
+    commit: v0.7.1b
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.1c
+    versionCode: 322
+    commit: v0.7.1c
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.1d
+    versionCode: 323
+    commit: v0.7.1d
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.2a
+    versionCode: 335
+    commit: v0.7.2a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.2b
+    versionCode: 338
+    commit: v0.7.2b
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.2c
+    versionCode: 339
+    commit: v0.7.2c
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.2d
+    versionCode: 340
+    commit: v0.7.2d
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.3a
+    versionCode: 347
+    commit: v0.7.3a
+    subdir: core
+    gradle:
+      - yes
+    scandelete:
+      - SPD-classes/src/main/jniLibs/
+    preassemble:
+      - :SPD-classes:ndkBuild
+
+  - versionName: 0.7.4
+    versionCode: 356
+    commit: v0.7.4
+    subdir: core
+    gradle:
+      - yes
+
+  - versionName: 0.7.4c
+    versionCode: 362
+    commit: v0.7.4c
+    subdir: android
+    gradle:
+      - yes
+    scandelete:
+      - android/libs/*
+
+  - versionName: 0.7.4d
+    versionCode: 363
+    commit: v0.7.4d
+    subdir: android
+    gradle:
+      - yes
+    scandelete:
+      - android/libs/*
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: HTTP
+UpdateCheckData: https://raw.githubusercontent.com/00-Evan/shattered-pixel-dungeon/master/build.gradle|appVersionCode
+    = (.*)|.|appVersionName = ['"](.*)['"]
+CurrentVersion: 0.7.4d
+CurrentVersionCode: 363
diff --git a/metadata/com.shkmishra.lyrically.txt b/metadata/com.shkmishra.lyrically.txt
deleted file mode 100644
index c0ad6d73b6..0000000000
--- a/metadata/com.shkmishra.lyrically.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-Categories:Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/shkcodes/Lyrically
-Issue Tracker:https://github.com/shkcodes/Lyrically/issues
-Changelog:https://github.com/shkcodes/Lyrically/releases
-
-Auto Name:Lyrically
-Summary:A lyrics app which works everywhere
-Description:
-An everywhere lyrics app which can be used by simply swiping a part of your
-screen. See the lyrics without interrupting what you're doing.
-
-Supported Apps include:
-
-* Google Play Music
-* Spotify
-* Phonograph
-* Shuttle
-* Poweramp
-* BlackPlayer
-* Rocket Player
-.
-
-Repo Type:git
-Repo:https://github.com/shkcodes/Lyrically
-
-Build:0.11,2
-    commit=0.11
-    subdir=app
-    gradle=yes
-
-Build:0.2,3
-    disable=resource issue
-    commit=0.2
-    subdir=app
-    gradle=yes
-
-Build:0.22,6
-    commit=0.22
-    subdir=app
-    gradle=yes
-
-Build:0.3,7
-    commit=0.3
-    subdir=app
-    gradle=yes
-
-Build:0.31,8
-    commit=0.31
-    subdir=app
-    gradle=yes
-
-Build:0.4,9
-    disable=resource issue
-    commit=0.4
-    subdir=app
-    gradle=yes
-
-Build:0.42,11
-    commit=0.42
-    subdir=app
-    gradle=yes
-
-Build:0.5,12
-    commit=0.5
-    subdir=app
-    gradle=yes
-
-Build:0.51,13
-    commit=0.51
-    subdir=app
-    gradle=yes
-
-Build:0.52,14
-    commit=0.52
-    subdir=app
-    gradle=yes
-
-Build:0.53,15
-    commit=0.53
-    subdir=app
-    gradle=yes
-
-Build:0.54,16
-    commit=0.54
-    subdir=app
-    gradle=yes
-
-Build:0.55,17
-    commit=0.55
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.55
-Current Version Code:17
diff --git a/metadata/com.shkmishra.lyrically.yml b/metadata/com.shkmishra.lyrically.yml
new file mode 100644
index 0000000000..08eeda96a1
--- /dev/null
+++ b/metadata/com.shkmishra.lyrically.yml
@@ -0,0 +1,124 @@
+Categories:
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/shkcodes/Lyrically
+IssueTracker: https://github.com/shkcodes/Lyrically/issues
+Changelog: https://github.com/shkcodes/Lyrically/releases
+
+AutoName: Lyrically
+Summary: A lyrics app which works everywhere
+Description: |-
+    An everywhere lyrics app which can be used by simply swiping a part of your
+    screen. See the lyrics without interrupting what you're doing.
+
+    Supported Apps include:
+
+    * Google Play Music
+    * Spotify
+    * Phonograph
+    * Shuttle
+    * Poweramp
+    * BlackPlayer
+    * Rocket Player
+
+RepoType: git
+Repo: https://github.com/shkcodes/Lyrically
+
+Builds:
+  - versionName: '0.11'
+    versionCode: 2
+    commit: '0.11'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.2'
+    versionCode: 3
+    disable: resource issue
+    commit: '0.2'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.22'
+    versionCode: 6
+    commit: '0.22'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.3'
+    versionCode: 7
+    commit: '0.3'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.31'
+    versionCode: 8
+    commit: '0.31'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.4'
+    versionCode: 9
+    disable: resource issue
+    commit: '0.4'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.42'
+    versionCode: 11
+    commit: '0.42'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.5'
+    versionCode: 12
+    commit: '0.5'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.51'
+    versionCode: 13
+    commit: '0.51'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.52'
+    versionCode: 14
+    commit: '0.52'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.53'
+    versionCode: 15
+    commit: '0.53'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.54'
+    versionCode: 16
+    commit: '0.54'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.55'
+    versionCode: 17
+    commit: '0.55'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '0.55'
+CurrentVersionCode: 17
diff --git a/metadata/com.simplemobiletools.applauncher.txt b/metadata/com.simplemobiletools.applauncher.txt
deleted file mode 100644
index 930ae01cf8..0000000000
--- a/metadata/com.simplemobiletools.applauncher.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-Categories:System
-License:Apache-2.0
-Author Name:Tibor Kaputa
-Author Email:hello@simplemobiletools.com
-Web Site:https://simplemobiletools.com
-Source Code:https://github.com/SimpleMobileTools/Simple-App-Launcher
-Issue Tracker:https://github.com/SimpleMobileTools/Simple-App-Launcher/issues
-Changelog:https://github.com/SimpleMobileTools/Simple-App-Launcher/blob/HEAD/CHANGELOG.md
-Donate:https://simplemobiletools.com/donate
-Bitcoin:19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
-Litecoin:LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
-
-Auto Name:App Launcher
-
-Repo Type:git
-Repo:https://github.com/SimpleMobileTools/Simple-App-Launcher
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.3,3
-    commit=1.3
-    subdir=app
-    gradle=yes
-
-Build:1.4,4
-    commit=1.4
-    subdir=app
-    gradle=yes
-
-Build:1.5,5
-    commit=1.5
-    subdir=app
-    gradle=yes
-
-Build:1.6,6
-    commit=1.6
-    subdir=app
-    gradle=yes
-
-Build:2.0.0,7
-    disable=Could not find com.android.tools.build:gradle:3.0.0
-    commit=2.0.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.0,8
-    commit=3.0.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.1,9
-    commit=3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.0,10
-    commit=3.1.0
-    subdir=app
-    gradle=yes
-
-Build:3.1.1,11
-    commit=3.1.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.2,12
-    commit=3.1.2
-    subdir=app
-    gradle=yes
-
-Build:4.0.0,13
-    commit=4.0.0
-    subdir=app
-    gradle=yes
-
-Build:4.1.0,14
-    commit=4.1.0
-    subdir=app
-    gradle=yes
-
-Build:4.1.1,15
-    commit=4.1.1
-    subdir=app
-    gradle=yes
-
-Build:5.0.0,16
-    disable=ProGuard fails
-    commit=5.0.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.1,17
-    commit=5.0.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle && \
-        echo "android.enableJetifier=true" >> gradle.properties && \
-        echo "android.useAndroidX=true" >> gradle.properties
-
-Build:5.0.2,18
-    commit=5.0.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle && \
-        echo "android.enableJetifier=true" >> gradle.properties && \
-        echo "android.useAndroidX=true" >> gradle.properties
-
-Build:5.0.3,19
-    commit=5.0.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle && \
-        echo "android.enableJetifier=true" >> gradle.properties && \
-        echo "android.useAndroidX=true" >> gradle.properties
-
-Build:5.0.4,20
-    commit=5.0.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle && \
-        echo "android.enableJetifier=true" >> gradle.properties && \
-        echo "android.useAndroidX=true" >> gradle.properties
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:5.0.4
-Current Version Code:20
diff --git a/metadata/com.simplemobiletools.applauncher.yml b/metadata/com.simplemobiletools.applauncher.yml
new file mode 100644
index 0000000000..c402b16df4
--- /dev/null
+++ b/metadata/com.simplemobiletools.applauncher.yml
@@ -0,0 +1,174 @@
+Categories:
+  - System
+License: Apache-2.0
+AuthorName: Tibor Kaputa
+AuthorEmail: hello@simplemobiletools.com
+WebSite: https://simplemobiletools.com
+SourceCode: https://github.com/SimpleMobileTools/Simple-App-Launcher
+IssueTracker: https://github.com/SimpleMobileTools/Simple-App-Launcher/issues
+Changelog: https://github.com/SimpleMobileTools/Simple-App-Launcher/blob/HEAD/CHANGELOG.md
+Donate: https://simplemobiletools.com/donate
+Bitcoin: 19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
+Litecoin: LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
+
+AutoName: App Launcher
+
+RepoType: git
+Repo: https://github.com/SimpleMobileTools/Simple-App-Launcher
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 3
+    commit: '1.3'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 4
+    commit: '1.4'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 5
+    commit: '1.5'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.6'
+    versionCode: 6
+    commit: '1.6'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.0
+    versionCode: 7
+    disable: Could not find com.android.tools.build:gradle:3.0.0
+    commit: 2.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.0
+    versionCode: 8
+    commit: 3.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 9
+    commit: 3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.0
+    versionCode: 10
+    commit: 3.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.1
+    versionCode: 11
+    commit: 3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.2
+    versionCode: 12
+    commit: 3.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.0
+    versionCode: 13
+    commit: 4.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.0
+    versionCode: 14
+    commit: 4.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.1
+    versionCode: 15
+    commit: 4.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.0
+    versionCode: 16
+    disable: ProGuard fails
+    commit: 5.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.1
+    versionCode: 17
+    commit: 5.0.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/keystore/d' build.gradle
+      - echo "android.enableJetifier=true" >> gradle.properties
+      - echo "android.useAndroidX=true" >> gradle.properties
+
+  - versionName: 5.0.2
+    versionCode: 18
+    commit: 5.0.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/keystore/d' build.gradle
+      - echo "android.enableJetifier=true" >> gradle.properties
+      - echo "android.useAndroidX=true" >> gradle.properties
+
+  - versionName: 5.0.3
+    versionCode: 19
+    commit: 5.0.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/keystore/d' build.gradle
+      - echo "android.enableJetifier=true" >> gradle.properties
+      - echo "android.useAndroidX=true" >> gradle.properties
+
+  - versionName: 5.0.4
+    versionCode: 20
+    commit: 5.0.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/keystore/d' build.gradle
+      - echo "android.enableJetifier=true" >> gradle.properties
+      - echo "android.useAndroidX=true" >> gradle.properties
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 5.0.4
+CurrentVersionCode: 20
diff --git a/metadata/com.simplemobiletools.calculator.txt b/metadata/com.simplemobiletools.calculator.txt
deleted file mode 100644
index 4348eb6791..0000000000
--- a/metadata/com.simplemobiletools.calculator.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-Categories:System
-License:Apache-2.0
-Author Name:Tibor Kaputa
-Author Email:hello@simplemobiletools.com
-Web Site:https://simplemobiletools.com
-Source Code:https://github.com/SimpleMobileTools/Simple-Calculator
-Issue Tracker:https://github.com/SimpleMobileTools/Simple-Calculator/issues
-Changelog:https://github.com/SimpleMobileTools/Simple-Calculator/blob/HEAD/CHANGELOG.md
-Donate:https://simplemobiletools.com/donate
-Bitcoin:19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
-Litecoin:LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
-
-Auto Name:Calculator
-
-Repo Type:git
-Repo:https://github.com/SimpleMobileTools/Simple-Calculator
-
-Build:1.6,6
-    commit=3baa0952abb9dd6b14aaa8540d3209de2bc4a68e
-    subdir=app
-    gradle=yes
-
-Build:1.7,7
-    commit=1.7
-    subdir=app
-    gradle=yes
-
-Build:1.8,8
-    commit=1.8
-    subdir=app
-    gradle=yes
-
-Build:1.9,9
-    commit=1.9
-    subdir=app
-    gradle=yes
-
-Build:1.10,10
-    commit=1.10
-    subdir=app
-    gradle=yes
-
-Build:1.12,12
-    commit=1.12
-    subdir=app
-    gradle=yes
-
-Build:2.0.0,13
-    commit=2.0.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.1,15
-    commit=3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.0,16
-    commit=3.1.0
-    subdir=app
-    gradle=yes
-
-Build:3.1.1,17
-    commit=3.1.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.2,18
-    commit=3.1.2
-    subdir=app
-    gradle=yes
-
-Build:3.2.0,19
-    commit=3.2.0
-    subdir=app
-    gradle=yes
-
-Build:4.0.0,20
-    commit=4.0.0
-    subdir=app
-    gradle=yes
-
-Build:4.1.0,21
-    commit=4.1.0
-    subdir=app
-    gradle=yes
-
-Build:4.2.0,22
-    commit=4.2.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.0,23
-    commit=5.0.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.2,25
-    commit=5.0.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Build:5.0.3,26
-    commit=5.0.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Build:5.0.5,28
-    commit=5.0.5
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:5.0.5
-Current Version Code:28
diff --git a/metadata/com.simplemobiletools.calculator.yml b/metadata/com.simplemobiletools.calculator.yml
new file mode 100644
index 0000000000..428f598dfc
--- /dev/null
+++ b/metadata/com.simplemobiletools.calculator.yml
@@ -0,0 +1,159 @@
+Categories:
+  - System
+License: Apache-2.0
+AuthorName: Tibor Kaputa
+AuthorEmail: hello@simplemobiletools.com
+WebSite: https://simplemobiletools.com
+SourceCode: https://github.com/SimpleMobileTools/Simple-Calculator
+IssueTracker: https://github.com/SimpleMobileTools/Simple-Calculator/issues
+Changelog: https://github.com/SimpleMobileTools/Simple-Calculator/blob/HEAD/CHANGELOG.md
+Donate: https://simplemobiletools.com/donate
+Bitcoin: 19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
+Litecoin: LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
+
+AutoName: Calculator
+
+RepoType: git
+Repo: https://github.com/SimpleMobileTools/Simple-Calculator
+
+Builds:
+  - versionName: '1.6'
+    versionCode: 6
+    commit: 3baa0952abb9dd6b14aaa8540d3209de2bc4a68e
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 7
+    commit: '1.7'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 8
+    commit: '1.8'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 9
+    commit: '1.9'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 10
+    commit: '1.10'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 12
+    commit: '1.12'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.0
+    versionCode: 13
+    commit: 2.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 15
+    commit: 3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.0
+    versionCode: 16
+    commit: 3.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.1
+    versionCode: 17
+    commit: 3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.2
+    versionCode: 18
+    commit: 3.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.0
+    versionCode: 19
+    commit: 3.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.0
+    versionCode: 20
+    commit: 4.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.0
+    versionCode: 21
+    commit: 4.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.0
+    versionCode: 22
+    commit: 4.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.0
+    versionCode: 23
+    commit: 5.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.2
+    versionCode: 25
+    commit: 5.0.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+  - versionName: 5.0.3
+    versionCode: 26
+    commit: 5.0.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+  - versionName: 5.0.5
+    versionCode: 28
+    commit: 5.0.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 5.0.5
+CurrentVersionCode: 28
diff --git a/metadata/com.simplemobiletools.calendar.txt b/metadata/com.simplemobiletools.calendar.txt
deleted file mode 100644
index db40636052..0000000000
--- a/metadata/com.simplemobiletools.calendar.txt
+++ /dev/null
@@ -1,532 +0,0 @@
-Categories:System
-License:Apache-2.0
-Author Name:Tibor Kaputa
-Author Email:hello@simplemobiletools.com
-Web Site:https://simplemobiletools.com
-Source Code:https://github.com/SimpleMobileTools/Simple-Calendar
-Issue Tracker:https://github.com/SimpleMobileTools/Simple-Calendar/issues
-Changelog:https://github.com/SimpleMobileTools/Simple-Calendar/blob/HEAD/CHANGELOG.md
-Donate:https://simplemobiletools.com/donate
-Bitcoin:19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
-Litecoin:LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
-
-Auto Name:Calendar
-Description:
-'''NOTE''': Starting with version 6.0 this app is no longer developed and was
-replaced by [[com.simplemobiletools.calendar.pro]]. You are encouraged to
-uninstall this one and install the new one.
-
-To learn more about this change you can read
-[https://medium.com/@tibbi/some-simple-mobile-tools-apps-are-becoming-paid-d053268f0fb2
-here]
-.
-
-Repo Type:git
-Repo:https://github.com/SimpleMobileTools/Simple-Calendar
-
-Build:1.6,7
-    commit=7c920510354f9ce7a3e6ddc13b39960b50d09811
-    subdir=app
-    gradle=yes
-
-Build:1.8,8
-    commit=1.8
-    subdir=app
-    gradle=yes
-
-Build:1.9,9
-    commit=1.9
-    subdir=app
-    gradle=yes
-
-Build:1.11,11
-    commit=1.11
-    subdir=app
-    gradle=yes
-
-Build:1.12,12
-    commit=1.12
-    subdir=app
-    gradle=yes
-
-Build:1.14,14
-    commit=1.14
-    subdir=app
-    gradle=yes
-
-Build:1.15,15
-    commit=1.15
-    subdir=app
-    gradle=yes
-
-Build:1.16,16
-    commit=1.16
-    subdir=app
-    gradle=yes
-
-Build:1.17,17
-    commit=1.17
-    subdir=app
-    gradle=yes
-
-Build:1.18,18
-    commit=1.18
-    subdir=app
-    gradle=yes
-
-Build:1.19,19
-    commit=1.19
-    subdir=app
-    gradle=yes
-
-Build:1.20,20
-    commit=1.20
-    subdir=app
-    gradle=yes
-
-Build:1.21,21
-    commit=1.21
-    subdir=app
-    gradle=yes
-
-Build:1.22,22
-    commit=1.22
-    subdir=app
-    gradle=yes
-
-Build:1.23,23
-    commit=1.23
-    subdir=app
-    gradle=yes
-
-Build:1.24,24
-    commit=1.24
-    subdir=app
-    gradle=yes
-
-Build:1.25,25
-    commit=1.25
-    subdir=app
-    gradle=yes
-
-Build:1.26,26
-    commit=1.26
-    subdir=app
-    gradle=yes
-
-Build:1.27,27
-    commit=1.27
-    subdir=app
-    gradle=yes
-
-Build:1.28,28
-    commit=1.28
-    subdir=app
-    gradle=yes
-
-Build:1.31,31
-    commit=1.31
-    subdir=app
-    gradle=yes
-
-Build:1.32,32
-    commit=1.32
-    subdir=app
-    gradle=yes
-
-Build:1.33,33
-    commit=1.33
-    subdir=app
-    gradle=yes
-
-Build:1.34,34
-    commit=1.34
-    subdir=app
-    gradle=yes
-
-Build:1.36,36
-    commit=1.36
-    subdir=app
-    gradle=yes
-
-Build:1.37,37
-    commit=1.37
-    subdir=app
-    gradle=yes
-
-Build:1.39,39
-    commit=1.39
-    subdir=app
-    gradle=yes
-
-Build:1.40,40
-    commit=1.40
-    subdir=app
-    gradle=yes
-
-Build:1.41,41
-    commit=1.41
-    subdir=app
-    gradle=yes
-
-Build:1.42,42
-    commit=1.42
-    subdir=app
-    gradle=yes
-
-Build:2.0.0,44
-    commit=2.0.0
-    subdir=app
-    gradle=yes
-
-Build:2.0.2,46
-    commit=2.0.2
-    subdir=app
-    gradle=yes
-
-Build:2.0.3,47
-    commit=2.0.3
-    subdir=app
-    gradle=yes
-
-Build:2.1.0,48
-    commit=2.1.0
-    subdir=app
-    gradle=yes
-
-Build:2.1.1,49
-    commit=2.1.1
-    subdir=app
-    gradle=yes
-
-Build:2.1.2,50
-    commit=2.1.2
-    subdir=app
-    gradle=yes
-
-Build:2.1.3,51
-    commit=2.1.3
-    subdir=app
-    gradle=yes
-
-Build:2.1.4,52
-    disable=play
-    commit=2.1.4
-    subdir=app
-    gradle=yes
-
-Build:2.1.6,54
-    disable=play
-    commit=2.1.6
-    subdir=app
-    gradle=yes
-
-Build:2.1.8,56
-    disable=play
-    commit=2.1.8
-    subdir=app
-    gradle=yes
-
-Build:2.1.9,57
-    commit=2.1.9
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.1.10,58
-    commit=2.1.10
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.2.0,59
-    commit=2.2.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.2.1,60
-    commit=2.2.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.2.2,61
-    commit=2.2.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.2.4,63
-    commit=2.2.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.2.6,65
-    commit=2.2.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.2.7,66
-    commit=2.2.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.3.1,68
-    commit=2.3.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.3.3,70
-    commit=2.3.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.3.4,71
-    commit=2.3.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.4.2,75
-    commit=2.4.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.4.3,76
-    commit=2.4.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.5.0,77
-    commit=2.5.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.5.1,78
-    commit=2.5.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.5.2,79
-    commit=2.5.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.5.3,80
-    commit=2.5.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.5.6,83
-    commit=2.5.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.5.7,84
-    commit=2.5.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
-
-Build:2.6.1,87
-    disable=links against com.google.android.gms:play-services-auth
-    commit=2.6.1
-    subdir=app
-    gradle=yes
-
-Build:2.7.4,92
-    commit=2.7.4
-    subdir=app
-    gradle=yes
-
-Build:2.7.5,93
-    commit=2.7.5
-    subdir=app
-    gradle=yes
-
-Build:2.7.6,94
-    commit=2.7.6
-    subdir=app
-    gradle=yes
-
-Build:2.8.1,96
-    commit=2.8.1
-    subdir=app
-    gradle=yes
-
-Build:2.8.2,97
-    commit=2.8.2
-    subdir=app
-    gradle=yes
-
-Build:2.9.0,98
-    commit=2.9.0
-    subdir=app
-    gradle=yes
-
-Build:2.9.1,99
-    commit=2.9.1
-    subdir=app
-    gradle=yes
-
-Build:2.9.2,100
-    commit=2.9.2
-    subdir=app
-    gradle=yes
-
-Build:2.10.1,102
-    disable=Could not find com.android.tools.build:gradle:3.0.0
-    commit=2.10.1
-    subdir=app
-    gradle=yes
-
-Build:2.11.0,103
-    disable=Could not find com.android.tools.build:gradle:3.0.0
-    commit=2.11.0
-    subdir=app
-    gradle=yes
-
-Build:2.12.0,104
-    commit=2.12.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.1,106
-    commit=3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.0,107
-    commit=3.1.0
-    subdir=app
-    gradle=yes
-
-Build:3.2.1,109
-    commit=3.2.1
-    subdir=app
-    gradle=yes
-
-Build:3.2.2,110
-    commit=3.2.2
-    subdir=app
-    gradle=yes
-
-Build:3.2.3,111
-    commit=3.2.3
-    subdir=app
-    gradle=yes
-
-Build:3.2.4,112
-    commit=3.2.4
-    subdir=app
-    gradle=yes
-
-Build:3.3.0,113
-    commit=3.3.0
-    subdir=app
-    gradle=yes
-
-Build:3.3.2,115
-    commit=3.3.2
-    subdir=app
-    gradle=yes
-
-Build:3.4.0,116
-    commit=3.4.0
-    subdir=app
-    gradle=yes
-
-Build:3.4.1,117
-    commit=3.4.1
-    subdir=app
-    gradle=yes
-
-Build:3.4.2,118
-    commit=3.4.2
-    subdir=app
-    gradle=yes
-
-Build:4.0.0,119
-    commit=4.0.0
-    subdir=app
-    gradle=yes
-
-Build:4.0.3,122
-    commit=4.0.3
-    subdir=app
-    gradle=yes
-
-Build:4.0.4,123
-    commit=4.0.4
-    subdir=app
-    gradle=yes
-
-Build:4.1.0,124
-    commit=4.1.0
-    subdir=app
-    gradle=yes
-
-Build:4.1.1,125
-    commit=4.1.1
-    subdir=app
-    gradle=yes
-
-Build:4.1.2,126
-    commit=4.1.2
-    subdir=app
-    gradle=yes
-
-Build:4.1.3,127
-    commit=4.1.3
-    subdir=app
-    gradle=yes
-
-Build:4.2.0,128
-    commit=4.2.0
-    subdir=app
-    gradle=yes
-
-Build:4.2.1,129
-    commit=4.2.1
-    subdir=app
-    gradle=yes
-
-Build:5.0.1,131
-    disable=DayFragmentsHolder.kt: (53, 23): Type mismatch
-    commit=5.0.1
-    subdir=app
-    gradle=yes
-
-Build:5.1.0,132
-    commit=5.1.0
-    subdir=app
-    gradle=yes
-
-Build:5.1.1,133
-    commit=5.1.1
-    subdir=app
-    gradle=yes
-
-Build:5.1.2,134
-    commit=5.1.2
-    subdir=app
-    gradle=yes
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:5.1.2
-Current Version Code:134
diff --git a/metadata/com.simplemobiletools.calendar.yml b/metadata/com.simplemobiletools.calendar.yml
new file mode 100644
index 0000000000..d43b6ab387
--- /dev/null
+++ b/metadata/com.simplemobiletools.calendar.yml
@@ -0,0 +1,723 @@
+Categories:
+  - System
+License: Apache-2.0
+AuthorName: Tibor Kaputa
+AuthorEmail: hello@simplemobiletools.com
+WebSite: https://simplemobiletools.com
+SourceCode: https://github.com/SimpleMobileTools/Simple-Calendar
+IssueTracker: https://github.com/SimpleMobileTools/Simple-Calendar/issues
+Changelog: https://github.com/SimpleMobileTools/Simple-Calendar/blob/HEAD/CHANGELOG.md
+Donate: https://simplemobiletools.com/donate
+Bitcoin: 19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
+Litecoin: LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
+
+AutoName: Calendar
+Description: |-
+    '''NOTE''': Starting with version 6.0 this app is no longer developed and was
+    replaced by [[com.simplemobiletools.calendar.pro]]. You are encouraged to
+    uninstall this one and install the new one.
+
+    To learn more about this change you can read
+    [https://medium.com/@tibbi/some-simple-mobile-tools-apps-are-becoming-paid-d053268f0fb2
+    here]
+
+RepoType: git
+Repo: https://github.com/SimpleMobileTools/Simple-Calendar
+
+Builds:
+  - versionName: '1.6'
+    versionCode: 7
+    commit: 7c920510354f9ce7a3e6ddc13b39960b50d09811
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.8'
+    versionCode: 8
+    commit: '1.8'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 9
+    commit: '1.9'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 11
+    commit: '1.11'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 12
+    commit: '1.12'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 14
+    commit: '1.14'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 15
+    commit: '1.15'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 16
+    commit: '1.16'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.17'
+    versionCode: 17
+    commit: '1.17'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.18'
+    versionCode: 18
+    commit: '1.18'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.19'
+    versionCode: 19
+    commit: '1.19'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.20'
+    versionCode: 20
+    commit: '1.20'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.21'
+    versionCode: 21
+    commit: '1.21'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.22'
+    versionCode: 22
+    commit: '1.22'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.23'
+    versionCode: 23
+    commit: '1.23'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.24'
+    versionCode: 24
+    commit: '1.24'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.25'
+    versionCode: 25
+    commit: '1.25'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.26'
+    versionCode: 26
+    commit: '1.26'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.27'
+    versionCode: 27
+    commit: '1.27'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.28'
+    versionCode: 28
+    commit: '1.28'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.31'
+    versionCode: 31
+    commit: '1.31'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.32'
+    versionCode: 32
+    commit: '1.32'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.33'
+    versionCode: 33
+    commit: '1.33'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.34'
+    versionCode: 34
+    commit: '1.34'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.36'
+    versionCode: 36
+    commit: '1.36'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.37'
+    versionCode: 37
+    commit: '1.37'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.39'
+    versionCode: 39
+    commit: '1.39'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.40'
+    versionCode: 40
+    commit: '1.40'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.41'
+    versionCode: 41
+    commit: '1.41'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.42'
+    versionCode: 42
+    commit: '1.42'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.0
+    versionCode: 44
+    commit: 2.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.2
+    versionCode: 46
+    commit: 2.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.3
+    versionCode: 47
+    commit: 2.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.0
+    versionCode: 48
+    commit: 2.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.1
+    versionCode: 49
+    commit: 2.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.2
+    versionCode: 50
+    commit: 2.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.3
+    versionCode: 51
+    commit: 2.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.4
+    versionCode: 52
+    disable: play
+    commit: 2.1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.6
+    versionCode: 54
+    disable: play
+    commit: 2.1.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.8
+    versionCode: 56
+    disable: play
+    commit: 2.1.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.9
+    versionCode: 57
+    commit: 2.1.9
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.1.10
+    versionCode: 58
+    commit: 2.1.10
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.2.0
+    versionCode: 59
+    commit: 2.2.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.2.1
+    versionCode: 60
+    commit: 2.2.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.2.2
+    versionCode: 61
+    commit: 2.2.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.2.4
+    versionCode: 63
+    commit: 2.2.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.2.6
+    versionCode: 65
+    commit: 2.2.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.2.7
+    versionCode: 66
+    commit: 2.2.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.3.1
+    versionCode: 68
+    commit: 2.3.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.3.3
+    versionCode: 70
+    commit: 2.3.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.3.4
+    versionCode: 71
+    commit: 2.3.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.4.2
+    versionCode: 75
+    commit: 2.4.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.4.3
+    versionCode: 76
+    commit: 2.4.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.5.0
+    versionCode: 77
+    commit: 2.5.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.5.1
+    versionCode: 78
+    commit: 2.5.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.5.2
+    versionCode: 79
+    commit: 2.5.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.5.3
+    versionCode: 80
+    commit: 2.5.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.5.6
+    versionCode: 83
+    commit: 2.5.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.5.7
+    versionCode: 84
+    commit: 2.5.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/google-api/d' -e '/play-services/d' build.gradle
+
+  - versionName: 2.6.1
+    versionCode: 87
+    disable: links against com.google.android.gms:play-services-auth
+    commit: 2.6.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.4
+    versionCode: 92
+    commit: 2.7.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.5
+    versionCode: 93
+    commit: 2.7.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.6
+    versionCode: 94
+    commit: 2.7.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.8.1
+    versionCode: 96
+    commit: 2.8.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.8.2
+    versionCode: 97
+    commit: 2.8.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.9.0
+    versionCode: 98
+    commit: 2.9.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.9.1
+    versionCode: 99
+    commit: 2.9.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.9.2
+    versionCode: 100
+    commit: 2.9.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.10.1
+    versionCode: 102
+    disable: Could not find com.android.tools.build:gradle:3.0.0
+    commit: 2.10.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.11.0
+    versionCode: 103
+    disable: Could not find com.android.tools.build:gradle:3.0.0
+    commit: 2.11.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.12.0
+    versionCode: 104
+    commit: 2.12.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 106
+    commit: 3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.0
+    versionCode: 107
+    commit: 3.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.1
+    versionCode: 109
+    commit: 3.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.2
+    versionCode: 110
+    commit: 3.2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.3
+    versionCode: 111
+    commit: 3.2.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.4
+    versionCode: 112
+    commit: 3.2.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.3.0
+    versionCode: 113
+    commit: 3.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.3.2
+    versionCode: 115
+    commit: 3.3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.4.0
+    versionCode: 116
+    commit: 3.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.4.1
+    versionCode: 117
+    commit: 3.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.4.2
+    versionCode: 118
+    commit: 3.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.0
+    versionCode: 119
+    commit: 4.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.3
+    versionCode: 122
+    commit: 4.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.4
+    versionCode: 123
+    commit: 4.0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.0
+    versionCode: 124
+    commit: 4.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.1
+    versionCode: 125
+    commit: 4.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.2
+    versionCode: 126
+    commit: 4.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.3
+    versionCode: 127
+    commit: 4.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.0
+    versionCode: 128
+    commit: 4.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.1
+    versionCode: 129
+    commit: 4.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.1
+    versionCode: 131
+    disable: 'DayFragmentsHolder.kt: (53, 23): Type mismatch'
+    commit: 5.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.0
+    versionCode: 132
+    commit: 5.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.1
+    versionCode: 133
+    commit: 5.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.2
+    versionCode: 134
+    commit: 5.1.2
+    subdir: app
+    gradle:
+      - yes
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 5.1.2
+CurrentVersionCode: 134
diff --git a/metadata/com.simplemobiletools.camera.txt b/metadata/com.simplemobiletools.camera.txt
deleted file mode 100644
index 761907d05b..0000000000
--- a/metadata/com.simplemobiletools.camera.txt
+++ /dev/null
@@ -1,244 +0,0 @@
-Categories:Multimedia
-License:Apache-2.0
-Author Name:Tibor Kaputa
-Author Email:hello@simplemobiletools.com
-Web Site:https://simplemobiletools.com
-Source Code:https://github.com/SimpleMobileTools/Simple-Camera
-Issue Tracker:https://github.com/SimpleMobileTools/Simple-Camera/issues
-Changelog:https://github.com/SimpleMobileTools/Simple-Camera/blob/HEAD/CHANGELOG.md
-Donate:https://simplemobiletools.com/donate
-Bitcoin:19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
-Litecoin:LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
-
-Auto Name:Camera
-
-Repo Type:git
-Repo:https://github.com/SimpleMobileTools/Simple-Camera
-
-Build:1.12,13
-    commit=86848f556d30609f03aaff63562886868c6234d2
-    subdir=app
-    gradle=yes
-
-Build:1.14,14
-    commit=1.14
-    subdir=app
-    gradle=yes
-
-Build:1.15,15
-    commit=1.15
-    subdir=app
-    gradle=yes
-
-Build:1.16,16
-    commit=1.16
-    subdir=app
-    gradle=yes
-
-Build:1.17,17
-    commit=1.17
-    subdir=app
-    gradle=yes
-
-Build:1.19,19
-    commit=1.19
-    subdir=app
-    gradle=yes
-
-Build:1.20,20
-    commit=1.20
-    subdir=app
-    gradle=yes
-
-Build:1.21,21
-    commit=1.21
-    subdir=app
-    gradle=yes
-
-Build:1.22,22
-    commit=1.22
-    subdir=app
-    gradle=yes
-
-Build:1.23,23
-    commit=1.23
-    subdir=app
-    gradle=yes
-
-Build:1.24,24
-    commit=1.24
-    subdir=app
-    gradle=yes
-
-Build:1.26,26
-    commit=1.26
-    subdir=app
-    gradle=yes
-
-Build:1.27,27
-    commit=1.27
-    subdir=app
-    gradle=yes
-
-Build:1.28,28
-    commit=1.28
-    subdir=app
-    gradle=yes
-
-Build:1.30,30
-    commit=1.30
-    subdir=app
-    gradle=yes
-
-Build:1.31,31
-    commit=1.31
-    subdir=app
-    gradle=yes
-
-Build:1.32,32
-    commit=1.32
-    subdir=app
-    gradle=yes
-
-Build:2.0.1,34
-    commit=2.0.1
-    subdir=app
-    gradle=yes
-
-Build:2.1.0,35
-    commit=2.1.0
-    subdir=app
-    gradle=yes
-
-Build:2.1.1,36
-    commit=2.1.1
-    subdir=app
-    gradle=yes
-
-Build:2.2.0,37
-    commit=2.2.0
-    subdir=app
-    gradle=yes
-
-Build:2.2.1,38
-    commit=2.2.1
-    subdir=app
-    gradle=yes
-
-Build:2.3.1,40
-    commit=2.3.1
-    subdir=app
-    gradle=yes
-
-Build:2.3.2,41
-    commit=2.3.2
-    subdir=app
-    gradle=yes
-
-Build:2.3.4,43
-    commit=2.3.4
-    subdir=app
-    gradle=yes
-
-Build:2.3.5,44
-    commit=2.3.5
-    subdir=app
-    gradle=yes
-
-Build:2.3.6,45
-    commit=2.3.6
-    subdir=app
-    gradle=yes
-
-Build:2.4.1,47
-    commit=2.4.1
-    subdir=app
-    gradle=yes
-
-Build:2.5.0,48
-    commit=2.5.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.0,50
-    commit=3.0.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.1,51
-    commit=3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.1,53
-    commit=3.1.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.2,54
-    commit=3.1.2
-    subdir=app
-    gradle=yes
-
-Build:3.1.4,55
-    commit=3.1.4
-    subdir=app
-    gradle=yes
-
-Build:3.2.0,56
-    commit=3.2.0
-    subdir=app
-    gradle=yes
-
-Build:3.2.1,57
-    commit=3.2.1
-    subdir=app
-    gradle=yes
-
-Build:4.0.0,58
-    commit=4.0.0
-    subdir=app
-    gradle=yes
-
-Build:4.1.1,60
-    commit=4.1.1
-    subdir=app
-    gradle=yes
-
-Build:4.1.2,61
-    commit=4.1.2
-    subdir=app
-    gradle=yes
-
-Build:4.1.3,62
-    commit=4.1.3
-    subdir=app
-    gradle=yes
-
-Build:4.2.0,63
-    commit=4.2.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.0,64
-    disable=ProGuard fails
-    commit=5.0.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.1,65
-    commit=5.0.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Build:5.0.2,66
-    commit=5.0.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:5.0.2
-Current Version Code:66
diff --git a/metadata/com.simplemobiletools.camera.yml b/metadata/com.simplemobiletools.camera.yml
new file mode 100644
index 0000000000..0e69a13738
--- /dev/null
+++ b/metadata/com.simplemobiletools.camera.yml
@@ -0,0 +1,334 @@
+Categories:
+  - Multimedia
+License: Apache-2.0
+AuthorName: Tibor Kaputa
+AuthorEmail: hello@simplemobiletools.com
+WebSite: https://simplemobiletools.com
+SourceCode: https://github.com/SimpleMobileTools/Simple-Camera
+IssueTracker: https://github.com/SimpleMobileTools/Simple-Camera/issues
+Changelog: https://github.com/SimpleMobileTools/Simple-Camera/blob/HEAD/CHANGELOG.md
+Donate: https://simplemobiletools.com/donate
+Bitcoin: 19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
+Litecoin: LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
+
+AutoName: Camera
+
+RepoType: git
+Repo: https://github.com/SimpleMobileTools/Simple-Camera
+
+Builds:
+  - versionName: '1.12'
+    versionCode: 13
+    commit: 86848f556d30609f03aaff63562886868c6234d2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 14
+    commit: '1.14'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 15
+    commit: '1.15'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 16
+    commit: '1.16'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.17'
+    versionCode: 17
+    commit: '1.17'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.19'
+    versionCode: 19
+    commit: '1.19'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.20'
+    versionCode: 20
+    commit: '1.20'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.21'
+    versionCode: 21
+    commit: '1.21'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.22'
+    versionCode: 22
+    commit: '1.22'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.23'
+    versionCode: 23
+    commit: '1.23'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.24'
+    versionCode: 24
+    commit: '1.24'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.26'
+    versionCode: 26
+    commit: '1.26'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.27'
+    versionCode: 27
+    commit: '1.27'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.28'
+    versionCode: 28
+    commit: '1.28'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.30'
+    versionCode: 30
+    commit: '1.30'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.31'
+    versionCode: 31
+    commit: '1.31'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.32'
+    versionCode: 32
+    commit: '1.32'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.1
+    versionCode: 34
+    commit: 2.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.0
+    versionCode: 35
+    commit: 2.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.1
+    versionCode: 36
+    commit: 2.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 37
+    commit: 2.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.1
+    versionCode: 38
+    commit: 2.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.1
+    versionCode: 40
+    commit: 2.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.2
+    versionCode: 41
+    commit: 2.3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.4
+    versionCode: 43
+    commit: 2.3.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.5
+    versionCode: 44
+    commit: 2.3.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.6
+    versionCode: 45
+    commit: 2.3.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.1
+    versionCode: 47
+    commit: 2.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.0
+    versionCode: 48
+    commit: 2.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.0
+    versionCode: 50
+    commit: 3.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 51
+    commit: 3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.1
+    versionCode: 53
+    commit: 3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.2
+    versionCode: 54
+    commit: 3.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.4
+    versionCode: 55
+    commit: 3.1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.0
+    versionCode: 56
+    commit: 3.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.1
+    versionCode: 57
+    commit: 3.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.0
+    versionCode: 58
+    commit: 4.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.1
+    versionCode: 60
+    commit: 4.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.2
+    versionCode: 61
+    commit: 4.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.3
+    versionCode: 62
+    commit: 4.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.0
+    versionCode: 63
+    commit: 4.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.0
+    versionCode: 64
+    disable: ProGuard fails
+    commit: 5.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.1
+    versionCode: 65
+    commit: 5.0.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+  - versionName: 5.0.2
+    versionCode: 66
+    commit: 5.0.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 5.0.2
+CurrentVersionCode: 66
diff --git a/metadata/com.simplemobiletools.clock.txt b/metadata/com.simplemobiletools.clock.txt
deleted file mode 100644
index dc1a05f96c..0000000000
--- a/metadata/com.simplemobiletools.clock.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-Categories:System
-License:Apache-2.0
-Author Name:Tibor Kaputa
-Author Email:hello@simplemobiletools.com
-Web Site:https://simplemobiletools.com
-Source Code:https://github.com/SimpleMobileTools/Simple-CLock
-Issue Tracker:https://github.com/SimpleMobileTools/Simple-Clock/issues
-Changelog:https://github.com/SimpleMobileTools/Simple-Clock/blob/HEAD/CHANGELOG.md
-Donate:https://simplemobiletools.com/donate
-Bitcoin:19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
-Litecoin:LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
-
-Auto Name:Clock
-
-Repo Type:git
-Repo:https://github.com/SimpleMobileTools/Simple-Clock
-
-Build:3.1.0,2
-    commit=3.1.0
-    subdir=app
-    gradle=yes
-
-Build:3.1.1,3
-    commit=3.1.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.2,4
-    commit=3.1.2
-    subdir=app
-    gradle=yes
-
-Build:3.1.3,5
-    commit=3.1.3
-    subdir=app
-    gradle=yes
-
-Build:4.0.0,6
-    commit=4.0.0
-    subdir=app
-    gradle=yes
-
-Build:4.0.1,7
-    commit=4.0.1
-    subdir=app
-    gradle=yes
-
-Build:4.1.0,8
-    commit=4.1.0
-    subdir=app
-    gradle=yes
-
-Build:4.2.0,9
-    commit=4.2.0
-    subdir=app
-    gradle=yes
-
-Build:4.3.0,10
-    commit=4.3.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.0,11
-    disable=compileReleaseKotlin fails
-    commit=5.0.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.1,12
-    commit=5.0.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Build:5.0.2,13
-    commit=5.0.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Build:5.0.3,14
-    commit=5.0.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/keystore/d' build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:5.0.3
-Current Version Code:14
diff --git a/metadata/com.simplemobiletools.clock.yml b/metadata/com.simplemobiletools.clock.yml
new file mode 100644
index 0000000000..b182b54314
--- /dev/null
+++ b/metadata/com.simplemobiletools.clock.yml
@@ -0,0 +1,118 @@
+Categories:
+  - System
+License: Apache-2.0
+AuthorName: Tibor Kaputa
+AuthorEmail: hello@simplemobiletools.com
+WebSite: https://simplemobiletools.com
+SourceCode: https://github.com/SimpleMobileTools/Simple-CLock
+IssueTracker: https://github.com/SimpleMobileTools/Simple-Clock/issues
+Changelog: https://github.com/SimpleMobileTools/Simple-Clock/blob/HEAD/CHANGELOG.md
+Donate: https://simplemobiletools.com/donate
+Bitcoin: 19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
+Litecoin: LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
+
+AutoName: Clock
+
+RepoType: git
+Repo: https://github.com/SimpleMobileTools/Simple-Clock
+
+Builds:
+  - versionName: 3.1.0
+    versionCode: 2
+    commit: 3.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.1
+    versionCode: 3
+    commit: 3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.2
+    versionCode: 4
+    commit: 3.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.3
+    versionCode: 5
+    commit: 3.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.0
+    versionCode: 6
+    commit: 4.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.1
+    versionCode: 7
+    commit: 4.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.0
+    versionCode: 8
+    commit: 4.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.0
+    versionCode: 9
+    commit: 4.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.3.0
+    versionCode: 10
+    commit: 4.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.0
+    versionCode: 11
+    disable: compileReleaseKotlin fails
+    commit: 5.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.1
+    versionCode: 12
+    commit: 5.0.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+  - versionName: 5.0.2
+    versionCode: 13
+    commit: 5.0.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+  - versionName: 5.0.3
+    versionCode: 14
+    commit: 5.0.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/keystore/d' build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 5.0.3
+CurrentVersionCode: 14
diff --git a/metadata/com.simplemobiletools.contacts.txt b/metadata/com.simplemobiletools.contacts.txt
deleted file mode 100644
index f775be592f..0000000000
--- a/metadata/com.simplemobiletools.contacts.txt
+++ /dev/null
@@ -1,177 +0,0 @@
-Categories:Multimedia
-License:Apache-2.0
-Author Name:Tibor Kaputa
-Author Email:hello@simplemobiletools.com
-Web Site:https://simplemobiletools.com
-Source Code:https://github.com/SimpleMobileTools/Simple-Contacts
-Issue Tracker:https://github.com/SimpleMobileTools/Simple-Contacts/issues
-Changelog:https://github.com/SimpleMobileTools/Simple-Contacts/blob/HEAD/CHANGELOG.md
-Donate:https://simplemobiletools.com/donate
-Bitcoin:19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
-Litecoin:LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
-
-Auto Name:Contacts
-Description:
-'''NOTE''': Starting with version 6.0 this app is no longer developed and was
-replaced by [[com.simplemobiletools.contacts.pro]]. You are encouraged to
-uninstall this one and install the new one.
-
-To learn more about this change you can read
-[https://medium.com/@tibbi/some-simple-mobile-tools-apps-are-becoming-paid-d053268f0fb2
-here]
-.
-
-Repo Type:git
-Repo:https://github.com/SimpleMobileTools/Simple-Contacts
-
-Build:3.0.1,2
-    commit=3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.0.3,4
-    commit=3.0.3
-    subdir=app
-    gradle=yes
-
-Build:3.1.0,5
-    commit=3.1.0
-    subdir=app
-    gradle=yes
-
-Build:3.1.1,6
-    commit=3.1.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.2,7
-    commit=3.1.2
-    subdir=app
-    gradle=yes
-
-Build:3.1.3,8
-    commit=3.1.3
-    subdir=app
-    gradle=yes
-
-Build:3.1.4,9
-    commit=3.1.4
-    subdir=app
-    gradle=yes
-
-Build:3.2.0,10
-    commit=3.2.0
-    subdir=app
-    gradle=yes
-
-Build:3.3.0,11
-    commit=3.3.0
-    subdir=app
-    gradle=yes
-
-Build:3.3.1,12
-    commit=3.3.1
-    subdir=app
-    gradle=yes
-
-Build:3.3.2,13
-    commit=3.3.2
-    subdir=app
-    gradle=yes
-
-Build:3.4.0,15
-    commit=3.4.0
-    subdir=app
-    gradle=yes
-
-Build:3.5.0,16
-    commit=3.5.0
-    subdir=app
-    gradle=yes
-
-Build:3.5.1,17
-    commit=3.5.1
-    subdir=app
-    gradle=yes
-
-Build:3.5.2,18
-    commit=3.5.2
-    subdir=app
-    gradle=yes
-
-Build:3.5.3,19
-    commit=3.5.3
-    subdir=app
-    gradle=yes
-
-Build:4.0.2,22
-    commit=4.0.2
-    subdir=app
-    gradle=yes
-
-Build:4.0.3,23
-    commit=4.0.3
-    subdir=app
-    gradle=yes
-
-Build:4.0.4,24
-    commit=4.0.4
-    subdir=app
-    gradle=yes
-
-Build:4.0.5,25
-    commit=4.0.5
-    subdir=app
-    gradle=yes
-
-Build:4.1.0,26
-    commit=4.1.0
-    subdir=app
-    gradle=yes
-
-Build:4.2.1,28
-    commit=4.2.1
-    subdir=app
-    gradle=yes
-
-Build:4.2.2,29
-    commit=4.2.2
-    subdir=app
-    gradle=yes
-
-Build:4.3.0,30
-    commit=4.3.0
-    subdir=app
-    gradle=yes
-
-Build:4.4.0,31
-    commit=4.4.0
-    subdir=app
-    gradle=yes
-
-Build:4.5.0,32
-    commit=4.5.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.0,33
-    disable=MainActivity.kt: (315, 43): Type mismatch
-    commit=5.0.0
-    subdir=app
-    gradle=yes
-
-Build:5.1.0,34
-    commit=5.1.0
-    subdir=app
-    gradle=yes
-
-Build:5.1.1,35
-    commit=5.1.1
-    subdir=app
-    gradle=yes
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:5.1.1
-Current Version Code:35
diff --git a/metadata/com.simplemobiletools.contacts.yml b/metadata/com.simplemobiletools.contacts.yml
new file mode 100644
index 0000000000..1401db05c9
--- /dev/null
+++ b/metadata/com.simplemobiletools.contacts.yml
@@ -0,0 +1,236 @@
+Categories:
+  - Multimedia
+License: Apache-2.0
+AuthorName: Tibor Kaputa
+AuthorEmail: hello@simplemobiletools.com
+WebSite: https://simplemobiletools.com
+SourceCode: https://github.com/SimpleMobileTools/Simple-Contacts
+IssueTracker: https://github.com/SimpleMobileTools/Simple-Contacts/issues
+Changelog: https://github.com/SimpleMobileTools/Simple-Contacts/blob/HEAD/CHANGELOG.md
+Donate: https://simplemobiletools.com/donate
+Bitcoin: 19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
+Litecoin: LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
+
+AutoName: Contacts
+Description: |-
+    '''NOTE''': Starting with version 6.0 this app is no longer developed and was
+    replaced by [[com.simplemobiletools.contacts.pro]]. You are encouraged to
+    uninstall this one and install the new one.
+
+    To learn more about this change you can read
+    [https://medium.com/@tibbi/some-simple-mobile-tools-apps-are-becoming-paid-d053268f0fb2
+    here]
+
+RepoType: git
+Repo: https://github.com/SimpleMobileTools/Simple-Contacts
+
+Builds:
+  - versionName: 3.0.1
+    versionCode: 2
+    commit: 3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.3
+    versionCode: 4
+    commit: 3.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.0
+    versionCode: 5
+    commit: 3.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.1
+    versionCode: 6
+    commit: 3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.2
+    versionCode: 7
+    commit: 3.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.3
+    versionCode: 8
+    commit: 3.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.4
+    versionCode: 9
+    commit: 3.1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.0
+    versionCode: 10
+    commit: 3.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.3.0
+    versionCode: 11
+    commit: 3.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.3.1
+    versionCode: 12
+    commit: 3.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.3.2
+    versionCode: 13
+    commit: 3.3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.4.0
+    versionCode: 15
+    commit: 3.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.5.0
+    versionCode: 16
+    commit: 3.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.5.1
+    versionCode: 17
+    commit: 3.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.5.2
+    versionCode: 18
+    commit: 3.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.5.3
+    versionCode: 19
+    commit: 3.5.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.2
+    versionCode: 22
+    commit: 4.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.3
+    versionCode: 23
+    commit: 4.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.4
+    versionCode: 24
+    commit: 4.0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.5
+    versionCode: 25
+    commit: 4.0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.0
+    versionCode: 26
+    commit: 4.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.1
+    versionCode: 28
+    commit: 4.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.2
+    versionCode: 29
+    commit: 4.2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.3.0
+    versionCode: 30
+    commit: 4.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.4.0
+    versionCode: 31
+    commit: 4.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.5.0
+    versionCode: 32
+    commit: 4.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.0
+    versionCode: 33
+    disable: 'MainActivity.kt: (315, 43): Type mismatch'
+    commit: 5.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.0
+    versionCode: 34
+    commit: 5.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.1.1
+    versionCode: 35
+    commit: 5.1.1
+    subdir: app
+    gradle:
+      - yes
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 5.1.1
+CurrentVersionCode: 35
diff --git a/metadata/com.simplemobiletools.draw.txt b/metadata/com.simplemobiletools.draw.txt
deleted file mode 100644
index 3f7238a498..0000000000
--- a/metadata/com.simplemobiletools.draw.txt
+++ /dev/null
@@ -1,187 +0,0 @@
-Categories:Graphics
-License:Apache-2.0
-Author Name:Tibor Kaputa
-Author Email:hello@simplemobiletools.com
-Web Site:https://simplemobiletools.com
-Source Code:https://github.com/SimpleMobileTools/Simple-Draw
-Issue Tracker:https://github.com/SimpleMobileTools/Simple-Draw/issues
-Changelog:https://github.com/SimpleMobileTools/Simple-Draw/blob/HEAD/CHANGELOG.md
-Donate:https://simplemobiletools.com/donate
-Bitcoin:19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
-Litecoin:LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
-
-Auto Name:Draw
-Description:
-'''NOTE''': Starting with version 6.0 this app is no longer developed and was
-replaced by [[com.simplemobiletools.draw.pro]]. You are encouraged to uninstall
-this one and install the new one. To learn more about this change you can read
-[https://medium.com/@tibbi/some-simple-mobile-tools-apps-are-becoming-paid-d053268f0fb2
-here]
-.
-
-Repo Type:git
-Repo:https://github.com/SimpleMobileTools/Simple-Draw
-
-Build:1.6,6
-    commit=a85f4b6596b3d46072030a98e030795abaf28d11
-    subdir=app
-    gradle=yes
-
-Build:1.7,7
-    commit=1.7
-    subdir=app
-    gradle=yes
-
-Build:1.9,9
-    commit=1.9
-    subdir=app
-    gradle=yes
-
-Build:1.10,10
-    commit=1.10
-    subdir=app
-    gradle=yes
-
-Build:1.11,11
-    commit=1.11
-    subdir=app
-    gradle=yes
-
-Build:1.12,12
-    commit=1.12
-    subdir=app
-    gradle=yes
-
-Build:1.13,13
-    commit=1.13
-    subdir=app
-    gradle=yes
-
-Build:1.14,14
-    commit=1.14
-    subdir=app
-    gradle=yes
-
-Build:1.15,15
-    commit=1.15
-    subdir=app
-    gradle=yes
-
-Build:1.16,16
-    commit=1.16
-    subdir=app
-    gradle=yes
-
-Build:1.17,17
-    commit=1.17
-    subdir=app
-    gradle=yes
-
-Build:2.0.0,18
-    commit=2.0.0
-    subdir=app
-    gradle=yes
-
-Build:2.0.1,19
-    commit=2.0.1
-    subdir=app
-    gradle=yes
-
-Build:2.1.0,20
-    commit=2.1.0
-    subdir=app
-    gradle=yes
-
-Build:2.2.0,22
-    commit=2.2.0
-    subdir=app
-    gradle=yes
-
-Build:2.3.0,23
-    disable=Could not find com.android.tools.build:gradle:3.0.0.
-    commit=2.3.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.0,25
-    commit=3.0.0
-    subdir=app
-    gradle=yes
-
-Build:3.0.1,26
-    commit=3.0.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.0,27
-    commit=3.1.0
-    subdir=app
-    gradle=yes
-
-Build:3.1.1,28
-    commit=3.1.1
-    subdir=app
-    gradle=yes
-
-Build:3.1.2,29
-    commit=3.1.2
-    subdir=app
-    gradle=yes
-
-Build:3.1.4,31
-    commit=3.1.4
-    subdir=app
-    gradle=yes
-
-Build:3.1.5,32
-    commit=3.1.5
-    subdir=app
-    gradle=yes
-
-Build:3.1.6,33
-    commit=3.1.6
-    subdir=app
-    gradle=yes
-
-Build:4.0.0,34
-    commit=4.0.0
-    subdir=app
-    gradle=yes
-
-Build:4.1.0,36
-    commit=4.1.0
-    subdir=app
-    gradle=yes
-
-Build:4.2.0,37
-    commit=4.2.0
-    subdir=app
-    gradle=yes
-
-Build:4.3.0,38
-    commit=4.3.0
-    subdir=app
-    gradle=yes
-
-Build:4.3.1,39
-    commit=4.3.1
-    subdir=app
-    gradle=yes
-
-Build:5.0.0,40
-    disable=ProGuard fails
-    commit=5.0.0
-    subdir=app
-    gradle=yes
-
-Build:5.0.1,41
-    disable=ProGuard fails
-    commit=5.0.1
-    subdir=app
-    gradle=yes
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:5.0.1
-Current Version Code:41
diff --git a/metadata/com.simplemobiletools.draw.yml b/metadata/com.simplemobiletools.draw.yml
new file mode 100644
index 0000000000..4a7581ea42
--- /dev/null
+++ b/metadata/com.simplemobiletools.draw.yml
@@ -0,0 +1,250 @@
+Categories:
+  - Graphics
+License: Apache-2.0
+AuthorName: Tibor Kaputa
+AuthorEmail: hello@simplemobiletools.com
+WebSite: https://simplemobiletools.com
+SourceCode: https://github.com/SimpleMobileTools/Simple-Draw
+IssueTracker: https://github.com/SimpleMobileTools/Simple-Draw/issues
+Changelog: https://github.com/SimpleMobileTools/Simple-Draw/blob/HEAD/CHANGELOG.md
+Donate: https://simplemobiletools.com/donate
+Bitcoin: 19Hc8A7sWGud8sP19VXDC5a5j28UyJfpyJ
+Litecoin: LYACbHTKaM9ZubKQGxJ4NRyVy1gHUuztRP
+
+AutoName: Draw
+Description: |-
+    '''NOTE''': Starting with version 6.0 this app is no longer developed and was
+    replaced by [[com.simplemobiletools.draw.pro]]. You are encouraged to uninstall
+    this one and install the new one. To learn more about this change you can read
+    [https://medium.com/@tibbi/some-simple-mobile-tools-apps-are-becoming-paid-d053268f0fb2
+    here]
+
+RepoType: git
+Repo: https://github.com/SimpleMobileTools/Simple-Draw
+
+Builds:
+  - versionName: '1.6'
+    versionCode: 6
+    commit: a85f4b6596b3d46072030a98e030795abaf28d11
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.7'
+    versionCode: 7
+    commit: '1.7'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 9
+    commit: '1.9'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.10'
+    versionCode: 10
+    commit: '1.10'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.11'
+    versionCode: 11
+    commit: '1.11'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.12'
+    versionCode: 12
+    commit: '1.12'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.13'
+    versionCode: 13
+    commit: '1.13'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.14'
+    versionCode: 14
+    commit: '1.14'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.15'
+    versionCode: 15
+    commit: '1.15'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.16'
+    versionCode: 16
+    commit: '1.16'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.17'
+    versionCode: 17
+    commit: '1.17'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.0
+    versionCode: 18
+    commit: 2.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.1
+    versionCode: 19
+    commit: 2.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.0
+    versionCode: 20
+    commit: 2.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 22
+    commit: 2.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.0
+    versionCode: 23
+    disable: Could not find com.android.tools.build:gradle:3.0.0.
+    commit: 2.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.0
+    versionCode: 25
+    commit: 3.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 26
+    commit: 3.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.0
+    versionCode: 27
+    commit: 3.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.1
+    versionCode: 28
+    commit: 3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.2
+    versionCode: 29
+    commit: 3.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.4
+    versionCode: 31
+    commit: 3.1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.5
+    versionCode: 32
+    commit: 3.1.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.6
+    versionCode: 33
+    commit: 3.1.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.0.0
+    versionCode: 34
+    commit: 4.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.1.0
+    versionCode: 36
+    commit: 4.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.2.0
+    versionCode: 37
+    commit: 4.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.3.0
+    versionCode: 38
+    commit: 4.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 4.3.1
+    versionCode: 39
+    commit: 4.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.0
+    versionCode: 40
+    disable: ProGuard fails
+    commit: 5.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 5.0.1
+    versionCode: 41
+    disable: ProGuard fails
+    commit: 5.0.1
+    subdir: app
+    gradle:
+      - yes
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 5.0.1
+CurrentVersionCode: 41