diff --git a/package.json b/package.json
index 4ad78d8d..3648efe5 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,6 @@
   "dependencies": {
     "@bufbuild/protobuf": "^2.2.5",
     "@meshtastic/core": "npm:@jsr/meshtastic__core@2.6.2",
-    "@meshtastic/js": "npm:@jsr/meshtastic__js@2.6.0-0",
     "@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http",
     "@meshtastic/transport-web-bluetooth": "npm:@jsr/meshtastic__transport-web-bluetooth",
     "@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial",
diff --git a/src/components/PageComponents/Connect/BLE.tsx b/src/components/PageComponents/Connect/BLE.tsx
index 44aa508b..a3458792 100644
--- a/src/components/PageComponents/Connect/BLE.tsx
+++ b/src/components/PageComponents/Connect/BLE.tsx
@@ -5,9 +5,10 @@ import { useAppStore } from "@core/stores/appStore.ts";
 import { useDeviceStore } from "@core/stores/deviceStore.ts";
 import { subscribeAll } from "@core/subscriptions.ts";
 import { randId } from "@core/utils/randId.ts";
-import { BleConnection, ServiceUuid } from "@meshtastic/js";
+import { TransportWebBluetooth } from "@meshtastic/transport-web-bluetooth";
+import { MeshDevice } from "@meshtastic/core";
 import { useCallback, useEffect, useState } from "react";
-import { useMessageStore } from "../../../core/stores/messageStore/index.ts";
+import { useMessageStore } from "@core/stores/messageStore/index.ts";
 import { useTranslation } from "react-i18next";
 
 export const BLE = (
@@ -30,15 +31,13 @@ export const BLE = (
 
   const onConnect = async (bleDevice: BluetoothDevice) => {
     const id = randId();
+    const transport = await TransportWebBluetooth.createFromDevice(bleDevice);
     const device = addDevice(id);
+    const connection = new MeshDevice(transport, id);
+    connection.configure();
     setSelectedDevice(id);
-    const connection = new BleConnection(id);
-    await connection.connect({
-      device: bleDevice,
-    });
     device.addConnection(connection);
     subscribeAll(device, connection, messageStore);
-
     closeDialog();
   };
 
@@ -71,7 +70,7 @@ export const BLE = (
         onClick={async () => {
           await navigator.bluetooth
             .requestDevice({
-              filters: [{ services: [ServiceUuid] }],
+              filters: [{ services: [TransportWebBluetooth.ServiceUuid] }],
             })
             .then((device) => {
               const exists = bleDevices.findIndex((d) => d.id === device.id);
diff --git a/src/components/PageComponents/Messages/MessageItem.tsx b/src/components/PageComponents/Messages/MessageItem.tsx
index e431522f..b36efe13 100644
--- a/src/components/PageComponents/Messages/MessageItem.tsx
+++ b/src/components/PageComponents/Messages/MessageItem.tsx
@@ -15,7 +15,7 @@ import {
   MessageState,
   useMessageStore,
 } from "@core/stores/messageStore/index.ts";
-import { Protobuf, Types } from "@meshtastic/js";
+import { Protobuf, Types } from "@meshtastic/core";
 import { Message } from "@core/stores/messageStore/types.ts";
 import { useTranslation } from "react-i18next";
 // import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // Uncomment if needed later
diff --git a/src/core/dto/PacketToMessageDTO.ts b/src/core/dto/PacketToMessageDTO.ts
index 6b50ebb4..f6d4c575 100644
--- a/src/core/dto/PacketToMessageDTO.ts
+++ b/src/core/dto/PacketToMessageDTO.ts
@@ -1,10 +1,6 @@
-import type { Types } from "@meshtastic/js";
-import {
-  Message,
-  MessageState,
-  MessageType,
-} from "../stores/messageStore/index.ts";
-
+import type { Types } from "@meshtastic/core";
+import { MessageState, MessageType } from "@core/stores/messageStore/index.ts";
+import { Message } from "@core/stores/messageStore/types.ts";
 class PacketToMessageDTO {
   channel: Types.ChannelNumber;
   to: number;