diff --git a/metadata/name.seguri.android.isphoneencrypted.txt b/metadata/name.seguri.android.isphoneencrypted.txt
deleted file mode 100644
index c8c3f5025b..0000000000
--- a/metadata/name.seguri.android.isphoneencrypted.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Categories:Security
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/seguri/IsPhoneEncrypted
-Issue Tracker:https://github.com/seguri/IsPhoneEncrypted/issues
-
-Auto Name:IsPhoneEncrypted
-Summary:Check if the disk is fully encrypted
-Description:
-You can use this app to check if the phone is fully encrypting your disk.
-.
-
-Repo Type:git
-Repo:https://github.com/seguri/IsPhoneEncrypted
-
-Build:1.0.0,1
-    commit=v1.0.0
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.0.0
-Current Version Code:1
diff --git a/metadata/name.seguri.android.isphoneencrypted.yml b/metadata/name.seguri.android.isphoneencrypted.yml
new file mode 100644
index 0000000000..81945127ca
--- /dev/null
+++ b/metadata/name.seguri.android.isphoneencrypted.yml
@@ -0,0 +1,25 @@
+Categories:
+  - Security
+License: Apache-2.0
+SourceCode: https://github.com/seguri/IsPhoneEncrypted
+IssueTracker: https://github.com/seguri/IsPhoneEncrypted/issues
+
+AutoName: IsPhoneEncrypted
+Summary: Check if the disk is fully encrypted
+Description: You can use this app to check if the phone is fully encrypting your disk.
+
+RepoType: git
+Repo: https://github.com/seguri/IsPhoneEncrypted
+
+Builds:
+  - versionName: 1.0.0
+    versionCode: 1
+    commit: v1.0.0
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.0.0
+CurrentVersionCode: 1
diff --git a/metadata/name.seguri.android.lock.txt b/metadata/name.seguri.android.lock.txt
deleted file mode 100644
index edcc81aac7..0000000000
--- a/metadata/name.seguri.android.lock.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Categories:System
-License:Apache-2.0
-Author Name:Marco Seguri
-Web Site:
-Source Code:https://github.com/seguri/lock
-Issue Tracker:https://github.com/seguri/lock/issues
-
-Auto Name:Lock
-Summary:Lock the screen
-Description:
-Very fast shortcut to lock the screen (just launch the app).
-
-Realized for FAST launcher to be able to lock the screen searching for "lk" app
-(it will isolate this app as the only one containing "l" and "k" in its name).
-.
-
-Repo Type:git
-Repo:https://github.com/seguri/lock
-
-Build:1.0.1,2
-    commit=1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.1.0,3
-    commit=1.1.0
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
-
-Build:1.1.1,4
-    commit=1.1.1
-    subdir=app
-    gradle=yes
-
-Build:1.3.1,7
-    commit=1.3.1
-    subdir=app
-    gradle=yes
-
-Build:1.3.3,9
-    disable=lintVitalRelease fails
-    commit=1.3.3
-    subdir=app
-    gradle=yes
-
-Build:1.3.4,10
-    commit=1.3.4
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:1.3.4
-Current Version Code:10
diff --git a/metadata/name.seguri.android.lock.yml b/metadata/name.seguri.android.lock.yml
new file mode 100644
index 0000000000..db0883cb7d
--- /dev/null
+++ b/metadata/name.seguri.android.lock.yml
@@ -0,0 +1,68 @@
+Categories:
+  - System
+License: Apache-2.0
+AuthorName: Marco Seguri
+SourceCode: https://github.com/seguri/lock
+IssueTracker: https://github.com/seguri/lock/issues
+
+AutoName: Lock
+Summary: Lock the screen
+Description: |-
+    Very fast shortcut to lock the screen (just launch the app).
+
+    Realized for FAST launcher to be able to lock the screen searching for "lk" app
+    (it will isolate this app as the only one containing "l" and "k" in its name).
+
+RepoType: git
+Repo: https://github.com/seguri/lock
+
+Builds:
+  - versionName: 1.0.1
+    versionCode: 2
+    commit: 1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 3
+    commit: 1.1.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable
+        'ExtraTranslation' } }" >> build.gradle
+
+  - versionName: 1.1.1
+    versionCode: 4
+    commit: 1.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.1
+    versionCode: 7
+    commit: 1.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.3
+    versionCode: 9
+    disable: lintVitalRelease fails
+    commit: 1.3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.4
+    versionCode: 10
+    commit: 1.3.4
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 1.3.4
+CurrentVersionCode: 10
diff --git a/metadata/name.soulayrol.rhaa.sholi.txt b/metadata/name.soulayrol.rhaa.sholi.txt
deleted file mode 100644
index 884e730471..0000000000
--- a/metadata/name.soulayrol.rhaa.sholi.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-Categories:Writing
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/dsoulayrol/android-sholi
-Issue Tracker:https://github.com/dsoulayrol/android-sholi/issues
-
-Auto Name:ShoLi
-Summary:Shopping lists manager
-Description:
-ShoLi aims at being a very simple tool to edit shopping lists, and then to be a
-support for checking on those very lists. It was heavily inspired by
-[[caldwell.ben.trolly]] which proposed a clean and efficient interface to
-achieve the same goal.
-
-ShoLi was only designed for small devices, the kind you can have in your pocket
-when you are doing your shopping. It runs on Android 4.x, and needs no external
-library, neither special permission.
-.
-
-Repo Type:git
-Repo:https://github.com/dsoulayrol/android-sholi.git
-
-Build:1.0,1
-    commit=v1.0
-    subdir=sholi
-    gradle=defaultFlavor
-
-Build:1.1,2
-    commit=v1.1
-    subdir=sholi
-    gradle=defaultFlavor
-
-Build:1.2,3
-    commit=v1.2
-    subdir=sholi
-    gradle=defaultFlavor
-
-Build:1.3,4
-    commit=v1.3
-    subdir=sholi
-    gradle=defaultFlavor
-
-Build:1.4,5
-    disable=build fails
-    commit=v1.4
-    subdir=sholi
-    gradle=defaultFlavor
-
-Build:1.4.1,6
-    disable=build fails - java errors
-    commit=v1.4.1
-    subdir=sholi
-    gradle=defaultFlavor
-
-Build:1.4.2,7
-    commit=v1.4.2
-    subdir=sholi
-    gradle=defaultFlavor
-
-Build:1.5,8
-    commit=v1.5
-    subdir=sholi
-    gradle=defaultFlavor
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.5
-Current Version Code:8
diff --git a/metadata/name.soulayrol.rhaa.sholi.yml b/metadata/name.soulayrol.rhaa.sholi.yml
new file mode 100644
index 0000000000..3db593904b
--- /dev/null
+++ b/metadata/name.soulayrol.rhaa.sholi.yml
@@ -0,0 +1,85 @@
+Categories:
+  - Writing
+License: GPL-3.0-only
+SourceCode: https://github.com/dsoulayrol/android-sholi
+IssueTracker: https://github.com/dsoulayrol/android-sholi/issues
+Changelog: https://github.com/dsoulayrol/android-sholi/blob/HEAD/CHANGES
+
+AutoName: ShoLi
+Summary: Shopping lists manager
+Description: |-
+    ShoLi aims at being a very simple tool to edit shopping lists, and then to be a
+    support for checking on those very lists. It was heavily inspired by
+    [[caldwell.ben.trolly]] which proposed a clean and efficient interface to
+    achieve the same goal.
+
+    ShoLi was only designed for small devices, the kind you can have in your pocket
+    when you are doing your shopping. It runs on Android 4.x, and needs no external
+    library, neither special permission.
+
+RepoType: git
+Repo: https://github.com/dsoulayrol/android-sholi.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: v1.3
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+  - versionName: '1.4'
+    versionCode: 5
+    disable: build fails
+    commit: v1.4
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+  - versionName: 1.4.1
+    versionCode: 6
+    disable: build fails - java errors
+    commit: v1.4.1
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+  - versionName: 1.4.2
+    versionCode: 7
+    commit: v1.4.2
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+  - versionName: '1.5'
+    versionCode: 8
+    commit: v1.5
+    subdir: sholi
+    gradle:
+      - defaultFlavor
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.5'
+CurrentVersionCode: 8
diff --git a/metadata/name.starnberger.guenther.android.cbw.txt b/metadata/name.starnberger.guenther.android.cbw.txt
deleted file mode 100644
index 8ed7f8489d..0000000000
--- a/metadata/name.starnberger.guenther.android.cbw.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Categories:Navigation
-License:X11
-Web Site:
-Source Code:https://github.com/gstarnberger/CBW
-Issue Tracker:https://github.com/gstarnberger/CBW/issues
-
-Auto Name:Citybike Stations Vienna
-Summary:Show available citybikes in Vienna
-Description:
-Provides a listing of Citybike stations in Vienna/Austria sorted by the distance
-from the current location. For each station the number of available bikes, the
-number of available boxes, as well as the location are shown.
-.
-
-Repo Type:git
-Repo:https://github.com/gstarnberger/CBW.git
-
-Build:1.2.3,20
-    commit=374ad7be6d4fed421baaeea0da1250c146cd9c46
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2.3
-Current Version Code:20
diff --git a/metadata/name.starnberger.guenther.android.cbw.yml b/metadata/name.starnberger.guenther.android.cbw.yml
new file mode 100644
index 0000000000..1405c5d144
--- /dev/null
+++ b/metadata/name.starnberger.guenther.android.cbw.yml
@@ -0,0 +1,25 @@
+Categories:
+  - Navigation
+License: X11
+SourceCode: https://github.com/gstarnberger/CBW
+IssueTracker: https://github.com/gstarnberger/CBW/issues
+
+AutoName: Citybike Stations Vienna
+Summary: Show available citybikes in Vienna
+Description: |-
+    Provides a listing of Citybike stations in Vienna/Austria sorted by the distance
+    from the current location. For each station the number of available bikes, the
+    number of available boxes, as well as the location are shown.
+
+RepoType: git
+Repo: https://github.com/gstarnberger/CBW.git
+
+Builds:
+  - versionName: 1.2.3
+    versionCode: 20
+    commit: 374ad7be6d4fed421baaeea0da1250c146cd9c46
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.3
+CurrentVersionCode: 20
diff --git a/metadata/net.altcoinfaucet.app.txt b/metadata/net.altcoinfaucet.app.txt
deleted file mode 100644
index 470fee4ae7..0000000000
--- a/metadata/net.altcoinfaucet.app.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Disabled:https://gitlab.com/fdroid/fdroiddata/issues/471
-Categories:Internet,Reading
-License:MIT
-Web Site:http://altcoinfaucet.net
-Source Code:https://github.com/gehaxelt/Android-AltcoinfaucetApp
-Issue Tracker:https://github.com/gehaxelt/Android-AltcoinfaucetApp/issues
-Bitcoin:1J6793xykzCpZBD8npU9PUjX6SojMjLwD4
-
-Auto Name:Altcoinfaucet.net - Overview
-Summary:Faucet information
-Description:
-Information about the faucets at altcoinfaucet.net, including
-
-* Status
-* Balance
-* Min/Max payout
-* Withdrawal limit
-* Transaction fee
-* Timeout
-* Total paid
-* Total payouts
-* Used algorithm
-* Coins blocks
-* Difficulty
-* Hashrate
-
-To earn coins, you still have to go to the website [http://altcoinfaucet.net].
-.
-
-Repo Type:git
-Repo:https://github.com/gehaxelt/Android-AltcoinfaucetApp.git
-
-Build:1.0,1
-    commit=v1.0
-    srclibs=1:SugarORM@v1.2
-    rm=libs/*
-    prebuild=pushd $$SugarORM$$ && \
-        rm build.xml && \
-        android update lib-project -p ./ && \
-        popd
-    target=android-21
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags .*[0-9]$
-Current Version:1.0
-Current Version Code:1
diff --git a/metadata/net.altcoinfaucet.app.yml b/metadata/net.altcoinfaucet.app.yml
new file mode 100644
index 0000000000..6c611384cf
--- /dev/null
+++ b/metadata/net.altcoinfaucet.app.yml
@@ -0,0 +1,52 @@
+Disabled: https://gitlab.com/fdroid/fdroiddata/issues/471
+Categories:
+  - Internet
+  - Reading
+License: MIT
+WebSite: http://altcoinfaucet.net
+SourceCode: https://github.com/gehaxelt/Android-AltcoinfaucetApp
+IssueTracker: https://github.com/gehaxelt/Android-AltcoinfaucetApp/issues
+Bitcoin: 1J6793xykzCpZBD8npU9PUjX6SojMjLwD4
+
+AutoName: Altcoinfaucet.net - Overview
+Summary: Faucet information
+Description: |-
+    Information about the faucets at altcoinfaucet.net, including
+
+    * Status
+    * Balance
+    * Min/Max payout
+    * Withdrawal limit
+    * Transaction fee
+    * Timeout
+    * Total paid
+    * Total payouts
+    * Used algorithm
+    * Coins blocks
+    * Difficulty
+    * Hashrate
+
+    To earn coins, you still have to go to the website [http://altcoinfaucet.net].
+
+RepoType: git
+Repo: https://github.com/gehaxelt/Android-AltcoinfaucetApp.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    srclibs:
+      - 1:SugarORM@v1.2
+    rm:
+      - libs/*
+    prebuild:
+      - pushd $$SugarORM$$
+      - rm build.xml
+      - android update lib-project -p ./
+      - popd
+    target: android-21
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags .*[0-9]$
+CurrentVersion: '1.0'
+CurrentVersionCode: 1
diff --git a/metadata/net.anzix.osm.upload.txt b/metadata/net.anzix.osm.upload.txt
deleted file mode 100644
index 17ec2b75e7..0000000000
--- a/metadata/net.anzix.osm.upload.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Categories:Navigation
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/elek/osmgpxuploader
-Issue Tracker:https://github.com/elek/osmgpxuploader/issues
-
-Auto Name:OsmGpxUploader
-Summary:Upload GPX files to OpenStreetMap
-Description:
-Simple uploader which can:
-
-# Upload directly to OSM from any application which supports Share or Send GPX tracks
-# Define the source of your gpx traces (eg. a directory) and show the list about the new/uploaded tracks. Select the track and upload to the openstreetmap server
-# Allow you to choose your GPX file, tag it and upload
-
-Tags: openstreetmap osm gpx upload track tracking
-.
-
-Repo Type:git
-Repo:https://github.com/elek/osmgpxuploader.git
-
-Build:1.5.3,10
-    commit=4ebed08421d7
-    maven=yes
-    prebuild=$$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v13 -Dversion=13 -Dpackaging=jar -Dfile=$$SDK$$/extras/android/support/v13/android-support-v13.jar
-
-Build:1.5.3,5000
-    disable=for UCM purposes
-    commit=unknown - see disabled
-    subdir=upload
-
-Auto Update Mode:None
-Update Check Mode:Tags
-Current Version:1.5.3
-Current Version Code:10
diff --git a/metadata/net.anzix.osm.upload.yml b/metadata/net.anzix.osm.upload.yml
new file mode 100644
index 0000000000..2c6fdaabae
--- /dev/null
+++ b/metadata/net.anzix.osm.upload.yml
@@ -0,0 +1,38 @@
+Categories:
+  - Navigation
+License: GPL-3.0-only
+SourceCode: https://github.com/elek/osmgpxuploader
+IssueTracker: https://github.com/elek/osmgpxuploader/issues
+
+AutoName: OsmGpxUploader
+Summary: Upload GPX files to OpenStreetMap
+Description: |-
+    Simple uploader which can:
+
+    # Upload directly to OSM from any application which supports Share or Send GPX tracks
+    # Define the source of your gpx traces (eg. a directory) and show the list about the new/uploaded tracks. Select the track and upload to the openstreetmap server
+    # Allow you to choose your GPX file, tag it and upload
+
+    Tags: openstreetmap osm gpx upload track tracking
+
+RepoType: git
+Repo: https://github.com/elek/osmgpxuploader.git
+
+Builds:
+  - versionName: 1.5.3
+    versionCode: 10
+    commit: 4ebed08421d7
+    maven: 'yes'
+    prebuild: $$MVN3$$ install:install-file -DgroupId=android.support -DartifactId=compatibility-v13
+        -Dversion=13 -Dpackaging=jar -Dfile=$$SDK$$/extras/android/support/v13/android-support-v13.jar
+
+  - versionName: 1.5.3
+    versionCode: 5000
+    disable: for UCM purposes
+    commit: unknown - see disabled
+    subdir: upload
+
+AutoUpdateMode: None
+UpdateCheckMode: Tags
+CurrentVersion: 1.5.3
+CurrentVersionCode: 10
diff --git a/metadata/net.artificialworlds.rabbitescape.txt b/metadata/net.artificialworlds.rabbitescape.txt
deleted file mode 100644
index c23e9621e1..0000000000
--- a/metadata/net.artificialworlds.rabbitescape.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Categories:Games
-License:GPL-2.0-or-later
-Author Name:Andy Balaam and the Rabbit Escape developers
-Author Email:rabbitescape@artificialworlds.net
-Web Site:http://artificialworlds.net/rabbit-escape
-Source Code:https://github.com/andybalaam/rabbit-escape
-Issue Tracker:https://github.com/andybalaam/rabbit-escape/issues
-
-Auto Name:Rabbit Escape
-Summary:Lemmings-like puzzle/action game
-Description:
-Hundreds of levels of puzzling action!
-
-* Help your rabbits find their way from the entrance to the exit.
-* If you rescue enough rabbits, you can go on to the next level.
-* Control your rabbits by dropping tokens that give them special abilities.
-* Choose abilities like bridge-building, climbing and digging.
-* Make your own levels.
-.
-
-Repo Type:git
-Repo:https://github.com/andybalaam/rabbit-escape
-
-Build:0.10.2,102
-    disable=old failing build, needs sox
-    commit=v0.10.2
-    subdir=rabbit-escape-ui-android/app
-    gradle=paid
-    build=cd ../.. && \
-        make android-pre-fdroid
-
-Build:0.10.3,103
-    commit=v0.10.3
-    subdir=rabbit-escape-ui-android/app
-    gradle=paid
-    build=cd ../.. && \
-        make android-pre-fdroid
-
-Build:0.11,110
-    commit=v0.11
-    subdir=rabbit-escape-ui-android/app
-    sudo=apt-get update && \
-        apt-get install -y python3-lxml
-    gradle=paid
-    build=cd ../.. && \
-        make android-pre-fdroid
-
-Build:0.13,130
-    commit=v0.13
-    subdir=rabbit-escape-ui-android/app
-    sudo=apt-get update || apt-get update && \
-        apt-get install -y python3-lxml inkscape graphicsmagick-imagemagick-compat
-    gradle=paid
-    rm=lib
-    build=cd ../.. && \
-        make android-pre-fdroid
-
-Build:0.13.1,131
-    commit=v0.13.1
-    subdir=rabbit-escape-ui-android/app
-    sudo=apt-get update || apt-get update && \
-        apt-get install -y python3-lxml inkscape graphicsmagick-imagemagick-compat
-    gradle=paid
-    rm=lib
-    build=cd ../.. && \
-        make android-pre-fdroid
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags v\d+\.\d+(\.\d+)?
-Current Version:0.13.1
-Current Version Code:131
diff --git a/metadata/net.artificialworlds.rabbitescape.yml b/metadata/net.artificialworlds.rabbitescape.yml
new file mode 100644
index 0000000000..eae56ede7e
--- /dev/null
+++ b/metadata/net.artificialworlds.rabbitescape.yml
@@ -0,0 +1,93 @@
+Categories:
+  - Games
+License: GPL-2.0-or-later
+AuthorName: Andy Balaam and the Rabbit Escape developers
+AuthorEmail: rabbitescape@artificialworlds.net
+WebSite: http://artificialworlds.net/rabbit-escape
+SourceCode: https://github.com/andybalaam/rabbit-escape
+IssueTracker: https://github.com/andybalaam/rabbit-escape/issues
+Changelog: https://github.com/andybalaam/rabbit-escape/releases
+
+AutoName: Rabbit Escape
+Summary: Lemmings-like puzzle/action game
+Description: |-
+    Hundreds of levels of puzzling action!
+
+    * Help your rabbits find their way from the entrance to the exit.
+    * If you rescue enough rabbits, you can go on to the next level.
+    * Control your rabbits by dropping tokens that give them special abilities.
+    * Choose abilities like bridge-building, climbing and digging.
+    * Make your own levels.
+
+RepoType: git
+Repo: https://github.com/andybalaam/rabbit-escape
+
+Builds:
+  - versionName: 0.10.2
+    versionCode: 102
+    disable: old failing build, needs sox
+    commit: v0.10.2
+    subdir: rabbit-escape-ui-android/app
+    gradle:
+      - paid
+    build:
+      - cd ../..
+      - make android-pre-fdroid
+
+  - versionName: 0.10.3
+    versionCode: 103
+    commit: v0.10.3
+    subdir: rabbit-escape-ui-android/app
+    gradle:
+      - paid
+    build:
+      - cd ../..
+      - make android-pre-fdroid
+
+  - versionName: '0.11'
+    versionCode: 110
+    commit: v0.11
+    subdir: rabbit-escape-ui-android/app
+    sudo:
+      - apt-get update
+      - apt-get install -y python3-lxml
+    gradle:
+      - paid
+    build:
+      - cd ../..
+      - make android-pre-fdroid
+
+  - versionName: '0.13'
+    versionCode: 130
+    commit: v0.13
+    subdir: rabbit-escape-ui-android/app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y python3-lxml inkscape graphicsmagick-imagemagick-compat
+    gradle:
+      - paid
+    rm:
+      - lib
+    build:
+      - cd ../..
+      - make android-pre-fdroid
+
+  - versionName: 0.13.1
+    versionCode: 131
+    commit: v0.13.1
+    subdir: rabbit-escape-ui-android/app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y python3-lxml inkscape graphicsmagick-imagemagick-compat
+    gradle:
+      - paid
+    rm:
+      - lib
+    build:
+      - cd ../..
+      - make android-pre-fdroid
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags v\d+\.\d+(\.\d+)?
+CurrentVersion: 0.13.1
+CurrentVersionCode: 131
diff --git a/metadata/net.basov.lws.fdroid.txt b/metadata/net.basov.lws.fdroid.txt
deleted file mode 100644
index b8ac98acd7..0000000000
--- a/metadata/net.basov.lws.fdroid.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-Categories:Connectivity
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/mvbasov/lWS
-Issue Tracker:https://github.com/mvbasov/lWS/issues
-Changelog:https://github.com/mvbasov/lWS/releases
-
-Auto Name:lWS
-Summary:lightweight Web Server (lWS)
-Description:
-'''It is ...'''
-
-* ... a Web Server for static content.
-* ... lightweight. APK size less then 100 Kb.
-* ... as simple as possible. Only essential features implemented.
-* ... open. [https://github.com/mvbasov/lWS Source code] released under GPL-3.0.
-* ... a personal solution. It is not optimized/tested for many parallel connections and large file transfer.
-* ... network state responsive. Requires Wi-Fi connected or tethering enabled. Service will stop automatically if network is disconnected.
-
-'''Based on'''
-
-This application continues the development of
-[https://github.com/bodeme/androidwebserver Webserver for Android].
-
-'''What is configurable'''
-
-* Document root. Path may be entered as text or optionally selected using [[org.openintents.filemanager]]. If it is not installed it will offered for install.
-* Port. May be between 1024 and 65535. Default is 8080
-
-Any wrong values in parameters will automatically be set back to their defaults.
-
-'''Document root'''
-
-Document root by default is set to application private directory, example index
-file automatically created. It is a safe configuration. You can place your pages
-in this directory. But be careful! If you use Android 5.0 or above and uninstall
-the application this directory and its content will be removed.
-
-'''Security warning'''
-
-You can change document root to any readable path on file system, but you need
-to understand what are you doing. __Be careful: you could (suddenly?) create the
-configuration so than anyone on the same Wi-Fi network could access the data on
-your device whether you like it or not.__ All files from document root and below
-are available for reading without any restrictions to anyone who's connected to
-the network and knows the URL of the server.
-
-'''"Send", "QR code" and "Browser"'''
-
-After server starts you can press:
-
-* "Browser" button for check server operation in your local browser
-* "QR code" to call [[net.basov.lws.qr.fdroid]] or [[com.google.zxing.client.android]] to share URL by QR code. If no app is installed it offers to install lWS QR plugin
-* "Send" to share the working server URL to another device via Bluetooth, Android Beam, E-Mail and any other way available on your device.
-
-'''On screen log'''
-
-The application has no permanent logging. This was treated this as redundant
-functionality. The app tries to have the notification up to date. The on screen
-log works only when the application is visible. Log screen may be cleared after
-returning from background.
-.
-
-Repo Type:git
-Repo:https://github.com/mvbasov/lWS
-
-Build:03.00.01,30001
-    commit=v03.00.01f
-    subdir=app
-    patch=gradle_pkgid.patch,strings_lws_qr_package_name.patch
-    gradle=yes
-    prebuild=sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' build.gradle
-
-Build:05.00.00,50000
-    commit=v05.00.00
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' -e 's/net.basov.lws/net.basov.lws.fdroid/' build.gradle && \
-        sed -i -e 's/net.basov.lws.qr.gpm/net.basov.lws.qr.fdroid/' src/main/res/values/strings.xml
-
-Build:06.00.00,60000
-    commit=v06.00.00f
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' -e 's/net.basov.lws/net.basov.lws.fdroid/' build.gradle && \
-        sed -i -e 's/net.basov.lws.qr.gpm/net.basov.lws.qr.fdroid/' src/main/res/values/strings.xml
-
-Build:07.00.00,70000
-    commit=v07.00.00f
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' -e 's/net.basov.lws/net.basov.lws.fdroid/' build.gradle && \
-        sed -i -e 's/net.basov.lws.qr.gpm/net.basov.lws.qr.fdroid/' src/main/res/values/strings.xml
-
-Auto Update Mode:Version v%vf
-Update Check Mode:Tags v\d+\.00(\.\d+)?f
-Update Check Name:net.basov.lws
-Current Version:07.00.00
-Current Version Code:70000
diff --git a/metadata/net.basov.lws.fdroid.yml b/metadata/net.basov.lws.fdroid.yml
new file mode 100644
index 0000000000..78de9f7b53
--- /dev/null
+++ b/metadata/net.basov.lws.fdroid.yml
@@ -0,0 +1,115 @@
+Categories:
+  - Connectivity
+License: GPL-3.0-only
+SourceCode: https://github.com/mvbasov/lWS
+IssueTracker: https://github.com/mvbasov/lWS/issues
+Changelog: https://github.com/mvbasov/lWS/releases
+
+AutoName: lWS
+Summary: lightweight Web Server (lWS)
+Description: |-
+    '''It is ...'''
+
+    * ... a Web Server for static content.
+    * ... lightweight. APK size less then 100 Kb.
+    * ... as simple as possible. Only essential features implemented.
+    * ... open. [https://github.com/mvbasov/lWS Source code] released under GPL-3.0.
+    * ... a personal solution. It is not optimized/tested for many parallel connections and large file transfer.
+    * ... network state responsive. Requires Wi-Fi connected or tethering enabled. Service will stop automatically if network is disconnected.
+
+    '''Based on'''
+
+    This application continues the development of
+    [https://github.com/bodeme/androidwebserver Webserver for Android].
+
+    '''What is configurable'''
+
+    * Document root. Path may be entered as text or optionally selected using [[org.openintents.filemanager]]. If it is not installed it will offered for install.
+    * Port. May be between 1024 and 65535. Default is 8080
+
+    Any wrong values in parameters will automatically be set back to their defaults.
+
+    '''Document root'''
+
+    Document root by default is set to application private directory, example index
+    file automatically created. It is a safe configuration. You can place your pages
+    in this directory. But be careful! If you use Android 5.0 or above and uninstall
+    the application this directory and its content will be removed.
+
+    '''Security warning'''
+
+    You can change document root to any readable path on file system, but you need
+    to understand what are you doing. __Be careful: you could (suddenly?) create the
+    configuration so than anyone on the same Wi-Fi network could access the data on
+    your device whether you like it or not.__ All files from document root and below
+    are available for reading without any restrictions to anyone who's connected to
+    the network and knows the URL of the server.
+
+    '''"Send", "QR code" and "Browser"'''
+
+    After server starts you can press:
+
+    * "Browser" button for check server operation in your local browser
+    * "QR code" to call [[net.basov.lws.qr.fdroid]] or [[com.google.zxing.client.android]] to share URL by QR code. If no app is installed it offers to install lWS QR plugin
+    * "Send" to share the working server URL to another device via Bluetooth, Android Beam, E-Mail and any other way available on your device.
+
+    '''On screen log'''
+
+    The application has no permanent logging. This was treated this as redundant
+    functionality. The app tries to have the notification up to date. The on screen
+    log works only when the application is visible. Log screen may be cleared after
+    returning from background.
+
+RepoType: git
+Repo: https://github.com/mvbasov/lWS
+
+Builds:
+  - versionName: 03.00.01
+    versionCode: 30001
+    commit: v03.00.01f
+    subdir: app
+    patch:
+      - gradle_pkgid.patch
+      - strings_lws_qr_package_name.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' build.gradle
+
+  - versionName: 05.00.00
+    versionCode: 50000
+    commit: v05.00.00
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' -e 's/net.basov.lws/net.basov.lws.fdroid/'
+        build.gradle
+      - sed -i -e 's/net.basov.lws.qr.gpm/net.basov.lws.qr.fdroid/' src/main/res/values/strings.xml
+
+  - versionName: 06.00.00
+    versionCode: 60000
+    commit: v06.00.00f
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' -e 's/net.basov.lws/net.basov.lws.fdroid/'
+        build.gradle
+      - sed -i -e 's/net.basov.lws.qr.gpm/net.basov.lws.qr.fdroid/' src/main/res/values/strings.xml
+
+  - versionName: 07.00.00
+    versionCode: 70000
+    commit: v07.00.00f
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' -e 's/net.basov.lws/net.basov.lws.fdroid/'
+        build.gradle
+      - sed -i -e 's/net.basov.lws.qr.gpm/net.basov.lws.qr.fdroid/' src/main/res/values/strings.xml
+
+AutoUpdateMode: Version v%vf
+UpdateCheckMode: Tags v\d+\.00(\.\d+)?f
+UpdateCheckName: net.basov.lws
+CurrentVersion: 07.00.00
+CurrentVersionCode: 70000
diff --git a/metadata/net.basov.lws.qr.fdroid.txt b/metadata/net.basov.lws.qr.fdroid.txt
deleted file mode 100644
index bc76bf2e48..0000000000
--- a/metadata/net.basov.lws.qr.fdroid.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-Categories:Connectivity
-License:MIT
-Web Site:
-Source Code:https://github.com/mvbasov/lWS.QR
-Issue Tracker:https://github.com/mvbasov/lWS.QR/issues
-Changelog:https://github.com/mvbasov/lWS.QR/releases
-
-Auto Name:lWS QR
-Summary:lightweight Web Server QR code generator plugin
-Description:
-This app is designed as a QR Code plugin for [[net.basov.lws.fdroid]]. It can
-also be used standalone as a small and simple QR code generator. lWS QR can be
-easily integrated with your application. See [https://github.com/mvbasov/lWS.QR
-the source code] for details.
-.
-
-Repo Type:git
-Repo:https://github.com/mvbasov/lWS.QR.git
-
-Build:01.00.00,10000
-    commit=v01.00.00f
-    subdir=app
-    patch=gradle_pkgid.patch
-    gradle=yes
-    prebuild=sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' build.gradle
-
-Build:03.00.00,30000
-    commit=v03.00.00f
-    subdir=app
-    submodules=yes
-    sudo=apt-get install -y -t testing node-uglify
-    gradle=fdroid
-    prebuild=sed -i -e '/versionNameSuffix/d' build.gradle
-
-Build:03.00.02,30002
-    commit=v03.00.02f
-    subdir=app
-    submodules=yes
-    sudo=apt-get install -y -t testing node-uglify
-    gradle=fdroid
-    prebuild=sed -i -e '/versionNameSuffix/d' build.gradle
-
-Build:04.00.00,40000
-    commit=v04.00.00f
-    subdir=app
-    submodules=yes
-    sudo=apt update || apt update && \
-        apt install -y node-uglify
-    gradle=fdroid
-    prebuild=sed -i -e '/versionNameSuffix/d' build.gradle
-
-Auto Update Mode:Version v%vf
-Update Check Mode:Tags v\d+\.00(\.\d+)?f
-Update Check Name:net.basov.lws.qr
-Current Version:04.00.00
-Current Version Code:40000
diff --git a/metadata/net.basov.lws.qr.fdroid.yml b/metadata/net.basov.lws.qr.fdroid.yml
new file mode 100644
index 0000000000..9d1bc7ef46
--- /dev/null
+++ b/metadata/net.basov.lws.qr.fdroid.yml
@@ -0,0 +1,66 @@
+Categories:
+  - Connectivity
+License: MIT
+SourceCode: https://github.com/mvbasov/lWS.QR
+IssueTracker: https://github.com/mvbasov/lWS.QR/issues
+Changelog: https://github.com/mvbasov/lWS.QR/releases
+
+AutoName: lWS QR
+Summary: lightweight Web Server QR code generator plugin
+Description: |-
+    This app is designed as a QR Code plugin for [[net.basov.lws.fdroid]]. It can
+    also be used standalone as a small and simple QR code generator. lWS QR can be
+    easily integrated with your application. See [https://github.com/mvbasov/lWS.QR
+    the source code] for details.
+
+RepoType: git
+Repo: https://github.com/mvbasov/lWS.QR.git
+
+Builds:
+  - versionName: 01.00.00
+    versionCode: 10000
+    commit: v01.00.00f
+    subdir: app
+    patch:
+      - gradle_pkgid.patch
+    gradle:
+      - yes
+    prebuild: sed -i -e '/applicationIdSuffix/d' -e '/versionNameSuffix/d' build.gradle
+
+  - versionName: 03.00.00
+    versionCode: 30000
+    commit: v03.00.00f
+    subdir: app
+    submodules: true
+    sudo: apt-get install -y -t testing node-uglify
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/versionNameSuffix/d' build.gradle
+
+  - versionName: 03.00.02
+    versionCode: 30002
+    commit: v03.00.02f
+    subdir: app
+    submodules: true
+    sudo: apt-get install -y -t testing node-uglify
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/versionNameSuffix/d' build.gradle
+
+  - versionName: 04.00.00
+    versionCode: 40000
+    commit: v04.00.00f
+    subdir: app
+    submodules: true
+    sudo:
+      - apt update || apt update
+      - apt install -y node-uglify
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/versionNameSuffix/d' build.gradle
+
+AutoUpdateMode: Version v%vf
+UpdateCheckMode: Tags v\d+\.00(\.\d+)?f
+UpdateCheckName: net.basov.lws.qr
+CurrentVersion: 04.00.00
+CurrentVersionCode: 40000
diff --git a/metadata/net.bierbaumer.otp_authenticator.txt b/metadata/net.bierbaumer.otp_authenticator.txt
deleted file mode 100644
index d3459aecb1..0000000000
--- a/metadata/net.bierbaumer.otp_authenticator.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Categories:Security
-License:MIT
-Web Site:
-Source Code:https://github.com/0xbb/otp-authenticator
-Issue Tracker:https://github.com/0xbb/otp-authenticator/issues
-Changelog:https://github.com/0xbb/otp-authenticator/releases
-
-Auto Name:OTP Authenticator
-Summary:A two-factor authentication App
-Description:
-OTP Authenticator is a two-factor authentication App for Android 4.0+.
-
-It implements Time-based One-time Passwords (TOTP) like specified in RFC 6238.
-Simply scan the QR code and login with the generated 6-digit code.
-
-Features:
-
-* Free and Open-Source
-* Requires minimal permissions
-* Encrypted storage on Android 4.3+
-* Sleek minimalistic Material Design
-* Great Usability
-* Compatible with Google Authenticator
-.
-
-Repo Type:git
-Repo:https://github.com/0xbb/otp-authenticator
-
-Build:0.1,1
-    commit=v0.1.0
-    subdir=app
-    gradle=yes
-
-Build:0.1.1,2
-    commit=v0.1.1
-    subdir=app
-    gradle=yes
-
-Build:0.1.2,3
-    commit=v0.1.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.1.2
-Current Version Code:3
diff --git a/metadata/net.bierbaumer.otp_authenticator.yml b/metadata/net.bierbaumer.otp_authenticator.yml
new file mode 100644
index 0000000000..83b414be2d
--- /dev/null
+++ b/metadata/net.bierbaumer.otp_authenticator.yml
@@ -0,0 +1,53 @@
+Categories:
+  - Security
+License: MIT
+SourceCode: https://github.com/0xbb/otp-authenticator
+IssueTracker: https://github.com/0xbb/otp-authenticator/issues
+Changelog: https://github.com/0xbb/otp-authenticator/releases
+
+AutoName: OTP Authenticator
+Summary: A two-factor authentication App
+Description: |-
+    OTP Authenticator is a two-factor authentication App for Android 4.0+.
+
+    It implements Time-based One-time Passwords (TOTP) like specified in RFC 6238.
+    Simply scan the QR code and login with the generated 6-digit code.
+
+    Features:
+
+    * Free and Open-Source
+    * Requires minimal permissions
+    * Encrypted storage on Android 4.3+
+    * Sleek minimalistic Material Design
+    * Great Usability
+    * Compatible with Google Authenticator
+
+RepoType: git
+Repo: https://github.com/0xbb/otp-authenticator
+
+Builds:
+  - versionName: '0.1'
+    versionCode: 1
+    commit: v0.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.1
+    versionCode: 2
+    commit: v0.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.2
+    versionCode: 3
+    commit: v0.1.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.1.2
+CurrentVersionCode: 3
diff --git a/metadata/net.chilon.matt.teacup.txt b/metadata/net.chilon.matt.teacup.txt
deleted file mode 100644
index 1ab3b13dd3..0000000000
--- a/metadata/net.chilon.matt.teacup.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/yourealwaysbe/teacup
-Issue Tracker:https://github.com/yourealwaysbe/teacup/issues
-
-Auto Name:TeaCup
-Summary:Configurable music widget
-Description:
-Music widget primarily for the stock media player, but configurable for others
-(in theory, if you're expert).
-
-Can scrobble to Last FM. Select whether to connect on WiFi or on phone network;
-or cache when offline.
-
-Album art from embedded images, music file directory, or downloadable from Last
-FM. Can pre-fetch Last FM art for your music library.
-.
-
-Repo Type:git
-Repo:https://github.com/yourealwaysbe/teacup.git
-
-Build:1.0,1
-    commit=a544fdbe5c043f37952cc5624d937cd6212cc1ef
-
-Build:1.1,2
-    commit=a288fbc41c
-
-Build:1.2,3
-    commit=v1.2
-
-Build:1.3,4
-    commit=v1.3
-
-Build:1.5,6
-    commit=v1.5
-
-Build:1.6,7
-    commit=v1.6
-
-Build:1.7,8
-    commit=v1.7
-    target=android-17
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.7
-Current Version Code:8
diff --git a/metadata/net.chilon.matt.teacup.yml b/metadata/net.chilon.matt.teacup.yml
new file mode 100644
index 0000000000..e003ddd784
--- /dev/null
+++ b/metadata/net.chilon.matt.teacup.yml
@@ -0,0 +1,55 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://github.com/yourealwaysbe/teacup
+IssueTracker: https://github.com/yourealwaysbe/teacup/issues
+
+AutoName: TeaCup
+Summary: Configurable music widget
+Description: |-
+    Music widget primarily for the stock media player, but configurable for others
+    (in theory, if you're expert).
+
+    Can scrobble to Last FM. Select whether to connect on WiFi or on phone network;
+    or cache when offline.
+
+    Album art from embedded images, music file directory, or downloadable from Last
+    FM. Can pre-fetch Last FM art for your music library.
+
+RepoType: git
+Repo: https://github.com/yourealwaysbe/teacup.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: a544fdbe5c043f37952cc5624d937cd6212cc1ef
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: a288fbc41c
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: v1.3
+
+  - versionName: '1.5'
+    versionCode: 6
+    commit: v1.5
+
+  - versionName: '1.6'
+    versionCode: 7
+    commit: v1.6
+
+  - versionName: '1.7'
+    versionCode: 8
+    commit: v1.7
+    target: android-17
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.7'
+CurrentVersionCode: 8
diff --git a/metadata/net.czlee.debatekeeper.txt b/metadata/net.czlee.debatekeeper.txt
deleted file mode 100644
index 7b42211d62..0000000000
--- a/metadata/net.czlee.debatekeeper.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-Categories:Time
-License:GPL-3.0-only
-Web Site:http://tryingtoreason.wordpress.com/debatekeeper
-Source Code:https://github.com/czlee/debatekeeper
-Issue Tracker:https://github.com/czlee/debatekeeper/issues
-
-Auto Name:Debatekeeper
-Summary:Time debates
-Description:
-Time speeches in debates and have the bell ring automatically at the correct
-time. It supports most parliamentary styles of debating.
-
-The app rings a bell, vibrates and/or flashes the screen white (or any
-combination of the three) at bell times. It also rings overtime bells, which are
-configurable.
-
-There is a different bell sound, derived from the [[org.yuttadhammo.BodhiTimer]]
-bell.
-.
-
-Repo Type:git
-Repo:https://github.com/czlee/debatekeeper.git
-
-Build:0.10,14
-    commit=release-0.10
-    srclibs=NumberPicker-Novak@b4e2c5d51
-    extlibs=desk_bell.ogg
-    prebuild=sed -i 's@\(.1=\).*@\1$$NumberPicker-Novak$$@' project.properties && \
-        mkdir -p res/raw && \
-        mv libs/desk_bell.ogg res/raw
-
-Build:1.0,16
-    commit=release-1.0
-    srclibs=NumberPicker-Novak@b4e2c5d51
-    extlibs=desk_bell.ogg
-    prebuild=sed -i 's@\(.1=\).*@\1$$NumberPicker-Novak$$@' project.properties && \
-        mkdir -p res/raw && \
-        mv libs/desk_bell.ogg res/raw
-
-Build:1.1-beta.1,19
-    commit=release-1.1-beta.1
-    subdir=app
-    gradle=yes
-
-Build:1.2-beta,21
-    commit=release-1.2-beta
-    subdir=app
-    gradle=yes
-
-Build:1.2-beta.1,22
-    commit=release-1.2-beta.1
-    subdir=app
-    gradle=yes
-
-Build:1.2,23
-    commit=release-1.2
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version release-%v
-Update Check Mode:Tags
-Current Version:1.2
-Current Version Code:23
diff --git a/metadata/net.czlee.debatekeeper.yml b/metadata/net.czlee.debatekeeper.yml
new file mode 100644
index 0000000000..28673eaf87
--- /dev/null
+++ b/metadata/net.czlee.debatekeeper.yml
@@ -0,0 +1,80 @@
+Categories:
+  - Time
+License: GPL-3.0-only
+WebSite: http://tryingtoreason.wordpress.com/debatekeeper
+SourceCode: https://github.com/czlee/debatekeeper
+IssueTracker: https://github.com/czlee/debatekeeper/issues
+
+AutoName: Debatekeeper
+Summary: Time debates
+Description: |-
+    Time speeches in debates and have the bell ring automatically at the correct
+    time. It supports most parliamentary styles of debating.
+
+    The app rings a bell, vibrates and/or flashes the screen white (or any
+    combination of the three) at bell times. It also rings overtime bells, which are
+    configurable.
+
+    There is a different bell sound, derived from the [[org.yuttadhammo.BodhiTimer]]
+    bell.
+
+RepoType: git
+Repo: https://github.com/czlee/debatekeeper.git
+
+Builds:
+  - versionName: '0.10'
+    versionCode: 14
+    commit: release-0.10
+    srclibs:
+      - NumberPicker-Novak@b4e2c5d51
+    extlibs:
+      - desk_bell.ogg
+    prebuild:
+      - sed -i 's@\(.1=\).*@\1$$NumberPicker-Novak$$@' project.properties
+      - mkdir -p res/raw
+      - mv libs/desk_bell.ogg res/raw
+
+  - versionName: '1.0'
+    versionCode: 16
+    commit: release-1.0
+    srclibs:
+      - NumberPicker-Novak@b4e2c5d51
+    extlibs:
+      - desk_bell.ogg
+    prebuild:
+      - sed -i 's@\(.1=\).*@\1$$NumberPicker-Novak$$@' project.properties
+      - mkdir -p res/raw
+      - mv libs/desk_bell.ogg res/raw
+
+  - versionName: 1.1-beta.1
+    versionCode: 19
+    commit: release-1.1-beta.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2-beta
+    versionCode: 21
+    commit: release-1.2-beta
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2-beta.1
+    versionCode: 22
+    commit: release-1.2-beta.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 23
+    commit: release-1.2
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version release-%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.2'
+CurrentVersionCode: 23