diff --git a/metadata/com.zoffcc.applications.trifa.yml b/metadata/com.zoffcc.applications.trifa.yml
index 090e35d510..9feae725aa 100644
--- a/metadata/com.zoffcc.applications.trifa.yml
+++ b/metadata/com.zoffcc.applications.trifa.yml
@@ -1,5 +1,3 @@
-AntiFeatures:
-  - NonFreeAssets
 Categories:
   - Internet
 License: GPL-2.0-only
@@ -27,21 +25,8 @@ Builds:
     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
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.5
     versionCode: 10005
@@ -50,6 +35,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.6
     versionCode: 10006
@@ -58,6 +45,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.7
     versionCode: 10007
@@ -66,6 +55,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.8
     versionCode: 10008
@@ -74,6 +65,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.9
     versionCode: 10009
@@ -82,6 +75,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.10
     versionCode: 10010
@@ -90,6 +85,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.11
     versionCode: 10011
@@ -98,6 +95,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.12
     versionCode: 10012
@@ -106,6 +105,8 @@ Builds:
     gradle:
       - yes
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.13
     versionCode: 10013
@@ -115,6 +116,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.14
     versionCode: 10014
@@ -124,6 +127,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.15
     versionCode: 10015
@@ -133,6 +138,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.16
     versionCode: 10016
@@ -142,6 +149,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.17
     versionCode: 10017
@@ -151,6 +160,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.19
     versionCode: 10019
@@ -160,6 +171,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.20
     versionCode: 10020
@@ -169,6 +182,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.21
     versionCode: 10021
@@ -178,6 +193,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.22
     versionCode: 10022
@@ -187,6 +204,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.23
     versionCode: 10023
@@ -196,6 +215,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.24
     versionCode: 10024
@@ -205,6 +226,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.25
     versionCode: 10025
@@ -214,6 +237,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.26
     versionCode: 10026
@@ -223,6 +248,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.27
     versionCode: 10027
@@ -232,6 +259,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.28
     versionCode: 10028
@@ -241,6 +270,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.29
     versionCode: 10029
@@ -250,6 +281,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.32
     versionCode: 10032
@@ -259,6 +292,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.34
     versionCode: 10034
@@ -268,6 +303,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.35
     versionCode: 10035
@@ -277,6 +314,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.37
     versionCode: 10037
@@ -286,6 +325,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.38
     versionCode: 10038
@@ -295,6 +336,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.41
     versionCode: 10041
@@ -304,6 +347,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.42
     versionCode: 10042
@@ -313,6 +358,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.43
     versionCode: 10043
@@ -322,6 +369,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.45
     versionCode: 10045
@@ -331,6 +380,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.48
     versionCode: 10048
@@ -340,6 +391,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.49
     versionCode: 10049
@@ -349,6 +402,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.51
     versionCode: 10051
@@ -358,6 +413,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.54
     versionCode: 10054
@@ -367,6 +424,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.60
     versionCode: 10060
@@ -376,6 +435,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.61
     versionCode: 10061
@@ -385,6 +446,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.62
     versionCode: 10062
@@ -394,6 +457,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.64
     versionCode: 10064
@@ -403,6 +468,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.65
     versionCode: 10065
@@ -412,6 +479,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.66
     versionCode: 10066
@@ -421,16 +490,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
-
-  - versionName: 1.0.68
-    versionCode: 10068
-    disable: fails to build
-    commit: 1.0.68
-    subdir: android-refimpl-app/app
-    gradle:
-      - yes
-    prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
-    ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.69
     versionCode: 10069
@@ -440,6 +501,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.70
     versionCode: 10070
@@ -449,6 +512,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.72
     versionCode: 10072
@@ -458,6 +523,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.73
     versionCode: 10073
@@ -467,6 +534,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.75
     versionCode: 10075
@@ -476,6 +545,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.76
     versionCode: 10076
@@ -485,6 +556,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.77
     versionCode: 10077
@@ -494,6 +567,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.79
     versionCode: 10079
@@ -503,6 +578,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.80
     versionCode: 10080
@@ -512,6 +589,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.81
     versionCode: 10081
@@ -521,6 +600,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.83
     versionCode: 10083
@@ -530,6 +611,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.84
     versionCode: 10084
@@ -539,6 +622,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.85
     versionCode: 10085
@@ -548,6 +633,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.86
     versionCode: 10086
@@ -557,6 +644,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.88
     versionCode: 10088
@@ -566,6 +655,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.89
     versionCode: 10089
@@ -575,6 +666,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.91
     versionCode: 10091
@@ -584,6 +677,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.92
     versionCode: 10092
@@ -593,6 +688,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.93
     versionCode: 10093
@@ -602,6 +699,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.94
     versionCode: 10094
@@ -611,6 +710,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.95
     versionCode: 10095
@@ -620,6 +721,8 @@ Builds:
       - yes
     prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.6.4111459'
     ndk: r13b
+    antifeatures:
+      - NonFreeAssets
 
   - versionName: 1.0.96
     versionCode: 10096