diff --git a/metadata/com.github.axet.bookreader.txt b/metadata/com.github.axet.bookreader.txt
deleted file mode 100644
index a5aef45c97..0000000000
--- a/metadata/com.github.axet.bookreader.txt
+++ /dev/null
@@ -1,444 +0,0 @@
-Categories:Reading
-License:GPL-3.0-only
-Web Site:
-Source Code:https://gitlab.com/axet/android-book-reader/tree/HEAD
-Issue Tracker:https://gitlab.com/axet/android-book-reader/issues
-LiberapayID:1370123
-
-Auto Name:Book Reader
-Summary:Simple book reader
-Description:
-Book reader with a simple UI. Based on [[org.geometerplus.zlibrary.ui.android]].
-
-Supported formats: fb2, html, txt, epub, mobi, rtf, doc, pdf, djvu.
-
-All the best in this world is free!
-.
-
-Repo Type:git
-Repo:https://gitlab.com/axet/android-book-reader.git
-
-Build:0.0.69,68
-    commit=bookreader-0.0.69
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:0.0.78,77
-    commit=bookreader-0.0.78
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.0.0,97
-    commit=bookreader-1.0.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.0.8,105
-    commit=bookreader-1.0.8
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.0.14,111
-    commit=bookreader-1.0.14
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.0.16,113
-    commit=bookreader-1.0.16
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.0.27,126
-    commit=bookreader-1.0.27
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.13,141
-    commit=bookreader-1.1.13
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.16,144
-    commit=bookreader-1.1.16
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.24,152
-    commit=bookreader-1.1.24
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.27,155
-    commit=bookreader-1.1.27
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.37,165
-    commit=bookreader-1.1.37
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.38,166
-    commit=bookreader-1.1.38
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.39,167
-    commit=bookreader-1.1.39
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.46,174
-    commit=bookreader-1.1.46
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.47,175
-    commit=bookreader-1.1.47
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.49,177
-    commit=bookreader-1.1.49
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.52,180
-    commit=bookreader-1.1.52
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.1.57,185
-    commit=bookreader-1.1.57
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.2.2,188
-    commit=bookreader-1.2.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.2.3,189
-    commit=bookreader-1.2.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.2.4,190
-    commit=bookreader-1.2.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.2.5,191
-    commit=bookreader-1.2.5
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.2.6,192
-    commit=bookreader-1.2.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.3.0,193
-    commit=bookreader-1.3.0
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.4.3,197
-    commit=bookreader-1.4.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.4.6,200
-    commit=bookreader-1.4.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.5.10,211
-    commit=bookreader-1.5.10
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.5.13,214
-    commit=bookreader-1.5.13
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.2,217
-    commit=bookreader-1.6.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.4,219
-    commit=bookreader-1.6.4
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.7,222
-    commit=bookreader-1.6.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.9,224
-    commit=bookreader-1.6.9
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.10,225
-    commit=bookreader-1.6.10
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.11,226
-    commit=bookreader-1.6.11
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.20,235
-    commit=bookreader-1.6.20
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.6.22,237
-    commit=bookreader-1.6.22
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.7.10,259
-    commit=bookreader-1.7.10
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.7.21,270
-    commit=bookreader-1.7.21
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.8.3,274
-    commit=bookreader-1.8.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.8.8,279
-    commit=bookreader-1.8.8
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.8.11,282
-    commit=bookreader-1.8.11
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.1,284
-    commit=bookreader-1.9.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.2,285
-    commit=bookreader-1.9.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.6,289
-    commit=bookreader-1.9.6
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.8,291
-    commit=bookreader-1.9.8
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.9,292
-    commit=bookreader-1.9.9
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.12,295
-    commit=bookreader-1.9.12
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.13,296
-    commit=bookreader-1.9.13
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.15,298
-    commit=bookreader-1.9.15
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.17,300
-    commit=bookreader-1.9.17
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.26,309
-    commit=bookreader-1.9.26
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.31,314
-    commit=bookreader-1.9.31
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.32,315
-    commit=bookreader-1.9.32
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.33,316
-    commit=bookreader-1.9.33
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.9.34,317
-    commit=bookreader-1.9.34
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.10.1,319
-    commit=bookreader-1.10.1
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.10.2,320
-    commit=bookreader-1.10.2
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.10.3,321
-    commit=bookreader-1.10.3
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.10.5,323
-    commit=bookreader-1.10.5
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.10.7,325
-    commit=bookreader-1.10.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.10.9,327
-    commit=bookreader-1.10.9
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.7,335
-    commit=bookreader-1.11.7
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.14,342
-    commit=bookreader-1.11.14
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.15,343
-    commit=bookreader-1.11.15
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.23,351
-    commit=bookreader-1.11.23
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.25,353
-    commit=bookreader-1.11.25
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.28,356
-    commit=bookreader-1.11.28
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.31,359
-    commit=bookreader-1.11.31
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:1.11.32,360
-    commit=bookreader-1.11.32
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Auto Update Mode:Version bookreader-%v
-Update Check Mode:Tags
-Current Version:1.11.32
-Current Version Code:360
diff --git a/metadata/com.github.axet.bookreader.yml b/metadata/com.github.axet.bookreader.yml
new file mode 100644
index 0000000000..be979446eb
--- /dev/null
+++ b/metadata/com.github.axet.bookreader.yml
@@ -0,0 +1,584 @@
+Categories:
+  - Reading
+License: GPL-3.0-only
+SourceCode: https://gitlab.com/axet/android-book-reader/tree/HEAD
+IssueTracker: https://gitlab.com/axet/android-book-reader/issues
+LiberapayID: '1370123'
+
+AutoName: Book Reader
+Summary: Simple book reader
+Description: |-
+    Book reader with a simple UI. Based on [[org.geometerplus.zlibrary.ui.android]].
+
+    Supported formats: fb2, html, txt, epub, mobi, rtf, doc, pdf, djvu.
+
+    All the best in this world is free!
+
+RepoType: git
+Repo: https://gitlab.com/axet/android-book-reader.git
+
+Builds:
+  - versionName: 0.0.69
+    versionCode: 68
+    commit: bookreader-0.0.69
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 0.0.78
+    versionCode: 77
+    commit: bookreader-0.0.78
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.0.0
+    versionCode: 97
+    commit: bookreader-1.0.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.0.8
+    versionCode: 105
+    commit: bookreader-1.0.8
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.0.14
+    versionCode: 111
+    commit: bookreader-1.0.14
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.0.16
+    versionCode: 113
+    commit: bookreader-1.0.16
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.0.27
+    versionCode: 126
+    commit: bookreader-1.0.27
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.13
+    versionCode: 141
+    commit: bookreader-1.1.13
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.16
+    versionCode: 144
+    commit: bookreader-1.1.16
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.24
+    versionCode: 152
+    commit: bookreader-1.1.24
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.27
+    versionCode: 155
+    commit: bookreader-1.1.27
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.37
+    versionCode: 165
+    commit: bookreader-1.1.37
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.38
+    versionCode: 166
+    commit: bookreader-1.1.38
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.39
+    versionCode: 167
+    commit: bookreader-1.1.39
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.46
+    versionCode: 174
+    commit: bookreader-1.1.46
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.47
+    versionCode: 175
+    commit: bookreader-1.1.47
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.49
+    versionCode: 177
+    commit: bookreader-1.1.49
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.52
+    versionCode: 180
+    commit: bookreader-1.1.52
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.1.57
+    versionCode: 185
+    commit: bookreader-1.1.57
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.2.2
+    versionCode: 188
+    commit: bookreader-1.2.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.2.3
+    versionCode: 189
+    commit: bookreader-1.2.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.2.4
+    versionCode: 190
+    commit: bookreader-1.2.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.2.5
+    versionCode: 191
+    commit: bookreader-1.2.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.2.6
+    versionCode: 192
+    commit: bookreader-1.2.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.3.0
+    versionCode: 193
+    commit: bookreader-1.3.0
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.4.3
+    versionCode: 197
+    commit: bookreader-1.4.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.4.6
+    versionCode: 200
+    commit: bookreader-1.4.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.5.10
+    versionCode: 211
+    commit: bookreader-1.5.10
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.5.13
+    versionCode: 214
+    commit: bookreader-1.5.13
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.2
+    versionCode: 217
+    commit: bookreader-1.6.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.4
+    versionCode: 219
+    commit: bookreader-1.6.4
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.7
+    versionCode: 222
+    commit: bookreader-1.6.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.9
+    versionCode: 224
+    commit: bookreader-1.6.9
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.10
+    versionCode: 225
+    commit: bookreader-1.6.10
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.11
+    versionCode: 226
+    commit: bookreader-1.6.11
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.20
+    versionCode: 235
+    commit: bookreader-1.6.20
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.6.22
+    versionCode: 237
+    commit: bookreader-1.6.22
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.7.10
+    versionCode: 259
+    commit: bookreader-1.7.10
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.7.21
+    versionCode: 270
+    commit: bookreader-1.7.21
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.8.3
+    versionCode: 274
+    commit: bookreader-1.8.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.8.8
+    versionCode: 279
+    commit: bookreader-1.8.8
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.8.11
+    versionCode: 282
+    commit: bookreader-1.8.11
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.1
+    versionCode: 284
+    commit: bookreader-1.9.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.2
+    versionCode: 285
+    commit: bookreader-1.9.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.6
+    versionCode: 289
+    commit: bookreader-1.9.6
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.8
+    versionCode: 291
+    commit: bookreader-1.9.8
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.9
+    versionCode: 292
+    commit: bookreader-1.9.9
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.12
+    versionCode: 295
+    commit: bookreader-1.9.12
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.13
+    versionCode: 296
+    commit: bookreader-1.9.13
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.15
+    versionCode: 298
+    commit: bookreader-1.9.15
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.17
+    versionCode: 300
+    commit: bookreader-1.9.17
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.26
+    versionCode: 309
+    commit: bookreader-1.9.26
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.31
+    versionCode: 314
+    commit: bookreader-1.9.31
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.32
+    versionCode: 315
+    commit: bookreader-1.9.32
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.33
+    versionCode: 316
+    commit: bookreader-1.9.33
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.9.34
+    versionCode: 317
+    commit: bookreader-1.9.34
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.10.1
+    versionCode: 319
+    commit: bookreader-1.10.1
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.10.2
+    versionCode: 320
+    commit: bookreader-1.10.2
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.10.3
+    versionCode: 321
+    commit: bookreader-1.10.3
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.10.5
+    versionCode: 323
+    commit: bookreader-1.10.5
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.10.7
+    versionCode: 325
+    commit: bookreader-1.10.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.10.9
+    versionCode: 327
+    commit: bookreader-1.10.9
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.7
+    versionCode: 335
+    commit: bookreader-1.11.7
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.14
+    versionCode: 342
+    commit: bookreader-1.11.14
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.15
+    versionCode: 343
+    commit: bookreader-1.11.15
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.23
+    versionCode: 351
+    commit: bookreader-1.11.23
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.25
+    versionCode: 353
+    commit: bookreader-1.11.25
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.28
+    versionCode: 356
+    commit: bookreader-1.11.28
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.31
+    versionCode: 359
+    commit: bookreader-1.11.31
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 1.11.32
+    versionCode: 360
+    commit: bookreader-1.11.32
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+AutoUpdateMode: Version bookreader-%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.11.32
+CurrentVersionCode: 360
diff --git a/metadata/com.github.axet.maps.txt b/metadata/com.github.axet.maps.txt
deleted file mode 100644
index 3103aadda3..0000000000
--- a/metadata/com.github.axet.maps.txt
+++ /dev/null
@@ -1,187 +0,0 @@
-Categories:Navigation
-License:Apache-2.0
-Web Site:
-Source Code:https://gitlab.com/axet/omim/tree/HEAD
-Issue Tracker:https://gitlab.com/axet/omim/issues
-LiberapayID:1370123
-
-Summary:Offline OpenStreetMap maps
-Description:
-OpenStreetMap offline maps with track recording and custom bookmarks .kml path.
-Based on MAPS.ME project. Features include:
-
-* Track Recording (record your tracks)
-* Custom Bookmarks path (helps backup your bookmarks with apps like: Syncthing)
-* Removed ads and binaries (peace and freedom)
-* Screenlock option (prevent app stay turned on while in pocket with lockscreen enabled)
-.
-
-Repo Type:git
-Repo:https://gitlab.com/axet/omim.git
-
-Build:8.0.2-1-Google,1027
-    commit=omim-8.0.2-1
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    scanignore=data/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.1.0-2-Google,1030
-    commit=omim-8.1.0-2
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    scanignore=data/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.1.0-4-Google,1032
-    commit=omim-8.1.0-4
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    scanignore=data/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.2.3-1-Google,1035
-    commit=omim-8.2.3-1
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
-        sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle && \
-        sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java && \
-        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
-        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
-    scanignore=data/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.3.2-2-Google,1038
-    commit=omim-8.3.2-2
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
-        sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle && \
-        sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java && \
-        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
-        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
-    scanignore=data/*.bin,data/ugc_migration/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.3.5-3-Google,1041
-    commit=omim-8.3.5-3
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
-        sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle && \
-        sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java && \
-        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
-        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
-    scanignore=data/*.bin,data/ugc_migration/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.3.6-2-Google,1043
-    commit=omim-8.3.6-2
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
-        sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle && \
-        sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java && \
-        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
-        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java && \
-        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
-    scanignore=data/*.bin,data/ugc_migration/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.4.2-1-Google,1047
-    commit=omim-8.4.2-1
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
-        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
-        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java && \
-        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/analytics/PushWooshEventLogger.java && \
-        sed -i -e 's/enabled_ = true/enabled_ = false/' ../3party/Alohalytics/src/{alohalytics.h,cpp/alohalytics.cc} && \
-        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
-    scanignore=data/*.bin,data/ugc_migration/*.bin
-    scandelete=3party
-    ndk=r16b
-
-Build:8.6.2-2,1049
-    commit=omim-8.6.2-2
-    timeout=10800
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
-        sed -i -e '/versionName = /d' build.gradle && \
-        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
-        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java && \
-        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/analytics/PushWooshEventLogger.java && \
-        sed -i -e 's/enabled_ = true/enabled_ = false/' ../3party/Alohalytics/src/{alohalytics.h,cpp/alohalytics.cc} && \
-        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
-    scanignore=data/*.bin,data/ugc_migration/*.bin
-    scandelete=3party
-    ndk=r19
-
-Build:9.0.8-2,1052
-    commit=omim-9.0.8-2
-    timeout=14400
-    subdir=android
-    submodules=yes
-    gradle=google
-    rm=3party/Alohalytics/examples,iphone,tools/shaders_compiler
-    prebuild=sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle && \
-        sed -i -e '/versionName = /d' build.gradle && \
-        sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml && \
-        sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java && \
-        sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/analytics/PushWooshEventLogger.java && \
-        sed -i -e 's/enabled_ = true/enabled_ = false/' ../3party/Alohalytics/src/{alohalytics.h,cpp/alohalytics.cc} && \
-        sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
-    scanignore=data/*.bin,data/ugc_migration/*.bin
-    scandelete=3party
-    ndk=r19c
-
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:9.0.8-2
-Current Version Code:1052
diff --git a/metadata/com.github.axet.maps.yml b/metadata/com.github.axet.maps.yml
new file mode 100644
index 0000000000..7c8fb64e6b
--- /dev/null
+++ b/metadata/com.github.axet.maps.yml
@@ -0,0 +1,274 @@
+Categories:
+  - Navigation
+License: Apache-2.0
+SourceCode: https://gitlab.com/axet/omim/tree/HEAD
+IssueTracker: https://gitlab.com/axet/omim/issues
+LiberapayID: '1370123'
+
+Summary: Offline OpenStreetMap maps
+Description: |-
+    OpenStreetMap offline maps with track recording and custom bookmarks .kml path.
+    Based on MAPS.ME project. Features include:
+
+    * Track Recording (record your tracks)
+    * Custom Bookmarks path (helps backup your bookmarks with apps like: Syncthing)
+    * Removed ads and binaries (peace and freedom)
+    * Screenlock option (prevent app stay turned on while in pocket with lockscreen enabled)
+
+RepoType: git
+Repo: https://gitlab.com/axet/omim.git
+
+Builds:
+  - versionName: 8.0.2-1-Google
+    versionCode: 1027
+    commit: omim-8.0.2-1
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    scanignore:
+      - data/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.1.0-2-Google
+    versionCode: 1030
+    commit: omim-8.1.0-2
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    scanignore:
+      - data/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.1.0-4-Google
+    versionCode: 1032
+    commit: omim-8.1.0-4
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    scanignore:
+      - data/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.2.3-1-Google
+    versionCode: 1035
+    commit: omim-8.2.3-1
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle
+      - sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e
+        '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore:
+      - data/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.3.2-2-Google
+    versionCode: 1038
+    commit: omim-8.3.2-2
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle
+      - sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e
+        '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore:
+      - data/*.bin
+      - data/ugc_migration/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.3.5-3-Google
+    versionCode: 1041
+    commit: omim-8.3.5-3
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle
+      - sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e
+        '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore:
+      - data/*.bin
+      - data/ugc_migration/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.3.6-2-Google
+    versionCode: 1043
+    commit: omim-8.3.6-2
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/com.appsflyer/d' -e '/com.pushwoosh/d' build.gradle
+      - sed -i -e '/com.pushwoosh/d' -e '/pushManager/d' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e '/com.pushwoosh/d' -e 's/ implements SendPushTagsCallBack//' -e
+        '/PushManager/d' -e '/^  @Override/d' src/com/mapswithme/util/statistics/PushwooshHelper.java
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/MwmApplication.java
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore:
+      - data/*.bin
+      - data/ugc_migration/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.4.2-1-Google
+    versionCode: 1047
+    commit: omim-8.4.2-1
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/analytics/PushWooshEventLogger.java
+      - sed -i -e 's/enabled_ = true/enabled_ = false/' ../3party/Alohalytics/src/{alohalytics.h,cpp/alohalytics.cc}
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore:
+      - data/*.bin
+      - data/ugc_migration/*.bin
+    scandelete:
+      - 3party
+    ndk: r16b
+
+  - versionName: 8.6.2-2
+    versionCode: 1049
+    commit: omim-8.6.2-2
+    timeout: 10800
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/versionName = /d' build.gradle
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/analytics/PushWooshEventLogger.java
+      - sed -i -e 's/enabled_ = true/enabled_ = false/' ../3party/Alohalytics/src/{alohalytics.h,cpp/alohalytics.cc}
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore:
+      - data/*.bin
+      - data/ugc_migration/*.bin
+    scandelete:
+      - 3party
+    ndk: r19
+
+  - versionName: 9.0.8-2
+    versionCode: 1052
+    commit: omim-9.0.8-2
+    timeout: 14400
+    subdir: android
+    submodules: true
+    gradle:
+      - google
+    rm:
+      - 3party/Alohalytics/examples
+      - iphone
+      - tools/shaders_compiler
+    prebuild:
+      - sed -i -E -e '/\/\/ .* keys?$/,/^$/d' build.gradle
+      - sed -i -e '/versionName = /d' build.gradle
+      - sed -i -e '/^    <meta-data/,/^$/d' AndroidManifest.xml
+      - sed -i -e 's/!BuildConfig.FABRIC_API_KEY.startsWith("0000")/false/' src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java
+      - sed -i -e 's/BuildConfig.PW_APPID.equals(PW_EMPTY_APP_ID)/true/' src/com/mapswithme/maps/analytics/PushWooshEventLogger.java
+      - sed -i -e 's/enabled_ = true/enabled_ = false/' ../3party/Alohalytics/src/{alohalytics.h,cpp/alohalytics.cc}
+      - sed -i -e 's/MAPS.ME/Maps/' res/values*/strings.xml
+    scanignore:
+      - data/*.bin
+      - data/ugc_migration/*.bin
+    scandelete:
+      - 3party
+    ndk: r19c
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 9.0.8-2
+CurrentVersionCode: 1052
diff --git a/metadata/com.github.axet.torrentclient.txt b/metadata/com.github.axet.torrentclient.txt
deleted file mode 100644
index d6f2288594..0000000000
--- a/metadata/com.github.axet.torrentclient.txt
+++ /dev/null
@@ -1,615 +0,0 @@
-Categories:Internet
-License:GPL-3.0-only
-Web Site:https://gitlab.com/axet/android-torrent-client
-Source Code:https://gitlab.com/axet/android-torrent-client/tree/HEAD
-Issue Tracker:https://gitlab.com/axet/android-torrent-client/issues
-LiberapayID:1370123
-
-Auto Name:Torrent Client
-Summary:Download torrent files
-Description:
-Nice and simple torrent client. Supports magnet links, creating torrent files,
-UPNP, PMP, uTP, PEX and more.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/axet/android-torrent-client.git
-
-Build:2.7.15,314
-    disable=cannot find java-unrar
-    commit=torrentclient-2.7.15
-    subdir=app
-    gradle=yes
-
-Build:2.7.35,334
-    disable=more than one resulting apks found
-    commit=torrentclient-2.7.35
-    subdir=app
-    gradle=yes
-
-Build:2.7.55,354
-    disable=more than one resulting apks found
-    commit=torrentclient-2.7.55
-    subdir=app
-    gradle=yes
-
-Build:2.7.61,360
-    disable=more than one resulting apks found
-    commit=torrentclient-2.7.61
-    subdir=app
-    gradle=yes
-
-Build:2.7.62,361
-    disable=more than one resulting apks found
-    commit=torrentclient-2.7.62
-    subdir=app
-    gradle=yes
-
-Build:2.7.66,365
-    disable=more than one resulting apks found
-    commit=torrentclient-2.7.66
-    subdir=app
-    gradle=yes
-
-Build:2.7.71,370
-    disable=more than one resulting apks found
-    commit=torrentclient-2.7.71
-    subdir=app
-    gradle=yes
-
-Build:2.7.72,371
-    disable=more than one resulting apks found
-    commit=torrentclient-2.7.72
-    subdir=app
-    gradle=yes
-
-Build:3.0.0,377
-    disable=more than one resulting apks found
-    commit=torrentclient-3.0.0
-    subdir=app
-    gradle=yes
-
-Build:3.1.12,390
-    disable=more than one resulting apks found
-    commit=torrentclient-3.1.12
-    subdir=app
-    gradle=yes
-
-Build:3.1.27,405
-    disable=more than one resulting apks found
-    commit=torrentclient-3.1.27
-    subdir=app
-    gradle=yes
-
-Build:3.2.7,424
-    disable=more than one resulting apks found
-    commit=torrentclient-3.2.7
-    subdir=app
-    gradle=yes
-
-Build:3.2.11,428
-    disable=more than one resulting apks found
-    commit=torrentclient-3.2.11
-    subdir=app
-    gradle=yes
-
-Build:3.2.23,439
-    commit=torrentclient-3.2.23
-    subdir=app
-    gradle=universal
-
-Build:3.2.24,440
-    commit=torrentclient-3.2.24
-    subdir=app
-    gradle=universal
-
-Build:3.2.26,442
-    commit=torrentclient-3.2.26
-    subdir=app
-    gradle=universal
-
-Build:3.2.32,448
-    commit=torrentclient-3.2.32
-    subdir=app
-    gradle=universal
-
-Build:3.2.33,449
-    commit=torrentclient-3.2.33
-    subdir=app
-    gradle=universal
-
-Build:3.2.35,451
-    commit=torrentclient-3.2.35
-    subdir=app
-    gradle=universal
-
-Build:3.2.38,454
-    commit=torrentclient-3.2.38
-    subdir=app
-    gradle=universal
-
-Build:3.2.39,455
-    commit=torrentclient-3.2.39
-    subdir=app
-    gradle=universal
-
-Build:3.2.42,458
-    commit=torrentclient-3.2.42
-    subdir=app
-    gradle=universal
-
-Build:3.2.43,459
-    commit=torrentclient-3.2.43
-    subdir=app
-    gradle=universal
-
-Build:3.3.2,462
-    commit=torrentclient-3.3.2
-    subdir=app
-    gradle=universal
-
-Build:3.3.4,464
-    commit=torrentclient-3.3.4
-    subdir=app
-    gradle=universal
-
-Build:3.3.7,467
-    commit=torrentclient-3.3.7
-    subdir=app
-    gradle=universal
-
-Build:3.3.8,468
-    commit=torrentclient-3.3.8
-    subdir=app
-    gradle=universal
-
-Build:3.3.11,471
-    commit=torrentclient-3.3.11
-    subdir=app
-    gradle=universal
-
-Build:3.3.16,476
-    commit=torrentclient-3.3.16
-    subdir=app
-    gradle=universal
-
-Build:3.3.20,480
-    commit=torrentclient-3.3.20
-    subdir=app
-    gradle=universal
-
-Build:3.3.21,481
-    commit=torrentclient-3.3.21
-    subdir=app
-    gradle=universal
-
-Build:3.3.23,483
-    commit=torrentclient-3.3.23
-    subdir=app
-    gradle=universal
-
-Build:3.4.4,488
-    commit=torrentclient-3.4.4
-    subdir=app
-    gradle=universal
-
-Build:3.4.8,492
-    commit=torrentclient-3.4.8
-    subdir=app
-    gradle=universal
-
-Build:3.4.10,494
-    commit=torrentclient-3.4.10
-    subdir=app
-    gradle=universal
-
-Build:3.4.15,499
-    commit=torrentclient-3.4.15
-    subdir=app
-    gradle=universal
-
-Build:3.4.24,508
-    commit=torrentclient-3.4.24
-    subdir=app
-    gradle=universal
-
-Build:3.4.28,512
-    commit=torrentclient-3.4.28
-    subdir=app
-    gradle=universal
-
-Build:3.4.34,518
-    commit=torrentclient-3.4.34
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.35,519
-    commit=torrentclient-3.4.35
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.47,531
-    commit=torrentclient-3.4.47
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.48,532
-    commit=torrentclient-3.4.48
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.56,540
-    commit=torrentclient-3.4.56
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.60,544
-    commit=torrentclient-3.4.60
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.63,547
-    commit=torrentclient-3.4.63
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.66,550
-    commit=torrentclient-3.4.66
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.67,551
-    commit=torrentclient-3.4.67
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.68,552
-    commit=torrentclient-3.4.68
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.79,567
-    commit=torrentclient-3.4.79
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.84,572
-    commit=torrentclient-3.4.84
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.86,574
-    commit=torrentclient-3.4.86
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.89,577
-    commit=torrentclient-3.4.89
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.93,581
-    commit=torrentclient-3.4.93
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.96,584
-    commit=torrentclient-3.4.96
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.98,586
-    commit=torrentclient-3.4.98
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.105,593
-    commit=torrentclient-3.4.105
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.106,594
-    commit=torrentclient-3.4.106
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.107,595
-    commit=torrentclient-3.4.107
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.108,596
-    commit=torrentclient-3.4.108
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.111,599
-    commit=torrentclient-3.4.111
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.116,604
-    commit=torrentclient-3.4.116
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.117,605
-    commit=torrentclient-3.4.117
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.120,608
-    commit=torrentclient-3.4.120
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.122,610
-    commit=torrentclient-3.4.122
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.123,611
-    commit=torrentclient-3.4.123
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.124,612
-    commit=torrentclient-3.4.124
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.126,614
-    commit=torrentclient-3.4.126
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.128,616
-    commit=torrentclient-3.4.128
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-
-Build:3.4.132,620
-    commit=torrentclient-3.4.132
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle && \
-        sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-    ndk=r16b
-
-Build:3.4.136,624
-    commit=torrentclient-3.4.136
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle && \
-        sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-    ndk=r16b
-
-Build:3.4.137,625
-    disable=error: cannot find symbol Storage.isConnectedWifi
-    commit=torrentclient-3.4.137
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle && \
-        sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-    ndk=r16b
-
-Build:3.4.138,626
-    commit=torrentclient-3.4.138
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle && \
-        sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-    ndk=r16b
-
-Build:3.4.139,627
-    commit=torrentclient-3.4.139
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle && \
-        sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
-    ndk=r16b
-
-Build:3.4.141,629
-    commit=torrentclient-3.4.141
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.142,630
-    commit=torrentclient-3.4.142
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.147,635
-    commit=torrentclient-3.4.147
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.155,643
-    commit=torrentclient-3.4.155
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.156,644
-    commit=torrentclient-3.4.156
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.157,645
-    commit=torrentclient-3.4.157
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.163,651
-    commit=torrentclient-3.4.163
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.165,653
-    commit=torrentclient-3.4.165
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.169,657
-    commit=torrentclient-3.4.169
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.177,665
-    commit=torrentclient-3.4.177
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.178,666
-    commit=torrentclient-3.4.178
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.181,669
-    disable=lintVitalRelease fails
-    commit=torrentclient-3.4.181
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.182,670
-    disable=lintVitalRelease fails
-    commit=torrentclient-3.4.182
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.185,673
-    commit=torrentclient-3.4.185
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions {abortOnError false}' build.gradle
-    ndk=r16b
-
-Build:3.4.190,677
-    commit=torrentclient-3.4.190
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions {abortOnError false}' build.gradle
-    ndk=r16b
-
-Build:3.4.191,678
-    commit=torrentclient-3.4.191
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions {abortOnError false}' build.gradle
-    ndk=r16b
-
-Build:3.4.192,679
-    commit=torrentclient-3.4.192
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions {abortOnError false}' build.gradle
-    ndk=r16b
-
-Build:3.4.193,680
-    commit=torrentclient-3.4.193
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions {abortOnError false}' build.gradle
-    ndk=r16b
-
-Build:3.4.195,682
-    commit=torrentclient-3.4.195
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions {abortOnError false}' build.gradle
-    ndk=r16b
-
-Build:3.4.197,684
-    commit=torrentclient-3.4.197
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions {abortOnError false}' build.gradle
-    ndk=r16b
-
-Build:3.4.206,693
-    commit=torrentclient-3.4.206
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.207,694
-    commit=torrentclient-3.4.207
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.208,695
-    commit=torrentclient-3.4.208
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Build:3.4.209,696
-    commit=torrentclient-3.4.209
-    subdir=app
-    gradle=yes
-    prebuild=sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
-    ndk=r16b
-
-Auto Update Mode:Version torrentclient-%v
-Update Check Mode:Tags
-Current Version:3.4.209
-Current Version Code:696
diff --git a/metadata/com.github.axet.torrentclient.yml b/metadata/com.github.axet.torrentclient.yml
new file mode 100644
index 0000000000..238f58a7df
--- /dev/null
+++ b/metadata/com.github.axet.torrentclient.yml
@@ -0,0 +1,822 @@
+Categories:
+  - Internet
+License: GPL-3.0-only
+WebSite: https://gitlab.com/axet/android-torrent-client
+SourceCode: https://gitlab.com/axet/android-torrent-client/tree/HEAD
+IssueTracker: https://gitlab.com/axet/android-torrent-client/issues
+LiberapayID: '1370123'
+
+AutoName: Torrent Client
+Summary: Download torrent files
+Description: |-
+    Nice and simple torrent client. Supports magnet links, creating torrent files,
+    UPNP, PMP, uTP, PEX and more.
+
+RepoType: git
+Repo: https://gitlab.com/axet/android-torrent-client.git
+
+Builds:
+  - versionName: 2.7.15
+    versionCode: 314
+    disable: cannot find java-unrar
+    commit: torrentclient-2.7.15
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.35
+    versionCode: 334
+    disable: more than one resulting apks found
+    commit: torrentclient-2.7.35
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.55
+    versionCode: 354
+    disable: more than one resulting apks found
+    commit: torrentclient-2.7.55
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.61
+    versionCode: 360
+    disable: more than one resulting apks found
+    commit: torrentclient-2.7.61
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.62
+    versionCode: 361
+    disable: more than one resulting apks found
+    commit: torrentclient-2.7.62
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.66
+    versionCode: 365
+    disable: more than one resulting apks found
+    commit: torrentclient-2.7.66
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.71
+    versionCode: 370
+    disable: more than one resulting apks found
+    commit: torrentclient-2.7.71
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.7.72
+    versionCode: 371
+    disable: more than one resulting apks found
+    commit: torrentclient-2.7.72
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.0.0
+    versionCode: 377
+    disable: more than one resulting apks found
+    commit: torrentclient-3.0.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.12
+    versionCode: 390
+    disable: more than one resulting apks found
+    commit: torrentclient-3.1.12
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.1.27
+    versionCode: 405
+    disable: more than one resulting apks found
+    commit: torrentclient-3.1.27
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.7
+    versionCode: 424
+    disable: more than one resulting apks found
+    commit: torrentclient-3.2.7
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.11
+    versionCode: 428
+    disable: more than one resulting apks found
+    commit: torrentclient-3.2.11
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 3.2.23
+    versionCode: 439
+    commit: torrentclient-3.2.23
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.24
+    versionCode: 440
+    commit: torrentclient-3.2.24
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.26
+    versionCode: 442
+    commit: torrentclient-3.2.26
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.32
+    versionCode: 448
+    commit: torrentclient-3.2.32
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.33
+    versionCode: 449
+    commit: torrentclient-3.2.33
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.35
+    versionCode: 451
+    commit: torrentclient-3.2.35
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.38
+    versionCode: 454
+    commit: torrentclient-3.2.38
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.39
+    versionCode: 455
+    commit: torrentclient-3.2.39
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.42
+    versionCode: 458
+    commit: torrentclient-3.2.42
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.2.43
+    versionCode: 459
+    commit: torrentclient-3.2.43
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.2
+    versionCode: 462
+    commit: torrentclient-3.3.2
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.4
+    versionCode: 464
+    commit: torrentclient-3.3.4
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.7
+    versionCode: 467
+    commit: torrentclient-3.3.7
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.8
+    versionCode: 468
+    commit: torrentclient-3.3.8
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.11
+    versionCode: 471
+    commit: torrentclient-3.3.11
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.16
+    versionCode: 476
+    commit: torrentclient-3.3.16
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.20
+    versionCode: 480
+    commit: torrentclient-3.3.20
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.21
+    versionCode: 481
+    commit: torrentclient-3.3.21
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.3.23
+    versionCode: 483
+    commit: torrentclient-3.3.23
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.4.4
+    versionCode: 488
+    commit: torrentclient-3.4.4
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.4.8
+    versionCode: 492
+    commit: torrentclient-3.4.8
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.4.10
+    versionCode: 494
+    commit: torrentclient-3.4.10
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.4.15
+    versionCode: 499
+    commit: torrentclient-3.4.15
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.4.24
+    versionCode: 508
+    commit: torrentclient-3.4.24
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.4.28
+    versionCode: 512
+    commit: torrentclient-3.4.28
+    subdir: app
+    gradle:
+      - universal
+
+  - versionName: 3.4.34
+    versionCode: 518
+    commit: torrentclient-3.4.34
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.35
+    versionCode: 519
+    commit: torrentclient-3.4.35
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.47
+    versionCode: 531
+    commit: torrentclient-3.4.47
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.48
+    versionCode: 532
+    commit: torrentclient-3.4.48
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.56
+    versionCode: 540
+    commit: torrentclient-3.4.56
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.60
+    versionCode: 544
+    commit: torrentclient-3.4.60
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.63
+    versionCode: 547
+    commit: torrentclient-3.4.63
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.66
+    versionCode: 550
+    commit: torrentclient-3.4.66
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.67
+    versionCode: 551
+    commit: torrentclient-3.4.67
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.68
+    versionCode: 552
+    commit: torrentclient-3.4.68
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.79
+    versionCode: 567
+    commit: torrentclient-3.4.79
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.84
+    versionCode: 572
+    commit: torrentclient-3.4.84
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.86
+    versionCode: 574
+    commit: torrentclient-3.4.86
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.89
+    versionCode: 577
+    commit: torrentclient-3.4.89
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.93
+    versionCode: 581
+    commit: torrentclient-3.4.93
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.96
+    versionCode: 584
+    commit: torrentclient-3.4.96
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.98
+    versionCode: 586
+    commit: torrentclient-3.4.98
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.105
+    versionCode: 593
+    commit: torrentclient-3.4.105
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.106
+    versionCode: 594
+    commit: torrentclient-3.4.106
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.107
+    versionCode: 595
+    commit: torrentclient-3.4.107
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.108
+    versionCode: 596
+    commit: torrentclient-3.4.108
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.111
+    versionCode: 599
+    commit: torrentclient-3.4.111
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.116
+    versionCode: 604
+    commit: torrentclient-3.4.116
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.117
+    versionCode: 605
+    commit: torrentclient-3.4.117
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.120
+    versionCode: 608
+    commit: torrentclient-3.4.120
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.122
+    versionCode: 610
+    commit: torrentclient-3.4.122
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.123
+    versionCode: 611
+    commit: torrentclient-3.4.123
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.124
+    versionCode: 612
+    commit: torrentclient-3.4.124
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.126
+    versionCode: 614
+    commit: torrentclient-3.4.126
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.128
+    versionCode: 616
+    commit: torrentclient-3.4.128
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+
+  - versionName: 3.4.132
+    versionCode: 620
+    commit: torrentclient-3.4.132
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+      - sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.136
+    versionCode: 624
+    commit: torrentclient-3.4.136
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+      - sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.137
+    versionCode: 625
+    disable: 'error: cannot find symbol Storage.isConnectedWifi'
+    commit: torrentclient-3.4.137
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+      - sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.138
+    versionCode: 626
+    commit: torrentclient-3.4.138
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+      - sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.139
+    versionCode: 627
+    commit: torrentclient-3.4.139
+    subdir: app
+    gradle:
+      - yes
+    prebuild:
+      - sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+      - sed -i -e "s/gradleVersion = '4.2.1'/gradleVersion = '4.6'/" ../build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.141
+    versionCode: 629
+    commit: torrentclient-3.4.141
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.142
+    versionCode: 630
+    commit: torrentclient-3.4.142
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.147
+    versionCode: 635
+    commit: torrentclient-3.4.147
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.155
+    versionCode: 643
+    commit: torrentclient-3.4.155
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.156
+    versionCode: 644
+    commit: torrentclient-3.4.156
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.157
+    versionCode: 645
+    commit: torrentclient-3.4.157
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.163
+    versionCode: 651
+    commit: torrentclient-3.4.163
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.165
+    versionCode: 653
+    commit: torrentclient-3.4.165
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.169
+    versionCode: 657
+    commit: torrentclient-3.4.169
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.177
+    versionCode: 665
+    commit: torrentclient-3.4.177
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.178
+    versionCode: 666
+    commit: torrentclient-3.4.178
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.181
+    versionCode: 669
+    disable: lintVitalRelease fails
+    commit: torrentclient-3.4.181
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.182
+    versionCode: 670
+    disable: lintVitalRelease fails
+    commit: torrentclient-3.4.182
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.185
+    versionCode: 673
+    commit: torrentclient-3.4.185
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions
+        {abortOnError false}' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.190
+    versionCode: 677
+    commit: torrentclient-3.4.190
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions
+        {abortOnError false}' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.191
+    versionCode: 678
+    commit: torrentclient-3.4.191
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions
+        {abortOnError false}' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.192
+    versionCode: 679
+    commit: torrentclient-3.4.192
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions
+        {abortOnError false}' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.193
+    versionCode: 680
+    commit: torrentclient-3.4.193
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions
+        {abortOnError false}' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.195
+    versionCode: 682
+    commit: torrentclient-3.4.195
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions
+        {abortOnError false}' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.197
+    versionCode: 684
+    commit: torrentclient-3.4.197
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' -e '43 a  lintOptions
+        {abortOnError false}' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.206
+    versionCode: 693
+    commit: torrentclient-3.4.206
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.207
+    versionCode: 694
+    commit: torrentclient-3.4.207
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.208
+    versionCode: 695
+    commit: torrentclient-3.4.208
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+  - versionName: 3.4.209
+    versionCode: 696
+    commit: torrentclient-3.4.209
+    subdir: app
+    gradle:
+      - yes
+    prebuild: sed -i -e '/variant.outputs.each/,/}$/d; /enable true/d' build.gradle
+    ndk: r16b
+
+AutoUpdateMode: Version torrentclient-%v
+UpdateCheckMode: Tags
+CurrentVersion: 3.4.209
+CurrentVersionCode: 696
diff --git a/metadata/de.k3b.android.contentproviderhelper.txt b/metadata/de.k3b.android.contentproviderhelper.txt
deleted file mode 100644
index 3574c7bb14..0000000000
--- a/metadata/de.k3b.android.contentproviderhelper.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Categories:Development,System
-License:GPL-3.0-only
-Web Site:https://github.com/k3b/ContentProviderHelper/wiki
-Source Code:https://github.com/k3b/ContentProviderHelper
-Issue Tracker:https://github.com/k3b/ContentProviderHelper/issues
-Changelog:https://github.com/k3b/ContentProviderHelper/wiki/History
-Donate:http://donate.openstreetmap.org/
-
-Auto Name:Content Provider Helper
-Summary:Discover, view and query data of content providers
-Description:
-This helper is a frontend to query installed content providers. Android's
-content providers are similar to database tables.: They have a name (aka
-"content:" uri), columns and they can be queried similar to SQL.
-
-Android uses
-[https://developer.android.com/guide/topics/providers/content-providers.html
-content-providers] as API to manage global accessable data (i.e. images, address
-book, text messages, ...).
-
-Forked from  [https://github.com/jenzz/ContentProviderHelper jenzz-s
-ContentProviderHelper]  which is not maintained anymore.
-
-App permissions are set generously to provide maximum compatibility.
-.
-
-Repo Type:git
-Repo:https://github.com/k3b/ContentProviderHelper.git
-
-Build:1.3.0,3
-    commit=v1.3.0
-    subdir=app
-    gradle=yes
-
-Build:1.3.1,4
-    commit=v1.3.1
-    subdir=app
-    gradle=yes
-
-Build:1.3.1.1,5
-    commit=v1.3.1.1
-    subdir=app
-    gradle=yes
-
-Maintainer Notes:
-Please use git-branch "FDroid" for FDroid-builds.
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.3.1.1
-Current Version Code:5
diff --git a/metadata/de.k3b.android.contentproviderhelper.yml b/metadata/de.k3b.android.contentproviderhelper.yml
new file mode 100644
index 0000000000..92ded23cd2
--- /dev/null
+++ b/metadata/de.k3b.android.contentproviderhelper.yml
@@ -0,0 +1,58 @@
+Categories:
+  - Development
+  - System
+License: GPL-3.0-only
+WebSite: https://github.com/k3b/ContentProviderHelper/wiki
+SourceCode: https://github.com/k3b/ContentProviderHelper
+IssueTracker: https://github.com/k3b/ContentProviderHelper/issues
+Changelog: https://github.com/k3b/ContentProviderHelper/wiki/History
+Donate: http://donate.openstreetmap.org/
+
+AutoName: Content Provider Helper
+Summary: Discover, view and query data of content providers
+Description: |-
+    This helper is a frontend to query installed content providers. Android's
+    content providers are similar to database tables.: They have a name (aka
+    "content:" uri), columns and they can be queried similar to SQL.
+
+    Android uses
+    [https://developer.android.com/guide/topics/providers/content-providers.html
+    content-providers] as API to manage global accessable data (i.e. images, address
+    book, text messages, ...).
+
+    Forked from  [https://github.com/jenzz/ContentProviderHelper jenzz-s
+    ContentProviderHelper]  which is not maintained anymore.
+
+    App permissions are set generously to provide maximum compatibility.
+
+RepoType: git
+Repo: https://github.com/k3b/ContentProviderHelper.git
+
+Builds:
+  - versionName: 1.3.0
+    versionCode: 3
+    commit: v1.3.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.1
+    versionCode: 4
+    commit: v1.3.1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.3.1.1
+    versionCode: 5
+    commit: v1.3.1.1
+    subdir: app
+    gradle:
+      - yes
+
+MaintainerNotes: Please use git-branch "FDroid" for FDroid-builds.
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.3.1.1
+CurrentVersionCode: 5
diff --git a/metadata/de.k3b.android.toGoZip.txt b/metadata/de.k3b.android.toGoZip.txt
deleted file mode 100644
index b863041012..0000000000
--- a/metadata/de.k3b.android.toGoZip.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:https://github.com/k3b/toGoZip/wiki
-Source Code:https://github.com/k3b/toGoZip
-Issue Tracker:https://github.com/k3b/toGoZip/issues
-Translation:https://crowdin.com/project/togozip
-Changelog:https://github.com/k3b/toGoZip/wiki/History
-
-Auto Name:ToGoZip
-
-Repo Type:git
-Repo:https://github.com/k3b/toGoZip.git
-
-Build:0.2.2.20141120,2
-    commit=75a75604a468ac3a546075b2c7944c0c9e92a0a1
-    subdir=app
-    gradle=yes
-
-Build:0.2.4.20141126,4
-    commit=aeac661a8352b00d1068853e8ad31c70569089f2
-    subdir=app
-    gradle=yes
-
-Build:0.2.5.20141129,5
-    commit=4e248479821214ab430e356fe819c47f94372de1
-    subdir=app
-    gradle=yes
-
-Build:1.0.6.20141207,6
-    commit=edf2187afe10ab129119a55267aa7e8e1f662436
-    subdir=app
-    gradle=yes
-
-Build:1.0.8.170626,8
-    commit=v1.0.8.170626
-    subdir=app
-    gradle=yes
-
-Build:1.0.9.170725,9
-    commit=v1.0.9.170725
-    subdir=app
-    gradle=yes
-
-Build:1.0.10.171128,10
-    commit=v1.0.10.171128
-    subdir=app
-    gradle=yes
-
-Build:2.0.11.171227,11
-    commit=v2.0.11.171227
-    subdir=app
-    gradle=yes
-
-Build:2.0.12.180516,12
-    commit=v2.0.12.180516
-    subdir=app
-    gradle=yes
-
-Build:2.0.13.18130,13
-    commit=v2.0.13.18130
-    subdir=app
-    gradle=yes
-
-Build:2.0.17.181130,17
-    commit=v2.0.17.181130
-    subdir=app
-    gradle=yes
-
-Build:2.0.18.181224,18
-    commit=v2.0.18.181224
-    subdir=app
-    gradle=yes
-
-Build:2.0.19.190413,19
-    commit=v2.0.19.190413
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:2.0.19.190413
-Current Version Code:19
diff --git a/metadata/de.k3b.android.toGoZip.yml b/metadata/de.k3b.android.toGoZip.yml
new file mode 100644
index 0000000000..1d6e502b0d
--- /dev/null
+++ b/metadata/de.k3b.android.toGoZip.yml
@@ -0,0 +1,110 @@
+Categories:
+  - System
+License: GPL-3.0-only
+WebSite: https://github.com/k3b/toGoZip/wiki
+SourceCode: https://github.com/k3b/toGoZip
+IssueTracker: https://github.com/k3b/toGoZip/issues
+Translation: https://crowdin.com/project/togozip
+Changelog: https://github.com/k3b/toGoZip/wiki/History
+
+AutoName: ToGoZip
+
+RepoType: git
+Repo: https://github.com/k3b/toGoZip.git
+
+Builds:
+  - versionName: 0.2.2.20141120
+    versionCode: 2
+    commit: 75a75604a468ac3a546075b2c7944c0c9e92a0a1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.4.20141126
+    versionCode: 4
+    commit: aeac661a8352b00d1068853e8ad31c70569089f2
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.2.5.20141129
+    versionCode: 5
+    commit: 4e248479821214ab430e356fe819c47f94372de1
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.6.20141207
+    versionCode: 6
+    commit: edf2187afe10ab129119a55267aa7e8e1f662436
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.8.170626
+    versionCode: 8
+    commit: v1.0.8.170626
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.9.170725
+    versionCode: 9
+    commit: v1.0.9.170725
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 1.0.10.171128
+    versionCode: 10
+    commit: v1.0.10.171128
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.11.171227
+    versionCode: 11
+    commit: v2.0.11.171227
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.12.180516
+    versionCode: 12
+    commit: v2.0.12.180516
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.13.18130
+    versionCode: 13
+    commit: v2.0.13.18130
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.17.181130
+    versionCode: 17
+    commit: v2.0.17.181130
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.18.181224
+    versionCode: 18
+    commit: v2.0.18.181224
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 2.0.19.190413
+    versionCode: 19
+    commit: v2.0.19.190413
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 2.0.19.190413
+CurrentVersionCode: 19