diff --git a/metadata/androdns.android.leetdreams.ch.androdns.txt b/metadata/androdns.android.leetdreams.ch.androdns.txt
deleted file mode 100644
index b8df625301..0000000000
--- a/metadata/androdns.android.leetdreams.ch.androdns.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-Categories:Internet
-License:Apache-2.0
-Web Site:
-Source Code:https://github.com/gryphius/androdns
-Issue Tracker:https://github.com/gryphius/androdns/issues
-
-Auto Name:AndroDNS
-Summary:DNS client
-Description:
-This DNS client allows you to perform customized DNS queries directly from your
-mobile phone. In contrast to most other DNS clients, it does not impose
-restrictions on what you can query.
-
-Features:
-
-* Select recursive or authoritative server to query (default: system resolver)
-* Specify any question type (not just the most common A/AAAA/MX ....), you can even enter the type ID for new/experimental question types
-* Supports IN/CH/HS query class
-* Set question flags
-* DNSSEC aware (request / show RRSIGs ) - but it does not validate
-.
-
-Repo Type:git
-Repo:https://github.com/gryphius/androdns.git
-Binaries:https://github.com/gryphius/androdns/releases/download/v%v/androdns.apk
-
-Build:1.5,15
-    commit=v1.5
-    subdir=app
-    sudo=apt-get update || apt-get update && \
-        apt-get install -y disorderfs
-    init=cd ../.. && \
-        mv androdns.android.leetdreams.ch.androdns androdns.android.leetdreams.ch.androdns.build && \
-        mkdir androdns.android.leetdreams.ch.androdns && \
-        disorderfs --sort-dirents=yes --reverse-dirents=no androdns.android.leetdreams.ch.androdns.build androdns.android.leetdreams.ch.androdns
-    gradle=yes
-
-Build:1.5.1,16
-    commit=v1.5.1
-    subdir=app
-    sudo=apt-get update || apt-get update && \
-        apt-get install -y disorderfs
-    init=cd ../.. && \
-        mv androdns.android.leetdreams.ch.androdns androdns.android.leetdreams.ch.androdns.build && \
-        mkdir androdns.android.leetdreams.ch.androdns && \
-        disorderfs --sort-dirents=yes --reverse-dirents=no androdns.android.leetdreams.ch.androdns.build androdns.android.leetdreams.ch.androdns
-    gradle=yes
-
-Build:1.6beta1,17
-    disable=No binnary
-    commit=v1.6beta1
-    subdir=app
-    sudo=apt-get update || apt-get update && \
-        apt-get install -y disorderfs
-    init=cd ../.. && \
-        mv androdns.android.leetdreams.ch.androdns androdns.android.leetdreams.ch.androdns.build && \
-        mkdir androdns.android.leetdreams.ch.androdns && \
-        disorderfs --sort-dirents=yes --reverse-dirents=no androdns.android.leetdreams.ch.androdns.build androdns.android.leetdreams.ch.androdns
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags ^[0-9.]+$
-Current Version:1.5.1
-Current Version Code:16
diff --git a/metadata/androdns.android.leetdreams.ch.androdns.yml b/metadata/androdns.android.leetdreams.ch.androdns.yml
new file mode 100644
index 0000000000..2386a43c00
--- /dev/null
+++ b/metadata/androdns.android.leetdreams.ch.androdns.yml
@@ -0,0 +1,80 @@
+Categories:
+  - Internet
+License: Apache-2.0
+SourceCode: https://github.com/gryphius/androdns
+IssueTracker: https://github.com/gryphius/androdns/issues
+Changelog: https://github.com/gryphius/androdns/releases
+
+AutoName: AndroDNS
+Summary: DNS client
+Description: |-
+    This DNS client allows you to perform customized DNS queries directly from your
+    mobile phone. In contrast to most other DNS clients, it does not impose
+    restrictions on what you can query.
+
+    Features:
+
+    * Select recursive or authoritative server to query (default: system resolver)
+    * Specify any question type (not just the most common A/AAAA/MX ....), you can even enter the type ID for new/experimental question types
+    * Supports IN/CH/HS query class
+    * Set question flags
+    * DNSSEC aware (request / show RRSIGs ) - but it does not validate
+
+RepoType: git
+Repo: https://github.com/gryphius/androdns.git
+Binaries: https://github.com/gryphius/androdns/releases/download/v%v/androdns.apk
+
+Builds:
+  - versionName: '1.5'
+    versionCode: 15
+    commit: v1.5
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y disorderfs
+    init:
+      - cd ../..
+      - mv androdns.android.leetdreams.ch.androdns androdns.android.leetdreams.ch.androdns.build
+      - mkdir androdns.android.leetdreams.ch.androdns
+      - disorderfs --sort-dirents=yes --reverse-dirents=no androdns.android.leetdreams.ch.androdns.build
+        androdns.android.leetdreams.ch.androdns
+    gradle:
+      - yes
+
+  - versionName: 1.5.1
+    versionCode: 16
+    commit: v1.5.1
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y disorderfs
+    init:
+      - cd ../..
+      - mv androdns.android.leetdreams.ch.androdns androdns.android.leetdreams.ch.androdns.build
+      - mkdir androdns.android.leetdreams.ch.androdns
+      - disorderfs --sort-dirents=yes --reverse-dirents=no androdns.android.leetdreams.ch.androdns.build
+        androdns.android.leetdreams.ch.androdns
+    gradle:
+      - yes
+
+  - versionName: 1.6beta1
+    versionCode: 17
+    disable: No binnary
+    commit: v1.6beta1
+    subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y disorderfs
+    init:
+      - cd ../..
+      - mv androdns.android.leetdreams.ch.androdns androdns.android.leetdreams.ch.androdns.build
+      - mkdir androdns.android.leetdreams.ch.androdns
+      - disorderfs --sort-dirents=yes --reverse-dirents=no androdns.android.leetdreams.ch.androdns.build
+        androdns.android.leetdreams.ch.androdns
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags ^[0-9.]+$
+CurrentVersion: 1.5.1
+CurrentVersionCode: 16
diff --git a/metadata/anupam.acrylic.txt b/metadata/anupam.acrylic.txt
deleted file mode 100644
index c5c807c587..0000000000
--- a/metadata/anupam.acrylic.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-Categories:Graphics
-License:GPL-3.0-or-later
-Web Site:
-Source Code:https://github.com/valerio-bozzolan/AcrylicPaint
-Issue Tracker:https://github.com/valerio-bozzolan/AcrylicPaint/issues
-
-Auto Name:Acrylic Paint
-Summary:Simple finger painting
-Description:
-Acrylic Paint is a coloring tool based on the FingerPaint project taken from API
-demos.
-
-We use a patched fork authorized by the
-[https://github.com/anupam1525/AcrylicPaint/ original author] until main
-development is active again.
-.
-
-Repo Type:git
-Repo:https://github.com/valerio-bozzolan/AcrylicPaint.git
-
-Build:1.2.0,3
-    commit=e534db825b557ac523297599139a0616a4ce2545
-    subdir=Acrylic_Paint
-
-Build:1.2.4,4
-    commit=ec4b0e82deda585372e693bb10e1dc25a01508d6
-
-Build:1.3.1,7
-    commit=8e7d116f1caa877bf8f72caa703bafae333ba94f
-
-Build:2.1,11
-    commit=205982a3bc4294fd54925d27e8337a314aefe13a
-
-Build:2.1.3,13
-    commit=b35e030a104e6cd5e954f9f08109f9dbc88eab88
-
-Build:2.1.4,14
-    commit=360ff5c84e7290e2cc93618663a7f0b73430c31e
-    subdir=app
-    gradle=yes
-    prebuild=echo -e 'android { lintOptions { abortOnError false } }' >> build.gradle
-
-Build:2.2.0,15
-    commit=ffa88e06780133e80cefbe7e3d592773bba7ff77
-    subdir=app
-    gradle=yes
-
-Build:2.2.1,16
-    commit=2.2.1
-    subdir=app
-    gradle=yes
-
-Build:2.3.0,17
-    commit=b733443510d28c9a061e1f8e25bd1e37baad3749
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/jcenter()/a\        google()' ../build.gradle
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.3.0
-Current Version Code:17
diff --git a/metadata/anupam.acrylic.yml b/metadata/anupam.acrylic.yml
new file mode 100644
index 0000000000..ed19a86580
--- /dev/null
+++ b/metadata/anupam.acrylic.yml
@@ -0,0 +1,75 @@
+Categories:
+  - Graphics
+License: GPL-3.0-or-later
+SourceCode: https://github.com/valerio-bozzolan/AcrylicPaint
+IssueTracker: https://github.com/valerio-bozzolan/AcrylicPaint/issues
+
+AutoName: Acrylic Paint
+Summary: Simple finger painting
+Description: |-
+    Acrylic Paint is a coloring tool based on the FingerPaint project taken from API
+    demos.
+
+    We use a patched fork authorized by the
+    [https://github.com/anupam1525/AcrylicPaint/ original author] until main
+    development is active again.
+
+RepoType: git
+Repo: https://github.com/valerio-bozzolan/AcrylicPaint.git
+
+Builds:
+  - versionName: 1.2.0
+    versionCode: 3
+    commit: e534db825b557ac523297599139a0616a4ce2545
+    subdir: Acrylic_Paint
+
+  - versionName: 1.2.4
+    versionCode: 4
+    commit: ec4b0e82deda585372e693bb10e1dc25a01508d6
+
+  - versionName: 1.3.1
+    versionCode: 7
+    commit: 8e7d116f1caa877bf8f72caa703bafae333ba94f
+
+  - versionName: '2.1'
+    versionCode: 11
+    commit: 205982a3bc4294fd54925d27e8337a314aefe13a
+
+  - versionName: 2.1.3
+    versionCode: 13
+    commit: b35e030a104e6cd5e954f9f08109f9dbc88eab88
+
+  - versionName: 2.1.4
+    versionCode: 14
+    commit: 360ff5c84e7290e2cc93618663a7f0b73430c31e
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e 'android { lintOptions { abortOnError false } }' >> build.gradle
+
+  - versionName: 2.2.0
+    versionCode: 15
+    commit: ffa88e06780133e80cefbe7e3d592773bba7ff77
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.2.1
+    versionCode: 16
+    commit: 2.2.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.3.0
+    versionCode: 17
+    commit: b733443510d28c9a061e1f8e25bd1e37baad3749
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/jcenter()/a\        google()' ../build.gradle
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 2.3.0
+CurrentVersionCode: 17
diff --git a/metadata/app.librenews.io.librenews.txt b/metadata/app.librenews.io.librenews.txt
deleted file mode 100644
index fc82872ad4..0000000000
--- a/metadata/app.librenews.io.librenews.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:https://librenews.io/
-Source Code:https://github.com/milesmcc/LibreNews-Android
-Issue Tracker:https://github.com/milesmcc/LibreNews-Android/issues
-
-Auto Name:LibreNews
-Summary:Free, fast and decentralized breaking news notification app
-Description:
-Whenever anything noteworthy happens in the world, you can be sure that you'll
-be notified. LibreNews _doesn't_ depend on Google Play Services, and is
-completely FLOSS.
-
-Breaking news notifications are perhaps the most important channel by which we
-receive our information about the world, and LibreNews aims to democratize this
-essential medium. Don't let any corporation or government agency control your
-breaking news.
-
-Key features:
-
-* Free software ([https://github.com/milesmcc/LibreNews-Server server] and client licensed under GPLv3)
-* Doesn't use up a ton of battery life
-* Up-to-date and current
-* Doesn't rely on Google infrastructure
-* Secure (forces HTTPS) & decentralized
-* Lots of customization
-* Material design adherent interface
-* Simple, easy to understand settings
-* High-quality code
-* Encrypted & secure connection
-* No tracking
-* No ads
-* Syncs automatically, regardless of whether the app is open
-
-You can expect LibreNews to send you about three notifications per day if you
-connect to the [https://librenews.io default server] [https://librenews.io/api
-API].
-.
-
-Repo Type:git
-Repo:https://github.com/milesmcc/LibreNews-Android
-
-Build:1.0,1
-    commit=v1.0
-    subdir=LibreNews-App
-    gradle=yes
-
-Build:1.1,2
-    commit=v1.1b
-    subdir=LibreNews-App
-    gradle=yes
-
-Build:1.2,3
-    commit=v1.2
-    subdir=LibreNews-App
-    gradle=yes
-
-Build:1.3,4
-    commit=v1.3
-    subdir=LibreNews-App
-    gradle=yes
-
-Build:1.4,5
-    commit=v1.4
-    subdir=LibreNews-App
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.4
-Current Version Code:5
diff --git a/metadata/app.librenews.io.librenews.yml b/metadata/app.librenews.io.librenews.yml
new file mode 100644
index 0000000000..8610f81877
--- /dev/null
+++ b/metadata/app.librenews.io.librenews.yml
@@ -0,0 +1,83 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+WebSite: https://librenews.io/
+SourceCode: https://github.com/milesmcc/LibreNews-Android
+IssueTracker: https://github.com/milesmcc/LibreNews-Android/issues
+Changelog: https://github.com/milesmcc/LibreNews-Android/releases
+
+AutoName: LibreNews
+Summary: Free, fast and decentralized breaking news notification app
+Description: |-
+    Whenever anything noteworthy happens in the world, you can be sure that you’ll
+    be notified. LibreNews _doesn’t_ depend on Google Play Services, and is
+    completely FLOSS.
+
+    Breaking news notifications are perhaps the most important channel by which we
+    receive our information about the world, and LibreNews aims to democratize this
+    essential medium. Don’t let any corporation or government agency control your
+    breaking news.
+
+    Key features:
+
+    * Free software ([https://github.com/milesmcc/LibreNews-Server server] and client licensed under GPLv3)
+    * Doesn’t use up a ton of battery life
+    * Up-to-date and current
+    * Doesn’t rely on Google infrastructure
+    * Secure (forces HTTPS) & decentralized
+    * Lots of customization
+    * Material design adherent interface
+    * Simple, easy to understand settings
+    * High-quality code
+    * Encrypted & secure connection
+    * No tracking
+    * No ads
+    * Syncs automatically, regardless of whether the app is open
+
+    You can expect LibreNews to send you about three notifications per day if you
+    connect to the [https://librenews.io default server] [https://librenews.io/api
+    API].
+
+RepoType: git
+Repo: https://github.com/milesmcc/LibreNews-Android
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: v1.0
+    subdir: LibreNews-App
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 2
+    commit: v1.1b
+    subdir: LibreNews-App
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: v1.2
+    subdir: LibreNews-App
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 4
+    commit: v1.3
+    subdir: LibreNews-App
+    gradle:
+      - yes
+
+  - versionName: '1.4'
+    versionCode: 5
+    commit: v1.4
+    subdir: LibreNews-App
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '1.4'
+CurrentVersionCode: 5
diff --git a/metadata/app.reading.stoic.stoicreading.txt b/metadata/app.reading.stoic.stoicreading.txt
deleted file mode 100644
index d106cdd527..0000000000
--- a/metadata/app.reading.stoic.stoicreading.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-Categories:Reading
-License:GPL-3.0-or-later
-Author Name:Paul Hill
-Web Site:
-Source Code:https://github.com/zikalify/StoicReading
-Issue Tracker:https://github.com/zikalify/StoicReading/issues
-
-Auto Name:Stoic Reading
-Summary:Consolidation of Stoic texts
-Description:
-This app contains texts from Stoics including those of Emperor Marcus Aurelius,
-the freed slave Epictetus, and Seneca. It contains other, less well known, Stoic
-texts too.
-.
-
-Repo Type:git
-Repo:https://github.com/zikalify/StoicReading
-
-Build:0.7.1,4
-    commit=0.7.1
-    subdir=app
-    gradle=yes
-
-Build:0.8.0,5
-    commit=0.8.0
-    subdir=app
-    gradle=yes
-
-Build:0.8.2,7
-    commit=0.8.2
-    subdir=app
-    gradle=yes
-
-Build:0.8.3,8
-    commit=0.8.3
-    subdir=app
-    gradle=yes
-
-Build:0.8.5,10
-    commit=0.8.5
-    subdir=app
-    gradle=yes
-
-Build:0.8.6,11
-    commit=0.8.6
-    subdir=app
-    gradle=yes
-
-Build:0.8.7,12
-    commit=0.8.7
-    subdir=app
-    gradle=yes
-
-Build:0.9.0,15
-    commit=0.9.0
-    subdir=app
-    gradle=yes
-
-Build:0.9.4,19
-    commit=0.9.4
-    subdir=app
-    gradle=yes
-
-Build:0.9.6,21
-    commit=0.9.6
-    subdir=app
-    gradle=yes
-
-Build:0.9.8,23
-    commit=0.9.8
-    subdir=app
-    gradle=yes
-
-Build:0.9.10,25
-    commit=0.9.10
-    subdir=app
-    gradle=yes
-
-Build:0.9.11,26
-    commit=0.9.11
-    subdir=app
-    gradle=yes
-
-Build:0.9.12,27
-    commit=0.9.12
-    subdir=app
-    gradle=yes
-
-Build:0.9.13,28
-    commit=0.9.13
-    subdir=app
-    gradle=yes
-
-Build:0.9.14,29
-    commit=0.9.14
-    subdir=app
-    gradle=yes
-
-Build:0.9.15,30
-    commit=0.9.15
-    subdir=app
-    gradle=yes
-
-Build:1.0.0,31
-    commit=1.0.0
-    subdir=app
-    gradle=yes
-
-Build:1.0.1,32
-    commit=1.0.1
-    subdir=app
-    gradle=yes
-
-Build:1.0.3,34
-    commit=1.0.3
-    subdir=app
-    gradle=yes
-
-Build:1.1.0,35
-    commit=1.1.0
-    subdir=app
-    gradle=yes
-
-Build:1.1.1,36
-    commit=1.1.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags ^[0-9.]+$
-Current Version:1.1.1
-Current Version Code:36
diff --git a/metadata/app.reading.stoic.stoicreading.yml b/metadata/app.reading.stoic.stoicreading.yml
new file mode 100644
index 0000000000..5d3ca8729e
--- /dev/null
+++ b/metadata/app.reading.stoic.stoicreading.yml
@@ -0,0 +1,177 @@
+Categories:
+  - Reading
+License: GPL-3.0-or-later
+AuthorName: Paul Hill
+SourceCode: https://github.com/zikalify/StoicReading
+IssueTracker: https://github.com/zikalify/StoicReading/issues
+Changelog: https://github.com/zikalify/StoicReading/releases
+
+AutoName: Stoic Reading
+Summary: Consolidation of Stoic texts
+Description: |-
+    This app contains texts from Stoics including those of Emperor Marcus Aurelius,
+    the freed slave Epictetus, and Seneca. It contains other, less well known, Stoic
+    texts too.
+
+RepoType: git
+Repo: https://github.com/zikalify/StoicReading
+
+Builds:
+  - versionName: 0.7.1
+    versionCode: 4
+    commit: 0.7.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.0
+    versionCode: 5
+    commit: 0.8.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.2
+    versionCode: 7
+    commit: 0.8.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.3
+    versionCode: 8
+    commit: 0.8.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.5
+    versionCode: 10
+    commit: 0.8.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.6
+    versionCode: 11
+    commit: 0.8.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.8.7
+    versionCode: 12
+    commit: 0.8.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.0
+    versionCode: 15
+    commit: 0.9.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.4
+    versionCode: 19
+    commit: 0.9.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.6
+    versionCode: 21
+    commit: 0.9.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.8
+    versionCode: 23
+    commit: 0.9.8
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.10
+    versionCode: 25
+    commit: 0.9.10
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.11
+    versionCode: 26
+    commit: 0.9.11
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.12
+    versionCode: 27
+    commit: 0.9.12
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.13
+    versionCode: 28
+    commit: 0.9.13
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.14
+    versionCode: 29
+    commit: 0.9.14
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.9.15
+    versionCode: 30
+    commit: 0.9.15
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.0
+    versionCode: 31
+    commit: 1.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 32
+    commit: 1.0.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 34
+    commit: 1.0.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 35
+    commit: 1.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.1
+    versionCode: 36
+    commit: 1.1.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags ^[0-9.]+$
+CurrentVersion: 1.1.1
+CurrentVersionCode: 36
diff --git a/metadata/app.varlorg.unote.txt b/metadata/app.varlorg.unote.txt
deleted file mode 100644
index 516d436696..0000000000
--- a/metadata/app.varlorg.unote.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-Categories:Writing
-License:GPL-3.0-only
-Web Site:https://gitlab.com/Varlorg/uNote
-Source Code:https://gitlab.com/Varlorg/uNote/tree/HEAD
-Issue Tracker:https://gitlab.com/Varlorg/uNote/issues
-Changelog:https://gitlab.com/Varlorg/uNote/tags
-
-Auto Name:uNote
-Summary:Lightweight and minimalist notepad
-Description:
-Lightweight and minimalist notepad which focuses on simplicity and gives only
-basic features:
-
-* add/delete note
-* secure a note with password
-* sort notes by create date, modification date or title
-* search notes (only title or also in content except protected ones)
-* export/import database to sdcard
-
-Attention: the database may be cleaned if you update from 1.0.X to 1.1.X.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/Varlorg/uNote.git
-
-Build:1.0,1
-    commit=9815b027
-    subdir=app
-    gradle=yes
-
-Build:1.1.0,2
-    commit=v1.1.0
-    subdir=app
-    gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle
-
-Build:1.1.1,3
-    commit=v1.1.1
-    subdir=app
-    gradle=yes
-
-Build:1.1.2,4
-    commit=v1.1.2
-    subdir=app
-    gradle=yes
-
-Build:1.1.3,5
-    commit=v1.1.3
-    subdir=app
-    gradle=yes
-
-Build:1.1.4,6
-    commit=v1.1.4
-    subdir=app
-    gradle=yes
-
-Build:1.1.5,7
-    commit=v1.1.5
-    subdir=app
-    gradle=yes
-
-Build:1.2.0,8
-    commit=v1.2.0
-    subdir=app
-    gradle=yes
-
-Build:1.3.0,10
-    commit=v1.3.0
-    subdir=app
-    gradle=yes
-
-Build:1.3.1,11
-    commit=v1.3.1
-    subdir=app
-    gradle=yes
-
-Build:1.3.2,12
-    commit=v1.3.2
-    subdir=app
-    gradle=yes
-
-Build:1.3.3,13
-    commit=v1.3.3
-    subdir=app
-    gradle=yes
-
-Build:1.4.0,14
-    commit=v1.4.0
-    subdir=app
-    gradle=yes
-
-Build:1.4.1,15
-    commit=v1.4.1
-    subdir=app
-    gradle=yes
-
-Build:1.4.2,16
-    commit=v1.4.2
-    subdir=app
-    gradle=yes
-
-Build:1.4.3,17
-    commit=v1.4.3
-    subdir=app
-    gradle=yes
-
-Build:1.4.4,18
-    commit=v1.4.4
-    subdir=app
-    gradle=yes
-
-Build:1.5.0,19
-    commit=v1.5.0
-    subdir=app
-    gradle=yes
-
-Build:1.5.1,20
-    commit=v1.5.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.5.1
-Current Version Code:20
diff --git a/metadata/app.varlorg.unote.yml b/metadata/app.varlorg.unote.yml
new file mode 100644
index 0000000000..067bdde9e0
--- /dev/null
+++ b/metadata/app.varlorg.unote.yml
@@ -0,0 +1,167 @@
+Categories:
+  - Writing
+License: GPL-3.0-only
+WebSite: https://gitlab.com/Varlorg/uNote
+SourceCode: https://gitlab.com/Varlorg/uNote/tree/HEAD
+IssueTracker: https://gitlab.com/Varlorg/uNote/issues
+Translation: https://gitlab.com/Varlorg/uNote#translation-contribution
+Changelog: https://gitlab.com/Varlorg/uNote/tags
+LiberapayID: '28283'
+
+AutoName: uNote
+Summary: Lightweight and minimalist notepad
+Description: |-
+    Lightweight and minimalist notepad which focuses on simplicity and gives only
+    basic features:
+
+    * add/delete note
+    * secure a note with password
+    * sort notes by create date, modification date or title
+    * search notes (only title or also in content except protected ones)
+    * export/import database to sdcard
+
+    Attention: the database may be cleaned if you update from 1.0.X to 1.1.X.
+
+RepoType: git
+Repo: https://gitlab.com/Varlorg/uNote.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: 9815b027
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 2
+    commit: v1.1.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: echo -e "android { lintOptions { disable 'MissingTranslation' } }" >>
+        build.gradle
+
+  - versionName: 1.1.1
+    versionCode: 3
+    commit: v1.1.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.2
+    versionCode: 4
+    commit: v1.1.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.3
+    versionCode: 5
+    commit: v1.1.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.4
+    versionCode: 6
+    commit: v1.1.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.1.5
+    versionCode: 7
+    commit: v1.1.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 8
+    commit: v1.2.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 10
+    commit: v1.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.1
+    versionCode: 11
+    commit: v1.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.2
+    versionCode: 12
+    commit: v1.3.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.3
+    versionCode: 13
+    commit: v1.3.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 14
+    commit: v1.4.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 15
+    commit: v1.4.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.2
+    versionCode: 16
+    commit: v1.4.2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.3
+    versionCode: 17
+    commit: v1.4.3
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.4.4
+    versionCode: 18
+    commit: v1.4.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 19
+    commit: v1.5.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.5.1
+    versionCode: 20
+    commit: v1.5.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.5.1
+CurrentVersionCode: 20
diff --git a/metadata/org.tuxpaint.txt b/metadata/org.tuxpaint.txt
deleted file mode 100644
index 5621951202..0000000000
--- a/metadata/org.tuxpaint.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-Categories:Graphics,Science & Education
-License:GPL-2.0-or-later
-Web Site:http://tuxpaint.org
-Source Code:https://github.com/tux4kids/Tuxpaint-Android
-Issue Tracker:https://sourceforge.net/p/tuxpaint/bugs/?source=navbar
-Donate:http://www.newbreedsoftware.com/donate/
-
-Auto Name:Tux Paint
-
-Repo Type:git
-Repo:https://github.com/tux4kids/Tuxpaint-Android.git
-
-Build:0.9.23-beta,1
-    commit=966b358a6379e272466e7dc821f2bc469e301de5
-    extlibs=android/android-support-v4.jar
-    scandelete=jni/
-    buildjni=yes
-
-Build:0.9.23-beta,2
-    commit=4b5b368bfe2c471381197f275ccf9349b2b9bda2
-    extlibs=android/android-support-v4.jar
-    scandelete=jni/
-    buildjni=yes
-
-Build:0.9.23-beta,3
-    commit=faa0708ea54a6d1e826af146bb915372d5f082f5
-    extlibs=android/android-support-v4.jar
-    scandelete=jni/
-    buildjni=yes
-
-Build:0.9.23-beta,5
-    commit=a837c65caa395a93a839fd2b1949d7e457c184d9
-    extlibs=android/android-support-v4.jar
-    scandelete=jni/
-    buildjni=yes
-
-Build:0.9.23-beta_6,6
-    commit=2b37fe929211ab500ee37d90b7510ce470d06565
-    extlibs=android/android-support-v4.jar
-    scandelete=jni/
-    buildjni=yes
-
-Build:0.9.23-beta_7,7
-    commit=87c3b479e2b1690d8f76711dbb415cc3b659c23e
-    extlibs=android/android-support-v4.jar
-    prebuild=cd jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=jni/
-    buildjni=yes
-
-Build:0.9.23-beta_8,8
-    commit=f5cd0709c5e062ef7794f7824e489fc10b642078
-    extlibs=android/android-support-v4.jar
-    prebuild=cd jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=jni/
-    buildjni=yes
-
-Build:0.9.23-beta_10,10
-    commit=0.9.23-beta_10
-    subdir=app
-    gradle=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk && \
-        cd src/main/jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=app/src/main/jni/
-    ndk=r14b
-
-Build:0.9.23-beta_11,11
-    disable=build failing
-    commit=0.9.23-beta_11
-    subdir=app
-    gradle=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk && \
-        cd src/main/jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=app/src/main/jni/
-    ndk=r14b
-
-Build:0.9.23-beta_11b1,111
-    disable=Disabled due to crashes
-    commit=0.9.23-beta_11b1
-    subdir=app
-    gradle=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk && \
-        cd src/main/jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=app/src/main/jni/
-    ndk=r14b
-
-Build:0.9.23-beta_11b2,112
-    commit=0.9.23-beta_11b2
-    subdir=app
-    gradle=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk && \
-        cd src/main/jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=app/src/main/jni/
-    ndk=r14b
-
-Build:0.9.23-beta_12,120
-    commit=0.9.23-beta_12
-    subdir=app
-    gradle=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk && \
-        cd src/main/jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=app/src/main/jni/
-    ndk=r14b
-
-Build:0.9.23,923
-    commit=0.9.23
-    subdir=app
-    gradle=yes
-    extlibs=android/android-support-v4.jar
-    prebuild=echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk && \
-        cd src/main/jni/tuxpaint/ && \
-        ./mkzip_assets.sh
-    scandelete=app/src/main/jni/
-    ndk=r14b
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:0.9.23
-Current Version Code:923
diff --git a/metadata/org.tuxpaint.yml b/metadata/org.tuxpaint.yml
new file mode 100644
index 0000000000..cb75e2f4b3
--- /dev/null
+++ b/metadata/org.tuxpaint.yml
@@ -0,0 +1,193 @@
+Categories:
+  - Graphics
+  - Science & Education
+License: GPL-2.0-or-later
+WebSite: http://tuxpaint.org
+SourceCode: https://github.com/tux4kids/Tuxpaint-Android
+IssueTracker: https://sourceforge.net/p/tuxpaint/bugs/?source=navbar
+Donate: http://www.newbreedsoftware.com/donate/
+
+AutoName: Tux Paint
+
+RepoType: git
+Repo: https://github.com/tux4kids/Tuxpaint-Android.git
+
+Builds:
+  - versionName: 0.9.23-beta
+    versionCode: 1
+    commit: 966b358a6379e272466e7dc821f2bc469e301de5
+    extlibs:
+      - android/android-support-v4.jar
+    scandelete:
+      - jni/
+    buildjni:
+      - yes
+
+  - versionName: 0.9.23-beta
+    versionCode: 2
+    commit: 4b5b368bfe2c471381197f275ccf9349b2b9bda2
+    extlibs:
+      - android/android-support-v4.jar
+    scandelete:
+      - jni/
+    buildjni:
+      - yes
+
+  - versionName: 0.9.23-beta
+    versionCode: 3
+    commit: faa0708ea54a6d1e826af146bb915372d5f082f5
+    extlibs:
+      - android/android-support-v4.jar
+    scandelete:
+      - jni/
+    buildjni:
+      - yes
+
+  - versionName: 0.9.23-beta
+    versionCode: 5
+    commit: a837c65caa395a93a839fd2b1949d7e457c184d9
+    extlibs:
+      - android/android-support-v4.jar
+    scandelete:
+      - jni/
+    buildjni:
+      - yes
+
+  - versionName: 0.9.23-beta_6
+    versionCode: 6
+    commit: 2b37fe929211ab500ee37d90b7510ce470d06565
+    extlibs:
+      - android/android-support-v4.jar
+    scandelete:
+      - jni/
+    buildjni:
+      - yes
+
+  - versionName: 0.9.23-beta_7
+    versionCode: 7
+    commit: 87c3b479e2b1690d8f76711dbb415cc3b659c23e
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - cd jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - jni/
+    buildjni:
+      - yes
+
+  - versionName: 0.9.23-beta_8
+    versionCode: 8
+    commit: f5cd0709c5e062ef7794f7824e489fc10b642078
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - cd jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - jni/
+    buildjni:
+      - yes
+
+  - versionName: 0.9.23-beta_10
+    versionCode: 10
+    commit: 0.9.23-beta_10
+    subdir: app
+    gradle:
+      - yes
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk
+      - cd src/main/jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - app/src/main/jni/
+    ndk: r14b
+
+  - versionName: 0.9.23-beta_11
+    versionCode: 11
+    disable: build failing
+    commit: 0.9.23-beta_11
+    subdir: app
+    gradle:
+      - yes
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk
+      - cd src/main/jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - app/src/main/jni/
+    ndk: r14b
+
+  - versionName: 0.9.23-beta_11b1
+    versionCode: 111
+    disable: Disabled due to crashes
+    commit: 0.9.23-beta_11b1
+    subdir: app
+    gradle:
+      - yes
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk
+      - cd src/main/jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - app/src/main/jni/
+    ndk: r14b
+
+  - versionName: 0.9.23-beta_11b2
+    versionCode: 112
+    commit: 0.9.23-beta_11b2
+    subdir: app
+    gradle:
+      - yes
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk
+      - cd src/main/jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - app/src/main/jni/
+    ndk: r14b
+
+  - versionName: 0.9.23-beta_12
+    versionCode: 120
+    commit: 0.9.23-beta_12
+    subdir: app
+    gradle:
+      - yes
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk
+      - cd src/main/jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - app/src/main/jni/
+    ndk: r14b
+
+  - versionName: 0.9.23
+    versionCode: 923
+    commit: 0.9.23
+    subdir: app
+    gradle:
+      - yes
+    extlibs:
+      - android/android-support-v4.jar
+    prebuild:
+      - echo NDK_TOOLCHAIN_VERSION := 4.9 >> src/main/jni/Application.mk
+      - cd src/main/jni/tuxpaint/
+      - ./mkzip_assets.sh
+    scandelete:
+      - app/src/main/jni/
+    ndk: r14b
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: 0.9.23
+CurrentVersionCode: 923