diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz
index 30ee03ce..57467850 100644
Binary files a/ESP32_AP-Flasher/data/www/ota.js.gz and b/ESP32_AP-Flasher/data/www/ota.js.gz differ
diff --git a/ESP32_AP-Flasher/data/www/painter.js.gz b/ESP32_AP-Flasher/data/www/painter.js.gz
index a36cdf38..6f6cd850 100644
Binary files a/ESP32_AP-Flasher/data/www/painter.js.gz and b/ESP32_AP-Flasher/data/www/painter.js.gz differ
diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp
index 2e71f4ca..f0bb2070 100644
--- a/ESP32_AP-Flasher/src/contentmanager.cpp
+++ b/ESP32_AP-Flasher/src/contentmanager.cpp
@@ -8,9 +8,9 @@
 #define CONTENT_NFCLUT
 #define CONTENT_DAYAHEAD
 #define CONTENT_TIMESTAMP
-#endif
-#define CONTENT_CAL
 #define CONTENT_BUIENRADAR
+#define CONTENT_CAL
+#endif
 #define CONTENT_TAGCFG
 
 #include <Arduino.h>
diff --git a/ESP32_AP-Flasher/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp
index e68035eb..e123f13d 100644
--- a/ESP32_AP-Flasher/src/main.cpp
+++ b/ESP32_AP-Flasher/src/main.cpp
@@ -26,7 +26,9 @@
 #include "udp.h"
 #include "util.h"
 #include "web.h"
+#ifdef HAS_BLE_WRITER
 #include "ble_writer.h"
+#endif
 
 util::Timer intervalContentRunner(seconds(1));
 util::Timer intervalSysinfo(seconds(5));
diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js
index 8c09245c..076db60e 100644
--- a/ESP32_AP-Flasher/wwwroot/ota.js
+++ b/ESP32_AP-Flasher/wwwroot/ota.js
@@ -76,7 +76,8 @@ export async function initUpdate() {
                 const assets = release.assets;
                 const filesJsonAsset = assets.find(asset => asset.name === 'filesystem.json');
                 const binariesJsonAsset = assets.find(asset => asset.name === 'binaries.json');
-                if (filesJsonAsset && binariesJsonAsset) {
+                const containsEnv = assets.find(asset => asset.name === env + '.bin');
+                if (filesJsonAsset && binariesJsonAsset && containsEnv) {
                     return {
                         html_url: release.html_url,
                         tag_name: release.tag_name,
diff --git a/ESP32_AP-Flasher/wwwroot/painter.js b/ESP32_AP-Flasher/wwwroot/painter.js
index eef42eba..e92b714c 100644
--- a/ESP32_AP-Flasher/wwwroot/painter.js
+++ b/ESP32_AP-Flasher/wwwroot/painter.js
@@ -263,17 +263,11 @@ function startPainter(mac, width, height, tagtype) {
 		input.focus();
 
 		isAddingText = true;
-		//cursor = 'move';
-		//blackButton.innerHTML = 'aA'
-		//redButton.innerHTML = 'aA'
 		const colorButtons = document.querySelectorAll('.colorbutton');
 		colorButtons.forEach(button => {
 			button.innerHTML = 'aA';
 		});		
 		if (color=='white') {
-			//whiteButton.classList.remove('active');
-			//blackButton.classList.add('active');
-			//color='black';
 			document.querySelector('.colorbutton').click();
 		}
 	}
@@ -293,8 +287,6 @@ function startPainter(mac, width, height, tagtype) {
 		showCursor = false;
 		if (apply) drawText(input.value, textX, textY);
 		txtButton.classList.remove('active');
-		//blackButton.innerHTML = '&#65103;&#128396'
-		//redButton.innerHTML = '&#65103;&#128396'
 		const colorButtons = document.querySelectorAll('.colorbutton');
 		colorButtons.forEach(button => {
 			button.innerHTML = '&#65103;&#128396';