diff --git a/core b/core
index 25e82e98c..3b846e840 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 25e82e98c8d0fd1dba38baf77d686c56bf037019
+Subproject commit 3b846e840ea87cc70a76062b51324dd3e7441e6b
diff --git a/index.html b/index.html
index 608c90f91..aa92e55ab 100644
--- a/index.html
+++ b/index.html
@@ -209,11 +209,15 @@
       </div>
     </footer>
 
-    <script src="webtools/puck.js"></script>
+    <script src="webtools/uart.js"></script>
+    <script src="core/js/utils.js"></script>
+    <script>
+      UART.ports = UART.ports.filter(e => e.includes("Bluetooth")); // all watches are Bluetooth
+      Const.CONNECTION_DEVICE = "Bluetooth";
+    </script>
     <script src="webtools/heatshrink.js"></script>
     <script src="core/lib/marked.min.js"></script>
     <script src="core/lib/espruinotools.js"></script>
-    <script src="core/js/utils.js"></script>
     <script src="loader.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script> <!-- for backup.js -->
     <script src="backup.js"></script>
diff --git a/loader.js b/loader.js
index 578b4e1c4..9aca4e3e9 100644
--- a/loader.js
+++ b/loader.js
@@ -267,12 +267,16 @@ window.addEventListener('load', (event) => {
   // BLE Compatibility
   var selectBLECompat = document.getElementById("settings-ble-compat");
   if (selectBLECompat) {
-    Puck.increaseMTU = !SETTINGS.bleCompat;
+    function setBLECompat(compat) {
+      if ("undefined"!==typeof Puck) Puck.increaseMTU = !compat;
+      if ("undefined"!==typeof UART) UART.increaseMTU = !compat;
+    }
+    setBLECompat(SETTINGS.bleCompat);
     selectBLECompat.checked = !!SETTINGS.bleCompat;
     selectBLECompat.addEventListener("change",event=>{
       console.log("BLE compatibility mode "+(event.target.checked?"on":"off"));
       SETTINGS.bleCompat = event.target.checked;
-      Puck.increaseMTU = !SETTINGS.bleCompat;
+      setBLECompat(SETTINGS.bleCompat);
       saveSettings();
     });
   }
diff --git a/webtools b/webtools
index 20fc8008d..83fd9f65a 160000
--- a/webtools
+++ b/webtools
@@ -1 +1 @@
-Subproject commit 20fc8008dee232bcdcd3629ca5ffdef8401f7a8e
+Subproject commit 83fd9f65a378d0b4816552a5d84d2e1e8e71f538