diff --git a/cw_bitcoin/lib/litecoin_wallet.dart b/cw_bitcoin/lib/litecoin_wallet.dart
index ba172cd70..05e9e70b7 100644
--- a/cw_bitcoin/lib/litecoin_wallet.dart
+++ b/cw_bitcoin/lib/litecoin_wallet.dart
@@ -766,7 +766,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
   }
 
   @override
-  Future<void> close() async {
+  Future<void> close({bool? switchingToSameWalletType}) async {
     await super.close();
     await mwebUtxosBox.close();
     _syncTimer?.cancel();
diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock
index 5290746a2..ddc65c892 100644
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@@ -87,8 +87,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: cake-update-v3
-      resolved-ref: cc99eedb1d28ee9376dda0465ef72aa627ac6149
+      ref: cake-mweb
+      resolved-ref: "52afd84e5f37b89571e5eac4fe0480c36546ff53"
       url: "https://github.com/cake-tech/bitcoin_base"
     source: git
     version: "4.2.1"
@@ -320,18 +320,18 @@ packages:
     dependency: transitive
     description:
       name: ffigen
-      sha256: d3e76c2ad48a4e7f93a29a162006f00eba46ce7c08194a77bb5c5e97d1b5ff0a
+      sha256: "3e12e80ccb6539bb3917217bb6f32709220efb737de0d0fa8736da0b7cb507da"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.2"
+    version: "12.0.0"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
@@ -446,6 +446,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  http2:
+    dependency: transitive
+    description:
+      name: http2
+      sha256: "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -704,13 +712,13 @@ packages:
     source: hosted
     version: "1.5.1"
   protobuf:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: protobuf
-      sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
+      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.1.0"
   provider:
     dependency: transitive
     description:
@@ -824,8 +832,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "sp_v2.0.0"
-      resolved-ref: "62c152b9086cd968019128845371072f7e1168de"
+      ref: "sp_v3.0.0"
+      resolved-ref: eae38b14a44cd00de874ef999de741152bf438b5
       url: "https://github.com/cake-tech/sp_scanner"
     source: git
     version: "0.0.1"
diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml
index 9f07745a5..482dfcab2 100644
--- a/cw_bitcoin/pubspec.yaml
+++ b/cw_bitcoin/pubspec.yaml
@@ -47,7 +47,7 @@ dependencies:
   sp_scanner:
     git:
       url: https://github.com/cake-tech/sp_scanner
-      ref: sp_v2.0.0
+      ref: sp_v3.0.0
 
 
 dev_dependencies:
diff --git a/cw_core/pubspec.lock b/cw_core/pubspec.lock
index 518c71b94..53946925c 100644
--- a/cw_core/pubspec.lock
+++ b/cw_core/pubspec.lock
@@ -205,10 +205,10 @@ packages:
     dependency: "direct main"
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
diff --git a/cw_core/pubspec.yaml b/cw_core/pubspec.yaml
index 0513b122c..b2c16276d 100644
--- a/cw_core/pubspec.yaml
+++ b/cw_core/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   flutter:
     sdk: flutter
   http: ^1.1.0
-  file: ^6.1.4
+  file: ^7.0.0
   path_provider: ^2.0.11
   mobx: ^2.0.7+4
   flutter_mobx: ^2.0.6+1
diff --git a/cw_lightning/pubspec.lock b/cw_lightning/pubspec.lock
index 0ff143119..090a0fc41 100644
--- a/cw_lightning/pubspec.lock
+++ b/cw_lightning/pubspec.lock
@@ -87,8 +87,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: cake-update-v3
-      resolved-ref: cc99eedb1d28ee9376dda0465ef72aa627ac6149
+      ref: cake-mweb
+      resolved-ref: "52afd84e5f37b89571e5eac4fe0480c36546ff53"
       url: "https://github.com/cake-tech/bitcoin_base"
     source: git
     version: "4.2.1"
@@ -293,6 +293,13 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
+  cw_mweb:
+    dependency: transitive
+    description:
+      path: "../cw_mweb"
+      relative: true
+    source: path
+    version: "0.0.1"
   dart_style:
     dependency: transitive
     description:
@@ -337,18 +344,18 @@ packages:
     dependency: transitive
     description:
       name: ffigen
-      sha256: d3e76c2ad48a4e7f93a29a162006f00eba46ce7c08194a77bb5c5e97d1b5ff0a
+      sha256: "3e12e80ccb6539bb3917217bb6f32709220efb737de0d0fa8736da0b7cb507da"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.2"
+    version: "12.0.0"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
@@ -440,10 +447,26 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
+  google_identity_services_web:
+    dependency: transitive
+    description:
+      name: google_identity_services_web
+      sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1+1"
+  googleapis_auth:
+    dependency: transitive
+    description:
+      name: googleapis_auth
+      sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.0"
   graphs:
     dependency: transitive
     description:
@@ -452,6 +475,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
+  grpc:
+    dependency: transitive
+    description:
+      name: grpc
+      sha256: e93ee3bce45c134bf44e9728119102358c7cd69de7832d9a874e2e74eb8cab40
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.4"
   hex:
     dependency: transitive
     description:
@@ -484,6 +515,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  http2:
+    dependency: transitive
+    description:
+      name: http2
+      sha256: "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -657,10 +696,10 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.3"
   path_provider_android:
     dependency: transitive
     description:
@@ -673,10 +712,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -741,14 +780,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.4"
   protobuf:
     dependency: transitive
     description:
@@ -878,8 +909,8 @@ packages:
     dependency: transitive
     description:
       path: "."
-      ref: "sp_v2.0.0"
-      resolved-ref: "62c152b9086cd968019128845371072f7e1168de"
+      ref: "sp_v3.0.0"
+      resolved-ref: eae38b14a44cd00de874ef999de741152bf438b5
       url: "https://github.com/cake-tech/sp_scanner"
     source: git
     version: "0.0.1"
@@ -1003,6 +1034,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.1"
   web_socket_channel:
     dependency: transitive
     description:
@@ -1023,10 +1062,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+3"
+    version: "1.0.4"
   yaml:
     dependency: transitive
     description:
diff --git a/cw_lightning/pubspec.yaml b/cw_lightning/pubspec.yaml
index f7ce3bb73..d943036c6 100644
--- a/cw_lightning/pubspec.yaml
+++ b/cw_lightning/pubspec.yaml
@@ -37,7 +37,7 @@ dependencies:
   bitcoin_base:
     git:
       url: https://github.com/cake-tech/bitcoin_base
-      ref: cake-update-v3
+      ref: cake-mweb
   fluttertoast: 8.1.4
 
 dev_dependencies:
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index fddf6e24f..7ff4f59b9 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -4,10 +4,44 @@ PODS:
     - MTBBarcodeScanner
     - SwiftProtobuf
   - BigInt (5.2.0)
+  - breez_sdk (0.5.0):
+    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
   - CryptoSwift (1.8.2)
+  - cw_haven (0.0.1):
+    - cw_haven/Boost (= 0.0.1)
+    - cw_haven/Haven (= 0.0.1)
+    - cw_haven/OpenSSL (= 0.0.1)
+    - cw_haven/Sodium (= 0.0.1)
+    - cw_shared_external
+    - Flutter
+  - cw_haven/Boost (0.0.1):
+    - cw_shared_external
+    - Flutter
+  - cw_haven/Haven (0.0.1):
+    - cw_shared_external
+    - Flutter
+  - cw_haven/OpenSSL (0.0.1):
+    - cw_shared_external
+    - Flutter
+  - cw_haven/Sodium (0.0.1):
+    - cw_shared_external
+    - Flutter
+  - cw_mweb (0.0.1):
+    - Flutter
+  - cw_shared_external (0.0.1):
+    - cw_shared_external/Boost (= 0.0.1)
+    - cw_shared_external/OpenSSL (= 0.0.1)
+    - cw_shared_external/Sodium (= 0.0.1)
+    - Flutter
+  - cw_shared_external/Boost (0.0.1):
+    - Flutter
+  - cw_shared_external/OpenSSL (0.0.1):
+    - Flutter
+  - cw_shared_external/Sodium (0.0.1):
+    - Flutter
   - device_display_brightness (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
@@ -94,6 +128,8 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - sp_scanner (0.0.1):
+    - Flutter
   - SwiftProtobuf (1.26.0)
   - SwiftyGif (5.4.5)
   - Toast (4.1.1)
@@ -111,8 +147,12 @@ PODS:
 
 DEPENDENCIES:
   - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
+  - breez_sdk (from `.symlinks/plugins/breez_sdk/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - CryptoSwift
+  - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
+  - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
+  - cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
   - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
@@ -132,6 +172,7 @@ DEPENDENCIES:
   - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sp_scanner (from `.symlinks/plugins/sp_scanner/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - UnstoppableDomainsResolution (~> 4.0.0)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@@ -157,8 +198,16 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   barcode_scan2:
     :path: ".symlinks/plugins/barcode_scan2/ios"
+  breez_sdk:
+    :path: ".symlinks/plugins/breez_sdk/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
+  cw_haven:
+    :path: ".symlinks/plugins/cw_haven/ios"
+  cw_mweb:
+    :path: ".symlinks/plugins/cw_mweb/ios"
+  cw_shared_external:
+    :path: ".symlinks/plugins/cw_shared_external/ios"
   device_display_brightness:
     :path: ".symlinks/plugins/device_display_brightness/ios"
   device_info_plus:
@@ -197,6 +246,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sp_scanner:
+    :path: ".symlinks/plugins/sp_scanner/ios"
   uni_links:
     :path: ".symlinks/plugins/uni_links/ios"
   url_launcher_ios:
@@ -209,8 +260,12 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
   BigInt: f668a80089607f521586bbe29513d708491ef2f7
+  breez_sdk: 8570ad35b69b86c74fc0c5a51793c63ba9ae72b4
   connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
   CryptoSwift: c63a805d8bb5e5538e88af4e44bb537776af11ea
+  cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
+  cw_mweb: 87af74f9659fed0c1a2cbfb44413f1070e79e3ae
+  cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
   device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   devicelocale: b22617f40038496deffba44747101255cee005b0
@@ -235,8 +290,9 @@ SPEC CHECKSUMS:
   reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c
   SDWebImage: 066c47b573f408f18caa467d71deace7c0f8280d
   sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sp_scanner: eaa617fa827396b967116b7f1f43549ca62e9a12
   SwiftProtobuf: 5e8349171e7c2f88f5b9e683cb3cb79d1dc780b3
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 18dfee0b0..3d63ab0ea 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -16,7 +16,7 @@ import in_app_review
 import package_info
 import package_info_plus
 import path_provider_foundation
-import share_plus_macos
+import share_plus
 import shared_preferences_foundation
 import url_launcher_macos
 import wakelock_plus
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index 184e65b7d..a80567afd 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -21,7 +21,7 @@ dependencies:
   mobx: ^2.1.4
   flutter_mobx: ^2.0.6+5
   flutter_slidable: ^3.0.1
-  share_plus: ^4.0.10
+  share_plus: ^7.2.2
   # date_range_picker: ^1.0.6
   #https://api.flutter.dev/flutter/material/showDateRangePicker.html
   dio: ^4.0.6
@@ -66,7 +66,7 @@ dependencies:
       url: https://github.com/cake-tech/device_display_brightness.git
       ref: master
   workmanager: ^0.5.1
-  wakelock_plus: ^1.1.3
+  wakelock_plus: 1.1.3
   flutter_mailer: ^2.0.2
   device_info_plus: ^9.1.0
   base32: 2.1.3
diff --git a/scripts/android/build_mwebd.sh b/scripts/android/build_mwebd.sh
index d3a3bf091..bc4f30953 100755
--- a/scripts/android/build_mwebd.sh
+++ b/scripts/android/build_mwebd.sh
@@ -1,9 +1,9 @@
 # install go > 1.21:
-wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
-sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
+#wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
+#sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
 export PATH=$PATH:/usr/local/go/bin
 export PATH=$PATH:~/go/bin
-go install golang.org/x/mobile/cmd/gomobile@latest
+#go install golang.org/x/mobile/cmd/gomobile@latest
 gomobile init
 # build mwebd:
 git clone https://github.com/ltcmweb/mwebd
diff --git a/scripts/ios/build_mwebd.sh b/scripts/ios/build_mwebd.sh
index ae0834e39..ef7ed67c6 100755
--- a/scripts/ios/build_mwebd.sh
+++ b/scripts/ios/build_mwebd.sh
@@ -1,14 +1,14 @@
 # install go > 1.21:
-wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
-sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
+#wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz
+#sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.4.linux-amd64.tar.gz
 export PATH=$PATH:/usr/local/go/bin
 export PATH=$PATH:~/go/bin
-go install golang.org/x/mobile/cmd/gomobile@latest
+#go install golang.org/x/mobile/cmd/gomobile@latest
 gomobile init
 # build mwebd:
 git clone https://github.com/ltcmweb/mwebd
 cd mwebd
-gomobile bind -target=ios ./mwebd
+gomobile bind -target=ios .
 mkdir -p ../../../cw_mweb/android/libs/
 mv ./Mwebd.xcframework ../../../ios/
 # cleanup: