diff --git a/metadata/ca.cmetcalfe.xposed.disablebatterywarnings.txt b/metadata/ca.cmetcalfe.xposed.disablebatterywarnings.txt
deleted file mode 100644
index ceab93d773..0000000000
--- a/metadata/ca.cmetcalfe.xposed.disablebatterywarnings.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Categories:System
-License:MPL-2.0
-Web Site:http://repo.xposed.info/module/ca.cmetcalfe.xposed.disablebatterywarnings
-Source Code:https://github.com/pR0Ps/DisableBatteryWarnings
-Issue Tracker:https://github.com/pR0Ps/DisableBatteryWarnings/issues
-Bitcoin:15jv7w1AdCMkNpDaAQrPtwK3Lfxx5ggAKX
-
-Auto Name:Disable Battery Warnings
-Summary:Disable the annoying low battery warning popup and sound
-Description:
-A simple Xposed module to disable the annoying low battery warning popup and
-sound.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/pR0Ps/DisableBatteryWarnings
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:2
diff --git a/metadata/ca.cmetcalfe.xposed.disablebatterywarnings.yml b/metadata/ca.cmetcalfe.xposed.disablebatterywarnings.yml
new file mode 100644
index 0000000000..9f50e4dc37
--- /dev/null
+++ b/metadata/ca.cmetcalfe.xposed.disablebatterywarnings.yml
@@ -0,0 +1,38 @@
+Categories:
+  - System
+License: MPL-2.0
+WebSite: http://repo.xposed.info/module/ca.cmetcalfe.xposed.disablebatterywarnings
+SourceCode: https://github.com/pR0Ps/DisableBatteryWarnings
+IssueTracker: https://github.com/pR0Ps/DisableBatteryWarnings/issues
+Bitcoin: 15jv7w1AdCMkNpDaAQrPtwK3Lfxx5ggAKX
+
+AutoName: Disable Battery Warnings
+Summary: Disable the annoying low battery warning popup and sound
+Description: |-
+    A simple Xposed module to disable the annoying low battery warning popup and
+    sound.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/pR0Ps/DisableBatteryWarnings
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.1'
+CurrentVersionCode: 2
diff --git a/metadata/ca.cmetcalfe.xposed.flatconnectivityicons.txt b/metadata/ca.cmetcalfe.xposed.flatconnectivityicons.txt
deleted file mode 100644
index cd694db21c..0000000000
--- a/metadata/ca.cmetcalfe.xposed.flatconnectivityicons.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Categories:System
-License:MPL-2.0
-Web Site:http://repo.xposed.info/module/ca.cmetcalfe.xposed.flatconnectivityicons
-Source Code:https://github.com/pR0Ps/FlatConnectivityIcons
-Issue Tracker:https://github.com/pR0Ps/FlatConnectivityIcons/issues
-Bitcoin:15jv7w1AdCMkNpDaAQrPtwK3Lfxx5ggAKX
-
-Auto Name:Flat Connectivity Icons
-Summary:Xposed module that provides flat connectivity icons
-Description:
-A simple Xposed module to replace the KitKat-style connectivity icons in the
-statusbar with the flat-style Lollipop ones.
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/pR0Ps/FlatConnectivityIcons
-
-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/ca.cmetcalfe.xposed.flatconnectivityicons.yml b/metadata/ca.cmetcalfe.xposed.flatconnectivityicons.yml
new file mode 100644
index 0000000000..e7b636435e
--- /dev/null
+++ b/metadata/ca.cmetcalfe.xposed.flatconnectivityicons.yml
@@ -0,0 +1,31 @@
+Categories:
+  - System
+License: MPL-2.0
+WebSite: http://repo.xposed.info/module/ca.cmetcalfe.xposed.flatconnectivityicons
+SourceCode: https://github.com/pR0Ps/FlatConnectivityIcons
+IssueTracker: https://github.com/pR0Ps/FlatConnectivityIcons/issues
+Bitcoin: 15jv7w1AdCMkNpDaAQrPtwK3Lfxx5ggAKX
+
+AutoName: Flat Connectivity Icons
+Summary: Xposed module that provides flat connectivity icons
+Description: |-
+    A simple Xposed module to replace the KitKat-style connectivity icons in the
+    statusbar with the flat-style Lollipop ones.
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/pR0Ps/FlatConnectivityIcons
+
+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/ca.ddaly.android.heart.txt b/metadata/ca.ddaly.android.heart.txt
deleted file mode 100644
index d6896e3999..0000000000
--- a/metadata/ca.ddaly.android.heart.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Categories:Sports & Health
-License:GPL-3.0-only
-Web Site:https://daryldy.github.com/Heart
-Source Code:https://github.com/daryldy/Heart
-Issue Tracker:https://github.com/daryldy/Heart/issues
-
-Auto Name:Heart Observe
-Summary:Track pulse and blood pressure
-Description:
-Quickly and easily enter your blood pressure and other related information
-whenever you take a new reading from an in-home monitor, a pharmacy machine or
-your doctor's office. You can view the graph to immediately compare your new
-reading with past ones.
-.
-
-Repo Type:git
-Repo:https://github.com/daryldy/Heart.git
-
-Build:1.1,3
-    commit=v1.1
-    srclibs=2:NumberPicker-SimonVT@1da4372,1:ActionBarSherlock@4.4.0
-    rm=custom_rules.xml
-    prebuild=mv misc/reText/help.txt assets/misc/help.html && \
-        mv misc/reText/about.txt assets/misc/about.html
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:1.1
-Current Version Code:3
diff --git a/metadata/ca.ddaly.android.heart.yml b/metadata/ca.ddaly.android.heart.yml
new file mode 100644
index 0000000000..3e1a2bde61
--- /dev/null
+++ b/metadata/ca.ddaly.android.heart.yml
@@ -0,0 +1,35 @@
+Categories:
+  - Sports & Health
+License: GPL-3.0-only
+WebSite: https://daryldy.github.com/Heart
+SourceCode: https://github.com/daryldy/Heart
+IssueTracker: https://github.com/daryldy/Heart/issues
+
+AutoName: Heart Observe
+Summary: Track pulse and blood pressure
+Description: |-
+    Quickly and easily enter your blood pressure and other related information
+    whenever you take a new reading from an in-home monitor, a pharmacy machine or
+    your doctor's office. You can view the graph to immediately compare your new
+    reading with past ones.
+
+RepoType: git
+Repo: https://github.com/daryldy/Heart.git
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 3
+    commit: v1.1
+    srclibs:
+      - 2:NumberPicker-SimonVT@1da4372
+      - 1:ActionBarSherlock@4.4.0
+    rm:
+      - custom_rules.xml
+    prebuild:
+      - mv misc/reText/help.txt assets/misc/help.html
+      - mv misc/reText/about.txt assets/misc/about.html
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: '1.1'
+CurrentVersionCode: 3
diff --git a/metadata/ca.farrelltonsolar.classic.txt b/metadata/ca.farrelltonsolar.classic.txt
deleted file mode 100644
index 1933812951..0000000000
--- a/metadata/ca.farrelltonsolar.classic.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/graham22/Classic
-Issue Tracker:https://github.com/graham22/Classic/issues
-
-Name:MidniteSolar Classic Monitor
-Auto Name:Classic
-Summary:View solar charging device status
-Description:
-Unofficial status monitor for [http://www.midnitesolar.com/ Midnite solar]'s
-Classic 150, 200, 250 Charge Controller. It is a Read Only Program, it does not
-write to the Classic.
-
-If the app detects a Whizbang Junior current monitor, the State Of Charge will
-display along with a bi-directional current gauge. Basic support for the Tristar
-MPPT charge controller from Morningstar is also included.
-.
-
-Repo Type:git
-Repo:https://github.com/graham22/Classic
-
-Build:2.0.3,203
-    commit=ce6cb8ec200fce4d39314e11f804a8c841fe6662
-    subdir=app
-    gradle=yes
-
-Build:2.0.4,204
-    commit=4d83c5f27145c6333730f78c29f38002ab7b0879
-    subdir=app
-    gradle=yes
-
-Build:2.0.5,205
-    commit=c506349a5ceb0ec53656630e0c637b5f24e6120b
-    subdir=app
-    gradle=yes
-
-Build:2.1.1,211
-    commit=108616ab3f6df5f168827fffa08c162df6999676
-    subdir=app
-    gradle=yes
-
-Build:2.1.2,212
-    commit=9ad7baebd6172ce14b4aa93ab0114fda1fbd46b9
-    subdir=app
-    gradle=yes
-
-Build:2.1.5,215
-    commit=674e78f44a4faf583c84fa26f6eabe87af9978ac
-    subdir=app
-    gradle=yes
-
-Build:2.2,220
-    commit=480b5eb66d42c8813d08967d87be826e9c531628
-    subdir=app
-    gradle=yes
-
-Build:2.3,230
-    commit=856f0287f827ecc56b740c37190f0920f7376ecc
-    subdir=app
-    gradle=yes
-
-Build:2.3.1,231
-    commit=164f9fdfd1ab56800df30f5f8479c7da16ce2f1f
-    subdir=app
-    gradle=yes
-
-Build:2.3.2,232
-    commit=99257043f443062353397087a6c0c313813fd9b7
-    subdir=app
-    gradle=yes
-
-Build:2.3.3,233
-    commit=5b7e81a86b7cc8c2ddfca97f99e77c2f986b040e
-    subdir=app
-    gradle=yes
-
-Build:2.4.2,242
-    commit=04ded288cca61d7eeffb068aa5559edadcdcb716
-    subdir=app
-    gradle=yes
-
-Build:2.4.3,243
-    commit=bc9330b4f461201f5e2fc24e11f82c58a47cd046
-    subdir=app
-    gradle=yes
-
-Build:2.4.4,244
-    commit=92edd773506036613abe40f9d148201614d42460
-    subdir=app
-    gradle=yes
-
-Build:2.4.5,245
-    commit=e6d65e0377864f075706ad69b19f9de93f69bd8b
-    subdir=app
-    gradle=yes
-
-Build:2.4.6,246
-    commit=55bd0689ecb2afdedbdd6eb5a6fb66c6b2e4f837
-    subdir=app
-    gradle=yes
-
-Build:2.4.7,247
-    commit=7990d879b1c39d4b0ea7f8e945ad7edd99b131d5
-    subdir=app
-    gradle=yes
-
-Build:2.5.0,250
-    commit=860dc316e3bf40d3796c31eca7c9cfd8f2be1cfc
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:3.0.0
-Current Version Code:300
diff --git a/metadata/ca.farrelltonsolar.classic.yml b/metadata/ca.farrelltonsolar.classic.yml
new file mode 100644
index 0000000000..355ee2b709
--- /dev/null
+++ b/metadata/ca.farrelltonsolar.classic.yml
@@ -0,0 +1,152 @@
+Categories:
+  - System
+License: Apache-2.0
+SourceCode: https://github.com/graham22/Classic
+IssueTracker: https://github.com/graham22/Classic/issues
+
+Name: MidniteSolar Classic Monitor
+AutoName: Classic
+Summary: View solar charging device status
+Description: |-
+    Unofficial status monitor for [http://www.midnitesolar.com/ Midnite solar]'s
+    Classic 150, 200, 250 Charge Controller. It is a Read Only Program, it does not
+    write to the Classic.
+
+    If the app detects a Whizbang Junior current monitor, the State Of Charge will
+    display along with a bi-directional current gauge. Basic support for the Tristar
+    MPPT charge controller from Morningstar is also included.
+
+RepoType: git
+Repo: https://github.com/graham22/Classic
+
+Builds:
+  - versionName: 2.0.3
+    versionCode: 203
+    commit: ce6cb8ec200fce4d39314e11f804a8c841fe6662
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.4
+    versionCode: 204
+    commit: 4d83c5f27145c6333730f78c29f38002ab7b0879
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.5
+    versionCode: 205
+    commit: c506349a5ceb0ec53656630e0c637b5f24e6120b
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.1
+    versionCode: 211
+    commit: 108616ab3f6df5f168827fffa08c162df6999676
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.2
+    versionCode: 212
+    commit: 9ad7baebd6172ce14b4aa93ab0114fda1fbd46b9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.5
+    versionCode: 215
+    commit: 674e78f44a4faf583c84fa26f6eabe87af9978ac
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.2'
+    versionCode: 220
+    commit: 480b5eb66d42c8813d08967d87be826e9c531628
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.3'
+    versionCode: 230
+    commit: 856f0287f827ecc56b740c37190f0920f7376ecc
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.1
+    versionCode: 231
+    commit: 164f9fdfd1ab56800df30f5f8479c7da16ce2f1f
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.2
+    versionCode: 232
+    commit: 99257043f443062353397087a6c0c313813fd9b7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.3
+    versionCode: 233
+    commit: 5b7e81a86b7cc8c2ddfca97f99e77c2f986b040e
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.2
+    versionCode: 242
+    commit: 04ded288cca61d7eeffb068aa5559edadcdcb716
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.3
+    versionCode: 243
+    commit: bc9330b4f461201f5e2fc24e11f82c58a47cd046
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.4
+    versionCode: 244
+    commit: 92edd773506036613abe40f9d148201614d42460
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.5
+    versionCode: 245
+    commit: e6d65e0377864f075706ad69b19f9de93f69bd8b
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.6
+    versionCode: 246
+    commit: 55bd0689ecb2afdedbdd6eb5a6fb66c6b2e4f837
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.4.7
+    versionCode: 247
+    commit: 7990d879b1c39d4b0ea7f8e945ad7edd99b131d5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.5.0
+    versionCode: 250
+    commit: 860dc316e3bf40d3796c31eca7c9cfd8f2be1cfc
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: None
+UpdateCheckMode: RepoManifest
+CurrentVersion: 3.0.0
+CurrentVersionCode: 300
diff --git a/metadata/ca.mimic.apphangar.txt b/metadata/ca.mimic.apphangar.txt
deleted file mode 100644
index ddef3d4614..0000000000
--- a/metadata/ca.mimic.apphangar.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:http://hangar.mimic.ca
-Source Code:https://github.com/corcoran/Hangar
-Issue Tracker:https://github.com/corcoran/Hangar/issues
-
-Auto Name:Hangar
-Summary:Access recent and top apps
-Description:
-Provides a customizable shortcut launcher in your notification drawer to give
-you relevant, easy access to your most frequently used apps based on smart
-filtering algorithms.
-
-Features include:
-
-* Pinned apps
-* Icon packs and custom app icons
-* Re-sizeable widget to launch apps
-* Re-sizeable widget to view app use statistics with color coded bar graphs
-* Widgets intelligently scale according to size and device
-* Sort and display apps based on user specified weight factors
-* Blacklist unwanted apps
-* Fully customizable! Change the # of shortcuts, icon color, size and more..
-.
-
-Repo Type:git
-Repo:https://github.com/corcoran/Hangar
-
-Build:2.0,29
-    commit=08af25fdc48d72c
-    subdir=Apphangar
-    gradle=yes
-
-Build:2.1.1,31
-    commit=2.1.1
-    subdir=Apphangar
-    gradle=yes
-
-Build:2.2,38
-    commit=2.2
-    subdir=Apphangar
-    gradle=yes
-
-Build:2.3,49
-    commit=2.3
-    subdir=Apphangar
-    gradle=yes
-
-Build:2.4,56
-    commit=2.4
-    subdir=Apphangar
-    gradle=yes
-
-Build:2.5.1,62
-    commit=2.5.1
-    subdir=Apphangar
-    gradle=yes
-
-Build:2.6,74
-    commit=2.6
-    subdir=Apphangar
-    gradle=yes
-
-Build:2.7,75
-    commit=2.7
-    subdir=Apphangar
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.7
-Current Version Code:75
diff --git a/metadata/ca.mimic.apphangar.yml b/metadata/ca.mimic.apphangar.yml
new file mode 100644
index 0000000000..75bbb50c64
--- /dev/null
+++ b/metadata/ca.mimic.apphangar.yml
@@ -0,0 +1,89 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: http://hangar.mimic.ca
+SourceCode: https://github.com/corcoran/Hangar
+IssueTracker: https://github.com/corcoran/Hangar/issues
+
+AutoName: Hangar
+Summary: Access recent and top apps
+Description: |-
+    Provides a customizable shortcut launcher in your notification drawer to give
+    you relevant, easy access to your most frequently used apps based on smart
+    filtering algorithms.
+
+    Features include:
+
+    * Pinned apps
+    * Icon packs and custom app icons
+    * Re-sizeable widget to launch apps
+    * Re-sizeable widget to view app use statistics with color coded bar graphs
+    * Widgets intelligently scale according to size and device
+    * Sort and display apps based on user specified weight factors
+    * Blacklist unwanted apps
+    * Fully customizable! Change the # of shortcuts, icon color, size and more..
+
+RepoType: git
+Repo: https://github.com/corcoran/Hangar
+
+Builds:
+  - versionName: '2.0'
+    versionCode: 29
+    commit: 08af25fdc48d72c
+    subdir: Apphangar
+    gradle:
+      - yes
+
+  - versionName: 2.1.1
+    versionCode: 31
+    commit: 2.1.1
+    subdir: Apphangar
+    gradle:
+      - yes
+
+  - versionName: '2.2'
+    versionCode: 38
+    commit: '2.2'
+    subdir: Apphangar
+    gradle:
+      - yes
+
+  - versionName: '2.3'
+    versionCode: 49
+    commit: '2.3'
+    subdir: Apphangar
+    gradle:
+      - yes
+
+  - versionName: '2.4'
+    versionCode: 56
+    commit: '2.4'
+    subdir: Apphangar
+    gradle:
+      - yes
+
+  - versionName: 2.5.1
+    versionCode: 62
+    commit: 2.5.1
+    subdir: Apphangar
+    gradle:
+      - yes
+
+  - versionName: '2.6'
+    versionCode: 74
+    commit: '2.6'
+    subdir: Apphangar
+    gradle:
+      - yes
+
+  - versionName: '2.7'
+    versionCode: 75
+    commit: '2.7'
+    subdir: Apphangar
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '2.7'
+CurrentVersionCode: 75
diff --git a/metadata/ca.pr0ps.xposed.entrustunblocker.txt b/metadata/ca.pr0ps.xposed.entrustunblocker.txt
deleted file mode 100644
index 108ea3b97b..0000000000
--- a/metadata/ca.pr0ps.xposed.entrustunblocker.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-Categories:System
-License:MIT
-Web Site:http://repo.xposed.info/module/ca.pr0ps.xposed.entrustunblocker
-Source Code:https://github.com/pR0Ps/Entrust-IdentityGuard-Unblocker
-Issue Tracker:https://github.com/pR0Ps/Entrust-IdentityGuard-Unblocker/issues
-Bitcoin:15jv7w1AdCMkNpDaAQrPtwK3Lfxx5ggAKX
-
-Auto Name:Entrust IdentityGuard Unblocker
-Summary:Xposed module to let rooted devices use Entrust's IdentityGuard app
-Description:
-The Entrust IdentityGuard Mobile app refuses to work on devices that are rooted
-or running custom ROM images, calling them "unsecured".
-
-The validity of that statement notwithstanding, some people need to use the
-application for work. It's not something you choose to install, it's something
-you're forced to install by your IT department.
-
-In the interest of getting some work done (without buying a new phone), I
-created this Xposed module to bypass the checks for root and custom ROMs.
-
-Just install, enable, reboot, and you're done. Get back to work.
-
-Requires the [http://xposed.info Xposed framework]
-.
-
-Requires Root:yes
-
-Repo Type:git
-Repo:https://github.com/pR0Ps/Entrust-IdentityGuard-Unblocker
-
-Build:1.0,1
-    commit=v1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1,2
-    commit=v1.1
-    subdir=app
-    gradle=yes
-
-Build:1.2,3
-    commit=v1.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2
-Current Version Code:3
diff --git a/metadata/ca.pr0ps.xposed.entrustunblocker.yml b/metadata/ca.pr0ps.xposed.entrustunblocker.yml
new file mode 100644
index 0000000000..93187847fb
--- /dev/null
+++ b/metadata/ca.pr0ps.xposed.entrustunblocker.yml
@@ -0,0 +1,56 @@
+Categories:
+  - System
+License: MIT
+WebSite: http://repo.xposed.info/module/ca.pr0ps.xposed.entrustunblocker
+SourceCode: https://github.com/pR0Ps/Entrust-IdentityGuard-Unblocker
+IssueTracker: https://github.com/pR0Ps/Entrust-IdentityGuard-Unblocker/issues
+Bitcoin: 15jv7w1AdCMkNpDaAQrPtwK3Lfxx5ggAKX
+
+AutoName: Entrust IdentityGuard Unblocker
+Summary: Xposed module to let rooted devices use Entrust's IdentityGuard app
+Description: |-
+    The Entrust IdentityGuard Mobile app refuses to work on devices that are rooted
+    or running custom ROM images, calling them "unsecured".
+
+    The validity of that statement notwithstanding, some people need to use the
+    application for work. It's not something you choose to install, it's something
+    you're forced to install by your IT department.
+
+    In the interest of getting some work done (without buying a new phone), I
+    created this Xposed module to bypass the checks for root and custom ROMs.
+
+    Just install, enable, reboot, and you're done. Get back to work.
+
+    Requires the [http://xposed.info Xposed framework]
+
+RequiresRoot: 'yes'
+
+RepoType: git
+Repo: https://github.com/pR0Ps/Entrust-IdentityGuard-Unblocker
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.2'
+CurrentVersionCode: 3
diff --git a/metadata/ca.rmen.android.poetassistant.txt b/metadata/ca.rmen.android.poetassistant.txt
deleted file mode 100644
index b547da7771..0000000000
--- a/metadata/ca.rmen.android.poetassistant.txt
+++ /dev/null
@@ -1,409 +0,0 @@
-Categories:Writing
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/caarmen/poet-assistant
-Issue Tracker:https://github.com/caarmen/poet-assistant/issues
-Changelog:https://github.com/caarmen/poet-assistant/blob/HEAD/CHANGELOG.md
-
-Auto Name:Poet Assistant
-Summary:Dictionary and TTS tools for editing poems
-Description:
-A set of tools to help with writing poems:
-
-* a rhyming dictionary, using the Carnegie Mellon University pronunciation dictionary.
-* a thesaurus, using the WordNet thesaurus.
-* a dictionary, using the WordNet dictionary.
-* a screen where you can enter your poem text, and have it read aloud back to you by the device's text-to-speech engine.
-.
-
-Repo Type:git
-Repo:https://github.com/caarmen/poet-assistant.git
-
-Build:1.0.1,101
-    commit=release-1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.0.4,104
-    commit=release-1.0.4
-    subdir=app
-    gradle=yes
-
-Build:1.0.5,105
-    commit=release-1.0.5
-    subdir=app
-    gradle=yes
-
-Build:1.0.6,106
-    commit=release-1.0.6
-    subdir=app
-    gradle=yes
-
-Build:1.0.7,107
-    commit=release-1.0.7
-    subdir=app
-    gradle=yes
-
-Build:1.2.0,120
-    commit=release-1.2.0
-    subdir=app
-    gradle=yes
-
-Build:1.3.0,130
-    commit=release-1.3.0
-    subdir=app
-    gradle=yes
-
-Build:1.4.0,140
-    commit=release-1.4.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.0,150
-    commit=release-1.5.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.2,152
-    commit=release-1.5.2
-    subdir=app
-    gradle=yes
-
-Build:1.6.0,160
-    commit=release-1.6.0
-    subdir=app
-    gradle=yes
-
-Build:1.6.1,161
-    commit=release-1.6.1
-    subdir=app
-    gradle=yes
-
-Build:1.6.2,162
-    commit=release-1.6.2
-    subdir=app
-    gradle=yes
-
-Build:1.6.3,163
-    commit=release-1.6.3
-    subdir=app
-    gradle=yes
-
-Build:1.6.4,164
-    commit=release-1.6.4
-    subdir=app
-    gradle=yes
-
-Build:1.6.5,165
-    commit=release-1.6.5
-    subdir=app
-    gradle=yes
-
-Build:1.7.0,170
-    commit=release-1.7.0
-    subdir=app
-    gradle=yes
-
-Build:1.7.2,172
-    commit=release-1.7.2
-    subdir=app
-    gradle=yes
-
-Build:1.7.3,173
-    commit=release-1.7.3
-    subdir=app
-    gradle=yes
-
-Build:1.8.1,181
-    commit=release-1.8.1
-    subdir=app
-    gradle=yes
-
-Build:1.8.2,182
-    commit=release-1.8.2
-    subdir=app
-    gradle=yes
-
-Build:1.8.3,183
-    commit=release-1.8.3
-    subdir=app
-    gradle=yes
-
-Build:1.9.0,190
-    commit=release-1.9.0
-    subdir=app
-    gradle=yes
-
-Build:1.9.1,191
-    commit=release-1.9.1
-    subdir=app
-    gradle=yes
-
-Build:1.9.2,192
-    commit=release-1.9.2
-    subdir=app
-    gradle=yes
-
-Build:1.9.3,193
-    commit=release-1.9.3
-    subdir=app
-    gradle=yes
-
-Build:1.9.5,195
-    commit=release-1.9.5
-    subdir=app
-    gradle=yes
-
-Build:1.9.6,196
-    commit=release-1.9.6
-    subdir=app
-    gradle=yes
-
-Build:1.10.0,1100
-    commit=release-1.10.0
-    subdir=app
-    gradle=yes
-
-Build:1.10.1,1101
-    commit=release-1.10.1
-    subdir=app
-    gradle=yes
-
-Build:1.10.2,1102
-    commit=release-1.10.2
-    subdir=app
-    gradle=yes
-
-Build:1.10.3,1103
-    commit=release-1.10.3
-    subdir=app
-    gradle=yes
-
-Build:1.10.4,1104
-    commit=release-1.10.4
-    subdir=app
-    gradle=yes
-
-Build:1.10.6,1106
-    commit=release-1.10.6
-    subdir=app
-    gradle=yes
-
-Build:1.10.7,1107
-    commit=release-1.10.7
-    subdir=app
-    gradle=yes
-
-Build:1.10.9,1109
-    commit=release-1.10.9
-    subdir=app
-    gradle=yes
-
-Build:1.10.10,11010
-    commit=release-1.10.10
-    subdir=app
-    gradle=yes
-
-Build:1.10.11,11011
-    commit=release-1.10.11
-    subdir=app
-    gradle=yes
-
-Build:1.11.0,11100
-    commit=release-1.11.0
-    subdir=app
-    gradle=yes
-
-Build:1.11.1,11101
-    commit=release-1.11.1
-    subdir=app
-    gradle=yes
-
-Build:1.11.2,11102
-    commit=release-1.11.2
-    subdir=app
-    gradle=yes
-
-Build:1.12.0,11200
-    disable=dao session issue
-    commit=release-1.12.0
-    subdir=app
-    gradle=yes
-
-Build:1.13.0,11300
-    disable=dao session issue
-    commit=release-1.13.0
-    subdir=app
-    gradle=yes
-
-Build:1.13.1,11301
-    disable=dao session issue
-    commit=release-1.13.1
-    subdir=app
-    gradle=yes
-
-Build:1.13.2,11302
-    disable=dao session issue
-    commit=release-1.13.2
-    subdir=app
-    gradle=yes
-
-Build:1.14.0,11400
-    commit=release-1.14.0
-    subdir=app
-    gradle=yes
-
-Build:1.15.0,11500
-    commit=release-1.15.0
-    subdir=app
-    gradle=yes
-
-Build:1.16.1,11601
-    commit=release-1.16.1
-    subdir=app
-    gradle=yes
-
-Build:1.17.0,11700
-    commit=release-1.17.0
-    subdir=app
-    gradle=yes
-
-Build:1.17.1,11701
-    commit=release-1.17.1
-    subdir=app
-    gradle=yes
-
-Build:1.18.0,11800
-    commit=release-1.18.0
-    subdir=app
-    gradle=yes
-
-Build:1.18.1,11801
-    commit=release-1.18.1
-    subdir=app
-    gradle=yes
-
-Build:1.18.2,11802
-    commit=release-1.18.2
-    subdir=app
-    gradle=yes
-
-Build:1.18.3,11803
-    commit=release-1.18.3
-    subdir=app
-    gradle=yes
-
-Build:1.18.4,11804
-    commit=release-1.18.4
-    subdir=app
-    gradle=yes
-
-Build:1.18.5,11805
-    commit=release-1.18.5
-    subdir=app
-    gradle=yes
-
-Build:1.19.0,111900
-    commit=release-1.19.0
-    subdir=app
-    gradle=yes
-
-Build:1.20.0,112000
-    commit=release-1.20.0
-    subdir=app
-    gradle=yes
-
-Build:1.21.0,112100
-    commit=release-1.21.0
-    subdir=app
-    gradle=yes
-
-Build:1.22.0,112200
-    commit=release-1.22.0
-    subdir=app
-    gradle=yes
-
-Build:1.22.1,112201
-    commit=release-1.22.1
-    subdir=app
-    gradle=yes
-
-Build:1.22.2,112202
-    commit=release-1.22.2
-    subdir=app
-    gradle=yes
-
-Build:1.22.3,112203
-    commit=release-1.22.3
-    subdir=app
-    gradle=yes
-
-Build:1.25.0,112500
-    commit=release-1.25.0
-    subdir=app
-    gradle=yes
-
-Build:1.25.1,112501
-    commit=release-1.25.1
-    subdir=app
-    gradle=yes
-
-Build:1.26.1,112601
-    commit=release-1.26.1
-    subdir=app
-    gradle=yes
-
-Build:1.26.3,112603
-    commit=release-1.26.3
-    subdir=app
-    gradle=yes
-
-Build:1.26.4,112604
-    commit=release-1.26.4
-    subdir=app
-    gradle=yes
-
-Build:1.26.5,112605
-    commit=release-1.26.5
-    subdir=app
-    gradle=yes
-
-Build:1.26.6,112606
-    commit=release-1.26.6
-    subdir=app
-    gradle=yes
-
-Build:1.27.1,112701
-    commit=release-1.27.1
-    subdir=app
-    gradle=yes
-
-Build:1.28.0,112800
-    commit=release-1.28.0
-    subdir=app
-    gradle=yes
-
-Build:1.29.0,112900
-    commit=release-1.29.0
-    subdir=app
-    gradle=yes
-
-Build:1.29.1,112901
-    commit=release-1.29.1
-    subdir=app
-    gradle=yes
-
-Build:1.29.2,112902
-    commit=release-1.29.2
-    subdir=app
-    gradle=yes
-
-Build:1.30.0,113000
-    commit=release-1.30.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version release-%v
-Update Check Mode:Tags ^release-
-Current Version:1.30.0
-Current Version Code:113000
diff --git a/metadata/ca.rmen.android.poetassistant.yml b/metadata/ca.rmen.android.poetassistant.yml
new file mode 100644
index 0000000000..099c842916
--- /dev/null
+++ b/metadata/ca.rmen.android.poetassistant.yml
@@ -0,0 +1,561 @@
+Categories:
+  - Writing
+License: GPL-3.0-only
+SourceCode: https://github.com/caarmen/poet-assistant
+IssueTracker: https://github.com/caarmen/poet-assistant/issues
+Changelog: https://github.com/caarmen/poet-assistant/blob/HEAD/CHANGELOG.md
+
+AutoName: Poet Assistant
+Summary: Dictionary and TTS tools for editing poems
+Description: |-
+    A set of tools to help with writing poems:
+
+    * a rhyming dictionary, using the Carnegie Mellon University pronunciation dictionary.
+    * a thesaurus, using the WordNet thesaurus.
+    * a dictionary, using the WordNet dictionary.
+    * a screen where you can enter your poem text, and have it read aloud back to you by the device's text-to-speech engine.
+
+RepoType: git
+Repo: https://github.com/caarmen/poet-assistant.git
+
+Builds:
+  - versionName: 1.0.1
+    versionCode: 101
+    commit: release-1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.4
+    versionCode: 104
+    commit: release-1.0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.5
+    versionCode: 105
+    commit: release-1.0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.6
+    versionCode: 106
+    commit: release-1.0.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.7
+    versionCode: 107
+    commit: release-1.0.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 120
+    commit: release-1.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 130
+    commit: release-1.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 140
+    commit: release-1.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 150
+    commit: release-1.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 152
+    commit: release-1.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.0
+    versionCode: 160
+    commit: release-1.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.1
+    versionCode: 161
+    commit: release-1.6.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.2
+    versionCode: 162
+    commit: release-1.6.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.3
+    versionCode: 163
+    commit: release-1.6.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.4
+    versionCode: 164
+    commit: release-1.6.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.5
+    versionCode: 165
+    commit: release-1.6.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.0
+    versionCode: 170
+    commit: release-1.7.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.2
+    versionCode: 172
+    commit: release-1.7.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.7.3
+    versionCode: 173
+    commit: release-1.7.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.1
+    versionCode: 181
+    commit: release-1.8.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.2
+    versionCode: 182
+    commit: release-1.8.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.8.3
+    versionCode: 183
+    commit: release-1.8.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.0
+    versionCode: 190
+    commit: release-1.9.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.1
+    versionCode: 191
+    commit: release-1.9.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.2
+    versionCode: 192
+    commit: release-1.9.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.3
+    versionCode: 193
+    commit: release-1.9.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.5
+    versionCode: 195
+    commit: release-1.9.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.9.6
+    versionCode: 196
+    commit: release-1.9.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.0
+    versionCode: 1100
+    commit: release-1.10.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.1
+    versionCode: 1101
+    commit: release-1.10.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.2
+    versionCode: 1102
+    commit: release-1.10.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.3
+    versionCode: 1103
+    commit: release-1.10.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.4
+    versionCode: 1104
+    commit: release-1.10.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.6
+    versionCode: 1106
+    commit: release-1.10.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.7
+    versionCode: 1107
+    commit: release-1.10.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.9
+    versionCode: 1109
+    commit: release-1.10.9
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.10
+    versionCode: 11010
+    commit: release-1.10.10
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.10.11
+    versionCode: 11011
+    commit: release-1.10.11
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.11.0
+    versionCode: 11100
+    commit: release-1.11.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.11.1
+    versionCode: 11101
+    commit: release-1.11.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.11.2
+    versionCode: 11102
+    commit: release-1.11.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.12.0
+    versionCode: 11200
+    disable: dao session issue
+    commit: release-1.12.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.13.0
+    versionCode: 11300
+    disable: dao session issue
+    commit: release-1.13.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.13.1
+    versionCode: 11301
+    disable: dao session issue
+    commit: release-1.13.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.13.2
+    versionCode: 11302
+    disable: dao session issue
+    commit: release-1.13.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.14.0
+    versionCode: 11400
+    commit: release-1.14.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.15.0
+    versionCode: 11500
+    commit: release-1.15.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.16.1
+    versionCode: 11601
+    commit: release-1.16.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.17.0
+    versionCode: 11700
+    commit: release-1.17.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.17.1
+    versionCode: 11701
+    commit: release-1.17.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.18.0
+    versionCode: 11800
+    commit: release-1.18.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.18.1
+    versionCode: 11801
+    commit: release-1.18.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.18.2
+    versionCode: 11802
+    commit: release-1.18.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.18.3
+    versionCode: 11803
+    commit: release-1.18.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.18.4
+    versionCode: 11804
+    commit: release-1.18.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.18.5
+    versionCode: 11805
+    commit: release-1.18.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.19.0
+    versionCode: 111900
+    commit: release-1.19.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.20.0
+    versionCode: 112000
+    commit: release-1.20.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.21.0
+    versionCode: 112100
+    commit: release-1.21.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.22.0
+    versionCode: 112200
+    commit: release-1.22.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.22.1
+    versionCode: 112201
+    commit: release-1.22.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.22.2
+    versionCode: 112202
+    commit: release-1.22.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.22.3
+    versionCode: 112203
+    commit: release-1.22.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.25.0
+    versionCode: 112500
+    commit: release-1.25.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.25.1
+    versionCode: 112501
+    commit: release-1.25.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.26.1
+    versionCode: 112601
+    commit: release-1.26.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.26.3
+    versionCode: 112603
+    commit: release-1.26.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.26.4
+    versionCode: 112604
+    commit: release-1.26.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.26.5
+    versionCode: 112605
+    commit: release-1.26.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.26.6
+    versionCode: 112606
+    commit: release-1.26.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.27.1
+    versionCode: 112701
+    commit: release-1.27.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.28.0
+    versionCode: 112800
+    commit: release-1.28.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.29.0
+    versionCode: 112900
+    commit: release-1.29.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.29.1
+    versionCode: 112901
+    commit: release-1.29.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.29.2
+    versionCode: 112902
+    commit: release-1.29.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.30.0
+    versionCode: 113000
+    commit: release-1.30.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version release-%v
+UpdateCheckMode: Tags ^release-
+CurrentVersion: 1.30.0
+CurrentVersionCode: 113000
diff --git a/metadata/ca.rmen.android.scrumchatter.txt b/metadata/ca.rmen.android.scrumchatter.txt
deleted file mode 100644
index edf0ae7eee..0000000000
--- a/metadata/ca.rmen.android.scrumchatter.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:http://rmen.ca
-Source Code:https://github.com/caarmen/scrumchatter
-Issue Tracker:https://github.com/caarmen/scrumchatter/issues
-
-Auto Name:Scrum Chatter
-Summary:Time members while they speak at meetings
-Description:
-Time members while they speak at meetings. See who chatters the most in
-meetings.
-
-View average and total speaking time of members for all recorded meetings.
-
-Share the stats for one meeting or for all meetings.
-
-Export to Excel so you can add your own lovely charts and graphs as you see fit.
-
-You can export and import the database.
-
-Note: this app does NOT use the microphone to automatically detect when a person
-is speaking. You must press on a "play" button when a team member speaks.
-.
-
-Repo Type:git
-Repo:https://github.com/caarmen/scrumchatter.git
-
-Build:1.0.22,10022
-    commit=scrumchatter-1.0.22
-    subdir=app
-    gradle=yes
-
-Build:1.0.23,10023
-    commit=scrumchatter-1.0.23
-    subdir=app
-    gradle=yes
-
-Build:1.0.24,10024
-    commit=scrumchatter-1.0.24
-    subdir=app
-    gradle=yes
-
-Build:1.1.2,10102
-    commit=scrumchatter-1.1.2
-    subdir=app
-    gradle=yes
-
-Build:1.1.3,10103
-    commit=scrumchatter-1.1.3
-    subdir=app
-    gradle=yes
-
-Build:1.2.1,10201
-    commit=scrumchatter-1.2.1
-    subdir=app
-    gradle=yes
-
-Build:1.2.2,10202
-    commit=scrumchatter-1.2.2
-    subdir=app
-    gradle=yes
-
-Build:1.2.3,10203
-    commit=scrumchatter-1.2.3
-    subdir=app
-    gradle=yes
-
-Build:1.3.0,10300
-    commit=scrumchatter-1.3.0
-    subdir=app
-    gradle=yes
-
-Build:1.3.1,10301
-    commit=scrumchatter-1.3.1
-    subdir=app
-    gradle=yes
-
-Build:1.3.2,10302
-    commit=scrumchatter-1.3.2
-    subdir=app
-    gradle=yes
-
-Build:1.3.3,10303
-    commit=scrumchatter-1.3.3
-    subdir=app
-    gradle=yes
-
-Build:1.4.0,10400
-    commit=scrumchatter-1.4.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.0,10500
-    commit=scrumchatter-1.5.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.2,10502
-    commit=scrumchatter-1.5.2
-    subdir=app
-    gradle=yes
-
-Build:1.5.3,10503
-    commit=scrumchatter-1.5.3
-    subdir=app
-    gradle=yes
-
-Build:1.5.4,10504
-    commit=scrumchatter-1.5.4
-    subdir=app
-    gradle=yes
-
-Build:1.6.0,10600
-    commit=scrumchatter-1.6.0
-    subdir=app
-    gradle=yes
-
-Build:1.6.2,10602
-    commit=scrumchatter-1.6.2
-    subdir=app
-    gradle=yes
-
-Build:1.6.3,10603
-    commit=scrumchatter-1.6.3
-    subdir=app
-    gradle=yes
-
-Build:1.6.4,10604
-    commit=scrumchatter-1.6.4
-    subdir=app
-    gradle=yes
-
-Build:1.6.6,10606
-    commit=scrumchatter-1.6.6
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version scrumchatter-%v
-Update Check Mode:Tags ^scrumchatter.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*
-Current Version:1.6.6
-Current Version Code:10606
diff --git a/metadata/ca.rmen.android.scrumchatter.yml b/metadata/ca.rmen.android.scrumchatter.yml
new file mode 100644
index 0000000000..a6d6ee9ee8
--- /dev/null
+++ b/metadata/ca.rmen.android.scrumchatter.yml
@@ -0,0 +1,186 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: http://rmen.ca
+SourceCode: https://github.com/caarmen/scrumchatter
+IssueTracker: https://github.com/caarmen/scrumchatter/issues
+
+AutoName: Scrum Chatter
+Summary: Time members while they speak at meetings
+Description: |-
+    Time members while they speak at meetings. See who chatters the most in
+    meetings.
+
+    View average and total speaking time of members for all recorded meetings.
+
+    Share the stats for one meeting or for all meetings.
+
+    Export to Excel so you can add your own lovely charts and graphs as you see fit.
+
+    You can export and import the database.
+
+    Note: this app does NOT use the microphone to automatically detect when a person
+    is speaking. You must press on a "play" button when a team member speaks.
+
+RepoType: git
+Repo: https://github.com/caarmen/scrumchatter.git
+
+Builds:
+  - versionName: 1.0.22
+    versionCode: 10022
+    commit: scrumchatter-1.0.22
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.23
+    versionCode: 10023
+    commit: scrumchatter-1.0.23
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.24
+    versionCode: 10024
+    commit: scrumchatter-1.0.24
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.2
+    versionCode: 10102
+    commit: scrumchatter-1.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.3
+    versionCode: 10103
+    commit: scrumchatter-1.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.1
+    versionCode: 10201
+    commit: scrumchatter-1.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.2
+    versionCode: 10202
+    commit: scrumchatter-1.2.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.3
+    versionCode: 10203
+    commit: scrumchatter-1.2.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 10300
+    commit: scrumchatter-1.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.1
+    versionCode: 10301
+    commit: scrumchatter-1.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.2
+    versionCode: 10302
+    commit: scrumchatter-1.3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.3
+    versionCode: 10303
+    commit: scrumchatter-1.3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 10400
+    commit: scrumchatter-1.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 10500
+    commit: scrumchatter-1.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.2
+    versionCode: 10502
+    commit: scrumchatter-1.5.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.3
+    versionCode: 10503
+    commit: scrumchatter-1.5.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.4
+    versionCode: 10504
+    commit: scrumchatter-1.5.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.0
+    versionCode: 10600
+    commit: scrumchatter-1.6.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.2
+    versionCode: 10602
+    commit: scrumchatter-1.6.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.3
+    versionCode: 10603
+    commit: scrumchatter-1.6.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.4
+    versionCode: 10604
+    commit: scrumchatter-1.6.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.6.6
+    versionCode: 10606
+    commit: scrumchatter-1.6.6
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version scrumchatter-%v
+UpdateCheckMode: Tags ^scrumchatter.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*
+CurrentVersion: 1.6.6
+CurrentVersionCode: 10606
diff --git a/metadata/ca.rmen.nounours.txt b/metadata/ca.rmen.nounours.txt
deleted file mode 100644
index f59b7bbd05..0000000000
--- a/metadata/ca.rmen.nounours.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-Categories:Games
-License:GPL-3.0-only
-Author Web Site:http://www.facebook.com/nounoursbear
-Web Site:
-Source Code:https://github.com/caarmen/nounours-android
-Issue Tracker:https://github.com/caarmen/nounours-android/issues
-
-Auto Name:Nounours
-Summary:Nounours the teddy bear and friends
-Description:
-This cute teddy bear is a fun friend for children of all ages. Move him around
-by moving his head, paws, tummy, and ears. Spin him around.  Shake the phone.
-Nounours does some funny animations (disco, flying, jumping). Record and share
-his moves.
-
-Includes themes of Nounours in different settings, as well as a theme of
-Bugdroid.
-
-Includes a live wallpaper.
-.
-
-Repo Type:git
-Repo:https://github.com/caarmen/nounours-android
-
-Build:2.0.1,201
-    commit=release-2.0.1
-    subdir=app
-    gradle=yes
-
-Build:2.0.2,202
-    commit=release-2.0.2
-    subdir=app
-    gradle=yes
-
-Build:2.1.0,210
-    disable=scanner errors
-    commit=release-2.1.0
-    subdir=app
-    gradle=yes
-
-Build:2.2.1,221
-    commit=release-2.2.1
-    subdir=app
-    gradle=full
-
-Build:2.2.2,222
-    commit=release-2.2.2
-    subdir=app
-    gradle=full
-
-Build:2.3.2,232
-    commit=release-2.3.2
-    subdir=app
-    gradle=full
-
-Build:2.3.3,233
-    commit=release-2.3.3
-    subdir=app
-    gradle=full
-
-Build:3.0.0,300
-    commit=release-3.0.0
-    subdir=handheld
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.0.1,301
-    commit=release-3.0.1
-    subdir=handheld
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.1.0,310
-    commit=release-3.1.0
-    subdir=handheld
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.2.0,320
-    commit=release-3.2.0
-    subdir=handheld
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.3.0,330
-    commit=release-3.3.0
-    subdir=handheld
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.4.0,340
-    commit=release-3.4.0
-    subdir=handheld
-    init=sed -i 's/=true/=false/' ../settings.gradle
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.4.3,343
-    commit=release-3.4.3
-    subdir=handheld
-    init=sed -i 's/=true/=false/' ../settings.gradle
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.4.4,344
-    commit=release-3.4.4
-    subdir=handheld
-    init=sed -i 's/=true/=false/' ../settings.gradle
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.4.5,345
-    commit=release-3.4.5
-    subdir=handheld
-    init=sed -i 's/=true/=false/' ../settings.gradle
-    gradle=fullFoss
-    scanignore=wear/build.gradle
-
-Build:3.4.8,348
-    commit=release-3.4.8
-    subdir=handheld
-    gradle=full
-    rm=wear
-    prebuild=sed -i "/include ':wear'/d" ../settings.gradle
-
-Auto Update Mode:Version release-%v
-Update Check Mode:HTTP
-Update Check Data:https://raw.githubusercontent.com/caarmen/nounours-android/master/build.gradle|ext.handheldVersionCode=(.*)|.|ext.handheldVersionName="(.*)"
-Current Version:3.4.8
-Current Version Code:348
diff --git a/metadata/ca.rmen.nounours.yml b/metadata/ca.rmen.nounours.yml
new file mode 100644
index 0000000000..add29ece1e
--- /dev/null
+++ b/metadata/ca.rmen.nounours.yml
@@ -0,0 +1,174 @@
+Categories:
+  - Games
+License: GPL-3.0-only
+AuthorWebSite: http://www.facebook.com/nounoursbear
+SourceCode: https://github.com/caarmen/nounours-android
+IssueTracker: https://github.com/caarmen/nounours-android/issues
+
+AutoName: Nounours
+Summary: Nounours the teddy bear and friends
+Description: |-
+    This cute teddy bear is a fun friend for children of all ages. Move him around
+    by moving his head, paws, tummy, and ears. Spin him around.  Shake the phone.
+    Nounours does some funny animations (disco, flying, jumping). Record and share
+    his moves.
+
+    Includes themes of Nounours in different settings, as well as a theme of
+    Bugdroid.
+
+    Includes a live wallpaper.
+
+RepoType: git
+Repo: https://github.com/caarmen/nounours-android
+
+Builds:
+  - versionName: 2.0.1
+    versionCode: 201
+    commit: release-2.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.2
+    versionCode: 202
+    commit: release-2.0.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.1.0
+    versionCode: 210
+    disable: scanner errors
+    commit: release-2.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.1
+    versionCode: 221
+    commit: release-2.2.1
+    subdir: app
+    gradle:
+      - full
+
+  - versionName: 2.2.2
+    versionCode: 222
+    commit: release-2.2.2
+    subdir: app
+    gradle:
+      - full
+
+  - versionName: 2.3.2
+    versionCode: 232
+    commit: release-2.3.2
+    subdir: app
+    gradle:
+      - full
+
+  - versionName: 2.3.3
+    versionCode: 233
+    commit: release-2.3.3
+    subdir: app
+    gradle:
+      - full
+
+  - versionName: 3.0.0
+    versionCode: 300
+    commit: release-3.0.0
+    subdir: handheld
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.0.1
+    versionCode: 301
+    commit: release-3.0.1
+    subdir: handheld
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.1.0
+    versionCode: 310
+    commit: release-3.1.0
+    subdir: handheld
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.2.0
+    versionCode: 320
+    commit: release-3.2.0
+    subdir: handheld
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.3.0
+    versionCode: 330
+    commit: release-3.3.0
+    subdir: handheld
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.4.0
+    versionCode: 340
+    commit: release-3.4.0
+    subdir: handheld
+    init: sed -i 's/=true/=false/' ../settings.gradle
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.4.3
+    versionCode: 343
+    commit: release-3.4.3
+    subdir: handheld
+    init: sed -i 's/=true/=false/' ../settings.gradle
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.4.4
+    versionCode: 344
+    commit: release-3.4.4
+    subdir: handheld
+    init: sed -i 's/=true/=false/' ../settings.gradle
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.4.5
+    versionCode: 345
+    commit: release-3.4.5
+    subdir: handheld
+    init: sed -i 's/=true/=false/' ../settings.gradle
+    gradle:
+      - fullFoss
+    scanignore:
+      - wear/build.gradle
+
+  - versionName: 3.4.8
+    versionCode: 348
+    commit: release-3.4.8
+    subdir: handheld
+    gradle:
+      - full
+    rm:
+      - wear
+    prebuild: sed -i "/include ':wear'/d" ../settings.gradle
+
+AutoUpdateMode: Version release-%v
+UpdateCheckMode: HTTP
+UpdateCheckData: https://raw.githubusercontent.com/caarmen/nounours-android/master/build.gradle|ext.handheldVersionCode=(.*)|.|ext.handheldVersionName="(.*)"
+CurrentVersion: 3.4.8
+CurrentVersionCode: 348