diff --git a/metadata/com.aaronjwood.portauthority.txt b/metadata/com.aaronjwood.portauthority.txt
deleted file mode 100644
index 6de5495da9..0000000000
--- a/metadata/com.aaronjwood.portauthority.txt
+++ /dev/null
@@ -1,253 +0,0 @@
-Categories:Security
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/aaronjwood/PortAuthority
-Issue Tracker:https://github.com/aaronjwood/PortAuthority/issues
-Changelog:https://github.com/aaronjwood/PortAuthority/releases
-Donate:https://github.com/aaronjwood/PortAuthority#donate
-
-Auto Name:Port Authority
-Summary:Port scanner
-Description:
-A handy systems and security-focused tool, Port Authority is a very fast port
-scanner. It also allows you to quickly discover hosts on your network and will
-display useful network information about your device and other hosts.
-
-One of the fastest port scanners with host discovery on the market! Host
-discovery is typically performed in less than 5 seconds. If the device you're
-scanning drops packets, it takes about 10 seconds to scan 1000 ports. If the
-device you're scanning rejects packets, it takes less than 30 seconds to scan
-all 65,535 ports!
-
-'''Features:'''
-
-* Heavily threaded, no more waiting for results one at a time
-* LAN host discovery
-* Public IP discovery
-* MAC address vendor detection
-* LAN/WAN host TCP port scanning
-* Custom port range scans
-* Open discovered HTTP(S) services to browser
-* Lightweight service fingerprinting (SSH/HTTP(S) server type and version)
-* DNS record lookups supporting almost every record type
-* Wake-on-LAN for LAN hosts
-.
-
-Repo Type:git
-Repo:https://github.com/aaronjwood/PortAuthority
-
-Build:1.2.2,5
-    commit=v1.2.2
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.2.5,8
-    commit=v1.2.5
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.3.0,9
-    commit=v1.3.0
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.3.1,10
-    commit=v1.3.1
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.3.2,11
-    commit=v1.3.2
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.4.0,12
-    commit=v1.4.0
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.5.0,13
-    commit=v1.5.0
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.5.2,14
-    commit=v1.5.2
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.5.5,16
-    commit=v1.5.5
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.5.7,18
-    commit=v1.5.7
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.6.0,19
-    commit=v1.6.0
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.6.3,21
-    commit=v1.6.3
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.6.4,22
-    commit=v1.6.4
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.6.5,23
-    commit=v1.6.5
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.6.6,24
-    disable=non-free deps
-    commit=v1.6.6
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.6.11,29
-    commit=v1.6.11
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.7.0,30
-    commit=v1.7.0
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.7.1,31
-    commit=v1.7.1
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.7.2,32
-    commit=v1.7.2
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.7.5,34
-    commit=v1.7.5
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.7.6,35
-    commit=v1.7.6
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.7.9,37
-    commit=v1.7.9
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.8.1,39
-    commit=v1.8.1
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.8.2,40
-    commit=v1.8.2
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.8.3,41
-    commit=v1.8.3
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.9.0,42
-    commit=v1.9.0
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.9.2,43
-    commit=v1.9.2
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.9.4,44
-    commit=v1.9.4
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.9.5,45
-    commit=v1.9.5
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.9.8,46
-    commit=v1.9.8
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:1.9.9,47
-    commit=v1.9.9
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:2.0.0,48
-    commit=v2.0.0
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:2.0.1,49
-    commit=v2.0.1
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
-
-Build:2.2.6,54
-    commit=v2.2.6
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/applicationIdSuffix/d; /versionNameSuffix/d' build.gradle
-
-Build:2.2.8,55
-    commit=v2.2.8
-    subdir=app
-    gradle=free
-    prebuild=sed -i -e '/applicationIdSuffix/d; /versionNameSuffix/d' build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.2.8
-Current Version Code:55
diff --git a/metadata/com.aaronjwood.portauthority.yml b/metadata/com.aaronjwood.portauthority.yml
new file mode 100644
index 0000000000..17daf7d59e
--- /dev/null
+++ b/metadata/com.aaronjwood.portauthority.yml
@@ -0,0 +1,323 @@
+Categories:
+  - Security
+License: GPL-3.0-only
+SourceCode: https://github.com/aaronjwood/PortAuthority
+IssueTracker: https://github.com/aaronjwood/PortAuthority/issues
+Changelog: https://github.com/aaronjwood/PortAuthority/releases
+Donate: https://github.com/aaronjwood/PortAuthority#donate
+
+AutoName: Port Authority
+Summary: Port scanner
+Description: |-
+    A handy systems and security-focused tool, Port Authority is a very fast port
+    scanner. It also allows you to quickly discover hosts on your network and will
+    display useful network information about your device and other hosts.
+
+    One of the fastest port scanners with host discovery on the market! Host
+    discovery is typically performed in less than 5 seconds. If the device you're
+    scanning drops packets, it takes about 10 seconds to scan 1000 ports. If the
+    device you're scanning rejects packets, it takes less than 30 seconds to scan
+    all 65,535 ports!
+
+    '''Features:'''
+
+    * Heavily threaded, no more waiting for results one at a time
+    * LAN host discovery
+    * Public IP discovery
+    * MAC address vendor detection
+    * LAN/WAN host TCP port scanning
+    * Custom port range scans
+    * Open discovered HTTP(S) services to browser
+    * Lightweight service fingerprinting (SSH/HTTP(S) server type and version)
+    * DNS record lookups supporting almost every record type
+    * Wake-on-LAN for LAN hosts
+
+RepoType: git
+Repo: https://github.com/aaronjwood/PortAuthority
+
+Builds:
+  - versionName: 1.2.2
+    versionCode: 5
+    commit: v1.2.2
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.2.5
+    versionCode: 8
+    commit: v1.2.5
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.3.0
+    versionCode: 9
+    commit: v1.3.0
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.3.1
+    versionCode: 10
+    commit: v1.3.1
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.3.2
+    versionCode: 11
+    commit: v1.3.2
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.4.0
+    versionCode: 12
+    commit: v1.4.0
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.5.0
+    versionCode: 13
+    commit: v1.5.0
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.5.2
+    versionCode: 14
+    commit: v1.5.2
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.5.5
+    versionCode: 16
+    commit: v1.5.5
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.5.7
+    versionCode: 18
+    commit: v1.5.7
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.6.0
+    versionCode: 19
+    commit: v1.6.0
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.6.3
+    versionCode: 21
+    commit: v1.6.3
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.6.4
+    versionCode: 22
+    commit: v1.6.4
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.6.5
+    versionCode: 23
+    commit: v1.6.5
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.6.6
+    versionCode: 24
+    disable: non-free deps
+    commit: v1.6.6
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.6.11
+    versionCode: 29
+    commit: v1.6.11
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.7.0
+    versionCode: 30
+    commit: v1.7.0
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.7.1
+    versionCode: 31
+    commit: v1.7.1
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.7.2
+    versionCode: 32
+    commit: v1.7.2
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.7.5
+    versionCode: 34
+    commit: v1.7.5
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.7.6
+    versionCode: 35
+    commit: v1.7.6
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.7.9
+    versionCode: 37
+    commit: v1.7.9
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.8.1
+    versionCode: 39
+    commit: v1.8.1
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.8.2
+    versionCode: 40
+    commit: v1.8.2
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.8.3
+    versionCode: 41
+    commit: v1.8.3
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.9.0
+    versionCode: 42
+    commit: v1.9.0
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.9.2
+    versionCode: 43
+    commit: v1.9.2
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.9.4
+    versionCode: 44
+    commit: v1.9.4
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.9.5
+    versionCode: 45
+    commit: v1.9.5
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.9.8
+    versionCode: 46
+    commit: v1.9.8
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 1.9.9
+    versionCode: 47
+    commit: v1.9.9
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 2.0.0
+    versionCode: 48
+    commit: v2.0.0
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 2.0.1
+    versionCode: 49
+    commit: v2.0.1
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/com.aaronjwood.portauthority.free/d' build.gradle
+
+  - versionName: 2.2.6
+    versionCode: 54
+    commit: v2.2.6
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/applicationIdSuffix/d; /versionNameSuffix/d' build.gradle
+
+  - versionName: 2.2.8
+    versionCode: 55
+    commit: v2.2.8
+    subdir: app
+    gradle:
+      - free
+    prebuild: sed -i -e '/applicationIdSuffix/d; /versionNameSuffix/d' build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 2.2.8
+CurrentVersionCode: 55
diff --git a/metadata/com.abcdjdj.rootverifier.txt b/metadata/com.abcdjdj.rootverifier.txt
deleted file mode 100644
index 68627a3ba5..0000000000
--- a/metadata/com.abcdjdj.rootverifier.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Categories:System
-License:GPL-2.0-or-later
-Web Site:
-Source Code:https://github.com/abcdjdj/RootVerifier-APP
-Issue Tracker:https://github.com/abcdjdj/RootVerifier-APP/issues
-
-Auto Name:Root Verifier
-Summary:Check if device is rooted
-Description:
-RootVerifier checks if your Android device has Superuser ("root") access or not.
-It can be quite useful for those who are new to the Android world and don't know
-whether their device is rooted yet.
-.
-
-Repo Type:git
-Repo:https://github.com/abcdjdj/RootVerifier-APP.git
-
-Build:1.2,3
-    commit=ff498b24bee87
-
-Build:1.3,4
-    commit=f2fb7be5feff5a6fb998
-
-Build:1.4,5
-    commit=7bf4bb9c9
-
-Build:1.5,6
-    commit=8550385370a459e5
-
-Build:1.6,7
-    commit=e2eeb9fd6b7fe4c8b70be13
-
-Build:1.7,8
-    commit=ac7c2da4c0a5a80a1b11068f168f2878ecf44d2d
-
-Build:1.9,10
-    commit=3ebd791159cd556ab80c697aee08ef12ed75c98f
-
-Build:2.0,12
-    commit=d69a21d587ff4378997ca060a55e510cfcf9d9ff
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:2.0
-Current Version Code:12
diff --git a/metadata/com.abcdjdj.rootverifier.yml b/metadata/com.abcdjdj.rootverifier.yml
new file mode 100644
index 0000000000..7841109384
--- /dev/null
+++ b/metadata/com.abcdjdj.rootverifier.yml
@@ -0,0 +1,56 @@
+Categories:
+  - System
+License: GPL-2.0-or-later
+SourceCode: https://github.com/abcdjdj/RootVerifier-APP
+IssueTracker: https://github.com/abcdjdj/RootVerifier-APP/issues
+
+AutoName: Root Verifier
+Summary: Check if device is rooted
+Description: |-
+    RootVerifier checks if your Android device has Superuser ("root") access or not.
+    It can be quite useful for those who are new to the Android world and don't know
+    whether their device is rooted yet.
+
+RepoType: git
+Repo: https://github.com/abcdjdj/RootVerifier-APP.git
+
+Builds:
+  - versionName: '1.2'
+    versionCode: 3
+    commit: ff498b24bee87
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: f2fb7be5feff5a6fb998
+
+  - versionName: '1.4'
+    versionCode: 5
+    commit: 7bf4bb9c9
+
+  - versionName: '1.5'
+    versionCode: 6
+    commit: 8550385370a459e5
+
+  - versionName: '1.6'
+    versionCode: 7
+    commit: e2eeb9fd6b7fe4c8b70be13
+
+  - versionName: '1.7'
+    versionCode: 8
+    commit: ac7c2da4c0a5a80a1b11068f168f2878ecf44d2d
+
+  - versionName: '1.9'
+    versionCode: 10
+    commit: 3ebd791159cd556ab80c697aee08ef12ed75c98f
+
+  - versionName: '2.0'
+    versionCode: 12
+    commit: d69a21d587ff4378997ca060a55e510cfcf9d9ff
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '2.0'
+CurrentVersionCode: 12
diff --git a/metadata/com.abhijitvalluri.android.fitnotifications.txt b/metadata/com.abhijitvalluri.android.fitnotifications.txt
deleted file mode 100644
index 657333dcdc..0000000000
--- a/metadata/com.abhijitvalluri.android.fitnotifications.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-AntiFeatures:NonFreeDep
-Categories:Connectivity
-License:Apache-2.0
-Author Name:Smart Dinosaurs Entertainment
-Web Site:https://android.abhijitvalluri.com/
-Source Code:https://github.com/abhijitvalluri/fitnotifications
-Issue Tracker:https://github.com/abhijitvalluri/fitnotifications/issues
-
-Auto Name:Fit Notifications
-Summary:Enable all notifications for compatible Fitbit devices
-Description:
-''Fit Notifications'' allows you to view all your Android notifications on your
-Fitbit device. See list of compatible devices. '''No special permissions
-required!'''
-
-'''COMPATIBLE DEVICES:''' Fitbit Alta, Alta HR, Charge 2, Blaze, Surge Limited
-compatibility with Fitbit Flex 2 (lights up the LEDs)
-.
-
-Repo Type:git
-Repo:https://github.com/abhijitvalluri/fitnotifications.git
-
-Build:2.9.16,39
-    commit=39
-    subdir=app
-    gradle=yes
-
-Build:2.9.17,40
-    commit=40
-    subdir=app
-    gradle=yes
-
-Build:2.9.18,42
-    commit=42
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %c
-Update Check Mode:Tags
-Current Version:2.9.18
-Current Version Code:42
diff --git a/metadata/com.abhijitvalluri.android.fitnotifications.yml b/metadata/com.abhijitvalluri.android.fitnotifications.yml
new file mode 100644
index 0000000000..97b7620a76
--- /dev/null
+++ b/metadata/com.abhijitvalluri.android.fitnotifications.yml
@@ -0,0 +1,49 @@
+AntiFeatures:
+  - NonFreeDep
+Categories:
+  - Connectivity
+License: Apache-2.0
+AuthorName: Smart Dinosaurs Entertainment
+WebSite: https://android.abhijitvalluri.com/
+SourceCode: https://github.com/abhijitvalluri/fitnotifications
+IssueTracker: https://github.com/abhijitvalluri/fitnotifications/issues
+
+AutoName: Fit Notifications
+Summary: Enable all notifications for compatible Fitbit devices
+Description: |-
+    ''Fit Notifications'' allows you to view all your Android notifications on your
+    Fitbit device. See list of compatible devices. '''No special permissions
+    required!'''
+
+    '''COMPATIBLE DEVICES:''' Fitbit Alta, Alta HR, Charge 2, Blaze, Surge Limited
+    compatibility with Fitbit Flex 2 (lights up the LEDs)
+
+RepoType: git
+Repo: https://github.com/abhijitvalluri/fitnotifications.git
+
+Builds:
+  - versionName: 2.9.16
+    versionCode: 39
+    commit: '39'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.9.17
+    versionCode: 40
+    commit: '40'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.9.18
+    versionCode: 42
+    commit: '42'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %c
+UpdateCheckMode: Tags
+CurrentVersion: 2.9.18
+CurrentVersionCode: 42
diff --git a/metadata/com.abitsinc.andr.txt b/metadata/com.abitsinc.andr.txt
deleted file mode 100644
index a01d97404a..0000000000
--- a/metadata/com.abitsinc.andr.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:http://www.abitsinc.com
-Source Code:https://github.com/abitsinc/AB-ITS-Inc-Flashlight-Android
-Issue Tracker:https://github.com/abitsinc/AB-ITS-Inc-Flashlight-Android/issues
-
-Auto Name:Flashlight
-Summary:Use your device's LED as flashlight
-Description:
-Uses the LED on your device's camera as a flashlight. If your device does not
-have a camera LED, it will paint a white box on your screen to enable it to
-serve as a poor substitute for a flashlight.
-
-Requires the Camera permission to control your device's LED but you will notice
-that it does not require the Internet permission as it serves no ads.
-.
-
-Repo Type:git
-Repo:https://github.com/abitsinc/AB-ITS-Inc-Flashlight-Android.git
-
-Build:2,2
-    commit=95535a4ce7ab1c87ff79d6740f633939ea4240a7
-
-Build:3,3
-    commit=3.0
-
-Build:4,4
-    commit=4.1
-
-Build:5,5
-    commit=abitsinc_flashlight_5
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:5
-Current Version Code:5
diff --git a/metadata/com.abitsinc.andr.yml b/metadata/com.abitsinc.andr.yml
new file mode 100644
index 0000000000..038cb22336
--- /dev/null
+++ b/metadata/com.abitsinc.andr.yml
@@ -0,0 +1,41 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: http://www.abitsinc.com
+SourceCode: https://github.com/abitsinc/AB-ITS-Inc-Flashlight-Android
+IssueTracker: https://github.com/abitsinc/AB-ITS-Inc-Flashlight-Android/issues
+
+AutoName: Flashlight
+Summary: Use your device's LED as flashlight
+Description: |-
+    Uses the LED on your device's camera as a flashlight. If your device does not
+    have a camera LED, it will paint a white box on your screen to enable it to
+    serve as a poor substitute for a flashlight.
+
+    Requires the Camera permission to control your device's LED but you will notice
+    that it does not require the Internet permission as it serves no ads.
+
+RepoType: git
+Repo: https://github.com/abitsinc/AB-ITS-Inc-Flashlight-Android.git
+
+Builds:
+  - versionName: '2'
+    versionCode: 2
+    commit: 95535a4ce7ab1c87ff79d6740f633939ea4240a7
+
+  - versionName: '3'
+    versionCode: 3
+    commit: '3.0'
+
+  - versionName: '4'
+    versionCode: 4
+    commit: '4.1'
+
+  - versionName: '5'
+    versionCode: 5
+    commit: abitsinc_flashlight_5
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '5'
+CurrentVersionCode: 5
diff --git a/metadata/com.achep.widget.jellyclock.txt b/metadata/com.achep.widget.jellyclock.txt
deleted file mode 100644
index 1aafa80941..0000000000
--- a/metadata/com.achep.widget.jellyclock.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Categories:Theming
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/AChep/JellyBeanClock
-Issue Tracker:https://github.com/AChep/JellyBeanClock/issues
-
-Auto Name:Jelly Clock
-Summary:Simple clock widget
-Description:
-Basic resizable clock widget, the kind that comes with Android 4.2. It's just a
-white circle without shadows: not quite like the icon.
-.
-
-Repo Type:git
-Repo:https://github.com/AChep/JellyBeanClock.git
-
-Build:1.0.1,2
-    commit=43e2b35baf
-
-Build:1.0.2,3
-    disable=Don't build
-    commit=unknown - see disabled
-
-Build:1.21,6
-    commit=e8fc2309
-    init=rm -rf bin/ gen/
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.21
-Current Version Code:6
diff --git a/metadata/com.achep.widget.jellyclock.yml b/metadata/com.achep.widget.jellyclock.yml
new file mode 100644
index 0000000000..d4d6142fe2
--- /dev/null
+++ b/metadata/com.achep.widget.jellyclock.yml
@@ -0,0 +1,34 @@
+Categories:
+  - Theming
+License: Apache-2.0
+SourceCode: https://github.com/AChep/JellyBeanClock
+IssueTracker: https://github.com/AChep/JellyBeanClock/issues
+
+AutoName: Jelly Clock
+Summary: Simple clock widget
+Description: |-
+    Basic resizable clock widget, the kind that comes with Android 4.2. It's just a
+    white circle without shadows: not quite like the icon.
+
+RepoType: git
+Repo: https://github.com/AChep/JellyBeanClock.git
+
+Builds:
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 43e2b35baf
+
+  - versionName: 1.0.2
+    versionCode: 3
+    disable: Don't build
+    commit: unknown - see disabled
+
+  - versionName: '1.21'
+    versionCode: 6
+    commit: e8fc2309
+    init: rm -rf bin/ gen/
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.21'
+CurrentVersionCode: 6
diff --git a/metadata/com.actisec.clipcaster.txt b/metadata/com.actisec.clipcaster.txt
deleted file mode 100644
index aeee170caa..0000000000
--- a/metadata/com.actisec.clipcaster.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Categories:Security
-License:BSD-2-Clause-FreeBSD
-Web Site:
-Source Code:https://github.com/activems/clipcaster
-Issue Tracker:https://github.com/activems/clipcaster/issues
-
-Auto Name:ClipCaster
-Summary:Show unauthorized access to password safes
-Description:
-Proof of concept that shows how easily any installed app can read passwords when
-they're used from password management applications.
-
-Read the website for additional information.
-.
-
-Repo Type:git
-Repo:https://github.com/activems/clipcaster
-
-Build:1.0.48,48
-    commit=06369d49485236e3adb8754d44ee71c23ceed9c4
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-The android:version is "1.0." + VERSION_CODE (from app/version.properties).
-The android:versionCode is VERSION_CODE (see above). No UCM applies.
-.
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:1.0.48
-Current Version Code:48
diff --git a/metadata/com.actisec.clipcaster.yml b/metadata/com.actisec.clipcaster.yml
new file mode 100644
index 0000000000..0d82b73d75
--- /dev/null
+++ b/metadata/com.actisec.clipcaster.yml
@@ -0,0 +1,33 @@
+Categories:
+  - Security
+License: BSD-2-Clause-FreeBSD
+SourceCode: https://github.com/activems/clipcaster
+IssueTracker: https://github.com/activems/clipcaster/issues
+
+AutoName: ClipCaster
+Summary: Show unauthorized access to password safes
+Description: |-
+    Proof of concept that shows how easily any installed app can read passwords when
+    they're used from password management applications.
+
+    Read the website for additional information.
+
+RepoType: git
+Repo: https://github.com/activems/clipcaster
+
+Builds:
+  - versionName: 1.0.48
+    versionCode: 48
+    commit: 06369d49485236e3adb8754d44ee71c23ceed9c4
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    The android:version is "1.0." + VERSION_CODE (from app/version.properties).
+    The android:versionCode is VERSION_CODE (see above). No UCM applies.
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 1.0.48
+CurrentVersionCode: 48
diff --git a/metadata/com.acvarium.tasclock.txt b/metadata/com.acvarium.tasclock.txt
deleted file mode 100644
index cf4329a34c..0000000000
--- a/metadata/com.acvarium.tasclock.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/Acvarium/TasClock
-Issue Tracker:https://github.com/Acvarium/TasClock/issues
-
-Auto Name:TasClock
-Summary:Track your work time
-Description:
-Time tracker useful for freelancers or other people, who want to control or
-investigate their own time.
-
-On the first screen you can add some task with labels, start or stop timing of
-your tasks. Long press on some task, and you will open screen, where you can
-control all time periods of it. Long press on some period, and in new screen you
-can edit selected time period.
-.
-
-Repo Type:git
-Repo:https://github.com/Acvarium/TasClock
-
-Build:1.0,2
-    commit=6326f30cb22fd5c2eed40950eb9577c3d5b830ff
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0
-Current Version Code:2
diff --git a/metadata/com.acvarium.tasclock.yml b/metadata/com.acvarium.tasclock.yml
new file mode 100644
index 0000000000..ffdfee67e0
--- /dev/null
+++ b/metadata/com.acvarium.tasclock.yml
@@ -0,0 +1,29 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+SourceCode: https://github.com/Acvarium/TasClock
+IssueTracker: https://github.com/Acvarium/TasClock/issues
+
+AutoName: TasClock
+Summary: Track your work time
+Description: |-
+    Time tracker useful for freelancers or other people, who want to control or
+    investigate their own time.
+
+    On the first screen you can add some task with labels, start or stop timing of
+    your tasks. Long press on some task, and you will open screen, where you can
+    control all time periods of it. Long press on some period, and in new screen you
+    can edit selected time period.
+
+RepoType: git
+Repo: https://github.com/Acvarium/TasClock
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 2
+    commit: 6326f30cb22fd5c2eed40950eb9577c3d5b830ff
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: '1.0'
+CurrentVersionCode: 2
diff --git a/metadata/com.adam.aslfms.txt b/metadata/com.adam.aslfms.txt
deleted file mode 100644
index 8eec533fc8..0000000000
--- a/metadata/com.adam.aslfms.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/tgwizard/sls
-Issue Tracker:https://github.com/tgwizard/sls/issues
-Changelog:https://github.com/tgwizard/sls/blob/HEAD/app/src/main/assets/changelog.txt
-
-Auto Name:Simple Last.fm Scrobbler
-Summary:Last.fm/Libre.fm Scrobbler
-Description:
-Scrobbling means submitting listening information to Last.fm and/or Libre.fm;
-you can then get music recommendations and view your listening history and
-statistics. The media player that you use must be able to work with the API e.g.
-[[org.kreed.vanilla]] or [[jp.co.kayo.android.localplayer]]. Apps can also hook
-into the Now-Playing broadcast: for example, [[com.jlyr]] can use it to grab
-lyrics.
-
-More info about scrobbling can be found on
-[http://www.last.fm/help/faq?category=Scrobbling#201 Last.fm's FAQ].
-.
-
-Repo Type:git
-Repo:https://github.com/tgwizard/sls.git
-
-Build:1.4.3,30
-    commit=v1.4.3
-
-Build:1.4.4,31
-    commit=v1.4.4
-
-Build:1.4.5,32
-    commit=3d97696f1dd232b97fd907e14305bb7ec5949864
-
-Build:1.4.6,33
-    commit=v1.4.6
-
-Build:1.4.7,36
-    commit=v1.4.7.2
-
-Build:1.4.8,37
-    commit=v1.4.8
-
-Build:1.4.9,39
-    commit=v1.4.9-39
-    subdir=app
-    gradle=yes
-
-Build:1.5.0,40
-    commit=v1.5.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.1,42
-    commit=v1.5.1
-    subdir=app
-    gradle=yes
-
-Build:1.5.2,43
-    commit=v1.5.2
-    subdir=app
-    gradle=yes
-
-Build:1.5.3,44
-    commit=v1.5.3
-    subdir=app
-    gradle=yes
-
-Build:1.5.5,46
-    disable=invalid version name (1.5.4) and code (45) in the output APK
-    commit=v1.5.5
-    subdir=app
-    gradle=yes
-
-Build:1.5.7,48
-    commit=v1.5.7
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.5.7
-Current Version Code:48
diff --git a/metadata/com.adam.aslfms.yml b/metadata/com.adam.aslfms.yml
new file mode 100644
index 0000000000..a7d8e21d26
--- /dev/null
+++ b/metadata/com.adam.aslfms.yml
@@ -0,0 +1,102 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://github.com/tgwizard/sls
+IssueTracker: https://github.com/tgwizard/sls/issues
+Changelog: https://github.com/tgwizard/sls/blob/HEAD/app/src/main/assets/changelog.txt
+
+AutoName: Simple Last.fm Scrobbler
+Summary: Last.fm/Libre.fm Scrobbler
+Description: |-
+    Scrobbling means submitting listening information to Last.fm and/or Libre.fm;
+    you can then get music recommendations and view your listening history and
+    statistics. The media player that you use must be able to work with the API e.g.
+    [[org.kreed.vanilla]] or [[jp.co.kayo.android.localplayer]]. Apps can also hook
+    into the Now-Playing broadcast: for example, [[com.jlyr]] can use it to grab
+    lyrics.
+
+    More info about scrobbling can be found on
+    [http://www.last.fm/help/faq?category=Scrobbling#201 Last.fm's FAQ].
+
+RepoType: git
+Repo: https://github.com/tgwizard/sls.git
+
+Builds:
+  - versionName: 1.4.3
+    versionCode: 30
+    commit: v1.4.3
+
+  - versionName: 1.4.4
+    versionCode: 31
+    commit: v1.4.4
+
+  - versionName: 1.4.5
+    versionCode: 32
+    commit: 3d97696f1dd232b97fd907e14305bb7ec5949864
+
+  - versionName: 1.4.6
+    versionCode: 33
+    commit: v1.4.6
+
+  - versionName: 1.4.7
+    versionCode: 36
+    commit: v1.4.7.2
+
+  - versionName: 1.4.8
+    versionCode: 37
+    commit: v1.4.8
+
+  - versionName: 1.4.9
+    versionCode: 39
+    commit: v1.4.9-39
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 40
+    commit: v1.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.1
+    versionCode: 42
+    commit: v1.5.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 43
+    commit: v1.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.3
+    versionCode: 44
+    commit: v1.5.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.5
+    versionCode: 46
+    disable: invalid version name (1.5.4) and code (45) in the output APK
+    commit: v1.5.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.7
+    versionCode: 48
+    commit: v1.5.7
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.5.7
+CurrentVersionCode: 48
diff --git a/metadata/com.addi.txt b/metadata/com.addi.txt
deleted file mode 100644
index 9fa6357825..0000000000
--- a/metadata/com.addi.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Categories:Science & Education
-License:GPL-3.0-only
-Web Site:http://addi.googlecode.com
-Source Code:https://code.google.com/p/addi/source
-Issue Tracker:
-Donate:https://code.google.com/p/addi/wiki/Donate
-
-Auto Name:Addi
-Summary:Math calculation environment
-Description:
-Addi is a mathematical computing environment like Matlab and Octave, but made to
-work on Android devices.
-
-The goal is for 100% compliance with how Octave works including a compatibility
-mode that makes the behavior more similar to Matlab (already very similar).
-.
-
-Repo Type:git-svn
-Repo:https://addi.googlecode.com/svn/Addi
-
-Build:1.88,37
-    commit=179
-
-Build:1.91,40
-    commit=189
-    buildjni=yes
-
-Build:1.97,43
-    disable=No source code
-    commit=unknown - see disabled
-
-Build:1.98,44
-    commit=198
-    buildjni=yes
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.98
-Current Version Code:44
diff --git a/metadata/com.addi.yml b/metadata/com.addi.yml
new file mode 100644
index 0000000000..61f34716c8
--- /dev/null
+++ b/metadata/com.addi.yml
@@ -0,0 +1,45 @@
+Categories:
+  - Science & Education
+License: GPL-3.0-only
+WebSite: http://addi.googlecode.com
+SourceCode: https://code.google.com/p/addi/source
+Donate: https://code.google.com/p/addi/wiki/Donate
+
+AutoName: Addi
+Summary: Math calculation environment
+Description: |-
+    Addi is a mathematical computing environment like Matlab and Octave, but made to
+    work on Android devices.
+
+    The goal is for 100% compliance with how Octave works including a compatibility
+    mode that makes the behavior more similar to Matlab (already very similar).
+
+RepoType: git-svn
+Repo: https://addi.googlecode.com/svn/Addi
+
+Builds:
+  - versionName: '1.88'
+    versionCode: 37
+    commit: '179'
+
+  - versionName: '1.91'
+    versionCode: 40
+    commit: '189'
+    buildjni:
+      - yes
+
+  - versionName: '1.97'
+    versionCode: 43
+    disable: No source code
+    commit: unknown - see disabled
+
+  - versionName: '1.98'
+    versionCode: 44
+    commit: '198'
+    buildjni:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '1.98'
+CurrentVersionCode: 44
diff --git a/metadata/com.adguard.android.contentblocker.txt b/metadata/com.adguard.android.contentblocker.txt
deleted file mode 100644
index 84000e0f8a..0000000000
--- a/metadata/com.adguard.android.contentblocker.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-AntiFeatures:NonFreeAdd
-Categories:Internet
-License:GPL-3.0-or-later
-Web Site:https://adguard.com/adguard-content-blocker/overview.html
-Source Code:https://github.com/AdguardTeam/ContentBlocker
-Issue Tracker:https://github.com/AdguardTeam/ContentBlocker/issues
-Translation:http://adguard.oneskyapp.com/collaboration/
-
-Auto Name:AdGuard Content Blocker
-Summary:Block advertisements
-Description:
-AdGuard Content Blocker is an app that blocks ads on mobile devices operated by
-Android in browsers that support content blocking technology. As of today, there
-are only two such browsers: Yandex Browser and Samsung Internet browser.
-
-The app does not require root access.
-.
-
-Repo Type:git
-Repo:https://github.com/AdguardTeam/ContentBlocker.git
-
-Build:2.1.3,21002103
-    commit=v2.1.3
-    subdir=adguard_cb
-    gradle=samsung_api21
-
-Build:2.2.1,21002201
-    commit=v2.2.1
-    subdir=adguard_cb
-    gradle=samsung_api21,prodBackend
-
-Build:2.2.6,21002206
-    commit=v2.2.6
-    subdir=adguard_cb
-    gradle=samsung_api21,prodBackend
-
-Build:2.3.7,21002307
-    commit=v2.3.7
-    subdir=adguard_cb
-    gradle=samsung_api21,prodBackend
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.3.7
-Current Version Code:21002307
diff --git a/metadata/com.adguard.android.contentblocker.yml b/metadata/com.adguard.android.contentblocker.yml
new file mode 100644
index 0000000000..7925ef59c1
--- /dev/null
+++ b/metadata/com.adguard.android.contentblocker.yml
@@ -0,0 +1,58 @@
+AntiFeatures:
+  - NonFreeAdd
+Categories:
+  - Internet
+License: GPL-3.0-or-later
+WebSite: https://adguard.com/adguard-content-blocker/overview.html
+SourceCode: https://github.com/AdguardTeam/ContentBlocker
+IssueTracker: https://github.com/AdguardTeam/ContentBlocker/issues
+Translation: http://adguard.oneskyapp.com/collaboration/
+
+AutoName: AdGuard Content Blocker
+Summary: Block advertisements
+Description: |-
+    AdGuard Content Blocker is an app that blocks ads on mobile devices operated by
+    Android in browsers that support content blocking technology. As of today, there
+    are only two such browsers: Yandex Browser and Samsung Internet browser.
+
+    The app does not require root access.
+
+RepoType: git
+Repo: https://github.com/AdguardTeam/ContentBlocker.git
+
+Builds:
+  - versionName: 2.1.3
+    versionCode: 21002103
+    commit: v2.1.3
+    subdir: adguard_cb
+    gradle:
+      - samsung_api21
+
+  - versionName: 2.2.1
+    versionCode: 21002201
+    commit: v2.2.1
+    subdir: adguard_cb
+    gradle:
+      - samsung_api21
+      - prodBackend
+
+  - versionName: 2.2.6
+    versionCode: 21002206
+    commit: v2.2.6
+    subdir: adguard_cb
+    gradle:
+      - samsung_api21
+      - prodBackend
+
+  - versionName: 2.3.7
+    versionCode: 21002307
+    commit: v2.3.7
+    subdir: adguard_cb
+    gradle:
+      - samsung_api21
+      - prodBackend
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 2.3.7
+CurrentVersionCode: 21002307