diff --git a/metadata/com.iven.lfflfeedreader.txt b/metadata/com.iven.lfflfeedreader.txt
deleted file mode 100644
index 368211616e..0000000000
--- a/metadata/com.iven.lfflfeedreader.txt
+++ /dev/null
@@ -1,272 +0,0 @@
-Categories:Reading,Internet
-License:GPL-3.0-or-later
-Web Site:http://forum.xda-developers.com/member.php?u=4884893
-Source Code:https://github.com/enricocid/iven-feed-reader
-Issue Tracker:https://github.com/enricocid/iven-feed-reader/issues
-
-Auto Name:Iven News Reader
-Summary:Feed reader for Lffl
-Description:
-'''Note:''' The developer marked this app as "deprecated" on 2017-11-12.
-
-Light and modern Android feed reader that will allow you to read feeds in RSS
-format. Features:
-
-* Notifications
-* Custom feeds
-* Simple but modern UI
-* Themes
-* Immersive mode
-* In-app webview
-* Various customizations
-
-It is highly recommended to use the feedburner service to burn feeds, and enable
-"Convert format burner" service inside Optimize tab and select "Convert feed
-format to: RSS 2.0" to ensure the best compatibility.
-.
-
-Repo Type:git
-Repo:https://github.com/enricocid/iven-feed-reader
-
-Build:1.0,1
-    disable=crashes
-    commit=1.9
-    srclibs=Crouton@1.8.1,2:FadingActionBar@parent-3.0.0,3:LazyList@be926df2ec5ff81693251629748ed38655075393,JSoup@jsoup-1.8.1.a
-    extlibs=android/android-support-v4r11.jar
-    prebuild=sed -i -e '/Crouton/d' project.properties && \
-        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar && \
-        pushd $$Crouton$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$JSoup$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$FadingActionBar$$ && \
-        ant release && \
-        popd && \
-        cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/*.jar $$FadingActionBar$$/bin/classes.jar libs/
-
-Build:2.0,10
-    commit=2.0
-    srclibs=Crouton@1.8.1,1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46,2:LazyList@be926df2ec5ff81693251629748ed38655075393,JSoup@jsoup-1.8.1.a
-    extlibs=android/android-support-v4r11.jar
-    prebuild=sed -i -e '/Crouton/d' project.properties && \
-        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar && \
-        pushd $$Crouton$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$JSoup$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/ && \
-        pushd $$FadingActionBar$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        pushd $$LazyList$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        sed -i -e '/reference\.3/d' project.properties
-
-Build:2.0.1,11
-    commit=2.0.1
-    srclibs=Crouton@1.8.1,1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46,2:LazyList@be926df2ec5ff81693251629748ed38655075393,JSoup@jsoup-1.8.1.a
-    extlibs=android/android-support-v4r11.jar
-    prebuild=sed -i -e '/Crouton/d' project.properties && \
-        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar && \
-        pushd $$Crouton$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$JSoup$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/ && \
-        pushd $$FadingActionBar$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        pushd $$LazyList$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        sed -i -e '/reference\.3/d' project.properties
-
-Build:2.0.2,12
-    commit=2.0.2
-    srclibs=Crouton@1.8.1,1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46,2:LazyList@be926df2ec5ff81693251629748ed38655075393,JSoup@jsoup-1.8.1.a
-    extlibs=android/android-support-v4r11.jar
-    prebuild=sed -i -e '/Crouton/d' project.properties && \
-        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar && \
-        pushd $$Crouton$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$JSoup$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/ && \
-        pushd $$FadingActionBar$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        pushd $$LazyList$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        sed -i -e '/reference\.3/d' project.properties
-
-Build:2.0.3,13
-    commit=2.0.3
-    srclibs=Crouton@1.8.1,1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46,2:LazyList@be926df2ec5ff81693251629748ed38655075393,JSoup@jsoup-1.8.1.a
-    extlibs=android/android-support-v4r11.jar
-    prebuild=sed -i -e '/Crouton/d' project.properties && \
-        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar && \
-        pushd $$Crouton$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$JSoup$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/ && \
-        pushd $$FadingActionBar$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        pushd $$LazyList$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        sed -i -e '/reference\.3/d' project.properties
-
-Build:2.1,14
-    disable=needs materialishprogress
-    commit=2.1
-    srclibs=Crouton@1.8.1,1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46,2:LazyList@be926df2ec5ff81693251629748ed38655075393,JSoup@jsoup-1.8.1.a,materialishprogress@f879632bed075a228eb6bc528dc537af6638905f
-    extlibs=android/android-support-v4r11.jar
-    prebuild=sed -i -e '/Crouton/d' project.properties && \
-        $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4 -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar && \
-        pushd $$Crouton$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        pushd $$JSoup$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/ && \
-        pushd $$FadingActionBar$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        pushd $$LazyList$$ && \
-        android update lib-project -t android-21 -p ./ && \
-        echo "android.library=true" >> project.properties && \
-        popd && \
-        cp -fR $$materialishprogress$$/library/src/main/java/com src/ && \
-        cp -fR $$materialishprogress$$/library/src/main/res/values/attrs.xml res/values/ && \
-        sed -i -e '/reference\.3/d' project.properties
-
-Build:6.0.1,32
-    commit=6.0.1
-    subdir=project/app
-    gradle=yes
-
-Build:6.1,33
-    commit=6.1
-    subdir=project/app
-    gradle=yes
-
-Build:6.2,35
-    commit=6.2
-    subdir=project/app
-    gradle=yes
-
-Build:6.5,39
-    commit=3a8383c6794f31753f06603696ef6f172cdfddcd
-    subdir=project/app
-    gradle=yes
-
-Build:6.6,41
-    commit=6.6
-    subdir=project/app
-    gradle=yes
-
-Build:6.8.3,47
-    commit=6.8.3
-    subdir=project/app
-    gradle=yes
-
-Build:7.3.1,53
-    commit=7.3.1
-    subdir=project/app
-    gradle=yes
-
-Build:7.3.2,54
-    commit=7.3.2
-    subdir=project/app
-    gradle=yes
-
-Build:7.3.3,55
-    commit=7.3.3
-    subdir=project/app
-    gradle=yes
-
-Build:7.3.4,56
-    commit=7.3.4
-    subdir=project/app
-    gradle=yes
-
-Build:7.3.5,57
-    commit=7.3.5
-    subdir=project/app
-    gradle=yes
-
-Build:7.3.6,58
-    commit=7.3.6
-    subdir=project/app
-    gradle=yes
-
-Build:2.0.1,59
-    commit=release_2.0.1
-    subdir=project/app
-    gradle=yes
-
-Build:2.0.2,60
-    commit=release_2.0.2
-    subdir=project/app
-    gradle=yes
-
-Build:3.0.1,62
-    commit=3.0.1
-    subdir=project/app
-    gradle=yes
-
-Build:3.0.2,63
-    commit=3.0.2
-    subdir=project/app
-    gradle=yes
-
-Build:3.1,65
-    commit=3.1
-    subdir=project/app
-    gradle=yes
-
-Build:3.2,66
-    commit=release_3.2
-    subdir=project/app
-    gradle=yes
-
-Maintainer Notes:
-After 7.3.6 the upstream began to reuse version numbers starting with 2.0.1.
-When a new versions name coincides with an old one, they tag a new release as
-release_%v instead of %v.
-.
-
-Archive Policy:0 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:3.2
-Current Version Code:66
diff --git a/metadata/com.iven.lfflfeedreader.yml b/metadata/com.iven.lfflfeedreader.yml
new file mode 100644
index 0000000000..a3c8cb706e
--- /dev/null
+++ b/metadata/com.iven.lfflfeedreader.yml
@@ -0,0 +1,359 @@
+Categories:
+  - Reading
+  - Internet
+License: GPL-3.0-or-later
+WebSite: http://forum.xda-developers.com/member.php?u=4884893
+SourceCode: https://github.com/enricocid/iven-feed-reader
+IssueTracker: https://github.com/enricocid/iven-feed-reader/issues
+
+AutoName: Iven News Reader
+Summary: Feed reader for Lffl
+Description: |-
+    '''Note:''' The developer marked this app as "deprecated" on 2017-11-12.
+
+    Light and modern Android feed reader that will allow you to read feeds in RSS
+    format. Features:
+
+    * Notifications
+    * Custom feeds
+    * Simple but modern UI
+    * Themes
+    * Immersive mode
+    * In-app webview
+    * Various customizations
+
+    It is highly recommended to use the feedburner service to burn feeds, and enable
+    "Convert format burner" service inside Optimize tab and select "Convert feed
+    format to: RSS 2.0" to ensure the best compatibility.
+
+RepoType: git
+Repo: https://github.com/enricocid/iven-feed-reader
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    disable: crashes
+    commit: '1.9'
+    srclibs:
+      - Crouton@1.8.1
+      - 2:FadingActionBar@parent-3.0.0
+      - 3:LazyList@be926df2ec5ff81693251629748ed38655075393
+      - JSoup@jsoup-1.8.1.a
+    extlibs:
+      - android/android-support-v4r11.jar
+    prebuild:
+      - sed -i -e '/Crouton/d' project.properties
+      - $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4
+        -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar
+      - pushd $$Crouton$$
+      - $$MVN3$$ package
+      - popd
+      - pushd $$JSoup$$
+      - $$MVN3$$ package
+      - popd
+      - pushd $$FadingActionBar$$
+      - ant release
+      - popd
+      - cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/*.jar $$FadingActionBar$$/bin/classes.jar
+        libs/
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: '2.0'
+    srclibs:
+      - Crouton@1.8.1
+      - 1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46
+      - 2:LazyList@be926df2ec5ff81693251629748ed38655075393
+      - JSoup@jsoup-1.8.1.a
+    extlibs:
+      - android/android-support-v4r11.jar
+    prebuild:
+      - sed -i -e '/Crouton/d' project.properties
+      - $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4
+        -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar
+      - pushd $$Crouton$$
+      - $$MVN3$$ package
+      - popd
+      - pushd $$JSoup$$
+      - $$MVN3$$ package
+      - popd
+      - cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/
+      - pushd $$FadingActionBar$$
+      - android update lib-project -t android-21 -p ./
+      - sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml
+      - echo "android.library=true" >> project.properties
+      - popd
+      - pushd $$LazyList$$
+      - android update lib-project -t android-21 -p ./
+      - echo "android.library=true" >> project.properties
+      - popd
+      - sed -i -e '/reference\.3/d' project.properties
+
+  - versionName: 2.0.1
+    versionCode: 11
+    commit: 2.0.1
+    srclibs:
+      - Crouton@1.8.1
+      - 1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46
+      - 2:LazyList@be926df2ec5ff81693251629748ed38655075393
+      - JSoup@jsoup-1.8.1.a
+    extlibs:
+      - android/android-support-v4r11.jar
+    prebuild:
+      - sed -i -e '/Crouton/d' project.properties
+      - $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4
+        -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar
+      - pushd $$Crouton$$
+      - $$MVN3$$ package
+      - popd
+      - pushd $$JSoup$$
+      - $$MVN3$$ package
+      - popd
+      - cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/
+      - pushd $$FadingActionBar$$
+      - android update lib-project -t android-21 -p ./
+      - sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml
+      - echo "android.library=true" >> project.properties
+      - popd
+      - pushd $$LazyList$$
+      - android update lib-project -t android-21 -p ./
+      - echo "android.library=true" >> project.properties
+      - popd
+      - sed -i -e '/reference\.3/d' project.properties
+
+  - versionName: 2.0.2
+    versionCode: 12
+    commit: 2.0.2
+    srclibs:
+      - Crouton@1.8.1
+      - 1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46
+      - 2:LazyList@be926df2ec5ff81693251629748ed38655075393
+      - JSoup@jsoup-1.8.1.a
+    extlibs:
+      - android/android-support-v4r11.jar
+    prebuild:
+      - sed -i -e '/Crouton/d' project.properties
+      - $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4
+        -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar
+      - pushd $$Crouton$$
+      - $$MVN3$$ package
+      - popd
+      - pushd $$JSoup$$
+      - $$MVN3$$ package
+      - popd
+      - cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/
+      - pushd $$FadingActionBar$$
+      - android update lib-project -t android-21 -p ./
+      - sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml
+      - echo "android.library=true" >> project.properties
+      - popd
+      - pushd $$LazyList$$
+      - android update lib-project -t android-21 -p ./
+      - echo "android.library=true" >> project.properties
+      - popd
+      - sed -i -e '/reference\.3/d' project.properties
+
+  - versionName: 2.0.3
+    versionCode: 13
+    commit: 2.0.3
+    srclibs:
+      - Crouton@1.8.1
+      - 1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46
+      - 2:LazyList@be926df2ec5ff81693251629748ed38655075393
+      - JSoup@jsoup-1.8.1.a
+    extlibs:
+      - android/android-support-v4r11.jar
+    prebuild:
+      - sed -i -e '/Crouton/d' project.properties
+      - $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4
+        -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar
+      - pushd $$Crouton$$
+      - $$MVN3$$ package
+      - popd
+      - pushd $$JSoup$$
+      - $$MVN3$$ package
+      - popd
+      - cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/
+      - pushd $$FadingActionBar$$
+      - android update lib-project -t android-21 -p ./
+      - sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml
+      - echo "android.library=true" >> project.properties
+      - popd
+      - pushd $$LazyList$$
+      - android update lib-project -t android-21 -p ./
+      - echo "android.library=true" >> project.properties
+      - popd
+      - sed -i -e '/reference\.3/d' project.properties
+
+  - versionName: '2.1'
+    versionCode: 14
+    disable: needs materialishprogress
+    commit: '2.1'
+    srclibs:
+      - Crouton@1.8.1
+      - 1:FadingActionBar@1c148b91867259ea43e6343d8afb69d106168b46
+      - 2:LazyList@be926df2ec5ff81693251629748ed38655075393
+      - JSoup@jsoup-1.8.1.a
+      - materialishprogress@f879632bed075a228eb6bc528dc537af6638905f
+    extlibs:
+      - android/android-support-v4r11.jar
+    prebuild:
+      - sed -i -e '/Crouton/d' project.properties
+      - $$MVN3$$ install:install-file -DgroupId=com.google.android -DartifactId=support-v4
+        -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4r11.jar
+      - pushd $$Crouton$$
+      - $$MVN3$$ package
+      - popd
+      - pushd $$JSoup$$
+      - $$MVN3$$ package
+      - popd
+      - cp $$JSoup$$/target/jsoup-1.8.1.jar $$Crouton$$/target/crouton-1.8.1.jar libs/
+      - pushd $$FadingActionBar$$
+      - android update lib-project -t android-21 -p ./
+      - sed -i -e 's/name="library"/name="FadingActionBar"/g' build.xml
+      - echo "android.library=true" >> project.properties
+      - popd
+      - pushd $$LazyList$$
+      - android update lib-project -t android-21 -p ./
+      - echo "android.library=true" >> project.properties
+      - popd
+      - cp -fR $$materialishprogress$$/library/src/main/java/com src/
+      - cp -fR $$materialishprogress$$/library/src/main/res/values/attrs.xml res/values/
+      - sed -i -e '/reference\.3/d' project.properties
+
+  - versionName: 6.0.1
+    versionCode: 32
+    commit: 6.0.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '6.1'
+    versionCode: 33
+    commit: '6.1'
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '6.2'
+    versionCode: 35
+    commit: '6.2'
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '6.5'
+    versionCode: 39
+    commit: 3a8383c6794f31753f06603696ef6f172cdfddcd
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '6.6'
+    versionCode: 41
+    commit: '6.6'
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 6.8.3
+    versionCode: 47
+    commit: 6.8.3
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 7.3.1
+    versionCode: 53
+    commit: 7.3.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 7.3.2
+    versionCode: 54
+    commit: 7.3.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 7.3.3
+    versionCode: 55
+    commit: 7.3.3
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 7.3.4
+    versionCode: 56
+    commit: 7.3.4
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 7.3.5
+    versionCode: 57
+    commit: 7.3.5
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 7.3.6
+    versionCode: 58
+    commit: 7.3.6
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.0.1
+    versionCode: 59
+    commit: release_2.0.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.0.2
+    versionCode: 60
+    commit: release_2.0.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.0.1
+    versionCode: 62
+    commit: 3.0.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.0.2
+    versionCode: 63
+    commit: 3.0.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '3.1'
+    versionCode: 65
+    commit: '3.1'
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '3.2'
+    versionCode: 66
+    commit: release_3.2
+    subdir: project/app
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    After 7.3.6 the upstream began to reuse version numbers starting with 2.0.1.
+    When a new versions name coincides with an old one, they tag a new release as
+    release_%v instead of %v.
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '3.2'
+CurrentVersionCode: 66
diff --git a/metadata/com.iven.musicplayergo.txt b/metadata/com.iven.musicplayergo.txt
deleted file mode 100644
index 76d2a9f57d..0000000000
--- a/metadata/com.iven.musicplayergo.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Author Name:Ivan D'Ortenzio
-Web Site:
-Source Code:https://github.com/enricocid/Music-Player-GO
-Issue Tracker:https://github.com/enricocid/Music-Player-GO/issues
-Changelog:https://github.com/enricocid/Music-Player-GO/releases
-Donate:https://paypal.me/enricocid
-
-Auto Name:Music Player GO
-Summary:Very slim music player
-Description:
-''Music Player GO'' is a very slim music player (small app size). It offers a
-colorful and simple "Unified UI" (no need to navigate between activities). The
-app also features an Equalizer, Themes (Light, dark, night) andmore. It even
-deals with Pause/resume when the headsets are (dis)connected.
-.
-
-Repo Type:git
-Repo:https://github.com/enricocid/Music-Player-GO.git
-
-Build:2.3.3.3,49
-    commit=v2.3.3.3
-    subdir=project/app
-    gradle=yes
-
-Build:2.4.1.5,56
-    commit=v2.4.1.5
-    subdir=project/app
-    gradle=yes
-
-Build:2.4.1.8,59
-    commit=v2.4.1.8
-    subdir=project/app
-    gradle=yes
-
-Build:2.4.2.2,62
-    commit=v2.4.2.2
-    subdir=project/app
-    gradle=yes
-
-Build:2.5,63
-    commit=v2.5
-    subdir=project/app
-    gradle=yes
-
-Build:2.5.1.3,67
-    commit=v2.5.1.3
-    subdir=project/app
-    gradle=yes
-
-Build:2.5.1.4,68
-    commit=v2.5.1.4
-    subdir=project/app
-    gradle=yes
-
-Build:2.5.1.5,69
-    commit=v2.5.1.5
-    subdir=project/app
-    gradle=yes
-
-Build:2.5.2,70
-    commit=v2.5.2
-    subdir=project/app
-    gradle=yes
-
-Build:2.5.3.1,72
-    commit=v2.5.3.1
-    subdir=project/app
-    gradle=yes
-
-Build:2.5.3.2,73
-    commit=ae6e2ff6f20cd70e905a06c638e2d1a3a4382d1b
-    subdir=project/app
-    gradle=yes
-
-Build:3.0.4.1,81
-    commit=v.3.0.4.1
-    subdir=project/app
-    gradle=yes
-
-Build:3.1.1,84
-    commit=v3.1.1
-    subdir=project/app
-    gradle=yes
-
-Build:3.1.2.1,87
-    commit=v3.1.2.1
-    subdir=project/app
-    gradle=yes
-
-Build:3.1.3.2,90
-    commit=v3.1.3.2
-    subdir=project/app
-    gradle=yes
-
-Build:3.3,93
-    commit=v3.3
-    subdir=project/app
-    gradle=yes
-
-Build:3.4,94
-    commit=v3.4
-    subdir=project/app
-    gradle=yes
-
-Build:3.4.2,96
-    commit=v3.4.2
-    subdir=project/app
-    gradle=yes
-
-Build:3.5.0.2,99
-    commit=v3.5.0.2
-    subdir=project/app
-    gradle=yes
-
-Build:3.5.2.1,103
-    commit=v3.5.2.1
-    subdir=project/app
-    gradle=yes
-
-Build:3.5.2.4,106
-    commit=v3.5.2.4
-    subdir=project/app
-    gradle=yes
-
-Build:3.5.2.5,107
-    commit=v3.5.2.5
-    subdir=project/app
-    gradle=yes
-    rm=project/gradle
-
-Build:3.5.2.6,108
-    commit=v3.5.2.6
-    subdir=project/app
-    gradle=yes
-    rm=project/gradle
-
-Build:3.5.2.7,109
-    commit=v3.5.2.7
-    subdir=project/app
-    gradle=yes
-    rm=project/gradle
-
-Build:3.6,111
-    commit=v3.6
-    subdir=project/app
-    gradle=yes
-    rm=project/gradle
-
-Build:3.6.1.2,114
-    commit=v3.6.1.2
-    subdir=project/app
-    gradle=yes
-    rm=project/gradle
-
-Build:3.6.4.1,118
-    commit=v3.6.4.1
-    subdir=project/app
-    gradle=yes
-    rm=project/gradle
-
-Build:3.6.4.3,120
-    commit=v3.6.4.3
-    subdir=project/app
-    gradle=yes
-    rm=project/gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:3.6.4.3
-Current Version Code:120
diff --git a/metadata/com.iven.musicplayergo.yml b/metadata/com.iven.musicplayergo.yml
new file mode 100644
index 0000000000..c3a1e3b9d7
--- /dev/null
+++ b/metadata/com.iven.musicplayergo.yml
@@ -0,0 +1,235 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+AuthorName: Ivan D'Ortenzio
+SourceCode: https://github.com/enricocid/Music-Player-GO
+IssueTracker: https://github.com/enricocid/Music-Player-GO/issues
+Changelog: https://github.com/enricocid/Music-Player-GO/releases
+Donate: https://paypal.me/enricocid
+
+AutoName: Music Player GO
+Summary: Very slim music player
+Description: |-
+    ''Music Player GO'' is a very slim music player (small app size). It offers a
+    colorful and simple "Unified UI" (no need to navigate between activities). The
+    app also features an Equalizer, Themes (Light, dark, night) andmore. It even
+    deals with Pause/resume when the headsets are (dis)connected.
+
+RepoType: git
+Repo: https://github.com/enricocid/Music-Player-GO.git
+
+Builds:
+  - versionName: 2.3.3.3
+    versionCode: 49
+    commit: v2.3.3.3
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.4.1.5
+    versionCode: 56
+    commit: v2.4.1.5
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.4.1.8
+    versionCode: 59
+    commit: v2.4.1.8
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.4.2.2
+    versionCode: 62
+    commit: v2.4.2.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '2.5'
+    versionCode: 63
+    commit: v2.5
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.5.1.3
+    versionCode: 67
+    commit: v2.5.1.3
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.5.1.4
+    versionCode: 68
+    commit: v2.5.1.4
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.5.1.5
+    versionCode: 69
+    commit: v2.5.1.5
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.5.2
+    versionCode: 70
+    commit: v2.5.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.5.3.1
+    versionCode: 72
+    commit: v2.5.3.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 2.5.3.2
+    versionCode: 73
+    commit: ae6e2ff6f20cd70e905a06c638e2d1a3a4382d1b
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.0.4.1
+    versionCode: 81
+    commit: v.3.0.4.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.1.1
+    versionCode: 84
+    commit: v3.1.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.1.2.1
+    versionCode: 87
+    commit: v3.1.2.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.1.3.2
+    versionCode: 90
+    commit: v3.1.3.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '3.3'
+    versionCode: 93
+    commit: v3.3
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: '3.4'
+    versionCode: 94
+    commit: v3.4
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.4.2
+    versionCode: 96
+    commit: v3.4.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.5.0.2
+    versionCode: 99
+    commit: v3.5.0.2
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.5.2.1
+    versionCode: 103
+    commit: v3.5.2.1
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.5.2.4
+    versionCode: 106
+    commit: v3.5.2.4
+    subdir: project/app
+    gradle:
+      - yes
+
+  - versionName: 3.5.2.5
+    versionCode: 107
+    commit: v3.5.2.5
+    subdir: project/app
+    gradle:
+      - yes
+    rm:
+      - project/gradle
+
+  - versionName: 3.5.2.6
+    versionCode: 108
+    commit: v3.5.2.6
+    subdir: project/app
+    gradle:
+      - yes
+    rm:
+      - project/gradle
+
+  - versionName: 3.5.2.7
+    versionCode: 109
+    commit: v3.5.2.7
+    subdir: project/app
+    gradle:
+      - yes
+    rm:
+      - project/gradle
+
+  - versionName: '3.6'
+    versionCode: 111
+    commit: v3.6
+    subdir: project/app
+    gradle:
+      - yes
+    rm:
+      - project/gradle
+
+  - versionName: 3.6.1.2
+    versionCode: 114
+    commit: v3.6.1.2
+    subdir: project/app
+    gradle:
+      - yes
+    rm:
+      - project/gradle
+
+  - versionName: 3.6.4.1
+    versionCode: 118
+    commit: v3.6.4.1
+    subdir: project/app
+    gradle:
+      - yes
+    rm:
+      - project/gradle
+
+  - versionName: 3.6.4.3
+    versionCode: 120
+    commit: v3.6.4.3
+    subdir: project/app
+    gradle:
+      - yes
+    rm:
+      - project/gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 3.6.4.3
+CurrentVersionCode: 120
diff --git a/metadata/com.jarsilio.android.pocketup.txt b/metadata/com.jarsilio.android.pocketup.txt
deleted file mode 100644
index 0e0318ca36..0000000000
--- a/metadata/com.jarsilio.android.pocketup.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:https://gitlab.com/juanitobananas/pocket-up
-Source Code:https://gitlab.com/juanitobananas/pocket-up/tree/HEAD
-Issue Tracker:https://gitlab.com/juanitobananas/pocket-up/issues
-Changelog:https://gitlab.com/juanitobananas/pocket-up/blob/HEAD/CHANGELOG.md
-Bitcoin:16DXeCxxKGvepYLehyHSr3M1nv1s1eUotZ
-
-Auto Name:Pocket Up
-Summary:Turn the display on by waving
-Description:
-Wakes up your phone when you take it out of your pocket.
-
-Just take your phone out of your pocket or purse (or open the lid) and the
-screen will switch on automatically.
-
-'''Required Android Permissions:'''
-
-* WAKE_LOCK to turn on the screen.
-* RECEIVE_BOOT_COMPLETED to automatically startup on boot if enabled.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/juanitobananas/pocket-up.git
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,3
-    commit=v1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.0.3,4
-    commit=v1.0.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.0.3a,5
-    commit=v1.0.3a
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.0.4,6
-    commit=v1.0.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.1.0,7
-    commit=v1.1.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1.0
-Current Version Code:7
diff --git a/metadata/com.jarsilio.android.pocketup.yml b/metadata/com.jarsilio.android.pocketup.yml
new file mode 100644
index 0000000000..86a9349cdf
--- /dev/null
+++ b/metadata/com.jarsilio.android.pocketup.yml
@@ -0,0 +1,76 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: https://gitlab.com/juanitobananas/pocket-up
+SourceCode: https://gitlab.com/juanitobananas/pocket-up/tree/HEAD
+IssueTracker: https://gitlab.com/juanitobananas/pocket-up/issues
+Changelog: https://gitlab.com/juanitobananas/pocket-up/blob/HEAD/CHANGELOG.md
+Bitcoin: 16DXeCxxKGvepYLehyHSr3M1nv1s1eUotZ
+
+AutoName: Pocket Up
+Summary: Turn the display on by waving
+Description: |-
+    Wakes up your phone when you take it out of your pocket.
+
+    Just take your phone out of your pocket or purse (or open the lid) and the
+    screen will switch on automatically.
+
+    '''Required Android Permissions:'''
+
+    * WAKE_LOCK to turn on the screen.
+    * RECEIVE_BOOT_COMPLETED to automatically startup on boot if enabled.
+
+RepoType: git
+Repo: https://gitlab.com/juanitobananas/pocket-up.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: v1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 4
+    commit: v1.0.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.0.3a
+    versionCode: 5
+    commit: v1.0.3a
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.0.4
+    versionCode: 6
+    commit: v1.0.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 7
+    commit: v1.1.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.1.0
+CurrentVersionCode: 7
diff --git a/metadata/com.jarsilio.android.waveup.txt b/metadata/com.jarsilio.android.waveup.txt
deleted file mode 100644
index 8eb6b0aa06..0000000000
--- a/metadata/com.jarsilio.android.waveup.txt
+++ /dev/null
@@ -1,481 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:
-Source Code:https://gitlab.com/juanitobananas/wave-up/tree/HEAD
-Issue Tracker:https://gitlab.com/juanitobananas/wave-up/issues
-Translation:https://www.transifex.com/juanitobananas/waveup/
-Bitcoin:16DXeCxxKGvepYLehyHSr3M1nv1s1eUotZ
-
-Auto Name:WaveUp
-
-Repo Type:git
-Repo:https://gitlab.com/juanitobananas/wave-up.git
-
-Build:0.91,1
-    commit=875a239bf71de7cbba9369d57a53bbf1b286e567
-    subdir=app
-    gradle=yes
-
-Build:0.92,2
-    commit=v0.92
-    subdir=app
-    gradle=yes
-
-Build:0.93,3
-    commit=v0.93
-    subdir=app
-    gradle=yes
-
-Build:0.94,4
-    commit=v0.94
-    subdir=app
-    gradle=yes
-
-Build:0.95,5
-    commit=v0.95
-    subdir=app
-    gradle=yes
-
-Build:0.96,6
-    disable=old failing build
-    commit=v0.96
-    subdir=app
-    gradle=yes
-
-Build:0.96-1,7
-    commit=v0.96-1
-    subdir=app
-    gradle=yes
-
-Build:0.96-2,8
-    commit=v0.96-2
-    subdir=app
-    gradle=yes
-
-Build:0.97,9
-    commit=v0.97
-    subdir=app
-    gradle=yes
-
-Build:0.98,10
-    commit=v0.98
-    subdir=app
-    gradle=yes
-
-Build:0.98-1,11
-    commit=v0.98-1
-    subdir=app
-    gradle=yes
-
-Build:0.99,12
-    commit=v0.99
-    subdir=app
-    gradle=yes
-
-Build:0.99-1,13
-    commit=v0.99-1
-    subdir=app
-    gradle=yes
-
-Build:0.99-2,14
-    commit=v0.99-2
-    subdir=app
-    gradle=yes
-
-Build:1.0,16
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,17
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:1.2,18
-    disable=translations
-    commit=v1.2
-    subdir=app
-    gradle=yes
-
-Build:1.2-1,19
-    commit=v1.2-1
-    subdir=app
-    gradle=yes
-
-Build:1.2-2,20
-    commit=v1.2-2
-    subdir=app
-    gradle=yes
-
-Build:1.2-3,21
-    commit=v1.2-3
-    subdir=app
-    gradle=yes
-
-Build:1.3,22
-    commit=v1.3
-    subdir=app
-    gradle=yes
-
-Build:1.3-1,23
-    commit=v1.3-1
-    subdir=app
-    gradle=yes
-
-Build:1.3-2,24
-    commit=v1.3-2
-    subdir=app
-    gradle=yes
-
-Build:1.3-3,25
-    commit=v1.3-3
-    subdir=app
-    gradle=yes
-
-Build:1.3-4,26
-    commit=v1.3-4
-    subdir=app
-    gradle=yes
-
-Build:1.3-5,27
-    commit=v1.3-5
-    subdir=app
-    gradle=yes
-
-Build:1.3-8,29
-    commit=v1.3-8
-    subdir=app
-    gradle=yes
-
-Build:1.4,30
-    commit=v1.4
-    subdir=app
-    gradle=yes
-
-Build:1.4-2,32
-    commit=v1.4-2
-    subdir=app
-    gradle=yes
-
-Build:1.5,33
-    commit=v1.5
-    subdir=app
-    gradle=yes
-
-Build:1.5-2,35
-    commit=v1.5-2
-    subdir=app
-    gradle=yes
-
-Build:1.5-3,36
-    commit=v1.5-3
-    subdir=app
-    gradle=yes
-
-Build:1.5-4,37
-    commit=v1.5-4
-    subdir=app
-    gradle=yes
-
-Build:1.5-5,38
-    commit=v1.5-5
-    subdir=app
-    gradle=yes
-
-Build:1.5-5a,39
-    commit=v1.5-5a
-    subdir=app
-    gradle=yes
-
-Build:1.6.0,40
-    commit=v1.6.0
-    subdir=app
-    gradle=yes
-
-Build:1.6.1,41
-    commit=v1.6.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.6.1a,42
-    commit=v1.6.1a
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.6.2,43
-    commit=v1.6.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.7.0,44
-    commit=v1.7.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.7.1,45
-    commit=v1.7.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.0.0,46
-    commit=v2.0.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.0.1,47
-    commit=v2.0.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.1.0,48
-    commit=v2.1.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.1.0a,49
-    commit=v2.1.0a
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.1.0b,50
-    commit=v2.1.0b
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.1.0c,51
-    commit=v2.1.0c
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.2.0,52
-    commit=v2.2.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.3.0,53
-    commit=v2.3.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.3.0a,54
-    commit=v2.3.0a
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.3.0b,55
-    commit=v2.3.0b
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.3.1,56
-    commit=v2.3.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.4.0,57
-    commit=v2.4.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.4.1,58
-    commit=v2.4.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.4.2,59
-    commit=v2.4.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.4.3,60
-    commit=v2.4.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.4.4,61
-    commit=v2.4.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:2.5,62
-    commit=v2.5
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.5.3,65
-    commit=v2.5.3
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.5.4,66
-    commit=v2.5.4
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.5.5,67
-    commit=v2.5.5
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.1,69
-    commit=v2.6.1
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.2,70
-    commit=v2.6.2
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.3,71
-    commit=v2.6.3
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.4,72
-    commit=v2.6.4
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.6,74
-    commit=v2.6.6
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.6a,75
-    commit=v2.6.6a
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.6b,76
-    commit=v2.6.6b
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:2.6.7,77
-    commit=v2.6.7
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.1-beta,80
-    commit=v3.0.1-beta
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.2,81
-    commit=v3.0.2
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.3,82
-    commit=v3.0.3
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.4,83
-    commit=v3.0.4
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.5,84
-    commit=v3.0.5
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.6,85
-    commit=v3.0.6
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.7,86
-    commit=v3.0.7
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.9,88
-    commit=v3.0.9
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.10,89
-    commit=v3.0.10
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.11,90
-    commit=v3.0.11
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.12,91
-    commit=v3.0.12
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.0.15,94
-    commit=v3.0.15
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.1.0,95
-    commit=v3.1.0
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Build:3.1.1,96
-    commit=v3.1.1
-    subdir=app
-    submodules=yes
-    gradle=standard
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:3.1.1
-Current Version Code:96
diff --git a/metadata/com.jarsilio.android.waveup.yml b/metadata/com.jarsilio.android.waveup.yml
new file mode 100644
index 0000000000..f68e94eb0d
--- /dev/null
+++ b/metadata/com.jarsilio.android.waveup.yml
@@ -0,0 +1,648 @@
+Categories:
+  - System
+License: GPL-3.0-only
+SourceCode: https://gitlab.com/juanitobananas/wave-up/tree/HEAD
+IssueTracker: https://gitlab.com/juanitobananas/wave-up/issues
+Translation: https://www.transifex.com/juanitobananas/waveup/
+Bitcoin: 16DXeCxxKGvepYLehyHSr3M1nv1s1eUotZ
+
+AutoName: WaveUp
+
+RepoType: git
+Repo: https://gitlab.com/juanitobananas/wave-up.git
+
+Builds:
+  - versionName: '0.91'
+    versionCode: 1
+    commit: 875a239bf71de7cbba9369d57a53bbf1b286e567
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.92'
+    versionCode: 2
+    commit: v0.92
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.93'
+    versionCode: 3
+    commit: v0.93
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.94'
+    versionCode: 4
+    commit: v0.94
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.95'
+    versionCode: 5
+    commit: v0.95
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.96'
+    versionCode: 6
+    disable: old failing build
+    commit: v0.96
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.96-1
+    versionCode: 7
+    commit: v0.96-1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.96-2
+    versionCode: 8
+    commit: v0.96-2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.97'
+    versionCode: 9
+    commit: v0.97
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.98'
+    versionCode: 10
+    commit: v0.98
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.98-1
+    versionCode: 11
+    commit: v0.98-1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.99'
+    versionCode: 12
+    commit: v0.99
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.99-1
+    versionCode: 13
+    commit: v0.99-1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.99-2
+    versionCode: 14
+    commit: v0.99-2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 16
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 17
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 18
+    disable: translations
+    commit: v1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2-1
+    versionCode: 19
+    commit: v1.2-1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2-2
+    versionCode: 20
+    commit: v1.2-2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2-3
+    versionCode: 21
+    commit: v1.2-3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 22
+    commit: v1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3-1
+    versionCode: 23
+    commit: v1.3-1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3-2
+    versionCode: 24
+    commit: v1.3-2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3-3
+    versionCode: 25
+    commit: v1.3-3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3-4
+    versionCode: 26
+    commit: v1.3-4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3-5
+    versionCode: 27
+    commit: v1.3-5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3-8
+    versionCode: 29
+    commit: v1.3-8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 30
+    commit: v1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4-2
+    versionCode: 32
+    commit: v1.4-2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.5'
+    versionCode: 33
+    commit: v1.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5-2
+    versionCode: 35
+    commit: v1.5-2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5-3
+    versionCode: 36
+    commit: v1.5-3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5-4
+    versionCode: 37
+    commit: v1.5-4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5-5
+    versionCode: 38
+    commit: v1.5-5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5-5a
+    versionCode: 39
+    commit: v1.5-5a
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.0
+    versionCode: 40
+    commit: v1.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.1
+    versionCode: 41
+    commit: v1.6.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.6.1a
+    versionCode: 42
+    commit: v1.6.1a
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.6.2
+    versionCode: 43
+    commit: v1.6.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.7.0
+    versionCode: 44
+    commit: v1.7.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.7.1
+    versionCode: 45
+    commit: v1.7.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.0.0
+    versionCode: 46
+    commit: v2.0.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.0.1
+    versionCode: 47
+    commit: v2.0.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.1.0
+    versionCode: 48
+    commit: v2.1.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.1.0a
+    versionCode: 49
+    commit: v2.1.0a
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.1.0b
+    versionCode: 50
+    commit: v2.1.0b
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.1.0c
+    versionCode: 51
+    commit: v2.1.0c
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.2.0
+    versionCode: 52
+    commit: v2.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.3.0
+    versionCode: 53
+    commit: v2.3.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.3.0a
+    versionCode: 54
+    commit: v2.3.0a
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.3.0b
+    versionCode: 55
+    commit: v2.3.0b
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.3.1
+    versionCode: 56
+    commit: v2.3.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.4.0
+    versionCode: 57
+    commit: v2.4.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.4.1
+    versionCode: 58
+    commit: v2.4.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.4.2
+    versionCode: 59
+    commit: v2.4.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.4.3
+    versionCode: 60
+    commit: v2.4.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 2.4.4
+    versionCode: 61
+    commit: v2.4.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: '2.5'
+    versionCode: 62
+    commit: v2.5
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.5.3
+    versionCode: 65
+    commit: v2.5.3
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.5.4
+    versionCode: 66
+    commit: v2.5.4
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.5.5
+    versionCode: 67
+    commit: v2.5.5
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.1
+    versionCode: 69
+    commit: v2.6.1
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.2
+    versionCode: 70
+    commit: v2.6.2
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.3
+    versionCode: 71
+    commit: v2.6.3
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.4
+    versionCode: 72
+    commit: v2.6.4
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.6
+    versionCode: 74
+    commit: v2.6.6
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.6a
+    versionCode: 75
+    commit: v2.6.6a
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.6b
+    versionCode: 76
+    commit: v2.6.6b
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 2.6.7
+    versionCode: 77
+    commit: v2.6.7
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.1-beta
+    versionCode: 80
+    commit: v3.0.1-beta
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.2
+    versionCode: 81
+    commit: v3.0.2
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.3
+    versionCode: 82
+    commit: v3.0.3
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.4
+    versionCode: 83
+    commit: v3.0.4
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.5
+    versionCode: 84
+    commit: v3.0.5
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.6
+    versionCode: 85
+    commit: v3.0.6
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.7
+    versionCode: 86
+    commit: v3.0.7
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.9
+    versionCode: 88
+    commit: v3.0.9
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.10
+    versionCode: 89
+    commit: v3.0.10
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.11
+    versionCode: 90
+    commit: v3.0.11
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.12
+    versionCode: 91
+    commit: v3.0.12
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.0.15
+    versionCode: 94
+    commit: v3.0.15
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.1.0
+    versionCode: 95
+    commit: v3.1.0
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+  - versionName: 3.1.1
+    versionCode: 96
+    commit: v3.1.1
+    subdir: app
+    submodules: true
+    gradle:
+      - standard
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 3.1.1
+CurrentVersionCode: 96
diff --git a/metadata/com.java.SmokeReducer.txt b/metadata/com.java.SmokeReducer.txt
deleted file mode 100644
index 9e7c550a92..0000000000
--- a/metadata/com.java.SmokeReducer.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Categories:Time
-License:Apache-2.0
-Web Site:http://www.joshyyy.com/smoke_reducer.html
-Source Code:https://gitorious.org/smoke-reducer/smoke-reducer
-Issue Tracker:
-
-Auto Name:Smoke Reducer
-Summary:Track your smoking habits
-Description:
-First of all Smoke reducer (and stopper) records the distance between two times
-you are smoking. Then, it lengthens that time between each cigarette by telling
-you when to smoke. If you click the Sleep button, the time that you sleep isn't
-counted to the time between each alarm
-.
-
-Repo Type:git
-Repo:https://git.gitorious.org/smoke-reducer/smoke-reducer.git
-
-Build:1.0,1
-    commit=3f999b
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/com.java.SmokeReducer.yml b/metadata/com.java.SmokeReducer.yml
new file mode 100644
index 0000000000..44a547159e
--- /dev/null
+++ b/metadata/com.java.SmokeReducer.yml
@@ -0,0 +1,24 @@
+Categories:
+  - Time
+License: Apache-2.0
+SourceCode: https://gitorious.org/smoke-reducer/smoke-reducer
+
+AutoName: Smoke Reducer
+Summary: Track your smoking habits
+Description: |-
+    First of all Smoke reducer (and stopper) records the distance between two times
+    you are smoking. Then, it lengthens that time between each cigarette by telling
+    you when to smoke. If you click the Sleep button, the time that you sleep isn’t
+    counted to the time between each alarm
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 3f999b
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
+
+NoSourceSince: '1.0'
diff --git a/metadata/com.javierllorente.adc.txt b/metadata/com.javierllorente.adc.txt
deleted file mode 100644
index 9c38c834b3..0000000000
--- a/metadata/com.javierllorente.adc.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/javierllorente/adc
-Issue Tracker:https://github.com/javierllorente/adc/issues
-
-Auto Name:Diccionario castellano
-Summary:Browse Castilian dictionary
-Description:
-Look up words in the Castilian dictionary by the Royal Spanish Academy (RAE).
-.
-
-Repo Type:git
-Repo:https://github.com/javierllorente/adc
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/com.javierllorente.adc.yml b/metadata/com.javierllorente.adc.yml
new file mode 100644
index 0000000000..3f7ddc3235
--- /dev/null
+++ b/metadata/com.javierllorente.adc.yml
@@ -0,0 +1,26 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+SourceCode: https://github.com/javierllorente/adc
+IssueTracker: https://github.com/javierllorente/adc/issues
+
+AutoName: Diccionario castellano
+Summary: Browse Castilian dictionary
+Description: Look up words in the Castilian dictionary by the Royal Spanish Academy
+    (RAE).
+
+RepoType: git
+Repo: https://github.com/javierllorente/adc
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
diff --git a/metadata/com.javiersantos.mlmanager.txt b/metadata/com.javiersantos.mlmanager.txt
deleted file mode 100644
index 67cbbd2bc1..0000000000
--- a/metadata/com.javiersantos.mlmanager.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:http://javiersantos.github.io/mlmanager
-Source Code:https://github.com/javiersantos/MLManager
-Issue Tracker:https://github.com/javiersantos/MLManager/issues
-Changelog:https://github.com/javiersantos/MLManager/blob/HEAD/CHANGELOG.md
-
-Auto Name:ML Manager
-Summary:Manage apps
-Description:
-Modern, easy and customizable app manager with Material Design.
-.
-
-Repo Type:git
-Repo:https://github.com/javiersantos/MLManager
-
-Build:0.1,2
-    commit=c6fac08f21395bfe91f3365553fd76e57e191dee
-    subdir=app
-    gradle=yes
-
-Build:0.3.1,9
-    commit=v0.3.1
-    subdir=app
-    gradle=yes
-
-Build:0.4.0,10
-    commit=v0.4
-    subdir=app
-    gradle=yes
-
-Build:0.5,11
-    commit=v0.5
-    subdir=app
-    gradle=yes
-
-Build:0.5.1,12
-    commit=v0.5.1
-    subdir=app
-    gradle=yes
-
-Build:1.0,14
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.1,16
-    commit=v1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,17
-    commit=v1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.0.3,19
-    commit=v1.0.3
-    subdir=app
-    gradle=basic
-
-Build:1.0.4,20
-    commit=v1.0.4
-    subdir=app
-    gradle=basic
-
-Build:1.0.4.1,21
-    disable=third party maven repo
-    commit=v1.0.4.1
-    subdir=app
-    gradle=basic
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Update Check Name:com.javiersantos.mlmanagerpro
-Current Version:1.0.4.1
-Current Version Code:21
diff --git a/metadata/com.javiersantos.mlmanager.yml b/metadata/com.javiersantos.mlmanager.yml
new file mode 100644
index 0000000000..cd4ec0f7a3
--- /dev/null
+++ b/metadata/com.javiersantos.mlmanager.yml
@@ -0,0 +1,99 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: http://javiersantos.github.io/mlmanager
+SourceCode: https://github.com/javiersantos/MLManager
+IssueTracker: https://github.com/javiersantos/MLManager/issues
+Changelog: https://github.com/javiersantos/MLManager/blob/HEAD/CHANGELOG.md
+
+AutoName: ML Manager
+Summary: Manage apps
+Description: Modern, easy and customizable app manager with Material Design.
+
+RepoType: git
+Repo: https://github.com/javiersantos/MLManager
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 2
+    commit: c6fac08f21395bfe91f3365553fd76e57e191dee
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.3.1
+    versionCode: 9
+    commit: v0.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.4.0
+    versionCode: 10
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.5'
+    versionCode: 11
+    commit: v0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.5.1
+    versionCode: 12
+    commit: v0.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.0'
+    versionCode: 14
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 16
+    commit: v1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 17
+    commit: v1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 19
+    commit: v1.0.3
+    subdir: app
+    gradle:
+      - basic
+
+  - versionName: 1.0.4
+    versionCode: 20
+    commit: v1.0.4
+    subdir: app
+    gradle:
+      - basic
+
+  - versionName: 1.0.4.1
+    versionCode: 21
+    disable: third party maven repo
+    commit: v1.0.4.1
+    subdir: app
+    gradle:
+      - basic
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+UpdateCheckName: com.javiersantos.mlmanagerpro
+CurrentVersion: 1.0.4.1
+CurrentVersionCode: 21