diff --git a/ESP32_AP-Flasher/data/fonts/bahnschrift20.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift20.vlw
index b79a7400..a8a9d256 100644
Binary files a/ESP32_AP-Flasher/data/fonts/bahnschrift20.vlw and b/ESP32_AP-Flasher/data/fonts/bahnschrift20.vlw differ
diff --git a/ESP32_AP-Flasher/data/fonts/bahnschrift30.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift30.vlw
index e1282067..b798d556 100644
Binary files a/ESP32_AP-Flasher/data/fonts/bahnschrift30.vlw and b/ESP32_AP-Flasher/data/fonts/bahnschrift30.vlw differ
diff --git a/ESP32_AP-Flasher/data/fonts/bahnschrift70.vlw b/ESP32_AP-Flasher/data/fonts/bahnschrift70.vlw
index cf5e7b1a..ef396121 100644
Binary files a/ESP32_AP-Flasher/data/fonts/bahnschrift70.vlw and b/ESP32_AP-Flasher/data/fonts/bahnschrift70.vlw differ
diff --git a/ESP32_AP-Flasher/data/fonts/calibrib30.vlw b/ESP32_AP-Flasher/data/fonts/calibrib30.vlw
index 0a9d29c0..a3bfcc22 100644
Binary files a/ESP32_AP-Flasher/data/fonts/calibrib30.vlw and b/ESP32_AP-Flasher/data/fonts/calibrib30.vlw differ
diff --git a/ESP32_AP-Flasher/data/fonts/twcondensed20.vlw b/ESP32_AP-Flasher/data/fonts/twcondensed20.vlw
index d9fa24e0..01bda1fa 100644
Binary files a/ESP32_AP-Flasher/data/fonts/twcondensed20.vlw and b/ESP32_AP-Flasher/data/fonts/twcondensed20.vlw differ
diff --git a/ESP32_AP-Flasher/data/tagtypes/60.json b/ESP32_AP-Flasher/data/tagtypes/60.json
index 38668245..3b83b72b 100644
--- a/ESP32_AP-Flasher/data/tagtypes/60.json
+++ b/ESP32_AP-Flasher/data/tagtypes/60.json
@@ -8,11 +8,11 @@
 	"colortable": {
 		"white": [255, 255, 255],
 		"black": [0, 0, 0],
-		"yellow": [0, 200, 200],
+		"yellow": [200, 200, 0],
 		"gray": [150, 150, 150]
 	},
 	"shortlut": 0,
 	"options": ["led"],
 	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ],
-	"usetemplate": 1
+	"usetemplate": 51
 }
diff --git a/ESP32_AP-Flasher/data/tagtypes/61.json b/ESP32_AP-Flasher/data/tagtypes/61.json
index 61a47369..d95eed0f 100644
--- a/ESP32_AP-Flasher/data/tagtypes/61.json
+++ b/ESP32_AP-Flasher/data/tagtypes/61.json
@@ -14,5 +14,5 @@
 	"shortlut": 0,
 	"options": ["led"],
 	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ],
-	"usetemplate": 1
+	"usetemplate": 51
 }
diff --git a/ESP32_AP-Flasher/data/tagtypes/62.json b/ESP32_AP-Flasher/data/tagtypes/62.json
index a966c0a1..42dceb5e 100644
--- a/ESP32_AP-Flasher/data/tagtypes/62.json
+++ b/ESP32_AP-Flasher/data/tagtypes/62.json
@@ -14,5 +14,5 @@
 	"shortlut": 0,
 	"options": ["led"],
 	"contentids": [ 22, 23, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 17, 18, 19, 20 ],
-	"usetemplate": 1
+	"usetemplate": 51
 }
diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp
index 1f6d2e0e..cc1fd57e 100644
--- a/ESP32_AP-Flasher/src/newproto.cpp
+++ b/ESP32_AP-Flasher/src/newproto.cpp
@@ -237,8 +237,7 @@ void prepareExternalDataAvail(struct pendingData* pending, IPAddress remoteIP) {
         switch (pending->availdatainfo.dataType) {
             case DATATYPE_IMG_DIFF:
             case DATATYPE_IMG_RAW_1BPP:
-            case DATATYPE_IMG_RAW_2BPP:
-            case DATATYPE_IMG_RAW_1BPP_DIRECT: {
+            case DATATYPE_IMG_RAW_2BPP: {
                 Storage.begin();
 
                 char hexmac[17];