diff --git a/metadata/com.jparkie.aizoban.txt b/metadata/com.jparkie.aizoban.txt
deleted file mode 100644
index da5c766cd2..0000000000
--- a/metadata/com.jparkie.aizoban.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-Categories:Reading,Multimedia
-License:Apache-2.0
-Web Site:https://jparkie.github.io/Aizoban
-Source Code:https://github.com/jparkie/Aizoban
-Issue Tracker:https://github.com/jparkie/Aizoban/issues
-
-Auto Name:Aizōban
-Summary:Digital manga catalogue and reader
-Description:
-Offline digital manga catalogue.
-
-* Access to over 45 000 manga series from currently 6 sources: Batoto (EN), MangaEden (EN), MangaHere (EN), MangaReader (EN), MangaEden (IT), and MangaHere (ES).
-* Responsive viewer with options to switch reading direction, lock orientation, lock zoom, full-screen or immersive mode.
-* A search tool capable of filtering and ordering manga series by name, genre (not for all sources), and status.
-* An “Exploring” function to discover random manga series.
-* A download manager to collect your desired manga series offline.
-* Your personalized list of favourite manga series and recently read chapters (manageable with "Mark Read") .
-* Easy settings to manage your reading experience such as "Enable Lazy Loading" to conserve bandwidth.
-.
-
-Repo Type:git
-Repo:https://github.com/jparkie/Aizoban
-
-Build:1.2.3,25
-    commit=bfb98487c0777371e011b0dde004434ca6a5d8e5
-    subdir=app
-    gradle=yes
-
-Build:1.2.4,26
-    commit=0acb1a36cc6b69ee0ac8f6e5a831b54a68998379
-    subdir=app
-    gradle=yes
-
-Build:1.2.5,27
-    commit=b19aba68af9183ceb4b941c69d69fe98807bfce4
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.2.5
-Current Version Code:27
diff --git a/metadata/com.jparkie.aizoban.yml b/metadata/com.jparkie.aizoban.yml
new file mode 100644
index 0000000000..dfde161985
--- /dev/null
+++ b/metadata/com.jparkie.aizoban.yml
@@ -0,0 +1,46 @@
+Categories:
+  - Reading
+  - Multimedia
+License: Apache-2.0
+WebSite: https://jparkie.github.io/Aizoban
+SourceCode: https://github.com/jparkie/Aizoban
+
+AutoName: Aizōban
+Summary: Digital manga catalogue and reader
+Description: |-
+    Offline digital manga catalogue.
+
+    * Access to over 45 000 manga series from currently 6 sources: Batoto (EN), MangaEden (EN), MangaHere (EN), MangaReader (EN), MangaEden (IT), and MangaHere (ES).
+    * Responsive viewer with options to switch reading direction, lock orientation, lock zoom, full-screen or immersive mode.
+    * A search tool capable of filtering and ordering manga series by name, genre (not for all sources), and status.
+    * An “Exploring” function to discover random manga series.
+    * A download manager to collect your desired manga series offline.
+    * Your personalized list of favourite manga series and recently read chapters (manageable with "Mark Read") .
+    * Easy settings to manage your reading experience such as "Enable Lazy Loading" to conserve bandwidth.
+
+Builds:
+  - versionName: 1.2.3
+    versionCode: 25
+    commit: bfb98487c0777371e011b0dde004434ca6a5d8e5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.4
+    versionCode: 26
+    commit: 0acb1a36cc6b69ee0ac8f6e5a831b54a68998379
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.5
+    versionCode: 27
+    commit: b19aba68af9183ceb4b941c69d69fe98807bfce4
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 1.2.5
+CurrentVersionCode: 27
diff --git a/metadata/com.jparkie.givesmehope.txt b/metadata/com.jparkie.givesmehope.txt
deleted file mode 100644
index 6d5a254c4b..0000000000
--- a/metadata/com.jparkie.givesmehope.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Internet
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/jparkie/GivesMeHopeAndroidClient
-Issue Tracker:https://github.com/jparkie/GivesMeHopeAndroidClient/issues
-
-Auto Name:Anthology for Gives Me Hope
-Summary:Unofficial "Gives Me Hope" client
-Description:
-Unofficial client for [http://mobile.givesmehope.com/ Gives me hope].
-.
-
-Repo Type:git
-Repo:https://github.com/jparkie/GivesMeHopeAndroidClient
-
-Build:1.0,1
-    commit=b278acfe2e4bbd611448b97012de81729fe1a431
-    subdir=app
-    gradle=yes
-    rm=app/libs/*
-    prebuild=sed -i -e '/fileTree/acompile "org.jsoup:jsoup:1.8.1"' build.gradle
-
-Build:1.0,2
-    commit=4ce49fac339782373dcb289dede907e1c99d7823
-    subdir=app
-    gradle=yes
-    rm=app/libs/*
-
-Build:2.0.1,4
-    commit=d6515762493117451742bb598a4a18b2ffbbf455
-    subdir=app
-    gradle=yes
-    rm=app/libs/*
-
-Build:2.0.2,5
-    commit=0fd5dc34edb403ad250f5ed29e894114eb894912
-    subdir=app
-    gradle=yes
-    rm=app/libs/*
-
-Build:2.0.3,6
-    commit=88e5bf52da2d0132584488b14f576e78de9939d0
-    subdir=app
-    gradle=yes
-    rm=app/libs/*
-
-Archive Policy:0 versions
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:2.0.3
-Current Version Code:6
diff --git a/metadata/com.jparkie.givesmehope.yml b/metadata/com.jparkie.givesmehope.yml
new file mode 100644
index 0000000000..bc0f879b81
--- /dev/null
+++ b/metadata/com.jparkie.givesmehope.yml
@@ -0,0 +1,67 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Internet
+License: Apache-2.0
+SourceCode: https://github.com/jparkie/GivesMeHopeAndroidClient
+IssueTracker: https://github.com/jparkie/GivesMeHopeAndroidClient/issues
+
+AutoName: Anthology for Gives Me Hope
+Summary: Unofficial "Gives Me Hope" client
+Description: Unofficial client for [http://mobile.givesmehope.com/ Gives me hope].
+
+RepoType: git
+Repo: https://github.com/jparkie/GivesMeHopeAndroidClient
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: b278acfe2e4bbd611448b97012de81729fe1a431
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+    prebuild: sed -i -e '/fileTree/acompile "org.jsoup:jsoup:1.8.1"' build.gradle
+
+  - versionName: '1.0'
+    versionCode: 2
+    commit: 4ce49fac339782373dcb289dede907e1c99d7823
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: 2.0.1
+    versionCode: 4
+    commit: d6515762493117451742bb598a4a18b2ffbbf455
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: 2.0.2
+    versionCode: 5
+    commit: 0fd5dc34edb403ad250f5ed29e894114eb894912
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+  - versionName: 2.0.3
+    versionCode: 6
+    commit: 88e5bf52da2d0132584488b14f576e78de9939d0
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 2.0.3
+CurrentVersionCode: 6
diff --git a/metadata/com.jtmcn.archwiki.viewer.txt b/metadata/com.jtmcn.archwiki.viewer.txt
deleted file mode 100644
index 1acb445ebb..0000000000
--- a/metadata/com.jtmcn.archwiki.viewer.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Categories:Reading,Internet
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/jtmcn/archwiki-viewer
-Issue Tracker:https://github.com/jtmcn/archwiki-viewer/issues
-Changelog:https://github.com/jtmcn/archwiki-viewer/releases
-
-Auto Name:ArchWiki Viewer
-Summary:View Arch Linux Wiki articles
-Description:
-Quickly view Arch Linux Wiki articles on your phone with an easy to read format.
-.
-
-Repo Type:git
-Repo:https://github.com/jtmcn/archwiki-viewer
-
-Build:1.0.7,8
-    commit=v1.0.7
-    subdir=app
-    gradle=yes
-
-Build:1.0.11,12
-    commit=v1.0.11
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.0.11
-Current Version Code:12
diff --git a/metadata/com.jtmcn.archwiki.viewer.yml b/metadata/com.jtmcn.archwiki.viewer.yml
new file mode 100644
index 0000000000..1564805788
--- /dev/null
+++ b/metadata/com.jtmcn.archwiki.viewer.yml
@@ -0,0 +1,35 @@
+Categories:
+  - Reading
+  - Internet
+License: Apache-2.0
+SourceCode: https://github.com/jtmcn/archwiki-viewer
+IssueTracker: https://github.com/jtmcn/archwiki-viewer/issues
+Changelog: https://github.com/jtmcn/archwiki-viewer/releases
+
+AutoName: ArchWiki Viewer
+Summary: View Arch Linux Wiki articles
+Description: Quickly view Arch Linux Wiki articles on your phone with an easy to read
+    format.
+
+RepoType: git
+Repo: https://github.com/jtmcn/archwiki-viewer
+
+Builds:
+  - versionName: 1.0.7
+    versionCode: 8
+    commit: v1.0.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.11
+    versionCode: 12
+    commit: v1.0.11
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.0.11
+CurrentVersionCode: 12
diff --git a/metadata/com.juliansparber.captiveportallogin.txt b/metadata/com.juliansparber.captiveportallogin.txt
deleted file mode 100644
index 7c3f4e747c..0000000000
--- a/metadata/com.juliansparber.captiveportallogin.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Internet,Connectivity
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/jsparber/CaptivePortalAutologin/
-Issue Tracker:https://github.com/jsparber/CaptivePortalAutologin//issues
-
-Auto Name:CaptivePortalLogin
-Summary:Automatically log into networks with captive portal
-Description:
-Saves the login procedure for a network with a Captive Portal and reproduces it
-automatically.
-.
-
-Repo Type:git
-Repo:https://github.com/jsparber/CaptivePortalAutologin/
-
-Build:0.1,1
-    commit=v0.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/applicationId/aversionName "0.1"\nversionCode 1\n' build.gradle
-
-Build:0.2,2
-    commit=v0.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.2
-Current Version Code:2
diff --git a/metadata/com.juliansparber.captiveportallogin.yml b/metadata/com.juliansparber.captiveportallogin.yml
new file mode 100644
index 0000000000..eb93365ece
--- /dev/null
+++ b/metadata/com.juliansparber.captiveportallogin.yml
@@ -0,0 +1,36 @@
+Categories:
+  - Internet
+  - Connectivity
+License: Apache-2.0
+SourceCode: https://github.com/jsparber/CaptivePortalAutologin/
+IssueTracker: https://github.com/jsparber/CaptivePortalAutologin//issues
+
+AutoName: CaptivePortalLogin
+Summary: Automatically log into networks with captive portal
+Description: |-
+    Saves the login procedure for a network with a Captive Portal and reproduces it
+    automatically.
+
+RepoType: git
+Repo: https://github.com/jsparber/CaptivePortalAutologin/
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: v0.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/applicationId/aversionName "0.1"\nversionCode 1\n' build.gradle
+
+  - versionName: '0.2'
+    versionCode: 2
+    commit: v0.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '0.2'
+CurrentVersionCode: 2
diff --git a/metadata/com.junjunguo.pocketmaps.txt b/metadata/com.junjunguo.pocketmaps.txt
deleted file mode 100644
index 9639078192..0000000000
--- a/metadata/com.junjunguo.pocketmaps.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Categories:Navigation
-License:MIT
-Web Site:https://junjunguo.com/PocketMaps/
-Source Code:https://github.com/junjunguo/PocketMaps
-Issue Tracker:https://github.com/junjunguo/PocketMaps/issues
-Changelog:https://github.com/junjunguo/PocketMaps/releases
-
-Auto Name:PocketMaps
-Summary:View maps and use offline routing and navigation system
-Description:
-PocketMaps is a map viewer with navigation system.
-
-Maps can be easily downloaded with this app. Thus, a complete offline navigation
-is possible. Through the so-called geocoding places can be searched.
-
-* The search requires an internet connection.
-* A very limited offline search is also available.
-
-With the sport tracking feature, routes can be recorded to graph data such as
-speeds.
-.
-
-Repo Type:git
-Repo:https://github.com/junjunguo/PocketMaps
-
-Build:1.7,8
-    commit=ae65d065c1606e3abf4afa51e20d6891fd149f5d
-    subdir=PocketMaps/app
-    gradle=yes
-
-Build:1.9,9
-    commit=1.9
-    subdir=PocketMaps/app
-    gradle=yes
-
-Build:2.0,10
-    commit=2.0
-    subdir=PocketMaps/app
-    gradle=yes
-
-Build:2.3,13
-    commit=2.3
-    subdir=PocketMaps/app
-    gradle=yes
-
-Build:2.5,15
-    commit=2.5
-    subdir=PocketMaps/app
-    gradle=yes
-
-Build:2.6,16
-    commit=2.6
-    subdir=PocketMaps/app
-    gradle=yes
-
-Build:2.7,17
-    commit=2.7
-    subdir=PocketMaps/app
-    gradle=yes
-
-Build:2.9,19
-    commit=2.9
-    subdir=PocketMaps/app
-    gradle=yes
-
-Archive Policy:2 versions
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.9
-Current Version Code:19
diff --git a/metadata/com.junjunguo.pocketmaps.yml b/metadata/com.junjunguo.pocketmaps.yml
new file mode 100644
index 0000000000..0b222dbafa
--- /dev/null
+++ b/metadata/com.junjunguo.pocketmaps.yml
@@ -0,0 +1,87 @@
+Categories:
+  - Navigation
+License: MIT
+WebSite: https://junjunguo.com/PocketMaps/
+SourceCode: https://github.com/junjunguo/PocketMaps
+IssueTracker: https://github.com/junjunguo/PocketMaps/issues
+Changelog: https://github.com/junjunguo/PocketMaps/releases
+
+AutoName: PocketMaps
+Summary: View maps and use offline routing and navigation system
+Description: |-
+    PocketMaps is a map viewer with navigation system.
+
+    Maps can be easily downloaded with this app. Thus, a complete offline navigation
+    is possible. Through the so-called geocoding places can be searched.
+
+    * The search requires an internet connection.
+    * A very limited offline search is also available.
+
+    With the sport tracking feature, routes can be recorded to graph data such as
+    speeds.
+
+RepoType: git
+Repo: https://github.com/junjunguo/PocketMaps
+
+Builds:
+  - versionName: '1.7'
+    versionCode: 8
+    commit: ae65d065c1606e3abf4afa51e20d6891fd149f5d
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+  - versionName: '1.9'
+    versionCode: 9
+    commit: '1.9'
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 10
+    commit: '2.0'
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+  - versionName: '2.3'
+    versionCode: 13
+    commit: '2.3'
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+  - versionName: '2.5'
+    versionCode: 15
+    commit: '2.5'
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+  - versionName: '2.6'
+    versionCode: 16
+    commit: '2.6'
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+  - versionName: '2.7'
+    versionCode: 17
+    commit: '2.7'
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+  - versionName: '2.9'
+    versionCode: 19
+    commit: '2.9'
+    subdir: PocketMaps/app
+    gradle:
+      - yes
+
+ArchivePolicy: 2 versions
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '2.9'
+CurrentVersionCode: 19
diff --git a/metadata/com.jvillalba.apod.classic.txt b/metadata/com.jvillalba.apod.classic.txt
deleted file mode 100644
index 8a7b03d4ea..0000000000
--- a/metadata/com.jvillalba.apod.classic.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Science & Education,Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/fighthawkarg/NasaApodCL
-Issue Tracker:https://github.com/fighthawkarg/NasaApodCL/issues
-Donate:https://www.paypal.me/fightinghawk
-
-Auto Name:Apod Classic
-Summary:NASA Astronomy Picture of the Day Classic
-Description:
-NASA Astronomy Picture of the Day Classic
-
-App Icon by Icons8.com.
-
-* View Images from NASA
-* Read Descriptions of Images to Learn More About Them
-* Download Your Favorites Images
-.
-
-Repo Type:git
-Repo:https://github.com/fighthawkarg/NasaApodCL.git
-
-Build:3.2.8,11
-    commit=3.2.8
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:3.2.8
-Current Version Code:11
diff --git a/metadata/com.jvillalba.apod.classic.yml b/metadata/com.jvillalba.apod.classic.yml
new file mode 100644
index 0000000000..021f74d603
--- /dev/null
+++ b/metadata/com.jvillalba.apod.classic.yml
@@ -0,0 +1,34 @@
+Categories:
+  - Science & Education
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/fighthawkarg/NasaApodCL
+IssueTracker: https://github.com/fighthawkarg/NasaApodCL/issues
+Donate: https://www.paypal.me/fightinghawk
+
+AutoName: Apod Classic
+Summary: NASA Astronomy Picture of the Day Classic
+Description: |-
+    NASA Astronomy Picture of the Day Classic
+
+    App Icon by Icons8.com.
+
+    * View Images from NASA
+    * Read Descriptions of Images to Learn More About Them
+    * Download Your Favorites Images
+
+RepoType: git
+Repo: https://github.com/fighthawkarg/NasaApodCL.git
+
+Builds:
+  - versionName: 3.2.8
+    versionCode: 11
+    commit: 3.2.8
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 3.2.8
+CurrentVersionCode: 11
diff --git a/metadata/com.jvillalba.apod.md.txt b/metadata/com.jvillalba.apod.md.txt
deleted file mode 100644
index be9b541774..0000000000
--- a/metadata/com.jvillalba.apod.md.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Science & Education,Multimedia
-License:MIT
-Web Site:
-Source Code:https://github.com/fighthawkarg/NasaApodMD
-Issue Tracker:https://github.com/fighthawkarg/NasaApodMD/issues
-Donate:https://www.paypal.me/fightinghawk
-
-Auto Name:Apod MD
-Summary:NASA Astronomy Picture of the Day with Material Design
-Description:
-NASA Astronomy Picture of the Day with Material Design
-
-App Icon by Icons8.com.
-
-* View Images from NASA
-* Read Descriptions of Images to Learn More About Them
-* Download Your Favorites Images
-.
-
-Repo Type:git
-Repo:https://github.com/fighthawkarg/NasaApodMD.git
-
-Build:3.2.8,11
-    commit=3.2.8
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:3.2.8
-Current Version Code:11
diff --git a/metadata/com.jvillalba.apod.md.yml b/metadata/com.jvillalba.apod.md.yml
new file mode 100644
index 0000000000..a917b49a37
--- /dev/null
+++ b/metadata/com.jvillalba.apod.md.yml
@@ -0,0 +1,34 @@
+Categories:
+  - Science & Education
+  - Multimedia
+License: MIT
+SourceCode: https://github.com/fighthawkarg/NasaApodMD
+IssueTracker: https://github.com/fighthawkarg/NasaApodMD/issues
+Donate: https://www.paypal.me/fightinghawk
+
+AutoName: Apod MD
+Summary: NASA Astronomy Picture of the Day with Material Design
+Description: |-
+    NASA Astronomy Picture of the Day with Material Design
+
+    App Icon by Icons8.com.
+
+    * View Images from NASA
+    * Read Descriptions of Images to Learn More About Them
+    * Download Your Favorites Images
+
+RepoType: git
+Repo: https://github.com/fighthawkarg/NasaApodMD.git
+
+Builds:
+  - versionName: 3.2.8
+    versionCode: 11
+    commit: 3.2.8
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 3.2.8
+CurrentVersionCode: 11
diff --git a/metadata/com.kaliturin.blacklist.txt b/metadata/com.kaliturin.blacklist.txt
deleted file mode 100644
index 928e5a8a6a..0000000000
--- a/metadata/com.kaliturin.blacklist.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Categories:Phone & SMS
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/kaliturin/BlackList
-Issue Tracker:https://github.com/kaliturin/BlackList/issues
-
-Auto Name:Blacklist Blocker
-Summary:Block unwanted calls and/or SMS
-Description:
-This application allows you to block unwanted calls and/or SMS in a variety of
-ways: blacklists, whitelists, contacts-only.
-
-* Managing the Blacklist - to block phone numbers.
-* Managing the Whitelist - to exclude phone numbers from blocking.
-* Reading the Contacts and SMS lists of your phone - to block phone numbers not included in these lists.
-* Blocking of private/anonymous numbers.
-* Different ways of comparing blocked numbers (equality, by fragment, etc.).
-* Recording of the Event log - the history of blocked calls and SMS (with saving the texts).
-* Managing notifications about block events.
-* Support for light and dark themes of the interface.
-.
-
-Repo Type:git
-Repo:https://github.com/kaliturin/BlackList.git
-
-Build:1.2.12,18
-    commit=v1.2.12
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2.12
-Current Version Code:18
diff --git a/metadata/com.kaliturin.blacklist.yml b/metadata/com.kaliturin.blacklist.yml
new file mode 100644
index 0000000000..2e31b98388
--- /dev/null
+++ b/metadata/com.kaliturin.blacklist.yml
@@ -0,0 +1,36 @@
+Categories:
+  - Phone & SMS
+License: Apache-2.0
+SourceCode: https://github.com/kaliturin/BlackList
+IssueTracker: https://github.com/kaliturin/BlackList/issues
+
+AutoName: Blacklist Blocker
+Summary: Block unwanted calls and/or SMS
+Description: |-
+    This application allows you to block unwanted calls and/or SMS in a variety of
+    ways: blacklists, whitelists, contacts-only.
+
+    * Managing the Blacklist - to block phone numbers.
+    * Managing the Whitelist - to exclude phone numbers from blocking.
+    * Reading the Contacts and SMS lists of your phone - to block phone numbers not included in these lists.
+    * Blocking of private/anonymous numbers.
+    * Different ways of comparing blocked numbers (equality, by fragment, etc.).
+    * Recording of the Event log - the history of blocked calls and SMS (with saving the texts).
+    * Managing notifications about block events.
+    * Support for light and dark themes of the interface.
+
+RepoType: git
+Repo: https://github.com/kaliturin/BlackList.git
+
+Builds:
+  - versionName: 1.2.12
+    versionCode: 18
+    commit: v1.2.12
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.12
+CurrentVersionCode: 18
diff --git a/metadata/com.kanedias.vanilla.audiotag.txt b/metadata/com.kanedias.vanilla.audiotag.txt
deleted file mode 100644
index a0dd232c41..0000000000
--- a/metadata/com.kanedias.vanilla.audiotag.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Author Name:Kanedias
-Author Email:kanedias@keemail.me
-Web Site:
-Source Code:https://github.com/vanilla-music/vanilla-music-tag-editor
-Issue Tracker:https://github.com/vanilla-music/vanilla-music-tag-editor/issues
-Donate:https://www.patreon.com/kanedias
-LiberapayID:27922
-
-Auto Name:Vanilla Tag Editor
-Summary:Vanilla Music player Tag Editor plugin
-Description:
-This app is a plugin. Prior to use it you should have
-[[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
-are installed, request a context menu from library screen, select "Plugins" and
-"Tag Editor" afterwards.
-
-This plugin can edit metadata tags of the various music files and persist them
-to the file being edited. Note that not all music files support storing tags in
-metadata as this depends on format.
-
-Also note that artwork fetching and persisting is done in another plugin,
-[[com.kanedias.vanilla.coverfetch]] that is also available from store.
-
-'''Features:'''
-
-* Tag editing of multiple audiofile formats (mp3/ogg/flac)
-* Any supported tag: Title, Album, Year, Lyrics, etc.
-* Lightweight (640 KB in release apk)
-.
-
-Repo Type:git
-Repo:https://github.com/vanilla-music/vanilla-music-tag-editor
-
-Build:1.0,1
-    disable=gradle plugin outdated
-    commit=1.0
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle
-
-Build:1.0.1,2
-    commit=1.0.1
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle
-
-Build:1.0.2,3
-    commit=1.0.2
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle
-
-Build:1.0.3,4
-    commit=1.0.3
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle
-
-Build:1.0.4,5
-    commit=1.0.4
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle && \
-        echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:1.1.0,6
-    disable=doesnt build
-    commit=1.1.0
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle && \
-        echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:1.1.1,7
-    commit=1.1.1
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle && \
-        echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:1.1.2,8
-    commit=1.1.2
-    subdir=app
-    gradle=yes
-    srclibs=audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
-    rm=app/libs/*jar
-    prebuild=cp -fR $$audiotagger-android$$/src/org src/main/java/ && \
-        sed -i -e '/jar/d' build.gradle && \
-        echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:1.2.0,9
-    commit=1.2.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.1,10
-    commit=1.2.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.2,11
-    commit=1.2.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.3,12
-    commit=1.2.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.4,13
-    commit=1.2.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.5,14
-    commit=1.2.5
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.6,15
-    commit=1.2.6
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.3.0,16
-    commit=1.3.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.1,18
-    commit=1.4.1
-    subdir=app
-    gradle=yes
-
-Build:1.4.2,19
-    commit=1.4.2
-    subdir=app
-    gradle=yes
-
-Build:1.4.3,20
-    commit=1.4.3
-    subdir=app
-    gradle=yes
-
-Build:1.4.4,21
-    commit=1.4.4
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-- This app doesn't have default activity, this is normal
-- This app requires [[ch.blinkenlights.android.vanilla]]
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Update Check Ignore:beta
-Current Version:1.4.4
-Current Version Code:21
diff --git a/metadata/com.kanedias.vanilla.audiotag.yml b/metadata/com.kanedias.vanilla.audiotag.yml
new file mode 100644
index 0000000000..85883b1439
--- /dev/null
+++ b/metadata/com.kanedias.vanilla.audiotag.yml
@@ -0,0 +1,258 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+AuthorName: Kanedias
+AuthorEmail: kanedias@keemail.me
+SourceCode: https://github.com/vanilla-music/vanilla-music-tag-editor
+IssueTracker: https://github.com/vanilla-music/vanilla-music-tag-editor/issues
+Donate: https://www.patreon.com/kanedias
+LiberapayID: '27922'
+
+AutoName: Vanilla Tag Editor
+Summary: Vanilla Music player Tag Editor plugin
+Description: |-
+    This app is a plugin. Prior to use it you should have
+    [[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
+    are installed, request a context menu from library screen, select "Plugins" and
+    "Tag Editor" afterwards.
+
+    This plugin can edit metadata tags of the various music files and persist them
+    to the file being edited. Note that not all music files support storing tags in
+    metadata as this depends on format.
+
+    Also note that artwork fetching and persisting is done in another plugin,
+    [[com.kanedias.vanilla.coverfetch]] that is also available from store.
+
+    '''Features:'''
+
+    * Tag editing of multiple audiofile formats (mp3/ogg/flac)
+    * Any supported tag: Title, Album, Year, Lyrics, etc.
+    * Lightweight (640 KB in release apk)
+
+RepoType: git
+Repo: https://github.com/vanilla-music/vanilla-music-tag-editor
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    disable: gradle plugin outdated
+    commit: '1.0'
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 1.0.1
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: 1.0.2
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+
+  - versionName: 1.0.3
+    versionCode: 4
+    commit: 1.0.3
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+
+  - versionName: 1.0.4
+    versionCode: 5
+    commit: 1.0.4
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+
+  - versionName: 1.1.0
+    versionCode: 6
+    disable: doesnt build
+    commit: 1.1.0
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+
+  - versionName: 1.1.1
+    versionCode: 7
+    commit: 1.1.1
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+
+  - versionName: 1.1.2
+    versionCode: 8
+    commit: 1.1.2
+    subdir: app
+    gradle:
+      - yes
+    srclibs:
+      - audiotagger-android@392c8137057304e7364b5ec6dd14a65ea45299a6
+    rm:
+      - app/libs/*jar
+    prebuild:
+      - cp -fR $$audiotagger-android$$/src/org src/main/java/
+      - sed -i -e '/jar/d' build.gradle
+      - echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation'
+        } }" >> build.gradle
+
+  - versionName: 1.2.0
+    versionCode: 9
+    commit: 1.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.1
+    versionCode: 10
+    commit: 1.2.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.2
+    versionCode: 11
+    commit: 1.2.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.3
+    versionCode: 12
+    commit: 1.2.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.4
+    versionCode: 13
+    commit: 1.2.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.5
+    versionCode: 14
+    commit: 1.2.5
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.6
+    versionCode: 15
+    commit: 1.2.6
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 16
+    commit: 1.3.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 18
+    commit: 1.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.2
+    versionCode: 19
+    commit: 1.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.3
+    versionCode: 20
+    commit: 1.4.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.4
+    versionCode: 21
+    commit: 1.4.4
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    - This app doesn't have default activity, this is normal
+    - This app requires [[ch.blinkenlights.android.vanilla]]
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+UpdateCheckIgnore: beta
+CurrentVersion: 1.4.4
+CurrentVersionCode: 21
diff --git a/metadata/com.kanedias.vanilla.coverfetch.txt b/metadata/com.kanedias.vanilla.coverfetch.txt
deleted file mode 100644
index e3eb46dbfa..0000000000
--- a/metadata/com.kanedias.vanilla.coverfetch.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Author Name:Kanedias
-Author Email:kanedias@keemail.me
-Web Site:
-Source Code:https://github.com/vanilla-music/vanilla-music-cover-fetch
-Issue Tracker:https://github.com/vanilla-music/vanilla-music-cover-fetch/issues
-Donate:https://www.patreon.com/kanedias
-LiberapayID:27922
-
-Auto Name:Vanilla Cover Fetch
-Summary:Vanilla Music player Cover Fetch plugin
-Description:
-This app is a plugin. Prior to use it you should have
-[[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
-are installed, request a context menu from library screen, select "Plugins" and
-"Cover fetch" afterwards. Note that this plugin requires internet connection to
-be useful.
-
-'''Features:'''
-
-* Requests artwork by artist and album from musicbrainz
-* Can interact with Tag Editor plugin:
-* Can read artwork from file tags and show them without internet connection.
-* Can write artwork retrieved from wiki to file tags
-.
-
-Repo Type:git
-Repo:https://github.com/vanilla-music/vanilla-music-cover-fetch
-
-Build:1.0.0,1
-    commit=1.0.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.1,2
-    commit=1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,3
-    commit=1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.1.0,4
-    commit=1.1.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.1.1,5
-    commit=1.1.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.0,6
-    commit=1.2.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.3.0,7
-    commit=1.3.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.0,8
-    commit=1.4.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.1,9
-    commit=1.4.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.2,10
-    commit=1.4.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.3,11
-    commit=1.4.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.4,12
-    commit=1.4.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.5,13
-    commit=1.4.5
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-- This app doesn't have default activity, this is normal
-- This app requires [[ch.blinkenlights.android.vanilla]]
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Update Check Ignore:beta
-Current Version:1.4.5
-Current Version Code:13
diff --git a/metadata/com.kanedias.vanilla.coverfetch.yml b/metadata/com.kanedias.vanilla.coverfetch.yml
new file mode 100644
index 0000000000..f51ef7a6dd
--- /dev/null
+++ b/metadata/com.kanedias.vanilla.coverfetch.yml
@@ -0,0 +1,139 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+AuthorName: Kanedias
+AuthorEmail: kanedias@keemail.me
+SourceCode: https://github.com/vanilla-music/vanilla-music-cover-fetch
+IssueTracker: https://github.com/vanilla-music/vanilla-music-cover-fetch/issues
+Donate: https://www.patreon.com/kanedias
+LiberapayID: '27922'
+
+AutoName: Vanilla Cover Fetch
+Summary: Vanilla Music player Cover Fetch plugin
+Description: |-
+    This app is a plugin. Prior to use it you should have
+    [[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
+    are installed, request a context menu from library screen, select "Plugins" and
+    "Cover fetch" afterwards. Note that this plugin requires internet connection to
+    be useful.
+
+    '''Features:'''
+
+    * Requests artwork by artist and album from musicbrainz
+    * Can interact with Tag Editor plugin:
+    * Can read artwork from file tags and show them without internet connection.
+    * Can write artwork retrieved from wiki to file tags
+
+RepoType: git
+Repo: https://github.com/vanilla-music/vanilla-music-cover-fetch
+
+Builds:
+  - versionName: 1.0.0
+    versionCode: 1
+    commit: 1.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: 1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 4
+    commit: 1.1.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.1.1
+    versionCode: 5
+    commit: 1.1.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 6
+    commit: 1.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 7
+    commit: 1.3.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 8
+    commit: 1.4.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 9
+    commit: 1.4.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.2
+    versionCode: 10
+    commit: 1.4.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.3
+    versionCode: 11
+    commit: 1.4.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.4
+    versionCode: 12
+    commit: 1.4.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.5
+    versionCode: 13
+    commit: 1.4.5
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    - This app doesn't have default activity, this is normal
+    - This app requires [[ch.blinkenlights.android.vanilla]]
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+UpdateCheckIgnore: beta
+CurrentVersion: 1.4.5
+CurrentVersionCode: 13
diff --git a/metadata/com.kanedias.vanilla.lyrics.txt b/metadata/com.kanedias.vanilla.lyrics.txt
deleted file mode 100644
index 3add60723c..0000000000
--- a/metadata/com.kanedias.vanilla.lyrics.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Author Name:Kanedias
-Author Email:kanedias@keemail.me
-Web Site:
-Source Code:https://github.com/vanilla-music/vanilla-music-lyrics-search
-Issue Tracker:https://github.com/vanilla-music/vanilla-music-lyrics-search/issues
-Donate:https://www.patreon.com/kanedias
-LiberapayID:27922
-
-Auto Name:Vanilla Lyrics Search
-Summary:Vanilla Music player Lyrics Search plugin
-Description:
-This app is a plugin. Prior to use it you should have
-[[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
-are installed, request a context menu from library screen, select "Plugins" and
-"Lyrics search" afterwards. Note that this plugin requires internet connection
-to be useful.
-
-For file tag related operations it also optionally requires
-[[com.kanedias.vanilla.audiotag]] to be present.
-
-This plugin allows reading lyrics from file tag or from *.lrc file with same
-name. If no lyrics is available from these sources it can also download lyrics
-from [http://lyrics.wikia.com Lyrics Wiki] if it is present  for this file's
-artist and title.
-
-'''Features:'''
-
-* Requests lyrics by artist and title from lyrics.wikia.com
-* Can read lyrics from file tags or *.lrc files and show them without internet connection
-* Can write lyrics retrieved from wiki to file tags
-.
-
-Repo Type:git
-Repo:https://github.com/vanilla-music/vanilla-music-lyrics-search
-
-Build:1.0,1
-    commit=1.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.1,2
-    commit=1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.0.2,3
-    commit=1.0.2
-    subdir=app
-    gradle=yes
-
-Build:1.0.3,4
-    commit=1.0.3
-    subdir=app
-    gradle=yes
-
-Build:1.0.4,5
-    commit=1.0.4
-    subdir=app
-    gradle=yes
-
-Build:1.1.0,6
-    commit=1.1.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.0,7
-    commit=1.2.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.1,8
-    commit=1.2.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.2,9
-    commit=1.2.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.3.0,10
-    commit=1.3.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.3.1,11
-    commit=1.3.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.3.2,12
-    commit=1.3.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Maintainer Notes:
-- This app doesn't have default activity, this is normal
-- This app requires [[ch.blinkenlights.android.vanilla]]
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Update Check Ignore:beta
-Current Version:1.3.2
-Current Version Code:12
diff --git a/metadata/com.kanedias.vanilla.lyrics.yml b/metadata/com.kanedias.vanilla.lyrics.yml
new file mode 100644
index 0000000000..290ab35e08
--- /dev/null
+++ b/metadata/com.kanedias.vanilla.lyrics.yml
@@ -0,0 +1,137 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+AuthorName: Kanedias
+AuthorEmail: kanedias@keemail.me
+SourceCode: https://github.com/vanilla-music/vanilla-music-lyrics-search
+IssueTracker: https://github.com/vanilla-music/vanilla-music-lyrics-search/issues
+Donate: https://www.patreon.com/kanedias
+LiberapayID: '27922'
+
+AutoName: Vanilla Lyrics Search
+Summary: Vanilla Music player Lyrics Search plugin
+Description: |-
+    This app is a plugin. Prior to use it you should have
+    [[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
+    are installed, request a context menu from library screen, select "Plugins" and
+    "Lyrics search" afterwards. Note that this plugin requires internet connection
+    to be useful.
+
+    For file tag related operations it also optionally requires
+    [[com.kanedias.vanilla.audiotag]] to be present.
+
+    This plugin allows reading lyrics from file tag or from *.lrc file with same
+    name. If no lyrics is available from these sources it can also download lyrics
+    from [http://lyrics.wikia.com Lyrics Wiki] if it is present  for this file's
+    artist and title.
+
+    '''Features:'''
+
+    * Requests lyrics by artist and title from lyrics.wikia.com
+    * Can read lyrics from file tags or *.lrc files and show them without internet connection
+    * Can write lyrics retrieved from wiki to file tags
+
+RepoType: git
+Repo: https://github.com/vanilla-music/vanilla-music-lyrics-search
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 3
+    commit: 1.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 4
+    commit: 1.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.4
+    versionCode: 5
+    commit: 1.0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 6
+    commit: 1.1.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 7
+    commit: 1.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.1
+    versionCode: 8
+    commit: 1.2.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.2
+    versionCode: 9
+    commit: 1.2.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 10
+    commit: 1.3.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.3.1
+    versionCode: 11
+    commit: 1.3.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.3.2
+    versionCode: 12
+    commit: 1.3.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    - This app doesn't have default activity, this is normal
+    - This app requires [[ch.blinkenlights.android.vanilla]]
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+UpdateCheckIgnore: beta
+CurrentVersion: 1.3.2
+CurrentVersionCode: 12
diff --git a/metadata/com.kanedias.vanilla.metadata.txt b/metadata/com.kanedias.vanilla.metadata.txt
deleted file mode 100644
index c267fa53eb..0000000000
--- a/metadata/com.kanedias.vanilla.metadata.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Author Name:Kanedias
-Author Email:kanedias@keemail.me
-Web Site:
-Source Code:https://github.com/vanilla-music/vanilla-music-metadata-fetch
-Issue Tracker:https://github.com/vanilla-music/vanilla-music-metadata-fetch/issues
-Donate:https://www.patreon.com/kanedias
-LiberapayID:27922
-
-Auto Name:Vanilla Metadata Fetch
-Summary:Vanilla Music player Metadata retrieval plugin
-Description:
-This app is a plugin. Prior to use it you should have
-[[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
-are installed, request a context menu from library screen, select "Plugins" and
-"Metadata fetch" afterwards. Note that this plugin requires internet connection
-to be useful.
-
-This plugin can create fingerprint for any music file you wish to know about and
-request its metadata from [https://acoustid.org AcoustID], libre and open source
-fingerprinting service. If match is found it is then shown on the screen.
-
-'''Features:'''
-
-* Fetches tag metadata for various music files (mp3/ogg/flac)
-* Can also fetch cover image for selected song
-* Can write retrieved cover and tags if [[com.kanedias.vanilla.audiotag]] is installed
-.
-
-Repo Type:git
-Repo:https://github.com/vanilla-music/vanilla-music-metadata-fetch
-
-Build:1.0.3,4
-    commit=1.0.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e '/splits/,+15d' build.gradle
-
-Build:1.0.4,5
-    commit=1.0.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e '/splits/,+15d' build.gradle
-
-Maintainer Notes:
-- This app doesn't have default activity, this is normal
-- This app requires [[ch.blinkenlights.android.vanilla]]
-- This app contains native code and uses abi splits
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Update Check Ignore:beta
-Current Version:1.0.4
-Current Version Code:5
diff --git a/metadata/com.kanedias.vanilla.metadata.yml b/metadata/com.kanedias.vanilla.metadata.yml
new file mode 100644
index 0000000000..06db62be02
--- /dev/null
+++ b/metadata/com.kanedias.vanilla.metadata.yml
@@ -0,0 +1,61 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+AuthorName: Kanedias
+AuthorEmail: kanedias@keemail.me
+SourceCode: https://github.com/vanilla-music/vanilla-music-metadata-fetch
+IssueTracker: https://github.com/vanilla-music/vanilla-music-metadata-fetch/issues
+Donate: https://www.patreon.com/kanedias
+LiberapayID: '27922'
+
+AutoName: Vanilla Metadata Fetch
+Summary: Vanilla Music player Metadata retrieval plugin
+Description: |-
+    This app is a plugin. Prior to use it you should have
+    [[ch.blinkenlights.android.vanilla]] installed. Once both player and this plugin
+    are installed, request a context menu from library screen, select "Plugins" and
+    "Metadata fetch" afterwards. Note that this plugin requires internet connection
+    to be useful.
+
+    This plugin can create fingerprint for any music file you wish to know about and
+    request its metadata from [https://acoustid.org AcoustID], libre and open source
+    fingerprinting service. If match is found it is then shown on the screen.
+
+    '''Features:'''
+
+    * Fetches tag metadata for various music files (mp3/ogg/flac)
+    * Can also fetch cover image for selected song
+    * Can write retrieved cover and tags if [[com.kanedias.vanilla.audiotag]] is installed
+
+RepoType: git
+Repo: https://github.com/vanilla-music/vanilla-music-metadata-fetch
+
+Builds:
+  - versionName: 1.0.3
+    versionCode: 4
+    commit: 1.0.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild: sed -i -e '/splits/,+15d' build.gradle
+
+  - versionName: 1.0.4
+    versionCode: 5
+    commit: 1.0.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild: sed -i -e '/splits/,+15d' build.gradle
+
+MaintainerNotes: |-
+    - This app doesn't have default activity, this is normal
+    - This app requires [[ch.blinkenlights.android.vanilla]]
+    - This app contains native code and uses abi splits
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+UpdateCheckIgnore: beta
+CurrentVersion: 1.0.4
+CurrentVersionCode: 5