diff --git a/metadata/com.zoffcc.applications.trifa.txt b/metadata/com.zoffcc.applications.trifa.txt
deleted file mode 100644
index 01102aafcc..0000000000
--- a/metadata/com.zoffcc.applications.trifa.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-Categories:Internet
-License:GPL-2.0-only
-Web Site:
-Source Code:https://github.com/zoff99/ToxAndroidRefImpl
-Issue Tracker:https://github.com/zoff99/ToxAndroidRefImpl/issues
-Changelog:https://github.com/zoff99/ToxAndroidRefImpl/blob/zoff99/dev003/CHANGELOG.md
-Bitcoin:1TRifA7eNLHZEcCTj43eYVWHBbLqTuXkS
-
-Auto Name:TRIfA
-
-Repo Type:git
-Repo:https://github.com/zoff99/ToxAndroidRefImpl
-
-Build:1.0.2,10002
-    commit=3ebe7560ae6f588db0f41ad2e669b6284fdbf767
-    subdir=android-refimpl-app/app
-    gradle=yes
-
-Build:1.0.3,10003
-    commit=0072d16efc1fa24e34a94b75c5a1d9d531d4e0f2
-    subdir=android-refimpl-app/app
-    gradle=yes
-
-Build:1.0.4,10004
-    disable=Don't build gradle witness. Use jar from repo.
-    commit=c94404779343280593fc42a93a246b6496fd240c
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=cd ../gwitness ; rm -f build/libs/* ; gradle build --info && \
-        cp build/libs/gwitness.jar ./gwitness.jar && \
-        sed -i -e 's#../gwitness/build/libs/gwitness.jar#../gwitness/gwitness.jar#' ../app/build.gradle
-    scanignore=android-refimpl-app/gwitness/gwitness.jar
-
-Build:1.0.5,10005
-    commit=5d4349e31333ba4ae67caafba4976322841ee6d3
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.6,10006
-    commit=82678cfbc7b2b3b7fde0a8e0a1f7b047f73814d4
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.7,10007
-    commit=8d30843bdb9d179c9c1fe1e6d1e71b71996543be
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.8,10008
-    commit=1.0.8
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.9,10009
-    commit=1.0.9
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.10,10010
-    commit=1.0.10
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.11,10011
-    commit=1.0.11
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.12,10012
-    commit=1.0.12
-    subdir=android-refimpl-app/app
-    gradle=yes
-    ndk=r13b
-
-Build:1.0.13,10013
-    commit=1.0.13
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Build:1.0.14,10014
-    commit=1.0.14
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Build:1.0.15,10015
-    commit=1.0.15
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Build:1.0.16,10016
-    commit=1.0.16
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Build:1.0.17,10017
-    commit=1.0.17
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Build:1.0.19,10019
-    commit=1.0.19
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Build:1.0.20,10020
-    commit=1.0.20
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Build:1.0.21,10021
-    commit=1.0.21
-    subdir=android-refimpl-app/app
-    gradle=yes
-    prebuild=$ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk=r13b
-
-Maintainer Notes:
-Description and summary in app git repository
-.
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags ^[0-9].*
-Current Version:1.0.21
-Current Version Code:10021
diff --git a/metadata/com.zoffcc.applications.trifa.yml b/metadata/com.zoffcc.applications.trifa.yml
new file mode 100644
index 0000000000..6072c007d2
--- /dev/null
+++ b/metadata/com.zoffcc.applications.trifa.yml
@@ -0,0 +1,185 @@
+Categories:
+  - Internet
+License: GPL-2.0-only
+SourceCode: https://github.com/zoff99/ToxAndroidRefImpl
+IssueTracker: https://github.com/zoff99/ToxAndroidRefImpl/issues
+Changelog: https://github.com/zoff99/ToxAndroidRefImpl/blob/zoff99/dev003/CHANGELOG.md
+Bitcoin: 1TRifA7eNLHZEcCTj43eYVWHBbLqTuXkS
+
+AutoName: TRIfA
+
+RepoType: git
+Repo: https://github.com/zoff99/ToxAndroidRefImpl
+
+Builds:
+  - versionName: 1.0.2
+    versionCode: 10002
+    commit: 3ebe7560ae6f588db0f41ad2e669b6284fdbf767
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 10003
+    commit: 0072d16efc1fa24e34a94b75c5a1d9d531d4e0f2
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+
+  - versionName: 1.0.4
+    versionCode: 10004
+    disable: Don't build gradle witness. Use jar from repo.
+    commit: c94404779343280593fc42a93a246b6496fd240c
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild:
+      - cd ../gwitness ; rm -f build/libs/* ; gradle build --info
+      - cp build/libs/gwitness.jar ./gwitness.jar
+      - sed -i -e 's#../gwitness/build/libs/gwitness.jar#../gwitness/gwitness.jar#'
+        ../app/build.gradle
+    scanignore:
+      - android-refimpl-app/gwitness/gwitness.jar
+
+  - versionName: 1.0.5
+    versionCode: 10005
+    commit: 5d4349e31333ba4ae67caafba4976322841ee6d3
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.6
+    versionCode: 10006
+    commit: 82678cfbc7b2b3b7fde0a8e0a1f7b047f73814d4
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.7
+    versionCode: 10007
+    commit: 8d30843bdb9d179c9c1fe1e6d1e71b71996543be
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.8
+    versionCode: 10008
+    commit: 1.0.8
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.9
+    versionCode: 10009
+    commit: 1.0.9
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.10
+    versionCode: 10010
+    commit: 1.0.10
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.11
+    versionCode: 10011
+    commit: 1.0.11
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.12
+    versionCode: 10012
+    commit: 1.0.12
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    ndk: r13b
+
+  - versionName: 1.0.13
+    versionCode: 10013
+    commit: 1.0.13
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+  - versionName: 1.0.14
+    versionCode: 10014
+    commit: 1.0.14
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+  - versionName: 1.0.15
+    versionCode: 10015
+    commit: 1.0.15
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+  - versionName: 1.0.16
+    versionCode: 10016
+    commit: 1.0.16
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+  - versionName: 1.0.17
+    versionCode: 10017
+    commit: 1.0.17
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+  - versionName: 1.0.19
+    versionCode: 10019
+    commit: 1.0.19
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+  - versionName: 1.0.20
+    versionCode: 10020
+    commit: 1.0.20
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+  - versionName: 1.0.21
+    versionCode: 10021
+    commit: 1.0.21
+    subdir: android-refimpl-app/app
+    gradle:
+      - yes
+    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
+    ndk: r13b
+
+MaintainerNotes: Description and summary in app git repository
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags ^[0-9].*
+CurrentVersion: 1.0.21
+CurrentVersionCode: 10021