diff --git a/metadata/org.tw.onze.cmtheme.txt b/metadata/org.tw.onze.cmtheme.txt
deleted file mode 100644
index 2f5f4559a1..0000000000
--- a/metadata/org.tw.onze.cmtheme.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-Categories:Theming
-License:GPL-3.0-only
-Web Site:https://xphnx.github.io/fento-suite
-Source Code:https://gitlab.com/xphnx/onze_cm11_theme
-Issue Tracker:https://gitlab.com/xphnx/onze_cm11_theme/issues
-Changelog:https://gitlab.com/xphnx/onze_cm11_theme/blob/HEAD/CHANGELOG.md
-
-Auto Name:Onze
-Summary:CM11 FLOSS Theme
-Description:
-A port of TwelF CM12 Theme. Onze is a Material Design inspired theme for CM11
-aiming to provide a consistent and minimalistic look to your device.
-
-Features:
-
-* FLOSS Icon Pack
-* Wallpaper & Lockscreen
-* Alarm & Ringtone
-
-For issues, comments and icon request, please use the issue tracker.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/xphnx/onze_cm11_theme.git
-
-Build:0.4,4
-    commit=ddf5077f179f2c1f6054cc6d15816019f3f184fd
-    subdir=theme
-    gradle=yes
-
-Build:0.6,6
-    commit=v0.6
-    subdir=theme
-    gradle=yes
-
-Build:0.8,8
-    commit=v0.8
-    subdir=theme
-    gradle=yes
-
-Build:0.9,9
-    commit=v0.9
-    subdir=theme
-    gradle=yes
-
-Build:1.1,11
-    commit=v1.1
-    subdir=theme
-    gradle=yes
-
-Build:1.2,12
-    commit=v1.2
-    subdir=theme
-    gradle=yes
-
-Build:1.3,13
-    commit=eb6fd43ac4322cff4168e25ded7981ac1ccd9b0b
-    subdir=theme
-    gradle=yes
-
-Build:2.0,20
-    commit=v2.0
-    subdir=theme
-    gradle=yes
-
-Build:2.2,22
-    commit=v2.2
-    subdir=theme
-    gradle=yes
-
-Build:2.4,24
-    disable=remove apk
-    commit=v2.4
-    subdir=theme
-    gradle=yes
-
-Build:2.8.1,29
-    commit=v2.8.1
-    subdir=theme
-    gradle=yes
-
-Build:2.9.3,32
-    commit=v2.9.3
-    subdir=theme
-    gradle=yes
-
-Build:2.9.5,33
-    commit=v2.9.5
-    subdir=theme
-    gradle=yes
-
-Build:2.9.7,35
-    commit=v2.9.7
-    subdir=theme
-    gradle=yes
-
-Build:2.9.8,36
-    commit=v2.9.8
-    subdir=theme
-    gradle=yes
-
-Build:2.9.9,37
-    commit=v2.9.9
-    subdir=theme
-    gradle=yes
-
-Maintainer Notes:
-No longer being maintained.
-.
-
-Archive Policy:0 versions
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:2.9.9
-Current Version Code:37
diff --git a/metadata/org.tw.onze.cmtheme.yml b/metadata/org.tw.onze.cmtheme.yml
new file mode 100644
index 0000000000..7507791148
--- /dev/null
+++ b/metadata/org.tw.onze.cmtheme.yml
@@ -0,0 +1,146 @@
+Categories:
+  - Theming
+License: GPL-3.0-only
+WebSite: https://xphnx.github.io/fento-suite
+SourceCode: https://gitlab.com/xphnx/onze_cm11_theme
+IssueTracker: https://gitlab.com/xphnx/onze_cm11_theme/issues
+Changelog: https://gitlab.com/xphnx/onze_cm11_theme/blob/HEAD/CHANGELOG.md
+
+AutoName: Onze
+Summary: CM11 FLOSS Theme
+Description: |-
+    A port of TwelF CM12 Theme. Onze is a Material Design inspired theme for CM11
+    aiming to provide a consistent and minimalistic look to your device.
+
+    Features:
+
+    * FLOSS Icon Pack
+    * Wallpaper & Lockscreen
+    * Alarm & Ringtone
+
+    For issues, comments and icon request, please use the issue tracker.
+
+RepoType: git
+Repo: https://gitlab.com/xphnx/onze_cm11_theme.git
+
+Builds:
+  - versionName: '0.4'
+    versionCode: 4
+    commit: ddf5077f179f2c1f6054cc6d15816019f3f184fd
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '0.6'
+    versionCode: 6
+    commit: v0.6
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '0.8'
+    versionCode: 8
+    commit: v0.8
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '0.9'
+    versionCode: 9
+    commit: v0.9
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '1.1'
+    versionCode: 11
+    commit: v1.1
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '1.2'
+    versionCode: 12
+    commit: v1.2
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '1.3'
+    versionCode: 13
+    commit: eb6fd43ac4322cff4168e25ded7981ac1ccd9b0b
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '2.0'
+    versionCode: 20
+    commit: v2.0
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '2.2'
+    versionCode: 22
+    commit: v2.2
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: '2.4'
+    versionCode: 24
+    disable: remove apk
+    commit: v2.4
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: 2.8.1
+    versionCode: 29
+    commit: v2.8.1
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: 2.9.3
+    versionCode: 32
+    commit: v2.9.3
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: 2.9.5
+    versionCode: 33
+    commit: v2.9.5
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: 2.9.7
+    versionCode: 35
+    commit: v2.9.7
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: 2.9.8
+    versionCode: 36
+    commit: v2.9.8
+    subdir: theme
+    gradle:
+      - yes
+
+  - versionName: 2.9.9
+    versionCode: 37
+    commit: v2.9.9
+    subdir: theme
+    gradle:
+      - yes
+
+MaintainerNotes: No longer being maintained.
+
+ArchivePolicy: 0 versions
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: 2.9.9
+CurrentVersionCode: 37