diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 272f7bbee..18ad16e4b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -11,4 +11,3 @@ Please include a summary of the changes and which issue is fixed / feature is ad
 - [ ] Format code
 - [ ] Look for code duplication
 - [ ] Clear naming for variables and methods
-- [ ] Manual tests in accessibility mode (TalkBack on Android) passed 
diff --git a/.github/workflows/automated_integration_test.yml b/.github/workflows/automated_integration_test.yml
index 47b08c44d..1ed5baf9f 100644
--- a/.github/workflows/automated_integration_test.yml
+++ b/.github/workflows/automated_integration_test.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
  Automated_integration_test:
-   runs-on: ubuntu-24.04
+   runs-on: ubuntu-20.04
    strategy:
      fail-fast: false
      matrix:
@@ -55,7 +55,7 @@ jobs:
      - name: Flutter action
        uses: subosito/flutter-action@v1
        with:
-         flutter-version: "3.27.0"
+         flutter-version: "3.27.4"
          channel: stable
 
      - name: Install package dependencies
@@ -153,8 +153,8 @@ jobs:
          echo "const shortKey = '${{ secrets.SHORT_KEY }}';" >> lib/.secrets.g.dart
          echo "const backupSalt = '${{ secrets.BACKUP_SALT }}';" >> lib/.secrets.g.dart
          echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
-         echo "const changeNowCakeWalletApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
-         echo "const changeNowMoneroApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+         echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+         echo "const changeNowApiKeyDesktop = '${{ secrets.CHANGE_NOW_API_KEY_DESKTOP }}';" >> lib/.secrets.g.dart
          echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
          echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
          echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
@@ -168,7 +168,6 @@ jobs:
          echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
          echo "const twitterBearerToken = '${{ secrets.TWITTER_BEARER_TOKEN }}';" >> lib/.secrets.g.dart
          echo "const trocadorApiKey = '${{ secrets.TROCADOR_API_KEY }}';" >> lib/.secrets.g.dart
-         echo "const trocadorMoneroApiKey = '${{ secrets.TROCADOR_API_KEY }}';" >> lib/.secrets.g.dart
          echo "const trocadorExchangeMarkup = '${{ secrets.TROCADOR_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart
          echo "const anonPayReferralCode = '${{ secrets.ANON_PAY_REFERRAL_CODE }}';" >> lib/.secrets.g.dart
          echo "const fiatApiKey = '${{ secrets.FIAT_API_KEY }}';" >> lib/.secrets.g.dart
@@ -179,8 +178,7 @@ jobs:
          echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
          echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
          echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
-         echo "const exolixCakeWalletApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
-         echo "const exolixMoneroApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
+         echo "const exolixApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
          echo "const robinhoodApplicationId = '${{ secrets.ROBINHOOD_APPLICATION_ID }}';" >> lib/.secrets.g.dart
          echo "const exchangeHelperApiKey = '${{ secrets.ROBINHOOD_CID_CLIENT_SECRET }}';" >> lib/.secrets.g.dart
          echo "const walletConnectProjectId = '${{ secrets.WALLET_CONNECT_PROJECT_ID }}';" >> lib/.secrets.g.dart
diff --git a/.github/workflows/no_http_imports.yaml b/.github/workflows/no_http_imports.yaml
deleted file mode 100644
index dad6821ac..000000000
--- a/.github/workflows/no_http_imports.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: No http imports
-
-on: [pull_request]
-
-jobs:
-  PR_test_build:
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Check for http package usage
-        if: github.event_name == 'pull_request'
-        run: |
-          GIT_GREP_OUT="$(git grep package:http | (grep .dart: || test $? = 1) | (grep -v proxy_wrapper.dart || test $? = 1) | (grep -v very_insecure_http_do_not_use || test $? = 1) || true)"
-          [[ "x$GIT_GREP_OUT" == "x" ]] && exit 0
-          echo "$GIT_GREP_OUT"
-          echo "There are .dart files which use http imports"
-          echo "Using http package breaks proxy integration"
-          echo "Please use ProxyWrapper.getHttpClient() from package:cw_core/utils/proxy_wrapper.dart"
-          exit 1
-          
\ No newline at end of file
diff --git a/.github/workflows/no_print_in_dart.yaml b/.github/workflows/no_print_in_dart.yaml
index 507793bd8..b321a9cc9 100644
--- a/.github/workflows/no_print_in_dart.yaml
+++ b/.github/workflows/no_print_in_dart.yaml
@@ -4,16 +4,16 @@ on: [pull_request]
 
 jobs:
   PR_test_build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v4
       - name: Check for print() statements in dart code (use printV() instead)
         if: github.event_name == 'pull_request'
         run: |
-          GIT_GREP_OUT="$(git grep ' print(' | (grep .dart: || test $? = 1) | (grep -v print_verbose.dart || test $? = 1) | (grep -v print_verbose_dummy.dart || test $? = 1) || true)"
+          GIT_GREP_OUT="$(git grep ' print(' | (grep .dart: || test $? = 1) | (grep -v print_verbose.dart || test $? = 1) || true)"
           [[ "x$GIT_GREP_OUT" == "x" ]] && exit 0
           echo "$GIT_GREP_OUT"
           echo "There are .dart files which use print() statements"
-          echo "Please use printV from package:cw_core/utils/print_verbose.dart"
+          echo "Please use printV from package: cw_core/utils/print_verbose.dart"
           exit 1
diff --git a/.github/workflows/no_restricted_imports.yaml b/.github/workflows/no_restricted_imports.yaml
index 03c3de018..4b17de31a 100644
--- a/.github/workflows/no_restricted_imports.yaml
+++ b/.github/workflows/no_restricted_imports.yaml
@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   check_restricted_imports:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml
index f7c226ce4..6c72b587d 100644
--- a/.github/workflows/pr_test_build_android.yml
+++ b/.github/workflows/pr_test_build_android.yml
@@ -9,7 +9,7 @@ jobs:
   PR_test_build:
     runs-on: linux-amd64
     container:
-      image: ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly
+      image: ghcr.io/cake-tech/cake_wallet:3.27.4-linux
       env:
         STORE_PASS: test@cake_wallet
         KEY_PASS: test@cake_wallet
@@ -98,8 +98,8 @@ jobs:
           else
             echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
           fi
-          echo "const changeNowCakeWalletApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
-          echo "const changeNowMoneroApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const changeNowApiKeyDesktop = '${{ secrets.CHANGE_NOW_API_KEY_DESKTOP }}';" >> lib/.secrets.g.dart
           echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
           echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
@@ -113,7 +113,6 @@ jobs:
           echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
           echo "const twitterBearerToken = '${{ secrets.TWITTER_BEARER_TOKEN }}';" >> lib/.secrets.g.dart
           echo "const trocadorApiKey = '${{ secrets.TROCADOR_API_KEY }}';" >> lib/.secrets.g.dart
-          echo "const trocadorMoneroApiKey = '${{ secrets.TROCADOR_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const trocadorExchangeMarkup = '${{ secrets.TROCADOR_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart
           echo "const anonPayReferralCode = '${{ secrets.ANON_PAY_REFERRAL_CODE }}';" >> lib/.secrets.g.dart
           echo "const fiatApiKey = '${{ secrets.FIAT_API_KEY }}';" >> lib/.secrets.g.dart
@@ -125,8 +124,7 @@ jobs:
           echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
           echo "const nowNodesApiKey = '${{ secrets.EVM_NOWNODES_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
           echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
-          echo "const exolixCakeWalletApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
-          echo "const exolixMoneroApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const exolixApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const robinhoodApplicationId = '${{ secrets.ROBINHOOD_APPLICATION_ID }}';" >> lib/.secrets.g.dart
           echo "const exchangeHelperApiKey = '${{ secrets.ROBINHOOD_CID_CLIENT_SECRET }}';" >> lib/.secrets.g.dart
           echo "const walletConnectProjectId = '${{ secrets.WALLET_CONNECT_PROJECT_ID }}';" >> lib/.secrets.g.dart
@@ -255,11 +253,6 @@ jobs:
 
       - name: Build generated code
         run: |
-          flutter --version
-          flutter clean
-          rm -rf .dart_tool
-          rm pubspec.lock
-          flutter pub get
           ./model_generator.sh async
 
       - name: Generate key properties
@@ -281,7 +274,7 @@ jobs:
 
       - name: Build
         run: |
-          flutter build apk --dart-define=hasDevOptions=true --release --split-per-abi
+          flutter build apk --release --split-per-abi
 
       - name: Rename apk file
         run: |
diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml
index f057b19e5..9317aab34 100644
--- a/.github/workflows/pr_test_build_linux.yml
+++ b/.github/workflows/pr_test_build_linux.yml
@@ -9,7 +9,7 @@ jobs:
   PR_test_build:
     runs-on: linux-amd64
     container:
-      image: ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly
+      image: ghcr.io/cake-tech/cake_wallet:3.27.4-linux
       env:
         STORE_PASS: test@cake_wallet
         KEY_PASS: test@cake_wallet
@@ -22,6 +22,9 @@ jobs:
         - /opt/cw_cache_linux/root/.pub-cache/:/root/.pub-cache
         - /opt/cw_cache_linux/root/go/pkg:/root/go/pkg
         - /opt/cw_cache_linux/opt/generic_cache:/opt/generic_cache
+    strategy:
+      matrix:
+        api-level: [29]
 
     steps:
       - name: Fix github actions messing up $HOME...
@@ -91,8 +94,8 @@ jobs:
           else
             echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
           fi
-          echo "const changeNowCakeWalletApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
-          echo "const changeNowMoneroApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const changeNowApiKeyDesktop = '${{ secrets.CHANGE_NOW_API_KEY_DESKTOP }}';" >> lib/.secrets.g.dart
           echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
           echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
@@ -106,7 +109,6 @@ jobs:
           echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
           echo "const twitterBearerToken = '${{ secrets.TWITTER_BEARER_TOKEN }}';" >> lib/.secrets.g.dart
           echo "const trocadorApiKey = '${{ secrets.TROCADOR_API_KEY }}';" >> lib/.secrets.g.dart
-          echo "const trocadorMoneroApiKey = '${{ secrets.TROCADOR_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const trocadorExchangeMarkup = '${{ secrets.TROCADOR_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart
           echo "const anonPayReferralCode = '${{ secrets.ANON_PAY_REFERRAL_CODE }}';" >> lib/.secrets.g.dart
           echo "const fiatApiKey = '${{ secrets.FIAT_API_KEY }}';" >> lib/.secrets.g.dart
@@ -118,8 +120,7 @@ jobs:
           echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
           echo "const nowNodesApiKey = '${{ secrets.EVM_NOWNODES_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
           echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
-          echo "const exolixCakeWalletApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
-          echo "const exolixMoneroApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const exolixApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const robinhoodApplicationId = '${{ secrets.ROBINHOOD_APPLICATION_ID }}';" >> lib/.secrets.g.dart
           echo "const exchangeHelperApiKey = '${{ secrets.ROBINHOOD_CID_CLIENT_SECRET }}';" >> lib/.secrets.g.dart
           echo "const walletConnectProjectId = '${{ secrets.WALLET_CONNECT_PROJECT_ID }}';" >> lib/.secrets.g.dart
@@ -227,7 +228,7 @@ jobs:
 
       - name: Build linux
         run: |
-          flutter build linux --dart-define=hasDevOptions=true --release
+          flutter build linux --release
 
       - name: Compress release
         run: |
@@ -285,9 +286,6 @@ jobs:
           xmessage -timeout 30 "restore_wallet_through_seeds_flow_test" &
           rm -rf ~/.local/share/com.example.cake_wallet/ ~/Documents/cake_wallet/ ~/cake_wallet
           exec timeout --signal=SIGKILL 900 flutter drive --driver=test_driver/integration_test.dart --target=integration_test/test_suites/restore_wallet_through_seeds_flow_test.dart
-      - name: Test [cw_monero]
-        timeout-minutes: 2
-        run: cd cw_monero && flutter test
       - name: Stop screen recording, encrypt and upload
         if: always()
         run: |
diff --git a/.gitignore b/.gitignore
index 84a7ecdcd..e78b1c4e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,28 +141,9 @@ lib/wownero/wownero.dart
 lib/zano/zano.dart
 lib/decred/decred.dart
 
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png
-ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png
-
+ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_180.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_120.png
+ios/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
 ios/Runner/Info.plist
 android/app/src/main/res/mipmap-*
 android/app/src/main/res/drawable/ic_launcher.png
@@ -204,26 +185,3 @@ ios/MoneroWallet.framework/MoneroWallet
 ios/WowneroWallet.framework/WowneroWallet
 ios/ZanoWallet.framework/ZanoWallet
 *_libwallet2_api_c.dylib
-
-.flatpak-builder
-cake_wallet.flatpak
-flatpak-build/
-
-# macOS
-**/Flutter/ephemeral/
-**/Pods/
-**/macos/Flutter/GeneratedPluginRegistrant.swift
-**/macos/Flutter/ephemeral
-**/xcuserdata/
-
-# Windows
-**/windows/flutter/ephemeral/
-**/windows/flutter/generated_plugin_registrant.cc
-**/windows/flutter/generated_plugin_registrant.h
-**/windows/flutter/generated_plugins.cmake
-
-# Linux
-**/linux/flutter/ephemeral/
-**/linux/flutter/generated_plugin_registrant.cc
-**/linux/flutter/generated_plugin_registrant.h
-**/linux/flutter/generated_plugins.cmake
diff --git a/Dockerfile b/Dockerfile
index 151b7af20..d9c99da0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-# docker buildx build --push --pull --platform linux/amd64,linux/arm64 . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly
+# docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:3.27.4-linux
+# docker push ghcr.io/cake-tech/cake_wallet:3.27.4-linux
 
 # Heavily inspired by cirrusci images
 # https://github.com/cirruslabs/docker-images-android/blob/master/sdk/tools/Dockerfile
@@ -6,20 +7,20 @@
 # https://github.com/cirruslabs/docker-images-android/blob/master/sdk/34-ndk/Dockerfile
 # https://github.com/cirruslabs/docker-images-flutter/blob/master/sdk/Dockerfile
 
-FROM docker.io/debian:12
+FROM --platform=linux/amd64 docker.io/debian:12
 
 LABEL org.opencontainers.image.source=https://github.com/cake-tech/cake_wallet
 
 # Set necessary environment variables
 # Set Go version to latest known-working version
-ENV GOLANG_VERSION=1.24.1
+ENV GOLANG_VERSION=1.23.4
 
 # Pin Flutter version to latest known-working version
-ENV FLUTTER_VERSION=3.27.0
+ENV FLUTTER_VERSION=3.27.4
 
 # Pin Android Studio, platform, and build tools versions to latest known-working version
 # Comes from https://developer.android.com/studio/#command-tools
-ENV ANDROID_SDK_TOOLS_VERSION=13114758
+ENV ANDROID_SDK_TOOLS_VERSION=11076708
 # Comes from https://developer.android.com/studio/releases/build-tools
 ENV ANDROID_PLATFORM_VERSION=35
 ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0
@@ -59,20 +60,11 @@ RUN set -o xtrace \
     ffmpeg network-manager x11-utils xvfb psmisc \
     # aarch64-linux-gnu dependencies
     g++-aarch64-linux-gnu gcc-aarch64-linux-gnu \
-    # x86_64-linux-gnu dependencies
-    g++-x86-64-linux-gnu gcc-x86-64-linux-gnu \
-    # flatpak dependencies
-    flatpak flatpak-builder binutils elfutils patch unzip xz-utils zstd \
     && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     && sh -c 'echo "en_US.UTF-8 UTF-8" > /etc/locale.gen' \
     && locale-gen \
     && update-locale LANG=en_US.UTF-8
 
-ENV FLATPAK_RUNTIME_VERSION=24.08
-RUN flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \
-    && flatpak install -y flathub org.freedesktop.Platform//${FLATPAK_RUNTIME_VERSION} \
-    && flatpak install -y flathub org.freedesktop.Sdk//${FLATPAK_RUNTIME_VERSION}
-
 # Install nodejs for Github Actions
 RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash - && \
     apt-get install -y --no-install-recommends nodejs && \
@@ -82,28 +74,14 @@ RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash - && \
 ENV PATH=${PATH}:/usr/local/go/bin:${HOME}/go/bin
 ENV GOROOT=/usr/local/go
 ENV GOPATH=${HOME}/go
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" = "x86_64" ]; then \
-      wget https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz -O go.tar.gz; \
-    elif [ "$ARCH" = "aarch64" ]; then \
-      wget https://go.dev/dl/go${GOLANG_VERSION}.linux-arm64.tar.gz -O go.tar.gz; \
-    else \
-      echo "Unsupported architecture: $ARCH"; exit 1; \
-    fi && \
-    rm -rf /usr/local/go && \
-    tar -C /usr/local -xzf go.tar.gz && \
-    rm go.tar.gz && \
+RUN wget https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz &&\
+    rm -rf /usr/local/go &&\
+    tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz && \
     go install golang.org/x/mobile/cmd/gomobile@latest && \
     gomobile init
 
-RUN git config --global user.email "czarek@cakewallet.com" \
-    && git config --global user.name "CakeWallet CI"
-
-
 # Install Android SDK commandline tools and emulator
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" != "x86_64" ]; then exit 0; fi \
-    && wget -q https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip -O android-sdk-tools.zip \
+RUN wget -q https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip -O android-sdk-tools.zip \
     && mkdir -p ${ANDROID_HOME}/cmdline-tools/ \
     && unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}/cmdline-tools/ \
     && mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
@@ -116,17 +94,14 @@ RUN ARCH=$(uname -m) && \
     && sdkmanager platform-tools \
     && mkdir -p ${HOME}/.android \
     && touch ${HOME}/.android/repositories.cfg \
-
+    && git config --global user.email "czarek@cakewallet.com" \
+    && git config --global user.name "CakeWallet CI"
 
 # Handle emulator not being available on linux/arm64 (https://issuetracker.google.com/issues/227219818)
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" != "x86_64" ]; then exit 0; fi \
-    && sdkmanager emulator
+RUN if [ $(uname -m) == "x86_64" ]; then sdkmanager emulator ; fi
 
 # Pre-install extra Android SDK dependencies in order to not have to download them for each build
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" != "x86_64" ]; then exit 0; fi \
-    && yes | sdkmanager \
+RUN yes | sdkmanager \
     "platforms;android-$ANDROID_PLATFORM_VERSION" \
     "build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
     "platforms;android-33" \
@@ -139,16 +114,12 @@ RUN ARCH=$(uname -m) && \
 
 # Install extra NDK dependency for sp_scanner
 ENV ANDROID_NDK_VERSION=27.2.12479018
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" != "x86_64" ]; then exit 0; fi \
-    && yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
+RUN yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
     "ndk;27.0.12077973"
 
 # Install dependencies for tests
 # Comes from https://github.com/ReactiveCircus/android-emulator-runner
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" != "x86_64" ]; then exit 0; fi \
-    && yes | sdkmanager \
+RUN yes | sdkmanager \
     "system-images;android-29;default;x86_64" \
     "system-images;android-31;default;x86_64" \
     "platforms;android-29" \
@@ -164,12 +135,9 @@ RUN (addgroup kvm || true) && \
 ENV PATH=${HOME}/.cargo/bin:${PATH}
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
     cargo install cargo-ndk && \
-    for toolchain in stable nightly; \
+    for target in aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android x86_64-unknown-linux-gnu; \
     do \
-    for target in aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu; \
-    do \
-        rustup target add --toolchain $toolchain $target; \
-    done \
+        rustup target add --toolchain stable $target; \
     done
 
 # Download and install Flutter
@@ -178,11 +146,8 @@ ENV FLUTTER_HOME=${HOME}/sdks/flutter/${FLUTTER_VERSION}
 ENV FLUTTER_ROOT=$FLUTTER_HOME
 ENV PATH=${PATH}:${FLUTTER_HOME}/bin:${FLUTTER_HOME}/bin/cache/dart-sdk/bin
 
-RUN git clone --branch ${FLUTTER_VERSION} https://github.com/flutter/flutter.git ${FLUTTER_HOME} && \
-    cd ${FLUTTER_HOME} && \
-    git fetch -a
-
-RUN yes | flutter doctor --android-licenses \
+RUN git clone --depth 1 --branch ${FLUTTER_VERSION} https://github.com/flutter/flutter.git ${FLUTTER_HOME} \
+    && yes | flutter doctor --android-licenses \
     && flutter doctor \
     && chown -R root:root ${FLUTTER_HOME}
 
diff --git a/README.md b/README.md
index ea796dbf2..ea8f34624 100644
--- a/README.md
+++ b/README.md
@@ -26,13 +26,10 @@ Cake Wallet includes support for several cryptocurrencies, including:
 * Ethereum (ETH)
 * Litecoin (LTC)
 * Bitcoin Cash (BCH)
-* Polygon (POL)
+* Polygon (Pol)
 * Solana (SOL)
-* Tron (TRX)
 * Nano (XNO)
-* Zano (ZANO)
-* Decred (DCR)
-* Wownero (WOW)
+* Haven (XHV)
 
 ## Features
 
@@ -84,6 +81,10 @@ Cake Wallet includes support for several cryptocurrencies, including:
 * Automatically generate new addresses
 * Specify multiple recipients for batch sending
 
+### Haven Specific Features
+
+* Send, receive, and store XHV and all xAssets like xUSD, xEUR, xAG, etc.
+
 # Monero.com by Cake Wallet for Android and iOS
 
 ## Open Source Monero-Only Wallet
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4a8045bb3..c45ed9368 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -42,14 +42,6 @@ android {
         disable 'InvalidPackage'
     }
 
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-
     namespace "com.cakewallet.cake_wallet"
 
     defaultConfig {
@@ -81,6 +73,10 @@ android {
    buildTypes {
        release {
             signingConfig signingConfigs.release
+
+            shrinkResources false
+            minifyEnabled false
+
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
        debug {
@@ -99,7 +95,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 }
 configurations {
     implementation.exclude module:'proto-google-common-protos'
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index a733bae9e..d24d7f10a 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -5,98 +5,4 @@
 -keep class io.flutter.view.**  { *; }
 -keep class io.flutter.**  { *; }
 -keep class io.flutter.plugins.**  { *; }
--dontwarn io.flutter.embedding.**
--dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
-
-# start reown
--dontwarn com.github.luben.zstd.BufferPool
--dontwarn com.github.luben.zstd.ZstdInputStream
--dontwarn com.github.luben.zstd.ZstdOutputStream
--dontwarn com.google.api.client.http.GenericUrl
--dontwarn com.google.api.client.http.HttpHeaders
--dontwarn com.google.api.client.http.HttpRequest
--dontwarn com.google.api.client.http.HttpRequestFactory
--dontwarn com.google.api.client.http.HttpResponse
--dontwarn com.google.api.client.http.HttpTransport
--dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
--dontwarn com.google.api.client.http.javanet.NetHttpTransport
--dontwarn java.awt.Color
--dontwarn java.awt.Dimension
--dontwarn java.awt.Graphics2D
--dontwarn java.awt.Graphics
--dontwarn java.awt.Image
--dontwarn java.awt.Point
--dontwarn java.awt.Polygon
--dontwarn java.awt.Shape
--dontwarn java.awt.color.ColorSpace
--dontwarn java.awt.geom.AffineTransform
--dontwarn java.awt.image.BufferedImage
--dontwarn java.awt.image.ColorModel
--dontwarn java.awt.image.ComponentColorModel
--dontwarn java.awt.image.ComponentSampleModel
--dontwarn java.awt.image.DataBuffer
--dontwarn java.awt.image.DataBufferByte
--dontwarn java.awt.image.DataBufferInt
--dontwarn java.awt.image.DataBufferUShort
--dontwarn java.awt.image.ImageObserver
--dontwarn java.awt.image.MultiPixelPackedSampleModel
--dontwarn java.awt.image.Raster
--dontwarn java.awt.image.RenderedImage
--dontwarn java.awt.image.SampleModel
--dontwarn java.awt.image.SinglePixelPackedSampleModel
--dontwarn java.awt.image.WritableRaster
--dontwarn java.beans.BeanInfo
--dontwarn java.beans.FeatureDescriptor
--dontwarn java.beans.IntrospectionException
--dontwarn java.beans.Introspector
--dontwarn java.beans.PropertyDescriptor
--dontwarn java.lang.reflect.InaccessibleObjectException
--dontwarn javax.imageio.IIOImage
--dontwarn javax.imageio.ImageIO
--dontwarn javax.imageio.ImageWriteParam
--dontwarn javax.imageio.ImageWriter
--dontwarn javax.imageio.metadata.IIOMetadata
--dontwarn javax.imageio.stream.ImageOutputStream
--dontwarn javax.swing.JComponent
--dontwarn javax.swing.JFileChooser
--dontwarn javax.swing.JFrame
--dontwarn javax.swing.JPanel
--dontwarn javax.swing.ProgressMonitor
--dontwarn javax.swing.SwingUtilities
--dontwarn org.brotli.dec.BrotliInputStream
--dontwarn org.joda.time.Instant
--dontwarn org.objectweb.asm.AnnotationVisitor
--dontwarn org.objectweb.asm.Attribute
--dontwarn org.objectweb.asm.ClassReader
--dontwarn org.objectweb.asm.ClassVisitor
--dontwarn org.objectweb.asm.FieldVisitor
--dontwarn org.objectweb.asm.Label
--dontwarn org.objectweb.asm.MethodVisitor
--dontwarn org.objectweb.asm.Type
--dontwarn org.tukaani.xz.ARMOptions
--dontwarn org.tukaani.xz.ARMThumbOptions
--dontwarn org.tukaani.xz.DeltaOptions
--dontwarn org.tukaani.xz.FilterOptions
--dontwarn org.tukaani.xz.FinishableOutputStream
--dontwarn org.tukaani.xz.FinishableWrapperOutputStream
--dontwarn org.tukaani.xz.IA64Options
--dontwarn org.tukaani.xz.LZMA2InputStream
--dontwarn org.tukaani.xz.LZMA2Options
--dontwarn org.tukaani.xz.LZMAInputStream
--dontwarn org.tukaani.xz.LZMAOutputStream
--dontwarn org.tukaani.xz.MemoryLimitException
--dontwarn org.tukaani.xz.PowerPCOptions
--dontwarn org.tukaani.xz.SPARCOptions
--dontwarn org.tukaani.xz.SingleXZInputStream
--dontwarn org.tukaani.xz.UnsupportedOptionsException
--dontwarn org.tukaani.xz.X86Options
--dontwarn org.tukaani.xz.XZ
--dontwarn org.tukaani.xz.XZInputStream
--dontwarn org.tukaani.xz.XZOutputStream
--dontwarn us.hebi.matlab.mat.ejml.Mat5Ejml
--dontwarn us.hebi.matlab.mat.format.Mat5
--dontwarn us.hebi.matlab.mat.format.Mat5File
--dontwarn us.hebi.matlab.mat.types.Array
--dontwarn us.hebi.matlab.mat.types.MatFile$Entry
--dontwarn us.hebi.matlab.mat.types.MatFile
-# end reown
\ No newline at end of file
+-dontwarn io.flutter.embedding.**
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifestBase.xml b/android/app/src/main/AndroidManifestBase.xml
index 8283a7c8c..9a324edf3 100644
--- a/android/app/src/main/AndroidManifestBase.xml
+++ b/android/app/src/main/AndroidManifestBase.xml
@@ -24,10 +24,6 @@
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
 
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <application
         android:name=".Application"
@@ -39,10 +35,6 @@
         android:versionName="__versionName__"
         android:requestLegacyExternalStorage="true"
         android:extractNativeLibs="true">
-        <service 
-            android:name="androidx.work.impl.foreground.SystemForegroundService"
-            android:foregroundServiceType="dataSync"
-            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:launchMode="singleInstance"
@@ -111,15 +103,10 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="nano-gpt" />
             </intent-filter>
-
-            <meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
         </activity>
         <meta-data
                 android:name="flutterEmbedding"
                 android:value="2" />
-        <meta-data
-            android:name="io.flutter.embedding.android.EnableImpeller"
-            android:value="false" />
         <provider
             android:name="com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFileProvider"
             android:authorities="${applicationId}.flutter_inappwebview_android.fileprovider"
diff --git a/android/build.gradle b/android/build.gradle
index d42aa24b4..bc157bd1a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,7 +2,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/assets/faq/faq_pl.json b/assets/faq/faq_pl.json
index b41841cd8..a38d79068 100644
--- a/assets/faq/faq_pl.json
+++ b/assets/faq/faq_pl.json
@@ -13,7 +13,7 @@
   },
   {
     "question" : "Co oznaczają słowa „seed” i „keys”?",
-    "answer" : "Twoje klucze i fraza seed zawierają prywatne informacje o twoim portfelu i pozwalają wysyłać kryptowalutę oraz zobaczyć przychodzące transakcje.\nFraza „seed” to wersja twojego klucza prywatnego napisana w sposób, który łatwiej Ci zapisać. Wasze frazy seed i klucze są w rzeczywistości takie same, tylko w różnych formach zapisu!\nNigdy nie dawaj nikomu swojej frazy seed ani swoich kluczy. Twoje fundusze zostaną skradzione, jeśli upublicznisz frazę seed lub klucze. Zapisz jednak swoją frazę seed i przechowuj ją w bezpiecznym miejscu (pozwoli to przywrócić portfel, jeśli zgubisz telefon).\n"
+    "answer" : "Twoje klucze kodują prywatne informacje w twoim portfelu i pozwalają wydać monety i zobaczyć przychodzące transakcje.\nTwoje ziarno to tylko wersja twojego klucza prywatnego napisana w sposób, który łatwiej Ci zapisać. Wasze nasiona i klucze są w rzeczywistości takie same, tylko w różnych formach!\nNigdy nie dawaj nikomu swojego ziarna ani kluczy. Twoje fundusze zostaną skradzione, jeśli wydasz swoje nasiona lub klucze. Zapisz jednak swoje ziarno i przechowuj je w bezpiecznym miejscu (pozwoli to przywrócić portfel, jeśli zgubisz telefon).\n"
   },
   {
     "question" : "Ile portfeli mogę utworzyć?",
@@ -24,11 +24,11 @@
     "answer" : "Stuknij menu •••, wybierz „Portfele”, a następnie „Przywróć portfel”. Następnie wprowadź dane początkowe (lub klucze) i opcjonalnie wprowadź datę przed pierwszą transakcją w portfelu (przyspieszy to proces synchronizacji .) Może być konieczne pozostawienie aplikacji otwartej przez 15-30 minut, aby całkowicie przywrócić portfel.\n"
   },
   {
-    "question" : "Co mogę zrobić, jeśli zapomniałem frazę seed?",
-    "answer" : "Jeśli zapomniałeś swoją frazę seed, prawdopodobnie gdzieś je zapisałeś. Sprawdź swoje notatki i rozejrzyj się po komputerze. Jeśli nie możesz go nigdzie znaleźć, być może utworzono kopię zapasową Cake Wallet (w takim przypadku będziesz mógł przywrócić dane z tej kopii zapasowej). Jeśli żadna z tych czynności nie działa, niestety nic nie możemy zrobić.\n"
+    "question" : "Co mogę zrobić, jeśli stracę nasiona?",
+    "answer" : "Jeśli zapomniałeś o nasieniu, prawdopodobnie gdzieś je zapisałeś. Sprawdź swoje notatki i rozejrzyj się po komputerze. Jeśli nie możesz go nigdzie znaleźć, być może utworzono kopię zapasową Cake Wallet (w takim przypadku będziesz mógł przywrócić dane z tej kopii zapasowej). Jeśli żadna z tych czynności nie działa, niestety nic nie możemy zrobić.\n"
   },
   {
-    "question" : "Czy zbieracie jakieś informacje o moim portfelu?",
+    "question" : "Czy zbierasz jakieś informacje o moim portfelu?",
     "answer" : "Portfel Cake NIE gromadzi ani nie rejestruje żadnych informacji o Twoim portfelu. Dbamy o Twoją prywatność.\n"
   },
   {
@@ -37,7 +37,7 @@
   },
   {
     "question" : "Co to są „podadresy” i jak z nich korzystać?",
-    "answer" : "Podadres jest w unikalnym adresem, który można wygenerować w dowolnym momencie. Monety wysłane do niego nadal będą pojawiać się w głównym portfelu, ale osoba wysyłająca monety nie zna Twojego głównego adresu. Podadresy zawsze zaczynają się od „8”.\nMożesz utworzyć nowy podadres na ekranie Odbieranie, dotykając „+” obok przycisku Podadresy. Wprowadź nazwę podadresu i dotknij „Dodaj”. Następnie dotknij nazwy podadresu, gdy chcesz go użyć!\nJeśli jesteś paranoikiem, prawdopodobnie za każdym razem, gdy otrzymasz Monero, powinieneś utworzyć nowy podadres.\n"
+    "answer" : "Podadres jest w zasadzie unikalnym adresem, który można wygenerować w dowolnym momencie. Monety wysłane do niego nadal będą pojawiać się w głównym portfelu, ale osoba wysyłająca monety nie może podać Twojego głównego adresu. Podadresy zawsze zaczynają się od „8”.\nMożesz utworzyć nowy podadres na ekranie Odbieranie, dotykając „+” obok przycisku Podadresy. Wprowadź nazwę podadresu i dotknij „Dodaj”. Następnie dotknij nazwy podadresu, gdy chcesz go użyć!\nJeśli jesteś paranoikiem, prawdopodobnie za każdym razem, gdy otrzymasz Monero, powinieneś utworzyć nowy podadres.\n"
   },
   {
     "question" : "Co to jest ID transakcji?",
diff --git a/assets/images/2fa.png b/assets/images/2fa.png
deleted file mode 100644
index 36c99beab..000000000
Binary files a/assets/images/2fa.png and /dev/null differ
diff --git a/assets/images/2fa_warning_dark.svg b/assets/images/2fa_warning_dark.svg
deleted file mode 100644
index c9fcad341..000000000
--- a/assets/images/2fa_warning_dark.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<svg width="260" height="298" viewBox="0 0 260 298" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M119.655 6.27832C126.055 3.53578 133.272 3.45033 139.723 6.02148L140.345 6.27832L243.044 50.293C252.699 54.431 258.96 63.925 258.96 74.4297V128.542C258.96 175.815 236.309 220.2 198.085 247.94L197.18 248.593L145.264 285.676C136.276 292.096 124.25 292.197 115.167 285.978L114.736 285.676L62.8203 248.593C24.0499 220.899 1.04004 176.187 1.04004 128.542V74.4297C1.04004 64.0891 7.10644 54.7283 16.5059 50.4912L16.9561 50.293L119.655 6.27832Z" stroke="#708BF4" stroke-opacity="0.05" stroke-width="2.08"/>
-<path d="M120.451 17.2793C126.358 14.7477 133.02 14.6687 138.975 17.042L139.549 17.2793L234.349 57.9082C243.261 61.7279 249.04 70.491 249.04 80.1875V130.138C249.04 173.775 228.131 214.745 192.848 240.352L192.012 240.954L144.089 275.185C135.792 281.111 124.692 281.204 116.308 275.463L115.911 275.185L67.9883 240.954C32.2001 215.391 10.96 174.118 10.96 130.138V80.1875C10.9601 70.6424 16.56 62.0019 25.2363 58.0908L25.6514 57.9082L120.451 17.2793Z" stroke="#708BF4" stroke-opacity="0.15" stroke-width="1.92"/>
-<path d="M121.294 28.3906C126.68 26.0825 132.754 26.0099 138.183 28.1738L138.706 28.3906L225.605 65.6328C233.731 69.1153 239 77.1057 239 85.9463V131.733C239 171.381 220.152 208.625 188.301 232.109L186.774 233.218L142.846 264.596C135.282 269.999 125.161 270.083 117.517 264.849L117.154 264.596L73.2256 233.218C40.4513 209.807 21 172.01 21 131.733V85.9463C21 77.2438 26.1053 69.3657 34.0156 65.7998L34.3945 65.6328L121.294 28.3906Z" stroke="#708BF4" stroke-opacity="0.5" stroke-width="2"/>
-<path d="M77.8584 226.327L117.794 254.852C125.096 260.068 134.904 260.068 142.206 254.852L182.141 226.327C212.176 204.874 230 170.238 230 133.329V91.7041C230 83.3035 224.994 75.7112 217.272 72.4021L138.272 38.5449C132.99 36.281 127.01 36.281 121.728 38.5449L42.7277 72.4021C35.0063 75.7112 30 83.3035 30 91.7041V133.329C30 170.238 47.8247 204.874 77.8584 226.327Z" fill="black"/>
-<path d="M77.8584 226.327L117.794 254.852C125.096 260.068 134.904 260.068 142.206 254.852L182.141 226.327C212.176 204.874 230 170.238 230 133.329V91.7041C230 83.3035 224.994 75.7112 217.272 72.4021L138.272 38.5449C132.99 36.281 127.01 36.281 121.728 38.5449L42.7277 72.4021C35.0063 75.7112 30 83.3035 30 91.7041V133.329C30 170.238 47.8247 204.874 77.8584 226.327Z" fill="url(#paint0_linear_4774_13703)"/>
-<path d="M123.479 42.6295C127.513 40.9005 132.063 40.8473 136.13 42.4684L136.521 42.6295L215.521 76.4869C221.609 79.0957 225.556 85.0812 225.556 91.7037V133.329C225.556 168.248 208.955 201.05 180.902 221.734L179.559 222.711L139.623 251.236C134.047 255.219 126.615 255.343 120.923 251.609L120.377 251.236L80.4414 222.711C51.5757 202.092 34.4443 168.802 34.4443 133.329V91.7037C34.4445 85.2882 38.1486 79.4709 43.9141 76.7418L44.4785 76.4869L123.479 42.6295Z" stroke="url(#paint1_linear_4774_13703)" stroke-width="8.88889"/>
-<path d="M123.479 42.6295C127.513 40.9005 132.063 40.8473 136.13 42.4684L136.521 42.6295L215.521 76.4869C221.609 79.0957 225.556 85.0812 225.556 91.7037V133.329C225.556 168.248 208.955 201.05 180.902 221.734L179.559 222.711L139.623 251.236C134.047 255.219 126.615 255.343 120.923 251.609L120.377 251.236L80.4414 222.711C51.5757 202.092 34.4443 168.802 34.4443 133.329V91.7037C34.4445 85.2882 38.1486 79.4709 43.9141 76.7418L44.4785 76.4869L123.479 42.6295Z" stroke="url(#paint2_linear_4774_13703)" stroke-width="8.88889"/>
-<path d="M123.479 42.6295C127.513 40.9005 132.063 40.8473 136.13 42.4684L136.521 42.6295L215.521 76.4869C221.609 79.0957 225.556 85.0812 225.556 91.7037V133.329C225.556 168.248 208.955 201.05 180.902 221.734L179.559 222.711L139.623 251.236C134.047 255.219 126.615 255.343 120.923 251.609L120.377 251.236L80.4414 222.711C51.5757 202.092 34.4443 168.802 34.4443 133.329V91.7037C34.4445 85.2882 38.1486 79.4709 43.9141 76.7418L44.4785 76.4869L123.479 42.6295Z" stroke="url(#paint3_linear_4774_13703)" stroke-width="8.88889"/>
-<g filter="url(#filter0_ii_4774_13703)">
-<path d="M77.8584 226.327L117.794 254.852C125.096 260.068 134.904 260.068 142.206 254.852L182.141 226.327C212.176 204.874 230 170.238 230 133.329V91.7041C230 83.3035 224.994 75.7112 217.272 72.4021L138.272 38.5449C132.99 36.281 127.01 36.281 121.728 38.5449L42.7277 72.4021C35.0063 75.7112 30 83.3035 30 91.7041V133.329C30 170.238 47.8247 204.874 77.8584 226.327Z" fill="black" fill-opacity="0.01"/>
-</g>
-<rect x="66.5" y="110.5" width="127" height="69.5833" rx="9.33333" fill="url(#paint4_linear_4774_13703)" fill-opacity="0.15" stroke="url(#paint5_linear_4774_13703)" stroke-width="3"/>
-<g filter="url(#filter1_d_4774_13703)">
-<path d="M85.027 155.008L85.4252 147.997L79.5392 151.857L77.4272 148.187L83.7113 145.037L77.4272 141.886L79.5392 138.216L85.4252 142.076L85.027 135.065H89.2338L88.8529 142.076L94.739 138.216L96.851 141.886L90.5495 145.037L96.851 148.187L94.739 151.857L88.8529 147.997L89.2338 155.008H85.027ZM113.447 155.008L113.845 147.997L107.959 151.857L105.847 148.187L112.131 145.037L105.847 141.886L107.959 138.216L113.845 142.076L113.447 135.065H117.654L117.273 142.076L123.159 138.216L125.271 141.886L118.969 145.037L125.271 148.187L123.159 151.857L117.273 147.997L117.654 155.008H113.447ZM141.866 155.008L142.265 147.997L136.379 151.857L134.267 148.187L140.551 145.037L134.267 141.886L136.379 138.216L142.265 142.076L141.866 135.065H146.073L145.692 142.076L151.578 138.216L153.69 141.886L147.389 145.037L153.69 148.187L151.578 151.857L145.692 147.997L146.073 155.008H141.866ZM170.286 155.008L170.684 147.997L164.798 151.857L162.686 148.187L168.971 145.037L162.686 141.886L164.798 138.216L170.684 142.076L170.286 135.065H174.493L174.112 142.076L179.998 138.216L182.11 141.886L175.809 145.037L182.11 148.187L179.998 151.857L174.112 147.997L174.493 155.008H170.286Z" fill="#EFEFF8"/>
-</g>
-<path d="M164.716 223.419H215.284C220.845 223.419 224.31 217.386 221.508 212.583L196.224 169.239C193.443 164.473 186.556 164.473 183.776 169.239L158.492 212.583C155.69 217.386 159.155 223.419 164.716 223.419Z" fill="#D9D9D9"/>
-<path d="M164.716 223.419H215.284C220.845 223.419 224.31 217.386 221.508 212.583L196.224 169.239C193.443 164.473 186.556 164.473 183.776 169.239L158.492 212.583C155.69 217.386 159.155 223.419 164.716 223.419Z" fill="url(#paint6_linear_4774_13703)"/>
-<path d="M164.716 223.419H215.284C220.845 223.419 224.31 217.386 221.508 212.583L196.224 169.239C193.443 164.473 186.556 164.473 183.776 169.239L158.492 212.583C155.69 217.386 159.155 223.419 164.716 223.419Z" stroke="#312938" stroke-width="3.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.716 223.419H215.284C220.845 223.419 224.31 217.386 221.508 212.583L196.224 169.239C193.443 164.473 186.556 164.473 183.776 169.239L158.492 212.583C155.69 217.386 159.155 223.419 164.716 223.419Z" stroke="url(#paint7_linear_4774_13703)" stroke-width="3.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.716 223.419H215.284C220.845 223.419 224.31 217.386 221.508 212.583L196.224 169.239C193.443 164.473 186.556 164.473 183.776 169.239L158.492 212.583C155.69 217.386 159.155 223.419 164.716 223.419Z" stroke="url(#paint8_linear_4774_13703)" stroke-width="3.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M189.925 208.897H189.961M189.925 198.089V187.281" stroke="#312938" stroke-width="7.20545" stroke-linecap="round" stroke-linejoin="round"/>
-<defs>
-<filter id="filter0_ii_4774_13703" x="30" y="36.8469" width="200" height="221.917" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
-<feBlend mode="plus-lighter" in2="shape" result="effect1_innerShadow_4774_13703"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="-2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="effect1_innerShadow_4774_13703" result="effect2_innerShadow_4774_13703"/>
-</filter>
-<filter id="filter1_d_4774_13703" x="68.1106" y="125.748" width="123.316" height="38.5765" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4.65833"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.937255 0 0 0 0 0.937255 0 0 0 0 0.972549 0 0 0 0.3 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4774_13703"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4774_13703" result="shape"/>
-</filter>
-<linearGradient id="paint0_linear_4774_13703" x1="130" y1="34.9996" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#19233C"/>
-<stop offset="1" stop-color="#1647C3"/>
-</linearGradient>
-<linearGradient id="paint1_linear_4774_13703" x1="130" y1="34.9996" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.42" stop-color="#2077F8"/>
-<stop offset="0.700262" stop-color="#000F4D"/>
-</linearGradient>
-<linearGradient id="paint2_linear_4774_13703" x1="130" y1="34.9996" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint3_linear_4774_13703" x1="130" y1="34.9996" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D8E3FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint4_linear_4774_13703" x1="130" y1="109" x2="130" y2="181.583" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5590FF"/>
-<stop offset="1" stop-color="#5590FF" stop-opacity="0.5"/>
-</linearGradient>
-<linearGradient id="paint5_linear_4774_13703" x1="190.695" y1="181.583" x2="69.3054" y2="109" gradientUnits="userSpaceOnUse">
-<stop stop-color="#EFEFF8" stop-opacity="0"/>
-<stop offset="1" stop-color="#EFEFF8"/>
-</linearGradient>
-<linearGradient id="paint6_linear_4774_13703" x1="190" y1="165.664" x2="190.433" y2="233.264" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFC414"/>
-<stop offset="1" stop-color="#FF9500"/>
-</linearGradient>
-<linearGradient id="paint7_linear_4774_13703" x1="190" y1="165.664" x2="190" y2="223.419" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5C486E"/>
-<stop offset="1" stop-color="#312938"/>
-</linearGradient>
-<linearGradient id="paint8_linear_4774_13703" x1="190" y1="165.664" x2="190" y2="223.419" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#EBD4FF"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/assets/images/2fa_warning_light.svg b/assets/images/2fa_warning_light.svg
deleted file mode 100644
index 087d8e99b..000000000
--- a/assets/images/2fa_warning_light.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<svg width="260" height="298" viewBox="0 0 260 298" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M119.655 6.2793C126.055 3.53675 133.272 3.4513 139.723 6.02246L140.345 6.2793L243.044 50.2939C252.699 54.432 258.96 63.9259 258.96 74.4307V128.543C258.96 175.816 236.309 220.201 198.085 247.941L197.18 248.594L145.264 285.677C136.276 292.097 124.25 292.198 115.167 285.979L114.736 285.677L62.8203 248.594C24.0499 220.9 1.04004 176.188 1.04004 128.543V74.4307C1.04004 64.09 7.10644 54.7293 16.5059 50.4922L16.9561 50.2939L119.655 6.2793Z" stroke="#4A98DC" stroke-opacity="0.05" stroke-width="2.08"/>
-<path d="M120.451 17.2803C126.358 14.7487 133.02 14.6696 138.975 17.043L139.549 17.2803L234.349 57.9092C243.261 61.7289 249.04 70.492 249.04 80.1885V130.139C249.04 173.775 228.131 214.746 192.848 240.353L192.012 240.955L144.089 275.186C135.792 281.112 124.692 281.205 116.308 275.464L115.911 275.186L67.9883 240.955C32.2001 215.392 10.96 174.119 10.96 130.139V80.1885C10.9601 70.6434 16.56 62.0028 25.2363 58.0918L25.6514 57.9092L120.451 17.2803Z" stroke="#4B98DC" stroke-opacity="0.15" stroke-width="1.92"/>
-<path d="M121.294 28.3916C126.68 26.0835 132.754 26.0109 138.183 28.1748L138.706 28.3916L225.605 65.6338C233.731 69.1163 239 77.1066 239 85.9473V131.734C239 171.382 220.152 208.626 188.301 232.11L186.774 233.219L142.846 264.597C135.282 270 125.161 270.084 117.517 264.85L117.154 264.597L73.2256 233.219C40.4513 209.808 21 172.011 21 131.734V85.9473C21 77.2448 26.1053 69.3666 34.0156 65.8008L34.3945 65.6338L121.294 28.3916Z" stroke="#4895DB" stroke-opacity="0.35" stroke-width="2"/>
-<path d="M77.8584 226.328L117.794 254.853C125.096 260.069 134.904 260.069 142.206 254.853L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7051C230 83.3045 224.994 75.7122 217.272 72.403L138.272 38.5459C132.99 36.2819 127.01 36.2819 121.728 38.5459L42.7277 72.403C35.0063 75.7122 30 83.3045 30 91.7051V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="black"/>
-<path d="M77.8584 226.328L117.794 254.853C125.096 260.069 134.904 260.069 142.206 254.853L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7051C230 83.3045 224.994 75.7122 217.272 72.403L138.272 38.5459C132.99 36.2819 127.01 36.2819 121.728 38.5459L42.7277 72.403C35.0063 75.7122 30 83.3045 30 91.7051V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint0_linear_4774_13798)"/>
-<path d="M77.8584 226.328L117.794 254.853C125.096 260.069 134.904 260.069 142.206 254.853L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7051C230 83.3045 224.994 75.7122 217.272 72.403L138.272 38.5459C132.99 36.2819 127.01 36.2819 121.728 38.5459L42.7277 72.403C35.0063 75.7122 30 83.3045 30 91.7051V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint1_linear_4774_13798)"/>
-<path d="M77.8584 226.328L117.794 254.853C125.096 260.069 134.904 260.069 142.206 254.853L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7051C230 83.3045 224.994 75.7122 217.272 72.403L138.272 38.5459C132.99 36.2819 127.01 36.2819 121.728 38.5459L42.7277 72.403C35.0063 75.7122 30 83.3045 30 91.7051V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint2_linear_4774_13798)"/>
-<path d="M77.8584 226.328L117.794 254.853C125.096 260.069 134.904 260.069 142.206 254.853L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7051C230 83.3045 224.994 75.7122 217.272 72.403L138.272 38.5459C132.99 36.2819 127.01 36.2819 121.728 38.5459L42.7277 72.403C35.0063 75.7122 30 83.3045 30 91.7051V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint3_linear_4774_13798)"/>
-<path d="M123.479 42.6305C127.513 40.9015 132.063 40.8482 136.13 42.4693L136.521 42.6305L215.521 76.4879C221.609 79.0967 225.556 85.0821 225.556 91.7047V133.33C225.556 168.249 208.955 201.051 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.22 126.615 255.344 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7047C34.4445 85.2892 38.1486 79.4719 43.9141 76.7428L44.4785 76.4879L123.479 42.6305Z" stroke="url(#paint4_linear_4774_13798)" stroke-width="8.88889"/>
-<path d="M123.479 42.6305C127.513 40.9015 132.063 40.8482 136.13 42.4693L136.521 42.6305L215.521 76.4879C221.609 79.0967 225.556 85.0821 225.556 91.7047V133.33C225.556 168.249 208.955 201.051 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.22 126.615 255.344 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7047C34.4445 85.2892 38.1486 79.4719 43.9141 76.7428L44.4785 76.4879L123.479 42.6305Z" stroke="url(#paint5_linear_4774_13798)" stroke-width="8.88889"/>
-<path d="M123.479 42.6305C127.513 40.9015 132.063 40.8482 136.13 42.4693L136.521 42.6305L215.521 76.4879C221.609 79.0967 225.556 85.0821 225.556 91.7047V133.33C225.556 168.249 208.955 201.051 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.22 126.615 255.344 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7047C34.4445 85.2892 38.1486 79.4719 43.9141 76.7428L44.4785 76.4879L123.479 42.6305Z" stroke="url(#paint6_linear_4774_13798)" stroke-width="8.88889"/>
-<path d="M123.479 42.6305C127.513 40.9015 132.063 40.8482 136.13 42.4693L136.521 42.6305L215.521 76.4879C221.609 79.0967 225.556 85.0821 225.556 91.7047V133.33C225.556 168.249 208.955 201.051 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.22 126.615 255.344 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7047C34.4445 85.2892 38.1486 79.4719 43.9141 76.7428L44.4785 76.4879L123.479 42.6305Z" stroke="url(#paint7_linear_4774_13798)" stroke-width="8.88889"/>
-<g filter="url(#filter0_ii_4774_13798)">
-<path d="M77.8584 226.328L117.794 254.853C125.096 260.069 134.904 260.069 142.206 254.853L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7051C230 83.3045 224.994 75.7122 217.272 72.403L138.272 38.5459C132.99 36.2819 127.01 36.2819 121.728 38.5459L42.7277 72.403C35.0063 75.7122 30 83.3045 30 91.7051V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="black" fill-opacity="0.01"/>
-</g>
-<rect x="67" y="111" width="126" height="68.5833" rx="8.83333" fill="url(#paint8_linear_4774_13798)" stroke="url(#paint9_linear_4774_13798)" stroke-width="4"/>
-<g filter="url(#filter1_d_4774_13798)">
-<path d="M85.027 155.008L85.4252 147.997L79.5392 151.857L77.4272 148.187L83.7113 145.037L77.4272 141.886L79.5392 138.216L85.4252 142.076L85.027 135.065H89.2338L88.8529 142.076L94.739 138.216L96.851 141.886L90.5495 145.037L96.851 148.187L94.739 151.857L88.8529 147.997L89.2338 155.008H85.027ZM113.447 155.008L113.845 147.997L107.959 151.857L105.847 148.187L112.131 145.037L105.847 141.886L107.959 138.216L113.845 142.076L113.447 135.065H117.654L117.273 142.076L123.159 138.216L125.271 141.886L118.969 145.037L125.271 148.187L123.159 151.857L117.273 147.997L117.654 155.008H113.447ZM141.866 155.008L142.265 147.997L136.379 151.857L134.267 148.187L140.551 145.037L134.267 141.886L136.379 138.216L142.265 142.076L141.866 135.065H146.073L145.692 142.076L151.578 138.216L153.69 141.886L147.389 145.037L153.69 148.187L151.578 151.857L145.692 147.997L146.073 155.008H141.866ZM170.286 155.008L170.684 147.997L164.798 151.857L162.686 148.187L168.971 145.037L162.686 141.886L164.798 138.216L170.684 142.076L170.286 135.065H174.493L174.112 142.076L179.998 138.216L182.11 141.886L175.809 145.037L182.11 148.187L179.998 151.857L174.112 147.997L174.493 155.008H170.286Z" fill="#2C71CC"/>
-</g>
-<path d="M164.716 223.418H215.284C220.845 223.418 224.31 217.386 221.508 212.582L196.224 169.239C193.443 164.472 186.556 164.472 183.776 169.239L158.492 212.582C155.69 217.386 159.155 223.418 164.716 223.418Z" fill="#D9D9D9"/>
-<path d="M164.716 223.418H215.284C220.845 223.418 224.31 217.386 221.508 212.582L196.224 169.239C193.443 164.472 186.556 164.472 183.776 169.239L158.492 212.582C155.69 217.386 159.155 223.418 164.716 223.418Z" fill="url(#paint10_linear_4774_13798)"/>
-<path d="M164.716 223.418H215.284C220.845 223.418 224.31 217.386 221.508 212.582L196.224 169.239C193.443 164.472 186.556 164.472 183.776 169.239L158.492 212.582C155.69 217.386 159.155 223.418 164.716 223.418Z" stroke="#312938" stroke-width="3.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M164.716 223.418H215.284C220.845 223.418 224.31 217.386 221.508 212.582L196.224 169.239C193.443 164.472 186.556 164.472 183.776 169.239L158.492 212.582C155.69 217.386 159.155 223.418 164.716 223.418Z" stroke="url(#paint11_linear_4774_13798)" stroke-width="3.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M189.925 208.896H189.961M189.925 198.088V187.28" stroke="#312938" stroke-width="7.20545" stroke-linecap="round" stroke-linejoin="round"/>
-<defs>
-<filter id="filter0_ii_4774_13798" x="30" y="36.8479" width="200" height="221.917" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4774_13798"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="-2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.022328 0 0 0 0 0.298259 0 0 0 0 0.663462 0 0 0 1 0"/>
-<feBlend mode="normal" in2="effect1_innerShadow_4774_13798" result="effect2_innerShadow_4774_13798"/>
-</filter>
-<filter id="filter1_d_4774_13798" x="68.1106" y="125.748" width="123.316" height="38.5765" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="4.65833"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.172549 0 0 0 0 0.443137 0 0 0 0 0.8 0 0 0 0.3 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4774_13798"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4774_13798" result="shape"/>
-</filter>
-<linearGradient id="paint0_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#002A52"/>
-<stop offset="1" stop-color="#0652DF"/>
-</linearGradient>
-<linearGradient id="paint1_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#19233C"/>
-<stop offset="1" stop-color="#144CD8"/>
-</linearGradient>
-<linearGradient id="paint2_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#19233C"/>
-<stop offset="1" stop-color="#1647C3"/>
-</linearGradient>
-<linearGradient id="paint3_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop offset="0.144488" stop-color="#FAFAFA"/>
-<stop offset="1" stop-color="#72AAFF"/>
-</linearGradient>
-<linearGradient id="paint4_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.42" stop-color="#2077F8"/>
-<stop offset="0.700262" stop-color="#000F4D"/>
-</linearGradient>
-<linearGradient id="paint5_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint6_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D8E3FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint7_linear_4774_13798" x1="130" y1="35.0006" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#68BEEF"/>
-<stop offset="0.700262" stop-color="#2C71CC"/>
-</linearGradient>
-<linearGradient id="paint8_linear_4774_13798" x1="147.5" y1="170" x2="69.5" y2="100" gradientUnits="userSpaceOnUse">
-<stop offset="0.0455724" stop-color="white" stop-opacity="0"/>
-<stop offset="1" stop-color="white" stop-opacity="0.5"/>
-</linearGradient>
-<linearGradient id="paint9_linear_4774_13798" x1="65" y1="109" x2="195" y2="185.5" gradientUnits="userSpaceOnUse">
-<stop stop-color="#4794DA"/>
-<stop offset="0.954879" stop-color="#72AAFF" stop-opacity="0.2"/>
-</linearGradient>
-<linearGradient id="paint10_linear_4774_13798" x1="190" y1="165.664" x2="190.433" y2="233.264" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFC414"/>
-<stop offset="1" stop-color="#FF9500"/>
-</linearGradient>
-<linearGradient id="paint11_linear_4774_13798" x1="190" y1="165.664" x2="190" y2="223.418" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5C486E"/>
-<stop offset="1" stop-color="#312938"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/assets/images/birthday_cake.png b/assets/images/birthday_cake.png
index 293cd10f6..84b084fba 100644
Binary files a/assets/images/birthday_cake.png and b/assets/images/birthday_cake.png differ
diff --git a/assets/images/birthday_cake.svg b/assets/images/birthday_cake.svg
new file mode 100644
index 000000000..b5e31dddb
--- /dev/null
+++ b/assets/images/birthday_cake.svg
@@ -0,0 +1,31 @@
+<svg width="163" height="178" viewBox="0 0 163 178" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M47.5763 28.5814C46.1363 28.5814 44.9689 27.414 44.9689 25.974V22.2461C44.9689 20.8061 46.1363 19.6387 47.5763 19.6387C49.0163 19.6387 50.1837 20.8061 50.1837 22.2461V25.974C50.1837 27.414 49.0163 28.5814 47.5763 28.5814Z" fill="#14C846"/>
+    <path d="M81.252 28.5814C79.812 28.5814 78.6445 27.414 78.6445 25.974V22.2461C78.6445 20.8061 79.812 19.6387 81.252 19.6387C82.6919 19.6387 83.8594 20.8061 83.8594 22.2461V25.974C83.8594 27.414 82.6919 28.5814 81.252 28.5814Z" fill="#14C846"/>
+    <path d="M114.928 28.5814C113.488 28.5814 112.32 27.414 112.32 25.974V22.2461C112.32 20.8061 113.488 19.6387 114.928 19.6387C116.368 19.6387 117.535 20.8061 117.535 22.2461V25.974C117.535 27.414 116.368 28.5814 114.928 28.5814Z" fill="#14C846"/>
+    <path d="M119.675 5.23777C118.208 2.28443 115.374 -2.62586 112.117 1.72088C109.646 5.02118 107.251 11.045 111.084 14.2782C113.143 16.0161 116.707 16.0196 118.771 14.2782C121.501 11.9753 121.084 8.07603 119.675 5.23777Z" fill="#FC914A"/>
+    <path d="M85.9992 5.23777C84.5328 2.28443 81.698 -2.62586 78.4419 1.72088C75.9701 5.02118 73.5754 11.045 77.408 14.2782C79.4678 16.0161 83.0317 16.0196 85.0957 14.2782C87.8255 11.9753 87.4086 8.07603 85.9992 5.23777Z" fill="#FC914A"/>
+    <path d="M147.295 113.917H15.2089V60.2027C15.2089 54.4747 19.8525 49.8311 25.5805 49.8311H136.923C142.651 49.8311 147.295 54.4747 147.295 60.2027V113.917Z" fill="#A06047"/>
+    <path d="M120.67 56.9909H109.185C108.196 56.9909 107.395 56.1892 107.395 55.2005V27.7645C107.395 26.7758 108.196 25.9741 109.185 25.9741H120.67C121.659 25.9741 122.461 26.7758 122.461 27.7645V55.2008C122.461 56.1896 121.659 56.9909 120.67 56.9909Z" fill="#14C846"/>
+    <path d="M86.9945 56.9909H75.5094C74.5206 56.9909 73.7189 56.1892 73.7189 55.2005V27.7645C73.7189 26.7758 74.5206 25.9741 75.5094 25.9741H86.9945C87.9832 25.9741 88.7849 26.7758 88.7849 27.7645V55.2008C88.7846 56.1896 87.9832 56.9909 86.9945 56.9909Z" fill="#14C846"/>
+    <path d="M52.3235 5.23777C50.8571 2.28443 48.0223 -2.62586 44.7662 1.72088C42.2943 5.02118 39.8997 11.045 43.7322 14.2782C45.7921 16.0161 49.3559 16.0196 51.4199 14.2782C54.1497 11.9753 53.7326 8.07603 52.3235 5.23777Z" fill="#FC914A"/>
+    <path d="M51.4183 14.2785C49.8107 15.6354 47.2898 15.9327 45.2776 15.1737C45.8432 14.9589 46.3696 14.6616 46.8243 14.2785C49.5527 11.9764 49.1373 8.07705 47.7265 5.2374C47.1 3.96985 46.2191 2.34421 45.1591 1.24145C48.249 -2.23546 50.9131 2.40158 52.3239 5.2374C53.7316 8.07705 54.1505 11.9764 51.4183 14.2785Z" fill="#EA7636"/>
+    <path d="M85.0943 14.2785C83.4867 15.6354 80.9659 15.9327 78.9536 15.1737C79.5193 14.9589 80.0456 14.6616 80.5004 14.2785C83.2288 11.9764 82.8133 8.07705 81.4025 5.2374C80.776 3.96985 79.8951 2.34421 78.8351 1.24145C81.925 -2.23546 84.5891 2.40158 85.9999 5.2374C87.4076 8.07705 87.8265 11.9764 85.0943 14.2785Z" fill="#EA7636"/>
+    <path d="M118.77 14.2785C117.163 15.6354 114.642 15.9327 112.63 15.1737C113.195 14.9589 113.722 14.6616 114.176 14.2785C116.905 11.9764 116.489 8.07705 115.078 5.2374C114.452 3.96985 113.571 2.34421 112.511 1.24145C115.601 -2.23546 118.265 2.40158 119.676 5.2374C121.083 8.07705 121.502 11.9764 118.77 14.2785Z" fill="#EA7636"/>
+    <path d="M53.3189 56.9909H41.8338C40.845 56.9909 40.0433 56.1892 40.0433 55.2005V27.7645C40.0433 26.7758 40.845 25.9741 41.8338 25.9741H53.3189C54.3076 25.9741 55.1093 26.7758 55.1093 27.7645V55.2008C55.109 56.1896 54.3076 56.9909 53.3189 56.9909Z" fill="#14C846"/>
+    <path d="M55.11 27.7659V55.2005C55.11 56.1888 54.3079 56.9909 53.3196 56.9909H48.8331V25.9758H53.3196C54.3079 25.9758 55.11 26.7744 55.11 27.7659Z" fill="#0EA939"/>
+    <path d="M88.7846 27.7659V55.2005C88.7846 56.1888 87.9826 56.9909 86.9942 56.9909H82.5077V25.9758H86.9942C87.9826 25.9758 88.7846 26.7744 88.7846 27.7659Z" fill="#0EA939"/>
+    <path d="M122.461 27.7659V55.2005C122.461 56.1888 121.659 56.9909 120.67 56.9909H116.184V25.9758H120.67C121.659 25.9758 122.461 26.7744 122.461 27.7659Z" fill="#0EA939"/>
+    <path d="M147.295 60.2028V113.916H134.809V60.2028C134.809 54.4738 130.169 49.8298 124.44 49.8298H136.922C142.651 49.8298 147.295 54.4738 147.295 60.2028Z" fill="#824730"/>
+    <path d="M147.296 60.2028V65.6885C144.844 67.6973 142.502 69.7953 137.607 69.7953C136.569 69.7953 135.645 69.7022 134.811 69.5304V60.2028C134.811 54.4738 130.17 49.8298 124.441 49.8298H136.923C142.652 49.8298 147.296 54.4738 147.296 60.2028Z" fill="#F7D443"/>
+    <path d="M162.503 178H0.000671387V124.286C0.000671387 118.558 4.64431 113.915 10.3723 113.915H152.131C157.859 113.915 162.503 118.558 162.503 124.286L162.503 178Z" fill="#A06047"/>
+    <path d="M162.503 124.286V177.999H147.296V124.286C147.296 118.557 142.652 113.916 136.923 113.916H152.13C157.859 113.916 162.503 118.557 162.503 124.286Z" fill="#824730"/>
+    <path d="M162.503 124.286V129.771C159.488 131.78 156.602 133.882 150.583 133.882C149.37 133.882 148.281 133.796 147.296 133.642V124.286C147.296 118.557 142.652 113.917 136.923 113.917H152.13C157.859 113.916 162.503 118.557 162.503 124.286Z" fill="#F7D443"/>
+    <path d="M147.293 83.5281H15.2078V96.4157H147.293V83.5281Z" fill="white"/>
+    <path d="M147.294 83.5281H134.808V96.4157H147.294V83.5281Z" fill="#C7ABA1"/>
+    <path d="M162.502 147.615H0.000671387V160.502H162.502V147.615Z" fill="white"/>
+    <path d="M162.504 147.615H147.296V160.502H162.504V147.615Z" fill="#C7ABA1"/>
+    <path d="M147.295 60.2028V65.6868C144.844 67.6973 142.501 69.7971 137.606 69.7971C128.214 69.7971 128.214 62.0638 118.822 62.0638C109.43 62.0638 109.43 69.7971 100.034 69.7971C90.6422 69.7971 90.6422 62.0638 81.2502 62.0638C71.8583 62.0638 71.8583 69.7971 62.4664 69.7971C53.0745 69.7971 53.0745 62.0638 43.6826 62.0638C34.2907 62.0638 34.2907 69.7971 24.8988 69.7971C20.0076 69.7971 17.6644 67.6976 15.2131 65.6868V60.2028C15.2131 54.4738 19.8574 49.8298 25.5861 49.8298H136.922C142.651 49.8298 147.295 54.4738 147.295 60.2028Z" fill="#2194FF"/>
+    <path d="M147.296 61.03V65.6883C144.844 67.697 142.502 69.7951 137.607 69.7951C136.569 69.7951 135.645 69.7019 134.811 69.5302V60.2026C134.811 54.4736 130.17 49.8296 124.441 49.8296H136.096C143.689 49.8299 147.296 54.6637 147.296 61.03Z" fill="#1585EC"/>
+    <path d="M162.504 125.114V129.77C159.488 131.781 156.604 133.881 150.584 133.881C139.026 133.881 139.026 126.148 127.469 126.148C115.916 126.148 115.916 133.881 104.359 133.881C92.8053 133.881 92.8053 126.148 81.2481 126.148C69.6949 126.148 69.6949 133.881 58.1377 133.881C46.5845 133.881 46.5845 126.148 35.0273 126.148C23.4741 126.148 23.4741 133.881 11.9169 133.881C5.89659 133.881 3.01591 131.781 0 129.77V124.287C0 118.558 4.64433 113.914 10.373 113.914H151.305C157.49 113.914 162.504 118.928 162.504 125.114Z" fill="#2194FF"/>
+    <path d="M162.503 125.113V129.771C159.488 131.78 156.602 133.882 150.583 133.882C149.37 133.882 148.281 133.796 147.296 133.642V124.286C147.296 118.557 142.652 113.916 136.923 113.916H151.593C158.474 113.916 162.503 118.048 162.503 125.113Z" fill="#1585EC"/>
+</svg>
diff --git a/assets/images/btc_lock_dark.png b/assets/images/btc_lock_dark.png
deleted file mode 100644
index f5b3d7e27..000000000
Binary files a/assets/images/btc_lock_dark.png and /dev/null differ
diff --git a/assets/images/btc_lock_light.png b/assets/images/btc_lock_light.png
deleted file mode 100644
index 4320d96e3..000000000
Binary files a/assets/images/btc_lock_light.png and /dev/null differ
diff --git a/assets/images/buy.png b/assets/images/buy.png
index 32c116e6b..ff4549d5a 100644
Binary files a/assets/images/buy.png and b/assets/images/buy.png differ
diff --git a/assets/images/cake_logo.png b/assets/images/cake_logo.png
index abbb4e62b..8a85bf225 100644
Binary files a/assets/images/cake_logo.png and b/assets/images/cake_logo.png differ
diff --git a/assets/images/cake_logo_dark.svg b/assets/images/cake_logo_dark.svg
deleted file mode 100644
index 095077443..000000000
--- a/assets/images/cake_logo_dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="28" height="37" viewBox="0 0 28 37" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M26.0117 0.00835344C26.0523 -0.000438375 26.0914 -0.00211226 26.1279 0.00249407C26.3832 0.0346771 26.5225 0.363833 26.3174 0.5689L11.9326 14.9625C11.4874 15.4075 11.2364 16.0124 11.2354 16.6421V35.7369C11.2354 35.8853 11.146 35.9965 11.0303 36.0445C10.9723 36.0685 10.9079 36.0769 10.8447 36.066C10.7815 36.055 10.7195 36.0247 10.667 35.9722L0.396484 25.7056C0.20853 25.5177 0.10361 25.2641 0.103516 24.9996V7.18218C0.103551 6.28774 0.727312 5.51391 1.60156 5.32378L26.0107 0.00835344H26.0117ZM27.1025 20.2906C27.1024 20.5551 26.9964 20.8079 26.8096 20.9947L12.9443 34.8316C12.9218 34.8541 12.8953 34.867 12.8682 34.8716C12.8413 34.8762 12.8137 34.873 12.7891 34.8628C12.7394 34.8423 12.7012 34.7942 12.7012 34.731L12.7031 27.6763L17.3975 23.0289C18.0656 22.4518 18.3422 22.2068 18.7549 22.1832C18.8235 22.1792 18.896 22.1822 18.9746 22.19C19.0532 22.1978 19.138 22.2106 19.2314 22.2291C19.6039 22.3026 19.9558 22.357 20.2842 22.3755C20.4156 22.3829 20.5432 22.3847 20.667 22.3794C21.2241 22.356 21.7026 22.1937 22.0898 21.7945C22.427 21.4466 22.853 20.8957 23.0713 19.4947C23.2236 18.5107 23.33 17.8883 23.5439 17.3169C23.7579 16.7456 24.0748 16.3552 24.4551 15.9761V15.9752L27.1201 13.2974L27.1025 20.2906ZM26.9834 7.87359C27.0584 7.90479 27.1162 7.97749 27.1162 8.07378L27.0967 11.2144L24.1006 14.3306C23.5194 14.8954 22.9476 15.67 22.6914 16.2759C22.4364 16.8808 22.1497 17.8845 22.0049 18.7476C21.8611 19.6097 21.8812 20.1323 21.1377 20.6011C20.9985 20.6888 20.8632 20.7369 20.7295 20.7574C20.6402 20.7711 20.5516 20.7729 20.4629 20.7652C20.0187 20.7267 19.5718 20.4629 19.0273 20.4019C18.973 20.3958 18.9177 20.3918 18.8613 20.3902L18.8604 20.3912C17.9582 20.3653 17.3076 21.023 17.3057 21.025L12.7021 25.6441V22.5533C12.7021 22.1752 12.8521 21.8114 13.1201 21.5435L26.749 7.92046C26.7832 7.88634 26.8233 7.86688 26.8643 7.85992C26.9048 7.85303 26.9462 7.85813 26.9834 7.87359ZM26.9277 2.16753C27.0287 2.17924 27.12 2.26134 27.1201 2.3814V5.49956H27.1211L12.7021 19.9498V16.8648C12.7022 16.4869 12.8522 16.1238 13.1201 15.856L26.752 2.22906C26.8026 2.17847 26.8672 2.16051 26.9277 2.16753Z" fill="#D7E2F7"/>
-</svg>
diff --git a/assets/images/cake_logo_light.svg b/assets/images/cake_logo_light.svg
deleted file mode 100644
index 767e205d1..000000000
--- a/assets/images/cake_logo_light.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="28" height="37" viewBox="0 0 28 37" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M26.0117 0.00769167C26.0523 -0.00110449 26.0914 -0.00180576 26.1279 0.00280886C26.3831 0.0350288 26.5224 0.363182 26.3174 0.568239L11.9326 14.9618C11.4874 15.4069 11.2364 16.0127 11.2354 16.6425V35.7372C11.2353 35.8856 11.1461 35.9969 11.0303 36.0448C10.9724 36.0688 10.9078 36.0772 10.8447 36.0663C10.7815 36.0554 10.7195 36.025 10.667 35.9725L0.396484 25.7059C0.208445 25.518 0.103516 25.2635 0.103516 24.9989V7.1825C0.103516 6.28802 0.727287 5.51423 1.60156 5.3241L26.0107 0.00769167H26.0117ZM27.1025 20.2899C27.1025 20.5545 26.9964 20.8071 26.8096 20.994L12.9443 34.8319C12.9218 34.8543 12.8952 34.8674 12.8682 34.8719C12.8413 34.8765 12.8138 34.8724 12.7891 34.8622C12.7396 34.8417 12.7013 34.7944 12.7012 34.7313L12.7031 27.6757L17.3975 23.0282C18.0655 22.4511 18.3423 22.2071 18.7549 22.1835C18.8235 22.1795 18.896 22.1815 18.9746 22.1893C19.0532 22.1971 19.138 22.2109 19.2314 22.2294C19.6039 22.303 19.9558 22.3574 20.2842 22.3759C20.4155 22.3833 20.5432 22.385 20.667 22.3798C21.224 22.3563 21.7026 22.1939 22.0898 21.7948C22.427 21.447 22.853 20.896 23.0713 19.495C23.2236 18.5109 23.33 17.8887 23.5439 17.3173C23.7579 16.7458 24.0747 16.3556 24.4551 15.9764V15.9755L27.1201 13.2977L27.1025 20.2899ZM26.9834 7.8739C27.0584 7.90515 27.1162 7.97782 27.1162 8.0741L27.0967 11.2137L24.1006 14.3309C23.5192 14.8958 22.9476 15.6702 22.6914 16.2762C22.4364 16.8812 22.1497 17.8848 22.0049 18.7479C21.8611 19.61 21.8812 20.1316 21.1377 20.6005C20.9984 20.6882 20.8633 20.7372 20.7295 20.7577C20.6402 20.7714 20.5516 20.7722 20.4629 20.7645C20.0188 20.7261 19.5717 20.4632 19.0273 20.4022C18.973 20.3961 18.9177 20.3912 18.8613 20.3895L18.8604 20.3915C17.9569 20.3655 17.3057 21.0253 17.3057 21.0253L12.7021 25.6444V22.5526C12.7022 22.1746 12.8523 21.8117 13.1201 21.5438L26.749 7.92078C26.7832 7.88666 26.8233 7.8672 26.8643 7.86023C26.9049 7.85331 26.9462 7.85839 26.9834 7.8739ZM26.9277 2.16785C27.0288 2.17959 27.1201 2.2615 27.1201 2.38172V5.4989H27.1211L12.7021 19.9501V16.8651C12.7021 16.4872 12.8523 16.1242 13.1201 15.8563L26.752 2.22937C26.8026 2.17876 26.8671 2.16081 26.9277 2.16785Z" fill="#1C1B1C"/>
-</svg>
diff --git a/assets/images/cakewallet_android_icon.png b/assets/images/cakewallet_android_icon.png
old mode 100644
new mode 100755
index 7f15c62f5..59cc69414
Binary files a/assets/images/cakewallet_android_icon.png and b/assets/images/cakewallet_android_icon.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-anydpi-v26/ic_launcher.xml b/assets/images/cakewallet_android_icon/mipmap-anydpi-v26/ic_launcher.xml
index 345888d26..c8bd4b26c 100644
--- a/assets/images/cakewallet_android_icon/mipmap-anydpi-v26/ic_launcher.xml
+++ b/assets/images/cakewallet_android_icon/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+    <background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
+    <foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_adaptive_mono"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher.png b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher.png
index 89c9b0571..10d0a1a82 100644
Binary files a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher.png and b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_back.png b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..5b0fde827
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_back.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_fore.png b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..9c16f0a27
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_fore.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_mono.png b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_mono.png
new file mode 100644
index 000000000..27f939b41
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_adaptive_mono.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_background.png b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_background.png
deleted file mode 100644
index 19669488f..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_background.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_foreground.png b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 1411a5da5..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_monochrome.png b/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_monochrome.png
deleted file mode 100644
index 1411a5da5..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-hdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher.png b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher.png
index 8f1d1c28b..8c59ec33e 100644
Binary files a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher.png and b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_back.png b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..5d25e42e7
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_back.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_fore.png b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..021fe65de
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_fore.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_mono.png b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_mono.png
new file mode 100644
index 000000000..7bdb298c1
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_adaptive_mono.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_background.png b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_background.png
deleted file mode 100644
index 75025cfd5..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_background.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_foreground.png b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index e8c47adb3..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_monochrome.png b/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_monochrome.png
deleted file mode 100644
index e8c47adb3..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-mdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher.png b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher.png
index f775a8fac..10c3acd7f 100644
Binary files a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher.png and b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_back.png b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..c4b66dc58
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_back.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_fore.png b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..b440b154d
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_mono.png b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_mono.png
new file mode 100644
index 000000000..79e9df08d
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_adaptive_mono.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_background.png b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_background.png
deleted file mode 100644
index 9784f16c8..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_foreground.png b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 6ba8eb301..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_monochrome.png b/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_monochrome.png
deleted file mode 100644
index 6ba8eb301..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xhdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher.png b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher.png
index 31458fa02..813a3678d 100644
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher.png and b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_back.png b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..75dc0219d
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_fore.png b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..90afb19e8
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_mono.png b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_mono.png
new file mode 100644
index 000000000..0bb1c7430
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_adaptive_mono.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_background.png b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_background.png
deleted file mode 100644
index 04ef206c8..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_foreground.png b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index cc93d633b..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_monochrome.png b/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_monochrome.png
deleted file mode 100644
index cc93d633b..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxhdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher.png b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher.png
index 158afbbf9..671422b96 100644
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher.png and b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_back.png b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_back.png
new file mode 100644
index 000000000..46b1e2cb1
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_back.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png
new file mode 100644
index 000000000..0a2025220
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_fore.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_mono.png b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_mono.png
new file mode 100644
index 000000000..205f2ad2a
Binary files /dev/null and b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_adaptive_mono.png differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_background.png b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_background.png
deleted file mode 100644
index 66a5487a2..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_foreground.png b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 0ecd56e8c..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_monochrome.png b/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_monochrome.png
deleted file mode 100644
index 0ecd56e8c..000000000
Binary files a/assets/images/cakewallet_android_icon/mipmap-xxxhdpi/ic_launcher_monochrome.png and /dev/null differ
diff --git a/assets/images/cakewallet_app_logo.png b/assets/images/cakewallet_app_logo.png
new file mode 100644
index 000000000..59cc69414
Binary files /dev/null and b/assets/images/cakewallet_app_logo.png differ
diff --git a/assets/images/cakewallet_icon_1024.png b/assets/images/cakewallet_icon_1024.png
index 35cf42245..64682cd1d 100644
Binary files a/assets/images/cakewallet_icon_1024.png and b/assets/images/cakewallet_icon_1024.png differ
diff --git a/assets/images/cakewallet_icon_120.png b/assets/images/cakewallet_icon_120.png
index 6e45f6423..1a2c1b99c 100644
Binary files a/assets/images/cakewallet_icon_120.png and b/assets/images/cakewallet_icon_120.png differ
diff --git a/assets/images/cakewallet_icon_180.png b/assets/images/cakewallet_icon_180.png
index da585ca42..ff69a866a 100644
Binary files a/assets/images/cakewallet_icon_180.png and b/assets/images/cakewallet_icon_180.png differ
diff --git a/assets/images/cakewallet_logo.png b/assets/images/cakewallet_logo.png
index c465fa26c..bf6896ad2 100644
Binary files a/assets/images/cakewallet_logo.png and b/assets/images/cakewallet_logo.png differ
diff --git a/assets/images/contact.png b/assets/images/contact.png
deleted file mode 100644
index 5cf96694b..000000000
Binary files a/assets/images/contact.png and /dev/null differ
diff --git a/assets/images/deuro_icon.png b/assets/images/deuro_icon.png
deleted file mode 100644
index 4dc068ff8..000000000
Binary files a/assets/images/deuro_icon.png and /dev/null differ
diff --git a/assets/images/hero/cw_welcome_dark.svg b/assets/images/hero/cw_welcome_dark.svg
deleted file mode 100644
index 5479cb1ee..000000000
--- a/assets/images/hero/cw_welcome_dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="179" height="37" viewBox="0 0 179 37" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M76.2936 20.5227L77.9877 22.2168C77.2983 23.1262 76.3963 23.8522 75.2815 24.3949C74.1815 24.923 72.964 25.187 71.6293 25.187C70.4412 25.187 69.3485 24.9816 68.3511 24.5709C67.3684 24.1603 66.5103 23.5882 65.7769 22.8548C65.0582 22.1215 64.4935 21.2561 64.0828 20.2587C63.6868 19.2466 63.4888 18.1539 63.4888 16.9805C63.4888 15.7924 63.6941 14.6997 64.1048 13.7023C64.5155 12.6902 65.0876 11.8175 65.8209 11.0841C66.569 10.3507 67.4417 9.7787 68.4391 9.36801C69.4365 8.95732 70.5219 8.75197 71.6953 8.75197C73.0301 8.75197 74.2401 9.02332 75.3255 9.56602C76.4109 10.0941 77.2983 10.8128 77.9877 11.7222L76.2936 13.4163C75.7802 12.6682 75.1348 12.0815 74.3575 11.6561C73.5801 11.2161 72.6927 10.9961 71.6953 10.9961C70.6392 10.9961 69.6932 11.2601 68.8571 11.7882C68.0211 12.3015 67.361 13.0056 66.877 13.9003C66.393 14.795 66.151 15.8217 66.151 16.9805C66.151 18.1245 66.393 19.1439 66.877 20.0387C67.361 20.9334 68.0211 21.6448 68.8571 22.1728C69.6932 22.6862 70.6392 22.9428 71.6953 22.9428C72.6927 22.9428 73.5801 22.7228 74.3575 22.2828C75.1348 21.8428 75.7802 21.2561 76.2936 20.5227ZM89.1654 24.835H86.8993V22.6568L86.7893 22.1948V18.0805C86.7893 17.2592 86.5252 16.6211 85.9972 16.1664C85.4692 15.6971 84.7505 15.4624 83.8411 15.4624C83.181 15.4624 82.565 15.5944 81.993 15.8584C81.4356 16.1224 80.9516 16.4891 80.5409 16.9585L79.1328 15.4184C79.7342 14.817 80.4382 14.3476 81.2449 14.0103C82.0516 13.6729 82.9464 13.5043 83.9291 13.5043C84.9705 13.5043 85.8799 13.6876 86.6573 14.0543C87.4493 14.4063 88.0653 14.9197 88.5054 15.5944C88.9454 16.2691 89.1654 17.0758 89.1654 18.0145V24.835ZM83.005 25.187C82.169 25.187 81.4283 25.033 80.7829 24.725C80.1375 24.4169 79.6388 23.9989 79.2868 23.4709C78.9348 22.9428 78.7588 22.3268 78.7588 21.6228C78.7588 20.86 78.9788 20.2147 79.4188 19.6866C79.8588 19.1439 80.4675 18.7333 81.2449 18.4546C82.037 18.1612 82.9464 18.0145 83.9731 18.0145H87.0533V19.7086H84.1931C83.3277 19.7086 82.6237 19.8627 82.081 20.1707C81.5529 20.4787 81.2889 20.9334 81.2889 21.5348C81.2889 22.0775 81.4943 22.5102 81.905 22.8328C82.3157 23.1409 82.851 23.2949 83.5111 23.2949C84.1418 23.2949 84.7211 23.1629 85.2492 22.8988C85.7772 22.6348 86.1952 22.2755 86.5032 21.8208C86.8259 21.3514 87.0093 20.816 87.0533 20.2147L87.8453 20.5887C87.8453 21.4834 87.64 22.2828 87.2293 22.9868C86.8186 23.6762 86.2466 24.2189 85.5132 24.6149C84.7798 24.9963 83.9438 25.187 83.005 25.187ZM93.3326 24.835H90.8685V8.99398H93.3326V24.835ZM102.111 24.835H98.8549L92.7166 19.1366H92.9366L98.4149 13.8563H101.473L95.6427 19.3566V18.9386L102.111 24.835ZM111.222 21.5128L112.63 23.0529C112.058 23.7129 111.347 24.2336 110.496 24.6149C109.645 24.9963 108.699 25.187 107.658 25.187C106.426 25.187 105.333 24.9376 104.38 24.4389C103.441 23.9402 102.7 23.2509 102.158 22.3708C101.63 21.4908 101.366 20.486 101.366 19.3566C101.366 18.2126 101.622 17.2005 102.136 16.3204C102.649 15.4404 103.353 14.751 104.248 14.2523C105.142 13.7536 106.147 13.5043 107.262 13.5043C108.347 13.5043 109.308 13.7536 110.144 14.2523C110.98 14.7363 111.64 15.411 112.124 16.2764C112.608 17.1272 112.85 18.1172 112.85 19.2466V19.3786H110.408V19.1366C110.408 18.4032 110.269 17.7652 109.99 17.2225C109.726 16.6651 109.359 16.2398 108.89 15.9464C108.421 15.6384 107.871 15.4844 107.24 15.4844C106.58 15.4844 105.993 15.6457 105.48 15.9684C104.981 16.2764 104.592 16.7165 104.314 17.2885C104.035 17.8459 103.896 18.5206 103.896 19.3126C103.896 20.1047 104.057 20.794 104.38 21.3807C104.717 21.9675 105.172 22.4221 105.744 22.7448C106.33 23.0529 107.005 23.2069 107.768 23.2069C109.161 23.2069 110.313 22.6422 111.222 21.5128ZM112.85 20.1267H103.082V18.4546H112.498L112.85 19.2686V20.1267ZM134.362 24.835H131.524L127.915 12.2062H128.223L124.593 24.835H121.755L117.135 9.10399H119.841L123.581 22.8548H122.899L126.859 9.10399H129.279L133.24 22.8548H132.624L136.342 9.10399H138.982L134.362 24.835ZM148.664 24.835H146.397V22.6568L146.287 22.1948V18.0805C146.287 17.2592 146.023 16.6211 145.495 16.1664C144.967 15.6971 144.249 15.4624 143.339 15.4624C142.679 15.4624 142.063 15.5944 141.491 15.8584C140.934 16.1224 140.45 16.4891 140.039 16.9585L138.631 15.4184C139.232 14.817 139.936 14.3476 140.743 14.0103C141.55 13.6729 142.445 13.5043 143.427 13.5043C144.469 13.5043 145.378 13.6876 146.155 14.0543C146.948 14.4063 147.564 14.9197 148.004 15.5944C148.444 16.2691 148.664 17.0758 148.664 18.0145V24.835ZM142.503 25.187C141.667 25.187 140.926 25.033 140.281 24.725C139.636 24.4169 139.137 23.9989 138.785 23.4709C138.433 22.9428 138.257 22.3268 138.257 21.6228C138.257 20.86 138.477 20.2147 138.917 19.6866C139.357 19.1439 139.966 18.7333 140.743 18.4546C141.535 18.1612 142.445 18.0145 143.471 18.0145H146.551V19.7086H143.691C142.826 19.7086 142.122 19.8627 141.579 20.1707C141.051 20.4787 140.787 20.9334 140.787 21.5348C140.787 22.0775 140.992 22.5102 141.403 22.8328C141.814 23.1409 142.349 23.2949 143.009 23.2949C143.64 23.2949 144.219 23.1629 144.747 22.8988C145.275 22.6348 145.693 22.2755 146.001 21.8208C146.324 21.3514 146.507 20.816 146.551 20.2147L147.344 20.5887C147.344 21.4834 147.138 22.2828 146.727 22.9868C146.317 23.6762 145.745 24.2189 145.011 24.6149C144.278 24.9963 143.442 25.187 142.503 25.187ZM152.831 24.835H150.367V8.99398H152.831V24.835ZM157.172 24.835H154.708V8.99398H157.172V24.835ZM168.465 21.5128L169.873 23.0529C169.301 23.7129 168.59 24.2336 167.739 24.6149C166.888 24.9963 165.942 25.187 164.901 25.187C163.669 25.187 162.576 24.9376 161.623 24.4389C160.684 23.9402 159.943 23.2509 159.401 22.3708C158.873 21.4908 158.609 20.486 158.609 19.3566C158.609 18.2126 158.865 17.2005 159.379 16.3204C159.892 15.4404 160.596 14.751 161.491 14.2523C162.385 13.7536 163.39 13.5043 164.505 13.5043C165.59 13.5043 166.551 13.7536 167.387 14.2523C168.223 14.7363 168.883 15.411 169.367 16.2764C169.851 17.1272 170.093 18.1172 170.093 19.2466V19.3786H167.651V19.1366C167.651 18.4032 167.512 17.7652 167.233 17.2225C166.969 16.6651 166.602 16.2398 166.133 15.9464C165.664 15.6384 165.114 15.4844 164.483 15.4844C163.823 15.4844 163.236 15.6457 162.723 15.9684C162.224 16.2764 161.835 16.7165 161.557 17.2885C161.278 17.8459 161.139 18.5206 161.139 19.3126C161.139 20.1047 161.3 20.794 161.623 21.3807C161.96 21.9675 162.415 22.4221 162.987 22.7448C163.574 23.0529 164.248 23.2069 165.011 23.2069C166.404 23.2069 167.556 22.6422 168.465 21.5128ZM170.093 20.1267H160.325V18.4546H169.741L170.093 19.2686V20.1267ZM177.989 24.835H175.283C174.359 24.835 173.662 24.6003 173.193 24.1309C172.724 23.6469 172.489 22.9502 172.489 22.0408V10.8421H174.953V21.6668C174.953 22.0481 175.041 22.3341 175.217 22.5248C175.393 22.7008 175.672 22.7888 176.053 22.7888H177.989V24.835ZM177.835 15.8584H170.443V13.8563H177.835V15.8584Z" fill="#D7E2F7"/>
-<path d="M55.0117 0.00769167C55.0523 -0.00110449 55.0914 -0.00180576 55.1279 0.00280886C55.3831 0.0350288 55.5224 0.363182 55.3174 0.568239L40.9326 14.9618C40.4874 15.4069 40.2364 16.0127 40.2354 16.6425V35.7372C40.2353 35.8856 40.1461 35.9969 40.0303 36.0448C39.9724 36.0688 39.9078 36.0772 39.8447 36.0663C39.7815 36.0554 39.7195 36.025 39.667 35.9725L29.3965 25.7059C29.2084 25.518 29.1035 25.2635 29.1035 24.9989V7.1825C29.1035 6.28802 29.7273 5.51423 30.6016 5.3241L55.0107 0.00769167H55.0117ZM56.1025 20.2899C56.1025 20.5546 55.9965 20.8081 55.8096 20.995L41.9443 34.8319C41.9218 34.8544 41.8953 34.8673 41.8682 34.8719C41.8413 34.8765 41.8137 34.8733 41.7891 34.8632C41.7394 34.8427 41.7012 34.7946 41.7012 34.7313L41.7031 27.6766L46.3975 23.0292C47.0655 22.4521 47.3423 22.2071 47.7549 22.1835C47.8235 22.1795 47.896 22.1816 47.9746 22.1893C48.0532 22.1971 48.138 22.2109 48.2314 22.2294C48.6039 22.303 48.9558 22.3574 49.2842 22.3759C49.4156 22.3833 49.5432 22.385 49.667 22.3798C50.2241 22.3563 50.7026 22.1941 51.0898 21.7948C51.427 21.447 51.853 20.8961 52.0713 19.495C52.2236 18.511 52.33 17.8887 52.5439 17.3173C52.7579 16.7459 53.0748 16.3556 53.4551 15.9764V15.9755L56.1201 13.2977L56.1025 20.2899ZM55.749 7.92078C55.8852 7.78481 56.1161 7.88195 56.1162 8.0741L56.0967 11.2147L53.1006 14.3309C52.5193 14.8958 51.9466 15.6702 51.6904 16.2762C51.4354 16.8811 51.1497 17.8849 51.0049 18.7479C50.8611 19.61 50.8812 20.1326 50.1377 20.6014C49.3944 21.0697 48.7644 20.4166 47.8613 20.3905L47.8604 20.3915C46.962 20.3657 46.3129 21.018 46.3057 21.0253L41.7021 25.6444V22.5536C41.7021 22.1755 41.8521 21.8117 42.1201 21.5438L55.749 7.92078ZM55.9277 2.16785C56.0288 2.17959 56.1201 2.2615 56.1201 2.38172V5.4989H56.1211L41.7021 19.9501V16.8651C41.7021 16.4872 41.8523 16.1242 42.1201 15.8563L55.752 2.22937C55.8026 2.17876 55.8671 2.16081 55.9277 2.16785Z" fill="#D7E2F7"/>
-<path d="M3.67294 24.128C2.95827 24.128 2.40894 23.928 2.02494 23.528C1.64627 23.1227 1.45694 22.5653 1.45694 21.856V17.272H0.616938C0.510271 17.272 0.419604 17.2373 0.344938 17.168C0.270271 17.0987 0.232938 16.9947 0.232938 16.856V16.072L1.55294 15.856L1.96894 13.616C1.9956 13.5093 2.04627 13.4267 2.12094 13.368C2.1956 13.3093 2.2916 13.28 2.40894 13.28H3.43294V15.864H5.62494V17.272H3.43294V21.72C3.43294 21.976 3.49427 22.176 3.61694 22.32C3.74494 22.464 3.91827 22.536 4.13694 22.536C4.2596 22.536 4.36094 22.5227 4.44094 22.496C4.52627 22.464 4.59827 22.432 4.65694 22.4C4.72094 22.368 4.77694 22.3387 4.82494 22.312C4.87294 22.28 4.92094 22.264 4.96894 22.264C5.0276 22.264 5.0756 22.28 5.11294 22.312C5.15027 22.3387 5.19027 22.3813 5.23294 22.44L5.82494 23.4C5.53694 23.64 5.20627 23.8213 4.83294 23.944C4.4596 24.0667 4.07294 24.128 3.67294 24.128ZM10.4596 15.664C11.0676 15.664 11.6196 15.7627 12.1156 15.96C12.6169 16.1573 13.0436 16.4373 13.3956 16.8C13.7529 17.1627 14.0276 17.6053 14.2196 18.128C14.4116 18.6507 14.5076 19.2347 14.5076 19.88C14.5076 20.5307 14.4116 21.1173 14.2196 21.64C14.0276 22.1627 13.7529 22.608 13.3956 22.976C13.0436 23.344 12.6169 23.6267 12.1156 23.824C11.6196 24.0213 11.0676 24.12 10.4596 24.12C9.84623 24.12 9.2889 24.0213 8.78756 23.824C8.28623 23.6267 7.8569 23.344 7.49956 22.976C7.14756 22.608 6.8729 22.1627 6.67556 21.64C6.48356 21.1173 6.38756 20.5307 6.38756 19.88C6.38756 19.2347 6.48356 18.6507 6.67556 18.128C6.8729 17.6053 7.14756 17.1627 7.49956 16.8C7.8569 16.4373 8.28623 16.1573 8.78756 15.96C9.2889 15.7627 9.84623 15.664 10.4596 15.664ZM10.4596 22.6C11.1422 22.6 11.6462 22.3707 11.9716 21.912C12.3022 21.4533 12.4676 20.7813 12.4676 19.896C12.4676 19.0107 12.3022 18.336 11.9716 17.872C11.6462 17.408 11.1422 17.176 10.4596 17.176C9.76623 17.176 9.25156 17.4107 8.91556 17.88C8.5849 18.344 8.41956 19.016 8.41956 19.896C8.41956 20.776 8.5849 21.448 8.91556 21.912C9.25156 22.3707 9.76623 22.6 10.4596 22.6Z" fill="#D7E2F7"/>
-</svg>
diff --git a/assets/images/hero/cw_welcome_light.svg b/assets/images/hero/cw_welcome_light.svg
deleted file mode 100644
index ece7d1f84..000000000
--- a/assets/images/hero/cw_welcome_light.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="179" height="37" viewBox="0 0 179 37" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.67294 24.128C2.95827 24.128 2.40894 23.928 2.02494 23.528C1.64627 23.1227 1.45694 22.5653 1.45694 21.856V17.272H0.616938C0.510271 17.272 0.419604 17.2373 0.344938 17.168C0.270271 17.0987 0.232938 16.9947 0.232938 16.856V16.072L1.55294 15.856L1.96894 13.616C1.9956 13.5093 2.04627 13.4267 2.12094 13.368C2.1956 13.3093 2.2916 13.28 2.40894 13.28H3.43294V15.864H5.62494V17.272H3.43294V21.72C3.43294 21.976 3.49427 22.176 3.61694 22.32C3.74494 22.464 3.91827 22.536 4.13694 22.536C4.2596 22.536 4.36094 22.5227 4.44094 22.496C4.52627 22.464 4.59827 22.432 4.65694 22.4C4.72094 22.368 4.77694 22.3387 4.82494 22.312C4.87294 22.28 4.92094 22.264 4.96894 22.264C5.0276 22.264 5.0756 22.28 5.11294 22.312C5.15027 22.3387 5.19027 22.3813 5.23294 22.44L5.82494 23.4C5.53694 23.64 5.20627 23.8213 4.83294 23.944C4.4596 24.0667 4.07294 24.128 3.67294 24.128ZM10.4596 15.664C11.0676 15.664 11.6196 15.7627 12.1156 15.96C12.6169 16.1573 13.0436 16.4373 13.3956 16.8C13.7529 17.1627 14.0276 17.6053 14.2196 18.128C14.4116 18.6507 14.5076 19.2347 14.5076 19.88C14.5076 20.5307 14.4116 21.1173 14.2196 21.64C14.0276 22.1627 13.7529 22.608 13.3956 22.976C13.0436 23.344 12.6169 23.6267 12.1156 23.824C11.6196 24.0213 11.0676 24.12 10.4596 24.12C9.84623 24.12 9.2889 24.0213 8.78756 23.824C8.28623 23.6267 7.8569 23.344 7.49956 22.976C7.14756 22.608 6.8729 22.1627 6.67556 21.64C6.48356 21.1173 6.38756 20.5307 6.38756 19.88C6.38756 19.2347 6.48356 18.6507 6.67556 18.128C6.8729 17.6053 7.14756 17.1627 7.49956 16.8C7.8569 16.4373 8.28623 16.1573 8.78756 15.96C9.2889 15.7627 9.84623 15.664 10.4596 15.664ZM10.4596 22.6C11.1422 22.6 11.6462 22.3707 11.9716 21.912C12.3022 21.4533 12.4676 20.7813 12.4676 19.896C12.4676 19.0107 12.3022 18.336 11.9716 17.872C11.6462 17.408 11.1422 17.176 10.4596 17.176C9.76623 17.176 9.25156 17.4107 8.91556 17.88C8.5849 18.344 8.41956 19.016 8.41956 19.896C8.41956 20.776 8.5849 21.448 8.91556 21.912C9.25156 22.3707 9.76623 22.6 10.4596 22.6Z" fill="#1C1B1C"/>
-<path d="M76.2936 20.5227L77.9877 22.2168C77.2983 23.1262 76.3963 23.8522 75.2815 24.3949C74.1815 24.923 72.964 25.187 71.6293 25.187C70.4412 25.187 69.3485 24.9816 68.3511 24.5709C67.3684 24.1603 66.5103 23.5882 65.7769 22.8548C65.0582 22.1215 64.4935 21.2561 64.0828 20.2587C63.6868 19.2466 63.4888 18.1539 63.4888 16.9805C63.4888 15.7924 63.6941 14.6997 64.1048 13.7023C64.5155 12.6902 65.0876 11.8175 65.8209 11.0841C66.569 10.3507 67.4417 9.7787 68.4391 9.36801C69.4365 8.95732 70.5219 8.75197 71.6953 8.75197C73.0301 8.75197 74.2401 9.02332 75.3255 9.56602C76.4109 10.0941 77.2983 10.8128 77.9877 11.7222L76.2936 13.4163C75.7802 12.6682 75.1348 12.0815 74.3575 11.6561C73.5801 11.2161 72.6927 10.9961 71.6953 10.9961C70.6392 10.9961 69.6932 11.2601 68.8571 11.7882C68.0211 12.3015 67.361 13.0056 66.877 13.9003C66.393 14.795 66.151 15.8217 66.151 16.9805C66.151 18.1245 66.393 19.1439 66.877 20.0387C67.361 20.9334 68.0211 21.6448 68.8571 22.1728C69.6932 22.6862 70.6392 22.9428 71.6953 22.9428C72.6927 22.9428 73.5801 22.7228 74.3575 22.2828C75.1348 21.8428 75.7802 21.2561 76.2936 20.5227ZM89.1654 24.835H86.8993V22.6568L86.7893 22.1948V18.0805C86.7893 17.2592 86.5252 16.6211 85.9972 16.1664C85.4692 15.6971 84.7505 15.4624 83.8411 15.4624C83.181 15.4624 82.565 15.5944 81.993 15.8584C81.4356 16.1224 80.9516 16.4891 80.5409 16.9585L79.1328 15.4184C79.7342 14.817 80.4382 14.3476 81.2449 14.0103C82.0516 13.6729 82.9464 13.5043 83.9291 13.5043C84.9705 13.5043 85.8799 13.6876 86.6573 14.0543C87.4493 14.4063 88.0653 14.9197 88.5054 15.5944C88.9454 16.2691 89.1654 17.0758 89.1654 18.0145V24.835ZM83.005 25.187C82.169 25.187 81.4283 25.033 80.7829 24.725C80.1375 24.4169 79.6388 23.9989 79.2868 23.4709C78.9348 22.9428 78.7588 22.3268 78.7588 21.6228C78.7588 20.86 78.9788 20.2147 79.4188 19.6866C79.8588 19.1439 80.4675 18.7333 81.2449 18.4546C82.037 18.1612 82.9464 18.0145 83.9731 18.0145H87.0533V19.7086H84.1931C83.3277 19.7086 82.6237 19.8627 82.081 20.1707C81.5529 20.4787 81.2889 20.9334 81.2889 21.5348C81.2889 22.0775 81.4943 22.5102 81.905 22.8328C82.3157 23.1409 82.851 23.2949 83.5111 23.2949C84.1418 23.2949 84.7211 23.1629 85.2492 22.8988C85.7772 22.6348 86.1952 22.2755 86.5032 21.8208C86.8259 21.3514 87.0093 20.816 87.0533 20.2147L87.8453 20.5887C87.8453 21.4834 87.64 22.2828 87.2293 22.9868C86.8186 23.6762 86.2466 24.2189 85.5132 24.6149C84.7798 24.9963 83.9438 25.187 83.005 25.187ZM93.3326 24.835H90.8685V8.99398H93.3326V24.835ZM102.111 24.835H98.8549L92.7166 19.1366H92.9366L98.4149 13.8563H101.473L95.6427 19.3566V18.9386L102.111 24.835ZM111.222 21.5128L112.63 23.0529C112.058 23.7129 111.347 24.2336 110.496 24.6149C109.645 24.9963 108.699 25.187 107.658 25.187C106.426 25.187 105.333 24.9376 104.38 24.4389C103.441 23.9402 102.7 23.2509 102.158 22.3708C101.63 21.4908 101.366 20.486 101.366 19.3566C101.366 18.2126 101.622 17.2005 102.136 16.3204C102.649 15.4404 103.353 14.751 104.248 14.2523C105.142 13.7536 106.147 13.5043 107.262 13.5043C108.347 13.5043 109.308 13.7536 110.144 14.2523C110.98 14.7363 111.64 15.411 112.124 16.2764C112.608 17.1272 112.85 18.1172 112.85 19.2466V19.3786H110.408V19.1366C110.408 18.4032 110.269 17.7652 109.99 17.2225C109.726 16.6651 109.359 16.2398 108.89 15.9464C108.421 15.6384 107.871 15.4844 107.24 15.4844C106.58 15.4844 105.993 15.6457 105.48 15.9684C104.981 16.2764 104.592 16.7165 104.314 17.2885C104.035 17.8459 103.896 18.5206 103.896 19.3126C103.896 20.1047 104.057 20.794 104.38 21.3807C104.717 21.9675 105.172 22.4221 105.744 22.7448C106.33 23.0529 107.005 23.2069 107.768 23.2069C109.161 23.2069 110.313 22.6422 111.222 21.5128ZM112.85 20.1267H103.082V18.4546H112.498L112.85 19.2686V20.1267ZM134.362 24.835H131.524L127.915 12.2062H128.223L124.593 24.835H121.755L117.135 9.10399H119.841L123.581 22.8548H122.899L126.859 9.10399H129.279L133.24 22.8548H132.624L136.342 9.10399H138.982L134.362 24.835ZM148.664 24.835H146.397V22.6568L146.287 22.1948V18.0805C146.287 17.2592 146.023 16.6211 145.495 16.1664C144.967 15.6971 144.249 15.4624 143.339 15.4624C142.679 15.4624 142.063 15.5944 141.491 15.8584C140.934 16.1224 140.45 16.4891 140.039 16.9585L138.631 15.4184C139.232 14.817 139.936 14.3476 140.743 14.0103C141.55 13.6729 142.445 13.5043 143.427 13.5043C144.469 13.5043 145.378 13.6876 146.155 14.0543C146.948 14.4063 147.564 14.9197 148.004 15.5944C148.444 16.2691 148.664 17.0758 148.664 18.0145V24.835ZM142.503 25.187C141.667 25.187 140.926 25.033 140.281 24.725C139.636 24.4169 139.137 23.9989 138.785 23.4709C138.433 22.9428 138.257 22.3268 138.257 21.6228C138.257 20.86 138.477 20.2147 138.917 19.6866C139.357 19.1439 139.966 18.7333 140.743 18.4546C141.535 18.1612 142.445 18.0145 143.471 18.0145H146.551V19.7086H143.691C142.826 19.7086 142.122 19.8627 141.579 20.1707C141.051 20.4787 140.787 20.9334 140.787 21.5348C140.787 22.0775 140.992 22.5102 141.403 22.8328C141.814 23.1409 142.349 23.2949 143.009 23.2949C143.64 23.2949 144.219 23.1629 144.747 22.8988C145.275 22.6348 145.693 22.2755 146.001 21.8208C146.324 21.3514 146.507 20.816 146.551 20.2147L147.344 20.5887C147.344 21.4834 147.138 22.2828 146.727 22.9868C146.317 23.6762 145.745 24.2189 145.011 24.6149C144.278 24.9963 143.442 25.187 142.503 25.187ZM152.831 24.835H150.367V8.99398H152.831V24.835ZM157.172 24.835H154.708V8.99398H157.172V24.835ZM168.465 21.5128L169.873 23.0529C169.301 23.7129 168.59 24.2336 167.739 24.6149C166.888 24.9963 165.942 25.187 164.901 25.187C163.669 25.187 162.576 24.9376 161.623 24.4389C160.684 23.9402 159.943 23.2509 159.401 22.3708C158.873 21.4908 158.609 20.486 158.609 19.3566C158.609 18.2126 158.865 17.2005 159.379 16.3204C159.892 15.4404 160.596 14.751 161.491 14.2523C162.385 13.7536 163.39 13.5043 164.505 13.5043C165.59 13.5043 166.551 13.7536 167.387 14.2523C168.223 14.7363 168.883 15.411 169.367 16.2764C169.851 17.1272 170.093 18.1172 170.093 19.2466V19.3786H167.651V19.1366C167.651 18.4032 167.512 17.7652 167.233 17.2225C166.969 16.6651 166.602 16.2398 166.133 15.9464C165.664 15.6384 165.114 15.4844 164.483 15.4844C163.823 15.4844 163.236 15.6457 162.723 15.9684C162.224 16.2764 161.835 16.7165 161.557 17.2885C161.278 17.8459 161.139 18.5206 161.139 19.3126C161.139 20.1047 161.3 20.794 161.623 21.3807C161.96 21.9675 162.415 22.4221 162.987 22.7448C163.574 23.0529 164.248 23.2069 165.011 23.2069C166.404 23.2069 167.556 22.6422 168.465 21.5128ZM170.093 20.1267H160.325V18.4546H169.741L170.093 19.2686V20.1267ZM177.989 24.835H175.283C174.359 24.835 173.662 24.6003 173.193 24.1309C172.724 23.6469 172.489 22.9502 172.489 22.0408V10.8421H174.953V21.6668C174.953 22.0481 175.041 22.3341 175.217 22.5248C175.393 22.7008 175.672 22.7888 176.053 22.7888H177.989V24.835ZM177.835 15.8584H170.443V13.8563H177.835V15.8584Z" fill="#1C1B1C"/>
-<path d="M55.0117 0.00819881C55.3359 -0.0620189 55.5519 0.335304 55.3174 0.569722L40.9326 14.9633C40.4875 15.4083 40.2364 16.0133 40.2354 16.643V35.7377C40.2352 36.0346 39.8766 36.1826 39.667 35.973L29.3965 25.7064C29.2084 25.5185 29.1035 25.264 29.1035 24.9994V7.183C29.1035 6.28853 29.7273 5.51474 30.6016 5.3246L55.0107 0.00819881H55.0117ZM56.1025 20.2904C56.1025 20.5551 55.9965 20.8086 55.8096 20.9955L41.9443 34.8324C41.9218 34.8549 41.8953 34.8679 41.8682 34.8725C41.8413 34.877 41.8137 34.8738 41.7891 34.8637C41.7394 34.8432 41.7012 34.7951 41.7012 34.7318L41.7031 27.6771L46.3975 23.0297C47.0655 22.4526 47.3423 22.2076 47.7549 22.184C47.8235 22.1801 47.896 22.1821 47.9746 22.1898C48.0532 22.1976 48.138 22.2114 48.2314 22.2299C48.6039 22.3035 48.9558 22.3579 49.2842 22.3764C49.4156 22.3838 49.5432 22.3855 49.667 22.3803C50.2241 22.3568 50.7026 22.1946 51.0898 21.7953C51.427 21.4475 51.853 20.8966 52.0713 19.4955C52.2236 18.5115 52.33 17.8892 52.5439 17.3178C52.7579 16.7464 53.0748 16.3561 53.4551 15.9769V15.976L56.1201 13.2982L56.1025 20.2904ZM55.749 7.92128C55.8852 7.78532 56.1161 7.88245 56.1162 8.0746L56.0967 11.2152L53.1006 14.3314C52.5193 14.8963 51.9466 15.6708 51.6904 16.2768C51.4354 16.8816 51.1497 17.8854 51.0049 18.7484C50.8611 19.6105 50.8812 20.1331 50.1377 20.6019C49.3944 21.0703 48.7644 20.4171 47.8613 20.391L47.8604 20.392C46.962 20.3662 46.3129 21.0185 46.3057 21.0258L41.7021 25.6449V22.5541C41.7021 22.176 41.8521 21.8122 42.1201 21.5443L55.749 7.92128ZM55.9277 2.16738C56.0288 2.17912 56.1191 2.26201 56.1191 2.38222V5.49941H56.1211L41.7021 19.9506V16.8656C41.7021 16.4876 41.8521 16.1237 42.1201 15.8559L55.752 2.22988C55.8026 2.17927 55.8671 2.16034 55.9277 2.16738Z" fill="#1C1B1C"/>
-</svg>
diff --git a/assets/images/history.svg b/assets/images/history.svg
deleted file mode 100644
index f308ab7e3..000000000
--- a/assets/images/history.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_67_21)">
-<path d="M70.4443 8.33334C101.173 8.33336 126 33.1598 126 63.889C126 94.6181 101.173 119.445 70.4443 119.445C53.0832 119.445 37.4581 111.458 27.3887 98.9583L37.2842 89.0628C44.7495 98.9587 56.9027 105.556 70.4443 105.556C93.361 105.556 112.111 86.8056 112.111 63.889C112.111 40.9723 93.361 22.222 70.4443 22.222C56.9027 22.222 44.7495 28.8193 37.2842 38.7152C33.1175 44.0971 30.3405 50.521 29.2988 57.639C28.9516 59.7223 28.7773 61.8057 28.7773 63.889H42.667L21.833 84.722L1 63.889H14.8887C14.8887 61.9793 14.8891 60.2431 15.2363 58.3333C15.7572 52.7778 17.146 47.5692 19.0557 42.5345C27.3891 22.5694 47.3542 8.33334 70.4443 8.33334ZM75.6523 35.4163V60.9378L93.708 78.9925L83.8125 88.889L61.7637 66.6663V35.4163H75.6523Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_67_21">
-<rect width="128" height="128" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/home_screen_setting_icon.svg b/assets/images/home_screen_setting_icon.svg
deleted file mode 100644
index 7b3aa7b4c..000000000
--- a/assets/images/home_screen_setting_icon.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="45" height="46" viewBox="0 0 45 46" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="22.5" cy="23" r="22.5" fill="#312938" fill-opacity="0.1"/>
-<path d="M25.391 19.4402C24.7502 15.2551 21.1352 12.0498 16.7708 12.0498C11.9548 12.0498 8.04984 15.9548 8.04984 20.7708C8.04984 24.1914 10.0183 27.1505 12.8847 28.5797C13.9003 29.087 15.0296 29.401 16.2246 29.4738C16.405 29.4857 16.5874 29.4917 16.7708 29.4917C20.8542 29.4917 24.2807 26.686 25.2306 22.8977C25.401 22.2169 25.4917 21.5043 25.4917 20.7708C25.4917 20.3183 25.4568 19.8738 25.391 19.4402ZM16.7708 26.5017C16.4518 26.5017 16.1379 26.4757 15.8329 26.4249C14.7794 26.2505 13.8226 25.788 13.0452 25.1223C11.8183 24.0708 11.0399 22.51 11.0399 20.7708C11.0399 17.6113 13.6113 15.0399 16.7708 15.0399C19.1429 15.0399 21.1821 16.488 22.0512 18.5462C22.3412 19.2309 22.5017 19.9824 22.5017 20.7708C22.5017 21.0508 22.4817 21.3259 22.4429 21.595C22.0422 24.3658 19.6512 26.5017 16.7708 26.5017Z" fill="#312938"/>
-<path d="M36.4551 15.7874H34.2126V13.5448C34.2126 12.7196 33.5429 12.0498 32.7176 12.0498C31.8924 12.0498 31.2226 12.7196 31.2226 13.5448V15.7874H28.9801C28.1548 15.7874 27.485 16.4571 27.485 17.2824C27.485 18.1076 28.1548 18.7774 28.9801 18.7774H31.2226V21.0199C31.2226 21.8452 31.8924 22.5149 32.7176 22.5149C33.5429 22.5149 34.2126 21.8452 34.2126 21.0199V18.7774H36.4551C37.2804 18.7774 37.9502 18.1076 37.9502 17.2824C37.9502 16.4571 37.2804 15.7874 36.4551 15.7874Z" fill="#312938"/>
-<path d="M25.391 19.4402C25.4568 19.8738 25.4917 20.3183 25.4917 20.7708C25.4917 21.5043 25.401 22.2169 25.2306 22.8977C26.4575 23.9502 27.2359 25.511 27.2359 27.2492C27.2359 30.4096 24.6654 32.9801 21.505 32.9801C19.1339 32.9801 17.0937 31.5319 16.2246 29.4738C15.0296 29.401 13.9003 29.087 12.8847 28.5797C13.5256 32.7658 17.1415 35.9701 21.505 35.9701C26.3219 35.9701 30.2259 32.0661 30.2259 27.2492C30.2259 23.8296 28.2575 20.8684 25.391 19.4402Z" fill="#312938"/>
-</svg>
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x.png
deleted file mode 100644
index 3fd15f3ce..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x~ipad.png
deleted file mode 100644
index 3fd15f3ce..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@3x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@3x.png
deleted file mode 100644
index b6ff994f6..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20~ipad.png
deleted file mode 100644
index 4be1a2317..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-20~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29.png
deleted file mode 100644
index 219f2c6be..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x.png
deleted file mode 100644
index ae94bb0ac..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x~ipad.png
deleted file mode 100644
index ae94bb0ac..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@3x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@3x.png
deleted file mode 100644
index 0ef9d3bbf..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29~ipad.png
deleted file mode 100644
index 219f2c6be..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-29~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x.png
deleted file mode 100644
index 9fdb32376..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x~ipad.png
deleted file mode 100644
index 9fdb32376..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@3x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@3x.png
deleted file mode 100644
index 485f8b37b..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40~ipad.png
deleted file mode 100644
index 3fd15f3ce..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-40~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@2x~car.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@2x~car.png
deleted file mode 100644
index 485f8b37b..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@2x~car.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@3x~car.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@3x~car.png
deleted file mode 100644
index 50148e6dc..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-60@3x~car.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-83.5@2x~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-83.5@2x~ipad.png
deleted file mode 100644
index 8f290ada2..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon-83.5@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x.png
deleted file mode 100644
index 485f8b37b..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x~ipad.png
deleted file mode 100644
index b11d7332f..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@3x.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@3x.png
deleted file mode 100644
index 50148e6dc..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ios-marketing.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ios-marketing.png
deleted file mode 100644
index 1fce95553..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ios-marketing.png and /dev/null differ
diff --git a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ipad.png b/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ipad.png
deleted file mode 100644
index 7d4a82186..000000000
Binary files a/assets/images/ios_icons/cakewallet_ios_icons/AppIcon~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x.png
deleted file mode 100644
index 7ea540caf..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x~ipad.png
deleted file mode 100644
index 7ea540caf..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-20@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-20@3x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-20@3x.png
deleted file mode 100644
index 6ac773754..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-20@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-20~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-20~ipad.png
deleted file mode 100644
index 57864a9b3..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-20~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-29.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-29.png
deleted file mode 100644
index 27f817dfc..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-29.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x.png
deleted file mode 100644
index 0455b4409..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x~ipad.png
deleted file mode 100644
index 0455b4409..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-29@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-29@3x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-29@3x.png
deleted file mode 100644
index 1b8a73481..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-29@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-29~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-29~ipad.png
deleted file mode 100644
index 27f817dfc..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-29~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x.png
deleted file mode 100644
index 963612d0c..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x~ipad.png
deleted file mode 100644
index 963612d0c..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-40@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-40@3x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-40@3x.png
deleted file mode 100644
index b6da404cb..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-40@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-40~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-40~ipad.png
deleted file mode 100644
index 7ea540caf..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-40~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-60@2x~car.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-60@2x~car.png
deleted file mode 100644
index b6da404cb..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-60@2x~car.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-60@3x~car.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-60@3x~car.png
deleted file mode 100644
index 37f7651a5..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-60@3x~car.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon-83.5@2x~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon-83.5@2x~ipad.png
deleted file mode 100644
index 21aa12463..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon-83.5@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon@2x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon@2x.png
deleted file mode 100644
index b6da404cb..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon@2x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon@2x~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon@2x~ipad.png
deleted file mode 100644
index b6b63a61e..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon@2x~ipad.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon@3x.png b/assets/images/ios_icons/monero_ios_icons/AppIcon@3x.png
deleted file mode 100644
index 37f7651a5..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon@3x.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon~ios-marketing.png b/assets/images/ios_icons/monero_ios_icons/AppIcon~ios-marketing.png
deleted file mode 100644
index 0c977110a..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon~ios-marketing.png and /dev/null differ
diff --git a/assets/images/ios_icons/monero_ios_icons/AppIcon~ipad.png b/assets/images/ios_icons/monero_ios_icons/AppIcon~ipad.png
deleted file mode 100644
index 849c5612a..000000000
Binary files a/assets/images/ios_icons/monero_ios_icons/AppIcon~ipad.png and /dev/null differ
diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png
index c465fa26c..73101354a 100644
Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png and b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_1024.png differ
diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png
index e79db4d99..9ceee3c5e 100644
Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png and b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_128.png differ
diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png
index 2d030845b..ef46cd805 100644
Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png and b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_16.png differ
diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png
index eef607c2c..6547a1b1b 100644
Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png and b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_256.png differ
diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png
index a09896830..e436872e8 100644
Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png and b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_32.png differ
diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png
index a98c5faf8..157b00493 100644
Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png and b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_512.png differ
diff --git a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png
index d8141a250..a46ed4535 100644
Binary files a/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png and b/assets/images/macos_icons/cakewallet_macos_icons/cakewallet_macos_64.png differ
diff --git a/assets/images/menu.svg b/assets/images/menu.svg
deleted file mode 100644
index 0a4cc3784..000000000
--- a/assets/images/menu.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M21 17V19H1V17H21ZM21 12H1V10H21V12ZM21 5H1V3H21V5Z" fill="white"/>
-</svg>
diff --git a/assets/images/notif.svg b/assets/images/notif.svg
deleted file mode 100644
index b1ff5b4fa..000000000
--- a/assets/images/notif.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M77.9219 103.359C77.9219 111.953 71.0469 119 62.4531 119C53.8594 119 46.8125 111.953 46.8125 103.359C46.8125 102.672 46.8125 102.156 46.9844 101.641H9V87.8906H21.0312V51.9688C21.0312 28.25 40.2812 9 64 9C87.7188 9 106.969 28.25 106.969 51.9688V87.8906H119V101.641H77.9219V103.359ZM64 22.75C47.8438 22.75 34.7812 35.8125 34.7812 51.9688V87.8906H93.2188V51.9688C93.2188 35.8125 80.1562 22.75 64 22.75Z" fill="white"/>
-</svg>
diff --git a/assets/images/notification_icon.svg b/assets/images/notification_icon.svg
index 360d0b4e6..099039e67 100644
--- a/assets/images/notification_icon.svg
+++ b/assets/images/notification_icon.svg
@@ -1,3 +1,69 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.7842 18.8721C13.7841 20.5907 12.4091 22 10.6904 22C8.97183 21.9999 7.56261 20.5907 7.5625 18.8721C7.5625 18.7347 7.56238 18.6314 7.59668 18.5283H0V15.7783H2.40625V8.59375C2.40625 3.85 6.25625 0 11 0C15.7437 0 19.5938 3.85 19.5938 8.59375V15.7783H22V18.5283H13.7842V18.8721ZM11 2.75C7.76875 2.75 5.15625 5.3625 5.15625 8.59375V15.7783H16.8438V8.59375C16.8438 5.3625 14.2312 2.75 11 2.75Z" fill="white"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   width="510px"
+   height="510px"
+   viewBox="0 0 510 510"
+   style="enable-background:new 0 0 510 510;"
+   xml:space="preserve"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="notification_logo_tilt_white.svg"><metadata
+     id="metadata42"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs40" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1090"
+     id="namedview38"
+     showgrid="false"
+     inkscape:zoom="0.4627451"
+     inkscape:cx="-849.27966"
+     inkscape:cy="255"
+     inkscape:window-x="-12"
+     inkscape:window-y="58"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="notifications"
+     inkscape:object-paths="true" /><g
+     id="g3"
+     transform="matrix(0.87658593,0,0,0.87658593,31.470588,31.470588)"><g
+       id="notifications"
+       transform="rotate(-20,255,255)"><path
+         d="m 233.56017,502.19654 c 28.05,0 51,-22.95 51,-51 h -102 c 0,28.05 22.95,51 51,51 z m 165.75,-153 v -140.25 c 0,-79.05 -53.55,-142.8 -127.5,-160.65 v -17.85 c 0,-20.4 -17.85,-38.2499996 -38.25,-38.2499996 -20.4,0 -38.25,17.8499996 -38.25,38.2499996 v 17.85 c -73.95,17.85 -127.499999,81.6 -127.499999,160.65 v 140.25 l -51,51 v 25.5 H 450.31017 v -25.5 z"
+         id="path6"
+         inkscape:connector-curvature="0"
+         style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:19.39342117;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g><g
+     id="g8" /><g
+     id="g10" /><g
+     id="g12" /><g
+     id="g14" /><g
+     id="g16" /><g
+     id="g18" /><g
+     id="g20" /><g
+     id="g22" /><g
+     id="g24" /><g
+     id="g26" /><g
+     id="g28" /><g
+     id="g30" /><g
+     id="g32" /><g
+     id="g34" /><g
+     id="g36" /></svg>
\ No newline at end of file
diff --git a/assets/images/passphrase_dark.png b/assets/images/passphrase_dark.png
deleted file mode 100644
index f72d1e1a1..000000000
Binary files a/assets/images/passphrase_dark.png and /dev/null differ
diff --git a/assets/images/passphrase_key.svg b/assets/images/passphrase_key.svg
deleted file mode 100644
index c577dc30a..000000000
--- a/assets/images/passphrase_key.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<svg width="158" height="158" viewBox="0 0 158 158" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3076_287)">
-<path d="M59.8674 111.213C61.104 109.782 62.8874 109.123 64.6415 109.237L69.6321 103.461C69.1122 101.951 69.369 100.216 70.4903 98.9183C71.6101 97.6223 73.2894 97.1164 74.8608 97.4098L79.8316 91.6568L65.7827 79.5181L42.7631 106.16C41.9574 107.093 41.5571 108.305 41.6467 109.532L41.9828 114.163L48.3733 119.684L53.4019 119.732C54.767 119.746 56.0685 119.159 56.9607 118.127L58.6055 116.223C58.2383 114.504 58.6308 112.644 59.8674 111.213Z" fill="url(#paint0_linear_3076_287)"/>
-<path d="M115.362 82.4834C126.257 69.8745 124.867 50.823 112.258 39.9285C99.6491 29.0339 80.5975 30.4236 69.703 43.0325C69.1902 43.6261 68.7318 44.2453 68.2752 44.866L68.1857 44.7886L56.0469 58.8375C52.6951 62.7168 53.1228 68.5796 57.002 71.9314L88.6121 99.2435C92.4913 102.595 98.3541 102.168 101.706 98.2884L113.845 84.2395L113.755 84.1621C114.303 83.6203 114.849 83.077 115.362 82.4834ZM104.671 48.709C108.551 52.0608 108.978 57.9236 105.626 61.8029C102.275 65.6821 96.4118 66.1098 92.5325 62.758C88.6532 59.4061 88.2256 53.5434 91.5774 49.6641C94.9292 45.7849 100.792 45.3572 104.671 48.709Z" fill="url(#paint1_linear_3076_287)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_3076_287" x1="72.8481" y1="85.54" x2="45.4677" y2="117.229" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E5A505"/>
-<stop offset="0.01" stop-color="#E9A804"/>
-<stop offset="0.06" stop-color="#F4B102"/>
-<stop offset="0.129" stop-color="#FBB600"/>
-<stop offset="0.323" stop-color="#FDB700"/>
-</linearGradient>
-<linearGradient id="paint1_linear_3076_287" x1="91.8949" y1="31.3914" x2="84.3571" y2="99.6065" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FEDE00"/>
-<stop offset="1" stop-color="#FFD000"/>
-</linearGradient>
-<clipPath id="clip0_3076_287">
-<rect width="111.4" height="111.4" fill="white" transform="translate(73.146) rotate(40.8281)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/assets/images/passphrase_light.png b/assets/images/passphrase_light.png
deleted file mode 100644
index f86f68156..000000000
Binary files a/assets/images/passphrase_light.png and /dev/null differ
diff --git a/assets/images/payjoin.png b/assets/images/payjoin.png
deleted file mode 100644
index 1ba3dccdb..000000000
Binary files a/assets/images/payjoin.png and /dev/null differ
diff --git a/assets/images/qr-cake.png b/assets/images/qr-cake.png
deleted file mode 100644
index 7c54dedb0..000000000
Binary files a/assets/images/qr-cake.png and /dev/null differ
diff --git a/assets/images/receive.png b/assets/images/receive.png
deleted file mode 100644
index 180a4e5b3..000000000
Binary files a/assets/images/receive.png and /dev/null differ
diff --git a/assets/images/seed_verified_dark.png b/assets/images/seed_verified_dark.png
deleted file mode 100644
index cbefa5d8c..000000000
Binary files a/assets/images/seed_verified_dark.png and /dev/null differ
diff --git a/assets/images/seed_verified_light.png b/assets/images/seed_verified_light.png
deleted file mode 100644
index a51eddcd7..000000000
Binary files a/assets/images/seed_verified_light.png and /dev/null differ
diff --git a/assets/images/seed_warning_dark.svg b/assets/images/seed_warning_dark.svg
deleted file mode 100644
index 0a47254ff..000000000
--- a/assets/images/seed_warning_dark.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<svg width="260" height="298" viewBox="0 0 260 298" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M119.655 6.27832C126.055 3.53578 133.272 3.45033 139.723 6.02148L140.345 6.27832L243.044 50.293C252.699 54.431 258.96 63.925 258.96 74.4297V128.542C258.96 175.815 236.309 220.2 198.085 247.94L197.18 248.593L145.264 285.676C136.276 292.096 124.25 292.197 115.167 285.978L114.736 285.676L62.8203 248.593C24.0499 220.899 1.04004 176.187 1.04004 128.542V74.4297C1.04004 64.0891 7.10644 54.7283 16.5059 50.4912L16.9561 50.293L119.655 6.27832Z" stroke="#708BF4" stroke-opacity="0.05" stroke-width="2.08"/>
-<path d="M120.451 17.2793C126.358 14.7477 133.02 14.6687 138.975 17.042L139.549 17.2793L234.349 57.9082C243.261 61.7279 249.04 70.491 249.04 80.1875V130.138C249.04 173.775 228.131 214.745 192.848 240.352L192.012 240.954L144.089 275.185C135.792 281.111 124.692 281.204 116.308 275.463L115.911 275.185L67.9883 240.954C32.2001 215.391 10.96 174.118 10.96 130.138V80.1875C10.9601 70.6424 16.56 62.0019 25.2363 58.0908L25.6514 57.9082L120.451 17.2793Z" stroke="#708BF4" stroke-opacity="0.15" stroke-width="1.92"/>
-<path d="M121.294 28.3906C126.68 26.0825 132.754 26.0099 138.183 28.1738L138.706 28.3906L225.605 65.6328C233.731 69.1153 239 77.1057 239 85.9463V131.733C239 171.381 220.152 208.625 188.301 232.109L186.774 233.218L142.846 264.596C135.282 269.999 125.161 270.083 117.517 264.849L117.154 264.596L73.2256 233.218C40.4513 209.807 21 172.01 21 131.733V85.9463C21 77.2438 26.1053 69.3657 34.0156 65.7998L34.3945 65.6328L121.294 28.3906Z" stroke="#708BF4" stroke-opacity="0.5" stroke-width="2"/>
-<path d="M77.8584 226.327L117.794 254.853C125.096 260.068 134.904 260.068 142.206 254.853L182.141 226.327C212.176 204.874 230 170.238 230 133.329V91.7045C230 83.3039 224.994 75.7116 217.272 72.4024L138.272 38.5453C132.99 36.2813 127.01 36.2813 121.728 38.5453L42.7277 72.4024C35.0063 75.7116 30 83.3039 30 91.7045V133.329C30 170.238 47.8247 204.874 77.8584 226.327Z" fill="black"/>
-<path d="M77.8584 226.327L117.794 254.853C125.096 260.068 134.904 260.068 142.206 254.853L182.141 226.327C212.176 204.874 230 170.238 230 133.329V91.7045C230 83.3039 224.994 75.7116 217.272 72.4024L138.272 38.5453C132.99 36.2813 127.01 36.2813 121.728 38.5453L42.7277 72.4024C35.0063 75.7116 30 83.3039 30 91.7045V133.329C30 170.238 47.8247 204.874 77.8584 226.327Z" fill="url(#paint0_linear_4659_24215)"/>
-<path d="M123.479 42.6299C127.513 40.9009 132.063 40.8476 136.13 42.4688L136.521 42.6299L215.521 76.4873C221.609 79.0961 225.556 85.0816 225.556 91.7041V133.329C225.556 168.248 208.955 201.051 180.902 221.734L179.559 222.711L139.623 251.236C134.047 255.22 126.615 255.344 120.923 251.609L120.377 251.236L80.4414 222.711C51.5757 202.092 34.4443 168.802 34.4443 133.329V91.7041C34.4445 85.2886 38.1486 79.4713 43.9141 76.7422L44.4785 76.4873L123.479 42.6299Z" stroke="url(#paint1_linear_4659_24215)" stroke-width="8.88889"/>
-<path d="M123.479 42.6299C127.513 40.9009 132.063 40.8476 136.13 42.4688L136.521 42.6299L215.521 76.4873C221.609 79.0961 225.556 85.0816 225.556 91.7041V133.329C225.556 168.248 208.955 201.051 180.902 221.734L179.559 222.711L139.623 251.236C134.047 255.22 126.615 255.344 120.923 251.609L120.377 251.236L80.4414 222.711C51.5757 202.092 34.4443 168.802 34.4443 133.329V91.7041C34.4445 85.2886 38.1486 79.4713 43.9141 76.7422L44.4785 76.4873L123.479 42.6299Z" stroke="url(#paint2_linear_4659_24215)" stroke-width="8.88889"/>
-<path d="M123.479 42.6299C127.513 40.9009 132.063 40.8476 136.13 42.4688L136.521 42.6299L215.521 76.4873C221.609 79.0961 225.556 85.0816 225.556 91.7041V133.329C225.556 168.248 208.955 201.051 180.902 221.734L179.559 222.711L139.623 251.236C134.047 255.22 126.615 255.344 120.923 251.609L120.377 251.236L80.4414 222.711C51.5757 202.092 34.4443 168.802 34.4443 133.329V91.7041C34.4445 85.2886 38.1486 79.4713 43.9141 76.7422L44.4785 76.4873L123.479 42.6299Z" stroke="url(#paint3_linear_4659_24215)" stroke-width="8.88889"/>
-<g filter="url(#filter0_i_4659_24215)">
-<path d="M77.8584 226.327L117.794 254.853C125.096 260.068 134.904 260.068 142.206 254.853L182.141 226.327C212.176 204.874 230 170.238 230 133.329V91.7045C230 83.3039 224.994 75.7116 217.272 72.4024L138.272 38.5453C132.99 36.2813 127.01 36.2813 121.728 38.5453L42.7277 72.4024C35.0063 75.7116 30 83.3039 30 91.7045V133.329C30 170.238 47.8247 204.874 77.8584 226.327Z" fill="black" fill-opacity="0.01"/>
-</g>
-<g filter="url(#filter1_ii_4659_24215)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M147.625 154.25C163.158 154.25 175.75 141.658 175.75 126.125C175.75 110.592 163.158 98 147.625 98C132.092 98 119.5 110.592 119.5 126.125C119.5 131.628 121.081 136.763 123.813 141.098L85.6611 179.25L104.393 197.982L113.232 189.143L103.339 179.25L113.25 169.339L123.143 179.232L131.982 170.393L122.089 160.5L132.652 149.937C136.987 152.669 142.122 154.25 147.625 154.25ZM147.625 141.75C156.254 141.75 163.25 134.754 163.25 126.125C163.25 117.496 156.254 110.5 147.625 110.5C138.996 110.5 132 117.496 132 126.125C132 134.754 138.996 141.75 147.625 141.75Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M147.625 154.25C163.158 154.25 175.75 141.658 175.75 126.125C175.75 110.592 163.158 98 147.625 98C132.092 98 119.5 110.592 119.5 126.125C119.5 131.628 121.081 136.763 123.813 141.098L85.6611 179.25L104.393 197.982L113.232 189.143L103.339 179.25L113.25 169.339L123.143 179.232L131.982 170.393L122.089 160.5L132.652 149.937C136.987 152.669 142.122 154.25 147.625 154.25ZM147.625 141.75C156.254 141.75 163.25 134.754 163.25 126.125C163.25 117.496 156.254 110.5 147.625 110.5C138.996 110.5 132 117.496 132 126.125C132 134.754 138.996 141.75 147.625 141.75Z" fill="url(#paint4_linear_4659_24215)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M147.625 154.25C163.158 154.25 175.75 141.658 175.75 126.125C175.75 110.592 163.158 98 147.625 98C132.092 98 119.5 110.592 119.5 126.125C119.5 131.628 121.081 136.763 123.813 141.098L85.6611 179.25L104.393 197.982L113.232 189.143L103.339 179.25L113.25 169.339L123.143 179.232L131.982 170.393L122.089 160.5L132.652 149.937C136.987 152.669 142.122 154.25 147.625 154.25ZM147.625 141.75C156.254 141.75 163.25 134.754 163.25 126.125C163.25 117.496 156.254 110.5 147.625 110.5C138.996 110.5 132 117.496 132 126.125C132 134.754 138.996 141.75 147.625 141.75Z" fill="url(#paint5_linear_4659_24215)"/>
-</g>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" fill="#D9D9D9"/>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" fill="url(#paint6_linear_4659_24215)"/>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" stroke="#312938" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" stroke="url(#paint7_linear_4659_24215)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" stroke="url(#paint8_linear_4659_24215)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M189.907 212.209H189.952M189.907 198.907V185.604" stroke="#312938" stroke-width="8.86825" stroke-linecap="round" stroke-linejoin="round"/>
-<defs>
-<filter id="filter0_i_4659_24215" x="30" y="36.8477" width="200" height="221.917" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
-<feBlend mode="plus-lighter" in2="shape" result="effect1_innerShadow_4659_24215"/>
-</filter>
-<filter id="filter1_ii_4659_24215" x="85.6611" y="98" width="90.0889" height="99.9814" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.4 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4659_24215"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="-2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
-<feBlend mode="normal" in2="effect1_innerShadow_4659_24215" result="effect2_innerShadow_4659_24215"/>
-</filter>
-<linearGradient id="paint0_linear_4659_24215" x1="130" y1="35" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#19233C"/>
-<stop offset="1" stop-color="#1647C3"/>
-</linearGradient>
-<linearGradient id="paint1_linear_4659_24215" x1="130" y1="35" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.42" stop-color="#2077F8"/>
-<stop offset="0.700262" stop-color="#000F4D"/>
-</linearGradient>
-<linearGradient id="paint2_linear_4659_24215" x1="130" y1="35" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint3_linear_4659_24215" x1="130" y1="35" x2="130" y2="263.571" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D8E3FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint4_linear_4659_24215" x1="130.705" y1="98" x2="130.705" y2="197.982" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#6DA8FF"/>
-</linearGradient>
-<linearGradient id="paint5_linear_4659_24215" x1="130.705" y1="98" x2="130.705" y2="197.982" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#6891FE"/>
-</linearGradient>
-<linearGradient id="paint6_linear_4659_24215" x1="190" y1="159" x2="190.533" y2="242.2" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFC414"/>
-<stop offset="1" stop-color="#FF9500"/>
-</linearGradient>
-<linearGradient id="paint7_linear_4659_24215" x1="190" y1="159" x2="190" y2="230.082" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5C486E"/>
-<stop offset="1" stop-color="#312938"/>
-</linearGradient>
-<linearGradient id="paint8_linear_4659_24215" x1="190" y1="159" x2="190" y2="230.082" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#EBD4FF"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/assets/images/seed_warning_light.svg b/assets/images/seed_warning_light.svg
deleted file mode 100644
index cab27ec31..000000000
--- a/assets/images/seed_warning_light.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-<svg width="260" height="298" viewBox="0 0 260 298" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M119.655 6.2793C126.055 3.53675 133.272 3.4513 139.723 6.02246L140.345 6.2793L243.044 50.2939C252.699 54.432 258.96 63.9259 258.96 74.4307V128.543C258.96 175.816 236.309 220.201 198.085 247.941L197.18 248.594L145.264 285.677C136.276 292.097 124.25 292.198 115.167 285.979L114.736 285.677L62.8203 248.594C24.0499 220.9 1.04004 176.188 1.04004 128.543V74.4307C1.04004 64.09 7.10644 54.7293 16.5059 50.4922L16.9561 50.2939L119.655 6.2793Z" stroke="#4A98DC" stroke-opacity="0.05" stroke-width="2.08"/>
-<path d="M120.451 17.2803C126.358 14.7487 133.02 14.6696 138.975 17.043L139.549 17.2803L234.349 57.9092C243.261 61.7289 249.04 70.492 249.04 80.1885V130.139C249.04 173.775 228.131 214.746 192.848 240.353L192.012 240.955L144.089 275.186C135.792 281.112 124.692 281.205 116.308 275.464L115.911 275.186L67.9883 240.955C32.2001 215.392 10.96 174.119 10.96 130.139V80.1885C10.9601 70.6434 16.56 62.0028 25.2363 58.0918L25.6514 57.9092L120.451 17.2803Z" stroke="#4B98DC" stroke-opacity="0.15" stroke-width="1.92"/>
-<path d="M121.294 28.3916C126.68 26.0835 132.754 26.0109 138.183 28.1748L138.706 28.3916L225.605 65.6338C233.731 69.1163 239 77.1066 239 85.9473V131.734C239 171.382 220.152 208.626 188.301 232.11L186.774 233.219L142.846 264.597C135.282 270 125.161 270.084 117.517 264.85L117.154 264.597L73.2256 233.219C40.4513 209.808 21 172.011 21 131.734V85.9473C21 77.2448 26.1053 69.3666 34.0156 65.8008L34.3945 65.6338L121.294 28.3916Z" stroke="#4895DB" stroke-opacity="0.35" stroke-width="2"/>
-<path d="M77.8584 226.328L117.794 254.854C125.096 260.069 134.904 260.069 142.206 254.854L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7054C230 83.3049 224.994 75.7126 217.272 72.4034L138.272 38.5462C132.99 36.2823 127.01 36.2823 121.728 38.5463L42.7277 72.4034C35.0063 75.7126 30 83.3049 30 91.7054V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="black"/>
-<path d="M77.8584 226.328L117.794 254.854C125.096 260.069 134.904 260.069 142.206 254.854L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7054C230 83.3049 224.994 75.7126 217.272 72.4034L138.272 38.5462C132.99 36.2823 127.01 36.2823 121.728 38.5463L42.7277 72.4034C35.0063 75.7126 30 83.3049 30 91.7054V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint0_linear_5093_13165)"/>
-<path d="M77.8584 226.328L117.794 254.854C125.096 260.069 134.904 260.069 142.206 254.854L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7054C230 83.3049 224.994 75.7126 217.272 72.4034L138.272 38.5462C132.99 36.2823 127.01 36.2823 121.728 38.5463L42.7277 72.4034C35.0063 75.7126 30 83.3049 30 91.7054V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint1_linear_5093_13165)"/>
-<path d="M77.8584 226.328L117.794 254.854C125.096 260.069 134.904 260.069 142.206 254.854L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7054C230 83.3049 224.994 75.7126 217.272 72.4034L138.272 38.5462C132.99 36.2823 127.01 36.2823 121.728 38.5463L42.7277 72.4034C35.0063 75.7126 30 83.3049 30 91.7054V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint2_linear_5093_13165)"/>
-<path d="M77.8584 226.328L117.794 254.854C125.096 260.069 134.904 260.069 142.206 254.854L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7054C230 83.3049 224.994 75.7126 217.272 72.4034L138.272 38.5462C132.99 36.2823 127.01 36.2823 121.728 38.5463L42.7277 72.4034C35.0063 75.7126 30 83.3049 30 91.7054V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint3_linear_5093_13165)"/>
-<path d="M77.8584 226.328L117.794 254.854C125.096 260.069 134.904 260.069 142.206 254.854L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7054C230 83.3049 224.994 75.7126 217.272 72.4034L138.272 38.5462C132.99 36.2823 127.01 36.2823 121.728 38.5463L42.7277 72.4034C35.0063 75.7126 30 83.3049 30 91.7054V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="url(#paint4_radial_5093_13165)" fill-opacity="0.3"/>
-<path d="M123.479 42.6309C127.513 40.9019 132.063 40.8486 136.13 42.4697L136.521 42.6309L215.521 76.4883C221.609 79.097 225.556 85.0825 225.556 91.7051V133.33C225.556 168.249 208.955 201.052 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.221 126.615 255.345 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7051C34.4445 85.2895 38.1486 79.4723 43.9141 76.7432L44.4785 76.4883L123.479 42.6309Z" stroke="url(#paint5_linear_5093_13165)" stroke-width="8.88889"/>
-<path d="M123.479 42.6309C127.513 40.9019 132.063 40.8486 136.13 42.4697L136.521 42.6309L215.521 76.4883C221.609 79.097 225.556 85.0825 225.556 91.7051V133.33C225.556 168.249 208.955 201.052 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.221 126.615 255.345 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7051C34.4445 85.2895 38.1486 79.4723 43.9141 76.7432L44.4785 76.4883L123.479 42.6309Z" stroke="url(#paint6_linear_5093_13165)" stroke-width="8.88889"/>
-<path d="M123.479 42.6309C127.513 40.9019 132.063 40.8486 136.13 42.4697L136.521 42.6309L215.521 76.4883C221.609 79.097 225.556 85.0825 225.556 91.7051V133.33C225.556 168.249 208.955 201.052 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.221 126.615 255.345 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7051C34.4445 85.2895 38.1486 79.4723 43.9141 76.7432L44.4785 76.4883L123.479 42.6309Z" stroke="url(#paint7_linear_5093_13165)" stroke-width="8.88889"/>
-<path d="M123.479 42.6309C127.513 40.9019 132.063 40.8486 136.13 42.4697L136.521 42.6309L215.521 76.4883C221.609 79.097 225.556 85.0825 225.556 91.7051V133.33C225.556 168.249 208.955 201.052 180.902 221.735L179.559 222.712L139.623 251.237C134.047 255.221 126.615 255.345 120.923 251.61L120.377 251.237L80.4414 222.712C51.5757 202.093 34.4443 168.803 34.4443 133.33V91.7051C34.4445 85.2895 38.1486 79.4723 43.9141 76.7432L44.4785 76.4883L123.479 42.6309Z" stroke="url(#paint8_linear_5093_13165)" stroke-width="8.88889"/>
-<g filter="url(#filter0_i_5093_13165)">
-<path d="M77.8584 226.328L117.794 254.854C125.096 260.069 134.904 260.069 142.206 254.854L182.141 226.328C212.176 204.875 230 170.239 230 133.33V91.7054C230 83.3049 224.994 75.7126 217.272 72.4034L138.272 38.5462C132.99 36.2823 127.01 36.2823 121.728 38.5463L42.7277 72.4034C35.0063 75.7126 30 83.3049 30 91.7054V133.33C30 170.239 47.8247 204.875 77.8584 226.328Z" fill="black" fill-opacity="0.01"/>
-</g>
-<g filter="url(#filter1_ii_5093_13165)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M147.625 154.251C163.158 154.251 175.75 141.659 175.75 126.126C175.75 110.593 163.158 98.001 147.625 98.001C132.092 98.001 119.5 110.593 119.5 126.126C119.5 131.629 121.081 136.764 123.813 141.099L85.6611 179.251L104.393 197.983L113.232 189.144L103.339 179.251L113.25 169.34L123.143 179.233L131.982 170.394L122.089 160.501L132.652 149.938C136.987 152.67 142.122 154.251 147.625 154.251ZM147.625 141.751C156.254 141.751 163.25 134.755 163.25 126.126C163.25 117.497 156.254 110.501 147.625 110.501C138.996 110.501 132 117.497 132 126.126C132 134.755 138.996 141.751 147.625 141.751Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M147.625 154.251C163.158 154.251 175.75 141.659 175.75 126.126C175.75 110.593 163.158 98.001 147.625 98.001C132.092 98.001 119.5 110.593 119.5 126.126C119.5 131.629 121.081 136.764 123.813 141.099L85.6611 179.251L104.393 197.983L113.232 189.144L103.339 179.251L113.25 169.34L123.143 179.233L131.982 170.394L122.089 160.501L132.652 149.938C136.987 152.67 142.122 154.251 147.625 154.251ZM147.625 141.751C156.254 141.751 163.25 134.755 163.25 126.126C163.25 117.497 156.254 110.501 147.625 110.501C138.996 110.501 132 117.497 132 126.126C132 134.755 138.996 141.751 147.625 141.751Z" fill="url(#paint9_linear_5093_13165)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M147.625 154.251C163.158 154.251 175.75 141.659 175.75 126.126C175.75 110.593 163.158 98.001 147.625 98.001C132.092 98.001 119.5 110.593 119.5 126.126C119.5 131.629 121.081 136.764 123.813 141.099L85.6611 179.251L104.393 197.983L113.232 189.144L103.339 179.251L113.25 169.34L123.143 179.233L131.982 170.394L122.089 160.501L132.652 149.938C136.987 152.67 142.122 154.251 147.625 154.251ZM147.625 141.751C156.254 141.751 163.25 134.755 163.25 126.126C163.25 117.497 156.254 110.501 147.625 110.501C138.996 110.501 132 117.497 132 126.126C132 134.755 138.996 141.751 147.625 141.751Z" fill="url(#paint10_linear_5093_13165)"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M147.625 154.251C163.158 154.251 175.75 141.659 175.75 126.126C175.75 110.593 163.158 98.001 147.625 98.001C132.092 98.001 119.5 110.593 119.5 126.126C119.5 131.629 121.081 136.764 123.813 141.099L85.6611 179.251L104.393 197.983L113.232 189.144L103.339 179.251L113.25 169.34L123.143 179.233L131.982 170.394L122.089 160.501L132.652 149.938C136.987 152.67 142.122 154.251 147.625 154.251ZM147.625 141.751C156.254 141.751 163.25 134.755 163.25 126.126C163.25 117.497 156.254 110.501 147.625 110.501C138.996 110.501 132 117.497 132 126.126C132 134.755 138.996 141.751 147.625 141.751Z" fill="url(#paint11_linear_5093_13165)"/>
-</g>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" fill="#D9D9D9"/>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" fill="url(#paint12_linear_5093_13165)"/>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" stroke="#312938" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M158.882 230.082H221.118C227.963 230.082 232.227 222.658 228.779 216.746L197.66 163.4C194.238 157.533 185.762 157.533 182.34 163.4L151.221 216.746C147.773 222.658 152.037 230.082 158.882 230.082Z" stroke="url(#paint13_linear_5093_13165)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M189.907 212.209H189.952M189.907 198.907V185.604" stroke="#312938" stroke-width="8.86825" stroke-linecap="round" stroke-linejoin="round"/>
-<defs>
-<filter id="filter0_i_5093_13165" x="30" y="36.8486" width="200" height="221.917" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_5093_13165"/>
-</filter>
-<filter id="filter1_ii_5093_13165" x="85.6611" y="98.001" width="90.0889" height="99.9814" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.3 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_5093_13165"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="-2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
-<feBlend mode="normal" in2="effect1_innerShadow_5093_13165" result="effect2_innerShadow_5093_13165"/>
-</filter>
-<linearGradient id="paint0_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#002A52"/>
-<stop offset="1" stop-color="#0652DF"/>
-</linearGradient>
-<linearGradient id="paint1_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#19233C"/>
-<stop offset="1" stop-color="#144CD8"/>
-</linearGradient>
-<linearGradient id="paint2_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#19233C"/>
-<stop offset="1" stop-color="#1647C3"/>
-</linearGradient>
-<linearGradient id="paint3_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FAFAFA"/>
-<stop offset="1" stop-color="#72AAFF"/>
-</linearGradient>
-<radialGradient id="paint4_radial_5093_13165" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(130 149.287) rotate(90) scale(97.381 85.2083)">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</radialGradient>
-<linearGradient id="paint5_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.42" stop-color="#2077F8"/>
-<stop offset="0.700262" stop-color="#000F4D"/>
-</linearGradient>
-<linearGradient id="paint6_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#C1F2FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint7_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D8E3FF"/>
-<stop offset="0.700262" stop-color="#718CF5"/>
-</linearGradient>
-<linearGradient id="paint8_linear_5093_13165" x1="130" y1="35.001" x2="130" y2="263.572" gradientUnits="userSpaceOnUse">
-<stop stop-color="#68BEEF"/>
-<stop offset="0.700262" stop-color="#2C71CC"/>
-</linearGradient>
-<linearGradient id="paint9_linear_5093_13165" x1="130.705" y1="98.001" x2="130.705" y2="197.983" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#6DA8FF"/>
-</linearGradient>
-<linearGradient id="paint10_linear_5093_13165" x1="130.705" y1="98.001" x2="130.705" y2="197.983" gradientUnits="userSpaceOnUse">
-<stop stop-color="#68BEEF"/>
-<stop offset="1" stop-color="#0047A3"/>
-</linearGradient>
-<linearGradient id="paint11_linear_5093_13165" x1="130.705" y1="98.001" x2="130.705" y2="197.983" gradientUnits="userSpaceOnUse">
-<stop stop-color="#68BEEF"/>
-<stop offset="0.700262" stop-color="#2C71CC"/>
-</linearGradient>
-<linearGradient id="paint12_linear_5093_13165" x1="190" y1="159" x2="190.533" y2="242.2" gradientUnits="userSpaceOnUse">
-<stop stop-color="#FFC414"/>
-<stop offset="1" stop-color="#FF9500"/>
-</linearGradient>
-<linearGradient id="paint13_linear_5093_13165" x1="190" y1="159" x2="190" y2="230.082" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5C486E"/>
-<stop offset="1" stop-color="#312938"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/assets/images/send.png b/assets/images/send.png
new file mode 100644
index 000000000..aef504999
Binary files /dev/null and b/assets/images/send.png differ
diff --git a/assets/images/send2.png b/assets/images/send2.png
deleted file mode 100644
index 85fc570a8..000000000
Binary files a/assets/images/send2.png and /dev/null differ
diff --git a/assets/images/swap.png b/assets/images/swap.png
deleted file mode 100644
index fe3fc0893..000000000
Binary files a/assets/images/swap.png and /dev/null differ
diff --git a/assets/images/tor_logo.svg b/assets/images/tor_logo.svg
deleted file mode 100644
index ebd00324d..000000000
--- a/assets/images/tor_logo.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 150.5 91.1" enable-background="new 0 0 150.5 91.1" xml:space="preserve">
-<g>
-	<g>
-		<g id="layer3_22_" transform="translate(-92,-63.999774)">
-			<g id="layer5_22_">
-				<g id="path2554_38_">
-					<path fill="#68B044" d="M176.9,70.8l-2.4,9.6c3.4-6.8,8.9-11.9,15.2-16.4c-4.6,5.3-8.8,10.6-11.3,16
-						c4.3-6.1,10.1-9.4,16.6-11.7c-8.7,7.7-15.6,16.1-20.8,24.4l-4.2-1.8C170.7,84.2,173.2,77.4,176.9,70.8L176.9,70.8z"/>
-				</g>
-				<g id="path2534_13_">
-					<path fill="#F5F8DE" d="M165.8,89.1l7.9,3.3c0,2-0.2,8.2,1.1,10c13.2,17,11,51.2-2.7,52c-20.8,0-28.8-14.1-28.8-27.1
-						c0-11.9,14.2-19.7,22.7-26.7C168.3,98.7,167.9,94.5,165.8,89.1L165.8,89.1z"/>
-				</g>
-				<g id="path2536_23_">
-					<path fill="#7E4798" d="M173.7,92.3l2.9,1.5c-0.3,1.9,0.1,6.1,2,7.1c8.4,5.2,16.2,10.8,19.3,16.5c11,19.9-7.7,38.4-24,36.6
-						c8.8-6.5,11.4-19.9,8.1-34.6c-1.3-5.7-3.4-10.9-7.1-16.8C173.3,99.9,173.9,96.3,173.7,92.3L173.7,92.3z"/>
-				</g>
-			</g>
-			<g id="layer4_22_">
-				<g id="path2540_23_">
-					<path fill="#010101" d="M170.5,101.8c-0.6,3.1-1.3,8.7-4,10.8c-1.1,0.8-2.3,1.6-3.5,2.4c-4.9,3.3-9.7,6.4-11.9,14.3
-						c-0.5,1.7-0.1,3.5,0.3,5.2c1.2,4.9,4.6,10.1,7.3,13.2c0,0.1,0.5,0.5,0.5,0.6c2.2,2.6,2.9,3.4,11.3,5.3l-0.2,0.9
-						c-5.1-1.3-9.2-2.6-11.9-5.6c0-0.1-0.5-0.5-0.5-0.5c-2.8-3.2-6.3-8.6-7.5-13.7c-0.5-2-0.9-3.6-0.3-5.7
-						c2.3-8.2,7.3-11.5,12.3-14.9c1.1-0.7,2.5-1.4,3.6-2.3C168.3,110.3,169.4,105.6,170.5,101.8L170.5,101.8z"/>
-				</g>
-				<g id="path2542_23_">
-					<path fill="#010101" d="M172.7,114.8c0.1,3.5-0.3,5.3,0.6,7.8c0.5,1.5,2.4,3.5,2.9,5.5c0.7,2.6,1.5,5.5,1.5,7.3
-						c0,2-0.1,5.8-1,9.8c-0.7,3.3-2.2,6.2-4.8,7.8c-2.7-0.5-5.8-1.5-7.6-3.1c-3.6-3.1-6.7-8.3-7.1-12.8c-0.3-3.7,3.1-9.2,7.9-11.9
-						c4-2.4,5-5,5.9-9.4c-1.2,3.8-2.4,6.9-6.3,9c-5.7,3-8.6,7.9-8.3,12.7c0.4,6.1,2.8,10.2,7.6,13.5c2,1.4,5.8,2.9,8.2,3.3v-0.3
-						c1.8-0.3,4.1-3.3,5.3-7.2c1-3.6,1.4-8.1,1.3-11c-0.1-1.7-0.8-5.3-2.2-8.6c-0.7-1.8-1.9-3.6-2.6-4.9
-						C173.1,120.8,173.1,118,172.7,114.8z"/>
-				</g>
-				<g id="path2544_23_">
-					<path fill="#010101" d="M172.1,128.5c0.1,2.4,1,5.4,1.4,8.5c0.3,2.3,0.2,4.6,0.1,6.6c-0.1,2.3-0.8,6.5-1.9,8.6
-						c-1-0.5-1.4-1-2.1-1.8c-0.8-1.1-1.4-2.3-1.9-3.6c-0.4-1-0.9-2.2-1.1-3.5c-0.3-2-0.2-5.2,2.1-8.4c1.8-2.6,2.2-2.8,2.8-5.7
-						c-0.8,2.6-1.4,2.9-3.3,5.1c-2.1,2.4-2.4,6-2.4,8.9c0,1.2,0.5,2.6,1,3.8c0.5,1.3,1,2.7,1.7,3.7c1.1,1.6,2.5,2.6,3.2,2.7
-						c0,0,0,0,0,0c0,0,0,0,0,0v-0.1c1.3-1.5,2.1-2.9,2.4-4.4c0.3-1.8,0.4-3.5,0.6-5.6c0.2-1.8,0.1-4.1-0.4-6.5
-						C173.7,133.8,172.6,130.7,172.1,128.5L172.1,128.5z"/>
-				</g>
-				<g id="path2550_23_">
-					<path fill="#010101" d="M172.5,99c0.1,3.5,0.3,10,1.3,12.6c0.3,0.9,2.8,4.7,4.5,9.4c1.2,3.2,1.5,6.2,1.7,7.1
-						c0.8,3.8-0.2,10.3-1.5,16.4c-0.7,3.3-3,7.4-5.6,9l-0.5,0.9c1.5-0.1,5.1-3.6,6.4-8.1c2.2-7.5,3-11,2-19.4
-						c-0.1-0.8-0.5-3.6-1.8-6.5c-1.9-4.5-4.6-8.8-4.9-9.7C173.4,109.3,172.6,103.1,172.5,99L172.5,99z"/>
-				</g>
-				<g id="path2552_23_">
-					<path fill="#010101" d="M173.7,92.6c-0.2,3.6-0.2,6.4,0.4,9.1c0.7,2.9,4.5,7.1,6.1,11.9c3,9.2,2.2,21.2,0.1,30.5
-						c-0.8,3.3-4.6,8.1-8.5,9.6l2.8,0.7c1.5-0.1,5.5-3.8,7.1-8c2.5-6.7,3-14.6,2-23c-0.1-0.8-1.4-8-2.7-11
-						c-1.8-4.5-4.7-7.7-5.7-10.5c-0.8-2.1-1.1-7.7-0.6-8.8L173.7,92.6z"/>
-				</g>
-			</g>
-		</g>
-		<g id="path2528_18_">
-			<path fill="#7E4798" d="M3.8,8.8h54.1c2,0,3.8,1.7,3.8,3.8v16c0,2.1-1.8,3.8-3.8,3.8H46.8c-2.5,0-3.6,1.4-3.6,3v52.3
-				c0,1.8-1.4,3.1-3.1,3.1H21.7c-1.7,0-3-1.3-3-3.1V34.9c0-1.6-1.5-2.6-2.6-2.6H3.8c-2.1,0-3.8-1.7-3.8-3.8v-16
-				C0,10.5,1.7,8.8,3.8,8.8z"/>
-		</g>
-		<g id="path2532_18_">
-			<path fill="#7E4798" d="M142.6,30h4.8c1.8,0,3.2,1.4,3.2,3.1v17.1c0,2.2,0.1,3.1-2.6,3.1c-5.3,0-7.7,2.8-7.7,5.9v28.9
-				c0,1.3-1.3,2.5-2.8,2.5h-17.2c-1.5,0-2.8-1.1-2.8-2.5V55.2c0-0.6,0-1.4,0.1-1.9c0.9-12.2,10.5-21.9,22.6-23.2
-				C140.5,30.1,141.9,30,142.6,30L142.6,30z"/>
-		</g>
-	</g>
-	<g>
-		<path fill="#010101" d="M101.7,46.3c-2.9-2.6-6.5-4.8-10.3-6.9c-1.7-0.9-6.9-5-5.1-10.8l-13.1-5.4l-0.9,0.7
-			c4.4,7.9,2.1,12.1-0.1,13.5c-4.4,3-10.8,6.8-13.9,10.1c-6.1,6.3-7.9,12.3-7.3,20.1c0.6,10.1,7.9,18.5,17.8,21.8
-			c4.3,1.4,8.3,1.6,12.7,1.6c7.1,0,14.5-1.9,19.8-6.3c5.7-4.7,9-11.8,9-19.1C110.3,58.3,107.2,51.3,101.7,46.3z M99.8,83.2
-			c-4.9,4-13.7,6.8-18.4,6.6c-5.2-0.3-10.3-1.1-14.8-3.3c-7.9-3.8-13.1-12.1-13.5-18.8C52.4,54,59,50.1,65.1,45.1
-			c3.4-2.8,8.2-4.2,10.9-9.2c0.5-1.1,0.8-3.5,0.2-6c-0.3-0.9-1.5-3.9-2-4.6l9.8,4.3c-1.2,4.5,2.5,9.2,5.5,10.9
-			c3,1.7,7.7,4.9,10.6,7.5c5.1,4.5,7.7,10.9,7.7,17.6C107.8,72.3,105,78.9,99.8,83.2z"/>
-	</g>
-</g>
-</svg>
diff --git a/assets/images/usdtbsc_icon.png b/assets/images/usdtbsc_icon.png
deleted file mode 100644
index 9f2cda237..000000000
Binary files a/assets/images/usdtbsc_icon.png and /dev/null differ
diff --git a/assets/images/wallet_group_bright.png b/assets/images/wallet_group_bright.png
new file mode 100644
index 000000000..263361db6
Binary files /dev/null and b/assets/images/wallet_group_bright.png differ
diff --git a/assets/images/wallet_group_confirmed_dark.png b/assets/images/wallet_group_confirmed_dark.png
deleted file mode 100644
index a047cb29c..000000000
Binary files a/assets/images/wallet_group_confirmed_dark.png and /dev/null differ
diff --git a/assets/images/wallet_group_confirmed_light.png b/assets/images/wallet_group_confirmed_light.png
deleted file mode 100644
index 851d32300..000000000
Binary files a/assets/images/wallet_group_confirmed_light.png and /dev/null differ
diff --git a/assets/images/wallet_group_dark.png b/assets/images/wallet_group_dark.png
new file mode 100644
index 000000000..7cd08d2cd
Binary files /dev/null and b/assets/images/wallet_group_dark.png differ
diff --git a/assets/images/wallet_group_empty_dark.png b/assets/images/wallet_group_empty_dark.png
deleted file mode 100644
index e613d876e..000000000
Binary files a/assets/images/wallet_group_empty_dark.png and /dev/null differ
diff --git a/assets/images/wallet_group_empty_light.png b/assets/images/wallet_group_empty_light.png
deleted file mode 100644
index f795648ae..000000000
Binary files a/assets/images/wallet_group_empty_light.png and /dev/null differ
diff --git a/assets/images/wallet_group_light.png b/assets/images/wallet_group_light.png
new file mode 100644
index 000000000..7827971e7
Binary files /dev/null and b/assets/images/wallet_group_light.png differ
diff --git a/assets/images/wallet_group_options_dark.png b/assets/images/wallet_group_options_dark.png
deleted file mode 100644
index 479aac57c..000000000
Binary files a/assets/images/wallet_group_options_dark.png and /dev/null differ
diff --git a/assets/images/wallet_group_options_light.png b/assets/images/wallet_group_options_light.png
deleted file mode 100644
index 308930520..000000000
Binary files a/assets/images/wallet_group_options_light.png and /dev/null differ
diff --git a/assets/images/wallet_name.png b/assets/images/wallet_name.png
new file mode 100644
index 000000000..f586682bd
Binary files /dev/null and b/assets/images/wallet_name.png differ
diff --git a/assets/images/wallet_name_light.png b/assets/images/wallet_name_light.png
new file mode 100644
index 000000000..0199c1b30
Binary files /dev/null and b/assets/images/wallet_name_light.png differ
diff --git a/assets/images/wallet_type.png b/assets/images/wallet_type.png
new file mode 100644
index 000000000..4e0eba8b5
Binary files /dev/null and b/assets/images/wallet_type.png differ
diff --git a/assets/images/wallet_type_light.png b/assets/images/wallet_type_light.png
new file mode 100644
index 000000000..e36c0d3aa
Binary files /dev/null and b/assets/images/wallet_type_light.png differ
diff --git a/assets/images/wallet_type_wallet_dark.png b/assets/images/wallet_type_wallet_dark.png
deleted file mode 100644
index b840f5547..000000000
Binary files a/assets/images/wallet_type_wallet_dark.png and /dev/null differ
diff --git a/assets/images/wallet_type_wallet_light.png b/assets/images/wallet_type_wallet_light.png
deleted file mode 100644
index ee759a109..000000000
Binary files a/assets/images/wallet_type_wallet_light.png and /dev/null differ
diff --git a/assets/images/wallets.png b/assets/images/wallets.png
deleted file mode 100644
index 62ea20039..000000000
Binary files a/assets/images/wallets.png and /dev/null differ
diff --git a/assets/images/welcome.png b/assets/images/welcome.png
new file mode 100644
index 000000000..f1132d253
Binary files /dev/null and b/assets/images/welcome.png differ
diff --git a/assets/images/welcome_dark_theme.svg b/assets/images/welcome_dark_theme.svg
deleted file mode 100644
index 8f60c931a..000000000
--- a/assets/images/welcome_dark_theme.svg
+++ /dev/null
@@ -1,215 +0,0 @@
-<svg width="375" height="304" viewBox="0 0 375 304" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="-40" width="475" height="304" fill="url(#paint0_linear_4656_21674)"/>
-<g filter="url(#filter0_df_4656_21674)">
-<circle cx="298.5" cy="121.5" r="2.5" fill="#E0E7FA"/>
-</g>
-<g opacity="0.5" filter="url(#filter1_df_4656_21674)">
-<ellipse cx="261" cy="64.5" rx="1" ry="2.5" fill="#E0E7FA"/>
-</g>
-<g filter="url(#filter2_df_4656_21674)">
-<path d="M95.5 59L96.3061 65.6939L103 66.5L96.3061 67.3061L95.5 74L94.6939 67.3061L88 66.5L94.6939 65.6939L95.5 59Z" fill="#D7E2F7"/>
-</g>
-<g filter="url(#filter3_df_4656_21674)">
-<path d="M38.5 156L39.3061 162.694L46 163.5L39.3061 164.306L38.5 171L37.6939 164.306L31 163.5L37.6939 162.694L38.5 156Z" fill="#D7E2F7"/>
-</g>
-<g filter="url(#filter4_df_4656_21674)">
-<path d="M336.5 79L337.306 85.6939L344 86.5L337.306 87.3061L336.5 94L335.694 87.3061L329 86.5L335.694 85.6939L336.5 79Z" fill="#D7E2F7"/>
-</g>
-<g filter="url(#filter5_df_4656_21674)">
-<path d="M75.5 123.5L76.1449 128.855L81.5 129.5L76.1449 130.145L75.5 135.5L74.8551 130.145L69.5 129.5L74.8551 128.855L75.5 123.5Z" fill="#D7E2F7"/>
-</g>
-<g filter="url(#filter6_df_4656_21674)">
-<circle cx="271.5" cy="216.5" r="2.5" fill="#E0E7FA"/>
-</g>
-<g filter="url(#filter7_df_4656_21674)">
-<path d="M316.5 171L317.844 182.156L329 183.5L317.844 184.844L316.5 196L315.156 184.844L304 183.5L315.156 182.156L316.5 171Z" fill="#D7E2F7"/>
-</g>
-<line x1="316.5" y1="161" x2="316.5" y2="207" stroke="url(#paint1_linear_4656_21674)"/>
-<line x1="293" y1="183.5" x2="339" y2="183.5" stroke="url(#paint2_linear_4656_21674)"/>
-<g opacity="0.2">
-<g filter="url(#filter8_df_4656_21674)">
-<path d="M54.5 77L55.8435 88.1565L67 89.5L55.8435 90.8435L54.5 102L53.1565 90.8435L42 89.5L53.1565 88.1565L54.5 77Z" fill="#D7E2F7"/>
-</g>
-<line x1="54.5" y1="67" x2="54.5" y2="113" stroke="url(#paint3_linear_4656_21674)"/>
-<line x1="31" y1="89.5" x2="77" y2="89.5" stroke="url(#paint4_linear_4656_21674)"/>
-</g>
-<g opacity="0.5" filter="url(#filter9_df_4656_21674)">
-<ellipse cx="102" cy="173.5" rx="1" ry="2.5" fill="#E0E7FA"/>
-</g>
-<path d="M176.165 126.986C174.967 129.623 174.3 132.551 174.3 135.636C174.3 147.197 183.672 156.569 195.232 156.569C200.746 156.569 205.761 154.436 209.5 150.951C206.208 158.196 198.909 163.235 190.433 163.235C178.872 163.235 169.5 153.863 169.5 142.302C169.5 136.255 172.065 130.808 176.165 126.986Z" fill="#D9D9D9"/>
-<path d="M176.165 126.986C174.967 129.623 174.3 132.551 174.3 135.636C174.3 147.197 183.672 156.569 195.232 156.569C200.746 156.569 205.761 154.436 209.5 150.951C206.208 158.196 198.909 163.235 190.433 163.235C178.872 163.235 169.5 153.863 169.5 142.302C169.5 136.255 172.065 130.808 176.165 126.986Z" fill="url(#paint5_linear_4656_21674)"/>
-<path d="M176.165 126.986C174.967 129.623 174.3 132.551 174.3 135.636C174.3 147.197 183.672 156.569 195.232 156.569C200.746 156.569 205.761 154.436 209.5 150.951C206.208 158.196 198.909 163.235 190.433 163.235C178.872 163.235 169.5 153.863 169.5 142.302C169.5 136.255 172.065 130.808 176.165 126.986Z" fill="url(#paint6_linear_4656_21674)"/>
-<g opacity="0.5" filter="url(#filter10_f_4656_21674)">
-<path d="M176.165 126.986C174.967 129.623 174.3 132.551 174.3 135.636C174.3 147.197 183.672 156.569 195.232 156.569C200.746 156.569 205.761 154.436 209.5 150.951C206.208 158.196 198.909 163.235 190.433 163.235C178.872 163.235 169.5 153.863 169.5 142.302C169.5 136.255 172.065 130.808 176.165 126.986Z" fill="#D9D9D9"/>
-<path d="M176.165 126.986C174.967 129.623 174.3 132.551 174.3 135.636C174.3 147.197 183.672 156.569 195.232 156.569C200.746 156.569 205.761 154.436 209.5 150.951C206.208 158.196 198.909 163.235 190.433 163.235C178.872 163.235 169.5 153.863 169.5 142.302C169.5 136.255 172.065 130.808 176.165 126.986Z" fill="url(#paint7_linear_4656_21674)"/>
-<path d="M176.165 126.986C174.967 129.623 174.3 132.551 174.3 135.636C174.3 147.197 183.672 156.569 195.232 156.569C200.746 156.569 205.761 154.436 209.5 150.951C206.208 158.196 198.909 163.235 190.433 163.235C178.872 163.235 169.5 153.863 169.5 142.302C169.5 136.255 172.065 130.808 176.165 126.986Z" fill="url(#paint8_linear_4656_21674)"/>
-</g>
-<defs>
-<filter id="filter0_df_4656_21674" x="284.5" y="107.5" width="28" height="28" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="1" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="5.25"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="2" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter1_df_4656_21674" x="248.5" y="50.5" width="25" height="28" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="1" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="5.25"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="2" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter2_df_4656_21674" x="81.1" y="52.1" width="28.8" height="28.8" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="0.6" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="3.15"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="0.3" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter3_df_4656_21674" x="24.1" y="149.1" width="28.8" height="28.8" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="0.6" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="3.15"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="0.3" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter4_df_4656_21674" x="322.1" y="72.1" width="28.8" height="28.8" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="0.6" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="3.15"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="0.3" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter5_df_4656_21674" x="63.98" y="117.98" width="23.04" height="23.04" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="0.48" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="2.52"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="0.24" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter6_df_4656_21674" x="257.5" y="202.5" width="28" height="28" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="1" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="5.25"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="2" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter7_df_4656_21674" x="292.5" y="159.5" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="1" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="5.25"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="0.5" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter8_df_4656_21674" x="30.5" y="65.5" width="48" height="48" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="1" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="5.25"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="0.5" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter9_df_4656_21674" x="89.5" y="159.5" width="25" height="28" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feMorphology radius="1" operator="dilate" in="SourceAlpha" result="effect1_dropShadow_4656_21674"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="5.25"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.7 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4656_21674"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4656_21674" result="shape"/>
-<feGaussianBlur stdDeviation="2" result="effect2_foregroundBlur_4656_21674"/>
-</filter>
-<filter id="filter10_f_4656_21674" x="156.1" y="113.586" width="66.8" height="63.049" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="6.7" result="effect1_foregroundBlur_4656_21674"/>
-</filter>
-<linearGradient id="paint0_linear_4656_21674" x1="198" y1="22.9607" x2="198" y2="268.181" gradientUnits="userSpaceOnUse">
-<stop stop-color="#142040"/>
-<stop offset="0.644231" stop-color="#14234B"/>
-<stop offset="1" stop-color="#1B284A" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint1_linear_4656_21674" x1="315.5" y1="161" x2="315.5" y2="207" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D7E2F7" stop-opacity="0"/>
-<stop offset="0.466346" stop-color="#D7E2F7"/>
-<stop offset="1" stop-color="#D7E2F7" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint2_linear_4656_21674" x1="293" y1="184.5" x2="339" y2="184.5" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D7E2F7" stop-opacity="0"/>
-<stop offset="0.466346" stop-color="#D7E2F7"/>
-<stop offset="1" stop-color="#D7E2F7" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_4656_21674" x1="53.5" y1="67" x2="53.5" y2="113" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D7E2F7" stop-opacity="0"/>
-<stop offset="0.466346" stop-color="#D7E2F7"/>
-<stop offset="1" stop-color="#D7E2F7" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint4_linear_4656_21674" x1="31" y1="90.5" x2="77" y2="90.5" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D7E2F7" stop-opacity="0"/>
-<stop offset="0.466346" stop-color="#D7E2F7"/>
-<stop offset="1" stop-color="#D7E2F7" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint5_linear_4656_21674" x1="189.5" y1="126.986" x2="189.5" y2="163.235" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D7E2F7"/>
-<stop offset="1" stop-color="#7891C1"/>
-</linearGradient>
-<linearGradient id="paint6_linear_4656_21674" x1="189.5" y1="126.986" x2="195.774" y2="163.063" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#7891C1"/>
-</linearGradient>
-<linearGradient id="paint7_linear_4656_21674" x1="189.5" y1="126.986" x2="189.5" y2="163.235" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D7E2F7"/>
-<stop offset="1" stop-color="#7891C1"/>
-</linearGradient>
-<linearGradient id="paint8_linear_4656_21674" x1="189.5" y1="126.986" x2="195.774" y2="163.063" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#7891C1"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/assets/images/welcome_light.png b/assets/images/welcome_light.png
new file mode 100644
index 000000000..6feff85d1
Binary files /dev/null and b/assets/images/welcome_light.png differ
diff --git a/assets/images/welcome_light_theme.svg b/assets/images/welcome_light_theme.svg
deleted file mode 100644
index 178b2853d..000000000
--- a/assets/images/welcome_light_theme.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg width="375" height="304" viewBox="0 0 375 304" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="-40" y="-27" width="475" height="331" fill="url(#paint0_linear_4656_21863)"/>
-<rect x="285" y="163" width="101" height="49" rx="24.5" fill="#EFEFF8"/>
-<circle cx="331" cy="173" r="31" fill="#EFEFF8"/>
-<rect x="-30" y="108" width="115" height="49" rx="24.5" fill="#EFEFF8"/>
-<circle cx="16" cy="118" r="31" fill="#EFEFF8"/>
-<rect x="251" y="193" width="30" height="19" rx="9.5" fill="#EFEFF8"/>
-<defs>
-<linearGradient id="paint0_linear_4656_21863" x1="197.5" y1="-27" x2="197.5" y2="304" gradientUnits="userSpaceOnUse">
-<stop stop-color="#68BEEF"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/assets/images/welcome_wallet_dark.png b/assets/images/welcome_wallet_dark.png
deleted file mode 100644
index 771a600d3..000000000
Binary files a/assets/images/welcome_wallet_dark.png and /dev/null differ
diff --git a/assets/images/welcome_wallet_light.png b/assets/images/welcome_wallet_light.png
deleted file mode 100644
index 2a738be0b..000000000
Binary files a/assets/images/welcome_wallet_light.png and /dev/null differ
diff --git a/assets/images/wyre-icon.png b/assets/images/wyre-icon.png
new file mode 100644
index 000000000..a2810948e
Binary files /dev/null and b/assets/images/wyre-icon.png differ
diff --git a/assets/images/wyre.png b/assets/images/wyre.png
new file mode 100644
index 000000000..a16bbdc8b
Binary files /dev/null and b/assets/images/wyre.png differ
diff --git a/assets/images/yat_crypto.png b/assets/images/yat_crypto.png
new file mode 100644
index 000000000..fbd5d2483
Binary files /dev/null and b/assets/images/yat_crypto.png differ
diff --git a/assets/nano_node_list.yml b/assets/nano_node_list.yml
index cda931b5e..be550177e 100644
--- a/assets/nano_node_list.yml
+++ b/assets/nano_node_list.yml
@@ -1,9 +1,9 @@
 -
   uri: nano.nownodes.io
   useSSL: true
+  is_default: true
 -
   uri: rpc.nano.to
-  is_default: true
   useSSL: true
 -
   uri: node.nautilus.io
diff --git a/assets/node_list.yml b/assets/node_list.yml
index 917dadfd9..49cc00a94 100644
--- a/assets/node_list.yml
+++ b/assets/node_list.yml
@@ -13,3 +13,9 @@
 -
   uri: nodes.hashvault.pro:18081
   is_default: false
+-
+  uri: node.c3pool.com:18081
+  is_default: false
+-
+  uri: node.community.rino.io:18081
+  is_default: false
diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt
index faf57258a..d1f91139b 100644
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@@ -1,4 +1,3 @@
-Add built-in Tor support (experimental)
-Ledger improvements
-UI/UX improvements
+UI/UX enhancements
+Stability improvements
 Bug fixes
\ No newline at end of file
diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt
index c49b895e3..0f8118b4e 100644
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@@ -1,9 +1 @@
-Add built-in Tor support (experimental)
-Add dEuro investments
-Solana fixes/enhancements
-Polygon fixes/enhancements
-WalletConnect improvements
-Ledger improvements
-Payjoin improvements
-UI/UX improvements
-Bug fixes
\ No newline at end of file
+Update for Zano's Hard fork
\ No newline at end of file
diff --git a/com.cakewallet.CakeWallet.yml b/com.cakewallet.CakeWallet.yml
index 6a19c3dda..83efa1388 100644
--- a/com.cakewallet.CakeWallet.yml
+++ b/com.cakewallet.CakeWallet.yml
@@ -1,6 +1,6 @@
 app-id: com.cakewallet.CakeWallet
 runtime: org.freedesktop.Platform
-runtime-version: '24.08'
+runtime-version: '22.08'
 sdk: org.freedesktop.Sdk
 command: cake_wallet
 separate-locales: false
@@ -15,6 +15,8 @@ finish-args:
 modules:
   - name: cake_wallet
     buildsystem: simple
+    only-arches:
+      - x86_64
     build-commands:
       - "cp -R bundle /app/cake_wallet"
       - "chmod +x /app/cake_wallet/cake_wallet"
diff --git a/cw_bitcoin/lib/address_from_output.dart b/cw_bitcoin/lib/address_from_output.dart
index 0d985b237..73bc101c4 100644
--- a/cw_bitcoin/lib/address_from_output.dart
+++ b/cw_bitcoin/lib/address_from_output.dart
@@ -2,37 +2,22 @@ import 'package:bitcoin_base/bitcoin_base.dart';
 
 String addressFromOutputScript(Script script, BasedUtxoNetwork network) {
   try {
-    return addressFromScript(script, network).toAddress(network);
+    switch (script.getAddressType()) {
+      case P2pkhAddressType.p2pkh:
+        return P2pkhAddress.fromScriptPubkey(script: script).toAddress(network);
+      case P2shAddressType.p2pkInP2sh:
+        return P2shAddress.fromScriptPubkey(script: script).toAddress(network);
+      case SegwitAddresType.p2wpkh:
+        return P2wpkhAddress.fromScriptPubkey(script: script).toAddress(network);
+      case P2shAddressType.p2pkhInP2sh:
+        return P2shAddress.fromScriptPubkey(script: script).toAddress(network);
+      case SegwitAddresType.p2wsh:
+        return P2wshAddress.fromScriptPubkey(script: script).toAddress(network);
+      case SegwitAddresType.p2tr:
+        return P2trAddress.fromScriptPubkey(script: script).toAddress(network);
+      default:
+    }
   } catch (_) {}
 
   return '';
 }
-
-BitcoinBaseAddress addressFromScript(Script script,
-    [BasedUtxoNetwork network = BitcoinNetwork.mainnet]) {
-  final addressType = script.getAddressType();
-  if (addressType == null) {
-    throw ArgumentError("Invalid script");
-  }
-
-  switch (addressType) {
-    case P2pkhAddressType.p2pkh:
-      return P2pkhAddress.fromScriptPubkey(
-          script: script, network: BitcoinNetwork.mainnet);
-    case P2shAddressType.p2pkhInP2sh:
-    case P2shAddressType.p2pkInP2sh:
-      return P2shAddress.fromScriptPubkey(
-          script: script, network: BitcoinNetwork.mainnet);
-    case SegwitAddresType.p2wpkh:
-      return P2wpkhAddress.fromScriptPubkey(
-          script: script, network: BitcoinNetwork.mainnet);
-    case SegwitAddresType.p2wsh:
-      return P2wshAddress.fromScriptPubkey(
-          script: script, network: BitcoinNetwork.mainnet);
-    case SegwitAddresType.p2tr:
-      return P2trAddress.fromScriptPubkey(
-          script: script, network: BitcoinNetwork.mainnet);
-  }
-
-  throw ArgumentError("Invalid script");
-}
diff --git a/cw_bitcoin/lib/bitcoin_address_record.dart b/cw_bitcoin/lib/bitcoin_address_record.dart
index 1509f913a..7e4b5f58f 100644
--- a/cw_bitcoin/lib/bitcoin_address_record.dart
+++ b/cw_bitcoin/lib/bitcoin_address_record.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:mobx/mobx.dart';
 
 import 'package:bitcoin_base/bitcoin_base.dart';
 
@@ -17,7 +16,7 @@ abstract class BaseBitcoinAddressRecord {
   })  : _txCount = txCount,
         _balance = balance,
         _name = name,
-        _isUsed = Observable(isUsed);
+        _isUsed = isUsed;
 
   @override
   bool operator ==(Object o) => o is BaseBitcoinAddressRecord && address == o.address;
@@ -28,7 +27,7 @@ abstract class BaseBitcoinAddressRecord {
   int _txCount;
   int _balance;
   String _name;
-  final Observable<bool> _isUsed;
+  bool _isUsed;
   BasedUtxoNetwork? network;
 
   int get txCount => _txCount;
@@ -41,9 +40,9 @@ abstract class BaseBitcoinAddressRecord {
 
   set balance(int value) => _balance = value;
 
-  bool get isUsed => _isUsed.value;
+  bool get isUsed => _isUsed;
 
-  void setAsUsed() => _isUsed.value = true;
+  void setAsUsed() => _isUsed = true;
   void setNewName(String label) => _name = label;
 
   int get hashCode => address.hashCode;
diff --git a/cw_bitcoin/lib/bitcoin_transaction_credentials.dart b/cw_bitcoin/lib/bitcoin_transaction_credentials.dart
index 7d6894e14..01e905fb0 100644
--- a/cw_bitcoin/lib/bitcoin_transaction_credentials.dart
+++ b/cw_bitcoin/lib/bitcoin_transaction_credentials.dart
@@ -3,17 +3,11 @@ import 'package:cw_core/output_info.dart';
 import 'package:cw_core/unspent_coin_type.dart';
 
 class BitcoinTransactionCredentials {
-  BitcoinTransactionCredentials(
-    this.outputs, {
-    required this.priority,
-    this.feeRate,
-    this.coinTypeToSpendFrom = UnspentCoinType.any,
-    this.payjoinUri,
-  });
+  BitcoinTransactionCredentials(this.outputs,
+      {required this.priority, this.feeRate, this.coinTypeToSpendFrom = UnspentCoinType.any});
 
   final List<OutputInfo> outputs;
   final BitcoinTransactionPriority? priority;
   final int? feeRate;
   final UnspentCoinType coinTypeToSpendFrom;
-  final String? payjoinUri;
 }
diff --git a/cw_bitcoin/lib/bitcoin_wallet.dart b/cw_bitcoin/lib/bitcoin_wallet.dart
index 9231022f6..7135d0a7a 100644
--- a/cw_bitcoin/lib/bitcoin_wallet.dart
+++ b/cw_bitcoin/lib/bitcoin_wallet.dart
@@ -3,33 +3,22 @@ import 'dart:convert';
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:cw_bitcoin/address_from_output.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
-import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
+import 'package:cw_bitcoin/psbt_transaction_builder.dart';
+import 'package:cw_core/encryption_file_utils.dart';
+import 'package:cw_bitcoin/electrum_derivations.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_addresses.dart';
 import 'package:cw_bitcoin/electrum_balance.dart';
-import 'package:cw_bitcoin/electrum_derivations.dart';
 import 'package:cw_bitcoin/electrum_wallet.dart';
 import 'package:cw_bitcoin/electrum_wallet_snapshot.dart';
-import 'package:cw_bitcoin/payjoin/manager.dart';
-import 'package:cw_bitcoin/payjoin/storage.dart';
-import 'package:cw_bitcoin/pending_bitcoin_transaction.dart';
-import 'package:cw_bitcoin/psbt/signer.dart';
-import 'package:cw_bitcoin/psbt/transaction_builder.dart';
-import 'package:cw_bitcoin/psbt/v0_deserialize.dart';
-import 'package:cw_bitcoin/psbt/v0_finalizer.dart';
 import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/encryption_file_utils.dart';
-import 'package:cw_core/payjoin_session.dart';
-import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_keys_file.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:ledger_bitcoin/ledger_bitcoin.dart';
-import 'package:ledger_bitcoin/psbt.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus.dart';
 import 'package:mobx/mobx.dart';
 
@@ -42,7 +31,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     required String password,
     required WalletInfo walletInfo,
     required Box<UnspentCoinsInfo> unspentCoinsInfo,
-    required Box<PayjoinSession> payjoinBox,
     required EncryptionFileUtils encryptionFileUtils,
     Uint8List? seedBytes,
     String? mnemonic,
@@ -83,21 +71,20 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     // String derivationPath = walletInfo.derivationInfo!.derivationPath!;
     // String sideDerivationPath = derivationPath.substring(0, derivationPath.length - 1) + "1";
     // final hd = bitcoin.HDWallet.fromSeed(seedBytes, network: networkType);
-
-    payjoinManager = PayjoinManager(PayjoinStorage(payjoinBox), this);
-    walletAddresses = BitcoinWalletAddresses(walletInfo,
-        initialAddresses: initialAddresses,
-        initialRegularAddressIndex: initialRegularAddressIndex,
-        initialChangeAddressIndex: initialChangeAddressIndex,
-        initialSilentAddresses: initialSilentAddresses,
-        initialSilentAddressIndex: initialSilentAddressIndex,
-        mainHd: hd,
-        sideHd: accountHD.childKey(Bip32KeyIndex(1)),
-        network: networkParam ?? network,
-        masterHd:
-            seedBytes != null ? Bip32Slip10Secp256k1.fromSeed(seedBytes) : null,
-        isHardwareWallet: walletInfo.isHardwareWallet,
-        payjoinManager: payjoinManager);
+    walletAddresses = BitcoinWalletAddresses(
+      walletInfo,
+      initialAddresses: initialAddresses,
+      initialRegularAddressIndex: initialRegularAddressIndex,
+      initialChangeAddressIndex: initialChangeAddressIndex,
+      initialSilentAddresses: initialSilentAddresses,
+      initialSilentAddressIndex: initialSilentAddressIndex,
+      mainHd: hd,
+      sideHd: accountHD.childKey(Bip32KeyIndex(1)),
+      network: networkParam ?? network,
+      masterHd:
+          seedBytes != null ? Bip32Slip10Secp256k1.fromSeed(seedBytes) : null,
+      isHardwareWallet: walletInfo.isHardwareWallet,
+    );
 
     autorun((_) {
       this.walletAddresses.isEnabledAutoGenerateSubaddress =
@@ -113,7 +100,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     required String password,
     required WalletInfo walletInfo,
     required Box<UnspentCoinsInfo> unspentCoinsInfo,
-    required Box<PayjoinSession> payjoinBox,
     required EncryptionFileUtils encryptionFileUtils,
     String? passphrase,
     String? addressPageType,
@@ -136,11 +122,9 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
         break;
       case DerivationType.electrum:
       default:
-        seedBytes =
-            await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
+        seedBytes = await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
         break;
     }
-
     return BitcoinWallet(
       mnemonic: mnemonic,
       passphrase: passphrase ?? "",
@@ -157,7 +141,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       initialChangeAddressIndex: initialChangeAddressIndex,
       addressPageType: addressPageType,
       networkParam: network,
-      payjoinBox: payjoinBox,
     );
   }
 
@@ -165,7 +148,6 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     required String name,
     required WalletInfo walletInfo,
     required Box<UnspentCoinsInfo> unspentCoinsInfo,
-    required Box<PayjoinSession> payjoinBox,
     required String password,
     required EncryptionFileUtils encryptionFileUtils,
     required bool alwaysScan,
@@ -222,8 +204,7 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     if (mnemonic != null) {
       switch (walletInfo.derivationInfo!.derivationType) {
         case DerivationType.electrum:
-          seedBytes =
-              await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
+          seedBytes = await mnemonicToSeedBytes(mnemonic, passphrase: passphrase ?? "");
           break;
         case DerivationType.bip39:
         default:
@@ -236,24 +217,24 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     }
 
     return BitcoinWallet(
-        mnemonic: mnemonic,
-        xpub: keysData.xPub,
-        password: password,
-        passphrase: passphrase,
-        walletInfo: walletInfo,
-        unspentCoinsInfo: unspentCoinsInfo,
-        initialAddresses: snp?.addresses,
-        initialSilentAddresses: snp?.silentAddresses,
-        initialSilentAddressIndex: snp?.silentAddressIndex ?? 0,
-        initialBalance: snp?.balance,
-        encryptionFileUtils: encryptionFileUtils,
-        seedBytes: seedBytes,
-        initialRegularAddressIndex: snp?.regularAddressIndex,
-        initialChangeAddressIndex: snp?.changeAddressIndex,
-        addressPageType: snp?.addressPageType,
-        networkParam: network,
-        alwaysScan: alwaysScan,
-        payjoinBox: payjoinBox);
+      mnemonic: mnemonic,
+      xpub: keysData.xPub,
+      password: password,
+      passphrase: passphrase,
+      walletInfo: walletInfo,
+      unspentCoinsInfo: unspentCoinsInfo,
+      initialAddresses: snp?.addresses,
+      initialSilentAddresses: snp?.silentAddresses,
+      initialSilentAddressIndex: snp?.silentAddressIndex ?? 0,
+      initialBalance: snp?.balance,
+      encryptionFileUtils: encryptionFileUtils,
+      seedBytes: seedBytes,
+      initialRegularAddressIndex: snp?.regularAddressIndex,
+      initialChangeAddressIndex: snp?.changeAddressIndex,
+      addressPageType: snp?.addressPageType,
+      networkParam: network,
+      alwaysScan: alwaysScan,
+    );
   }
 
   LedgerConnection? _ledgerConnection;
@@ -267,30 +248,19 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
   }
 
   @override
-  Future<void> close({bool shouldCleanup = false}) async {
-    payjoinManager.cleanupSessions();
-    super.close(shouldCleanup: shouldCleanup);
-  }
-
-  late final PayjoinManager payjoinManager;
-
-  bool get isPayjoinAvailable => unspentCoinsInfo.values
-      .where((element) =>
-          element.walletId == id && element.isSending && !element.isFrozen)
-      .isNotEmpty;
-
-  Future<PsbtV2> buildPsbt({
+  Future<BtcTransaction> buildHardwareWalletTransaction({
     required List<BitcoinBaseOutput> outputs,
     required BigInt fee,
     required BasedUtxoNetwork network,
     required List<UtxoWithAddress> utxos,
     required Map<String, PublicKeyWithDerivationPath> publicKeys,
-    required Uint8List masterFingerprint,
     String? memo,
     bool enableRBF = false,
     BitcoinOrdering inputOrdering = BitcoinOrdering.bip69,
     BitcoinOrdering outputOrdering = BitcoinOrdering.bip69,
   }) async {
+    final masterFingerprint = await _bitcoinLedgerApp!.getMasterFingerprint();
+
     final psbtReadyInputs = <PSBTReadyUtxoWithAddress>[];
     for (final utxo in utxos) {
       final rawTx =
@@ -308,128 +278,13 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       ));
     }
 
-    return PSBTTransactionBuild(
-            inputs: psbtReadyInputs, outputs: outputs, enableRBF: enableRBF)
-        .psbt;
-  }
+    final psbt = PSBTTransactionBuild(
+        inputs: psbtReadyInputs, outputs: outputs, enableRBF: enableRBF);
 
-  @override
-  Future<BtcTransaction> buildHardwareWalletTransaction({
-    required List<BitcoinBaseOutput> outputs,
-    required BigInt fee,
-    required BasedUtxoNetwork network,
-    required List<UtxoWithAddress> utxos,
-    required Map<String, PublicKeyWithDerivationPath> publicKeys,
-    String? memo,
-    bool enableRBF = false,
-    BitcoinOrdering inputOrdering = BitcoinOrdering.bip69,
-    BitcoinOrdering outputOrdering = BitcoinOrdering.bip69,
-  }) async {
-    final masterFingerprint = await _bitcoinLedgerApp!.getMasterFingerprint();
-
-    final psbt = await buildPsbt(
-      outputs: outputs,
-      fee: fee,
-      network: network,
-      utxos: utxos,
-      publicKeys: publicKeys,
-      masterFingerprint: masterFingerprint,
-      memo: memo,
-      enableRBF: enableRBF,
-      inputOrdering: inputOrdering,
-      outputOrdering: outputOrdering,
-    );
-
-    final rawHex = await _bitcoinLedgerApp!.signPsbt(psbt: psbt);
+    final rawHex = await _bitcoinLedgerApp!.signPsbt(psbt: psbt.psbt);
     return BtcTransaction.fromRaw(BytesUtils.toHexString(rawHex));
   }
 
-  @override
-  Future<PendingTransaction> createTransaction(Object credentials) async {
-    credentials = credentials as BitcoinTransactionCredentials;
-
-    final tx = (await super.createTransaction(credentials))
-        as PendingBitcoinTransaction;
-
-    final payjoinUri = credentials.payjoinUri;
-    if (payjoinUri == null) return tx;
-
-    final transaction = await buildPsbt(
-        utxos: tx.utxos,
-        outputs: tx.outputs
-            .map((e) => BitcoinOutput(
-                  address: addressFromScript(e.scriptPubKey),
-                  value: e.amount,
-                  isSilentPayment: e.isSilentPayment,
-                  isChange: e.isChange,
-                ))
-            .toList(),
-        fee: BigInt.from(tx.fee),
-        network: network,
-        memo: credentials.outputs.first.memo,
-        outputOrdering: BitcoinOrdering.none,
-        enableRBF: true,
-        publicKeys: tx.publicKeys!,
-        masterFingerprint: Uint8List(0));
-
-    final originalPsbt = await signPsbt(
-        base64.encode(transaction.asPsbtV0()), getUtxoWithPrivateKeys());
-
-    tx.commitOverride = () async {
-      final sender = await payjoinManager.initSender(
-          payjoinUri, originalPsbt, int.parse(tx.feeRate));
-      payjoinManager.spawnNewSender(
-          sender: sender, pjUrl: payjoinUri, amount: BigInt.from(tx.amount));
-    };
-
-    return tx;
-  }
-
-  List<UtxoWithPrivateKey> getUtxoWithPrivateKeys() => unspentCoins
-      .where((e) => (e.isSending && !e.isFrozen))
-      .map((unspent) => UtxoWithPrivateKey.fromUnspent(unspent, this))
-      .toList();
-
-  Future<void> commitPsbt(String finalizedPsbt) {
-    final psbt = PsbtV2()..deserializeV0(base64.decode(finalizedPsbt));
-
-    final btcTx =
-        BtcTransaction.fromRaw(BytesUtils.toHexString(psbt.extract()));
-
-    return PendingBitcoinTransaction(
-      btcTx,
-      type,
-      electrumClient: electrumClient,
-      amount: 0,
-      fee: 0,
-      feeRate: "",
-      network: network,
-      hasChange: true,
-    ).commit();
-  }
-
-  Future<String> signPsbt(
-      String preProcessedPsbt, List<UtxoWithPrivateKey> utxos) async {
-    final psbt = PsbtV2()..deserializeV0(base64Decode(preProcessedPsbt));
-
-    await psbt.signWithUTXO(utxos, (txDigest, utxo, key, sighash) {
-      return utxo.utxo.isP2tr()
-          ? key.signTapRoot(
-              txDigest,
-              sighash: sighash,
-              tweak: utxo.utxo.isSilentPayment != true,
-            )
-          : key.signInput(txDigest, sigHash: sighash);
-    }, (txId, vout) async {
-      final txHex = await electrumClient.getTransactionHex(hash: txId);
-      final output = BtcTransaction.fromRaw(txHex).outputs[vout];
-      return TaprootAmountScriptPair(output.amount, output.scriptPubKey);
-    });
-
-    psbt.finalizeV0();
-    return base64Encode(psbt.asPsbtV0());
-  }
-
   @override
   Future<String> signMessage(String message, {String? address = null}) async {
     if (walletInfo.isHardwareWallet) {
diff --git a/cw_bitcoin/lib/bitcoin_wallet_addresses.dart b/cw_bitcoin/lib/bitcoin_wallet_addresses.dart
index d84d958be..1a122ef9e 100644
--- a/cw_bitcoin/lib/bitcoin_wallet_addresses.dart
+++ b/cw_bitcoin/lib/bitcoin_wallet_addresses.dart
@@ -1,13 +1,10 @@
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:blockchain_utils/bip/bip/bip32/bip32.dart';
 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
-import 'package:cw_bitcoin/payjoin/manager.dart';
 import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_core/unspent_coin_type.dart';
-import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:mobx/mobx.dart';
-import 'package:payjoin_flutter/receive.dart' as payjoin;
 
 part 'bitcoin_wallet_addresses.g.dart';
 
@@ -20,7 +17,6 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
     required super.sideHd,
     required super.network,
     required super.isHardwareWallet,
-    required this.payjoinManager,
     super.initialAddresses,
     super.initialRegularAddressIndex,
     super.initialChangeAddressIndex,
@@ -29,13 +25,6 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
     super.masterHd,
   }) : super(walletInfo);
 
-  final PayjoinManager payjoinManager;
-
-  payjoin.Receiver? currentPayjoinReceiver;
-
-  @observable
-  String? payjoinEndpoint = null;
-
   @override
   String getAddress(
       {required int index,
@@ -56,33 +45,4 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
 
     return generateP2WPKHAddress(hd: hd, index: index, network: network);
   }
-
-  @action
-  Future<void> initPayjoin() async {
-    try {
-      await payjoinManager.initPayjoin();
-      currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(primaryAddress);
-      payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint();
-
-      payjoinManager.resumeSessions();
-    } catch (e) {
-      printV(e);
-      // Ignore Connectivity errors
-      if (!e.toString().contains("error sending request for url")) rethrow;
-    }
-  }
-
-  @action
-  Future<void> newPayjoinReceiver() async {
-    try {
-      currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(primaryAddress);
-      payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint();
-
-      payjoinManager.spawnReceiver(receiver: currentPayjoinReceiver!);
-    } catch (e) {
-      printV(e);
-      // Ignore Connectivity errors
-      if (!e.toString().contains("error sending request for url")) rethrow;
-    }
-  }
 }
diff --git a/cw_bitcoin/lib/bitcoin_wallet_service.dart b/cw_bitcoin/lib/bitcoin_wallet_service.dart
index 317b25bcd..7ee1534bf 100644
--- a/cw_bitcoin/lib/bitcoin_wallet_service.dart
+++ b/cw_bitcoin/lib/bitcoin_wallet_service.dart
@@ -5,7 +5,6 @@ import 'package:cw_bitcoin/bitcoin_mnemonics_bip39.dart';
 import 'package:cw_bitcoin/mnemonic_is_incorrect_exception.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
 import 'package:cw_core/encryption_file_utils.dart';
-import 'package:cw_core/payjoin_session.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_service.dart';
@@ -22,12 +21,10 @@ class BitcoinWalletService extends WalletService<
     BitcoinRestoreWalletFromSeedCredentials,
     BitcoinRestoreWalletFromWIFCredentials,
     BitcoinRestoreWalletFromHardware> {
-  BitcoinWalletService(this.walletInfoSource, this.unspentCoinsInfoSource,
-      this.payjoinSessionSource, this.alwaysScan, this.isDirect);
+  BitcoinWalletService(this.walletInfoSource, this.unspentCoinsInfoSource, this.alwaysScan, this.isDirect);
 
   final Box<WalletInfo> walletInfoSource;
   final Box<UnspentCoinsInfo> unspentCoinsInfoSource;
-  final Box<PayjoinSession> payjoinSessionSource;
   final bool alwaysScan;
   final bool isDirect;
 
@@ -58,7 +55,6 @@ class BitcoinWalletService extends WalletService<
       passphrase: credentials.passphrase,
       walletInfo: credentials.walletInfo!,
       unspentCoinsInfo: unspentCoinsInfoSource,
-      payjoinBox: payjoinSessionSource,
       network: network,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),
     );
@@ -83,7 +79,6 @@ class BitcoinWalletService extends WalletService<
         name: name,
         walletInfo: walletInfo,
         unspentCoinsInfo: unspentCoinsInfoSource,
-        payjoinBox: payjoinSessionSource,
         alwaysScan: alwaysScan,
         encryptionFileUtils: encryptionFileUtilsFor(isDirect),
       );
@@ -97,7 +92,6 @@ class BitcoinWalletService extends WalletService<
         name: name,
         walletInfo: walletInfo,
         unspentCoinsInfo: unspentCoinsInfoSource,
-        payjoinBox: payjoinSessionSource,
         alwaysScan: alwaysScan,
         encryptionFileUtils: encryptionFileUtilsFor(isDirect),
       );
@@ -132,7 +126,6 @@ class BitcoinWalletService extends WalletService<
       name: currentName,
       walletInfo: currentWalletInfo,
       unspentCoinsInfo: unspentCoinsInfoSource,
-      payjoinBox: payjoinSessionSource,
       alwaysScan: alwaysScan,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),
     );
@@ -154,6 +147,7 @@ class BitcoinWalletService extends WalletService<
     credentials.walletInfo?.network = network.value;
     credentials.walletInfo?.derivationInfo?.derivationPath =
         credentials.hwAccountData.derivationPath;
+
     final wallet = await BitcoinWallet(
       password: credentials.password!,
       xpub: credentials.hwAccountData.xpub,
@@ -161,7 +155,6 @@ class BitcoinWalletService extends WalletService<
       unspentCoinsInfo: unspentCoinsInfoSource,
       networkParam: network,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),
-      payjoinBox: payjoinSessionSource,
     );
     await wallet.save();
     await wallet.init();
@@ -189,7 +182,6 @@ class BitcoinWalletService extends WalletService<
       mnemonic: credentials.mnemonic,
       walletInfo: credentials.walletInfo!,
       unspentCoinsInfo: unspentCoinsInfoSource,
-      payjoinBox: payjoinSessionSource,
       network: network,
       encryptionFileUtils: encryptionFileUtilsFor(isDirect),
     );
diff --git a/cw_bitcoin/lib/electrum.dart b/cw_bitcoin/lib/electrum.dart
index 2ddd30df6..1f5c369e3 100644
--- a/cw_bitcoin/lib/electrum.dart
+++ b/cw_bitcoin/lib/electrum.dart
@@ -5,8 +5,6 @@ import 'dart:typed_data';
 import 'package:bitcoin_base/bitcoin_base.dart';
 import 'package:cw_bitcoin/bitcoin_amount_format.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_socket/abstract.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:flutter/foundation.dart';
 import 'package:rxdart/rxdart.dart';
 
@@ -44,7 +42,7 @@ class ElectrumClient {
   static const aliveTimerDuration = Duration(seconds: 4);
 
   bool get isConnected => _isConnected;
-  ProxySocket? socket;
+  Socket? socket;
   void Function(ConnectionStatus)? onConnectionStatusChange;
   int _id;
   final Map<String, SocketTask> _tasks;
@@ -74,11 +72,18 @@ class ElectrumClient {
     } catch (_) {}
     socket = null;
 
-    final ssl = !(useSSL == false || (useSSL == null && uri.toString().contains("btc-electrum")));
     try {
-      socket = await ProxyWrapper().getSocksSocket(ssl, host, port, connectionTimeout: connectionTimeout);
+      if (useSSL == false || (useSSL == null && uri.toString().contains("btc-electrum"))) {
+        socket = await Socket.connect(host, port, timeout: connectionTimeout);
+      } else {
+        socket = await SecureSocket.connect(
+          host,
+          port,
+          timeout: connectionTimeout,
+          onBadCertificate: (_) => true,
+        );
+      }
     } catch (e) {
-      printV("connect: $e");
       if (e is HandshakeException) {
         useSSL = !(useSSL ?? false);
       }
@@ -100,6 +105,7 @@ class ElectrumClient {
 
     // use ping to determine actual connection status since we could've just not timed out yet:
     // _setConnectionStatus(ConnectionStatus.connected);
+
     socket!.listen(
       (Uint8List event) {
         try {
diff --git a/cw_bitcoin/lib/electrum_balance.dart b/cw_bitcoin/lib/electrum_balance.dart
index aeb06f1f0..37c34058b 100644
--- a/cw_bitcoin/lib/electrum_balance.dart
+++ b/cw_bitcoin/lib/electrum_balance.dart
@@ -65,6 +65,6 @@ class ElectrumBalance extends Balance {
         'unconfirmed': unconfirmed,
         'frozen': frozen,
         'secondConfirmed': secondConfirmed,
-        'secondUnconfirmed': secondUnconfirmed,
+        'secondUnconfirmed': secondUnconfirmed
       });
 }
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index bb9cea1bc..fd778571f 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -4,9 +4,6 @@ import 'dart:io';
 import 'dart:isolate';
 
 import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:cw_bitcoin/bitcoin_amount_format.dart';
-import 'package:cw_core/format_amount.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_bitcoin/bitcoin_wallet.dart';
 import 'package:cw_bitcoin/litecoin_wallet.dart';
@@ -50,6 +47,7 @@ import 'package:mobx/mobx.dart';
 import 'package:rxdart/subjects.dart';
 import 'package:sp_scanner/sp_scanner.dart';
 import 'package:hex/hex.dart';
+import 'package:http/http.dart' as http;
 
 part 'electrum_wallet.g.dart';
 
@@ -493,9 +491,10 @@ abstract class ElectrumWalletBase
   Future<void> updateFeeRates() async {
     if (await checkIfMempoolAPIIsEnabled() && type == WalletType.bitcoin) {
       try {
-        final response = await ProxyWrapper()  
-            .get(clearnetUri: Uri.parse("https://mempool.cakewallet.com/api/v1/fees/recommended"))  
-            .timeout(Duration(seconds: 15));  
+        final response = await http
+            .get(Uri.parse("https://mempool.cakewallet.com/api/v1/fees/recommended"))
+            .timeout(Duration(seconds: 5));
+
         final result = json.decode(response.body) as Map<String, dynamic>;
         final slowFee = (result['economyFee'] as num?)?.toInt() ?? 0;
         int mediumFee = (result['hourFee'] as num?)?.toInt() ?? 0;
@@ -1175,18 +1174,19 @@ abstract class ElectrumWalletBase
         }
       });
 
-      return PendingBitcoinTransaction(transaction, type,
-          electrumClient: electrumClient,
-          amount: estimatedTx.amount,
-          fee: estimatedTx.fee,
-          feeRate: feeRateInt.toString(),
-          network: network,
-          hasChange: estimatedTx.hasChange,
-          isSendAll: estimatedTx.isSendAll,
-          hasTaprootInputs: hasTaprootInputs,
-          utxos: estimatedTx.utxos,
-          publicKeys: estimatedTx.publicKeys)
-        ..addListener((transaction) async {
+      return PendingBitcoinTransaction(
+        transaction,
+        type,
+        electrumClient: electrumClient,
+        amount: estimatedTx.amount,
+        fee: estimatedTx.fee,
+        feeRate: feeRateInt.toString(),
+        network: network,
+        hasChange: estimatedTx.hasChange,
+        isSendAll: estimatedTx.isSendAll,
+        hasTaprootInputs: hasTaprootInputs,
+        utxos: estimatedTx.utxos,
+      )..addListener((transaction) async {
           transactionHistory.addOne(transaction);
           if (estimatedTx.spendsSilentPayment) {
             transactionHistory.transactions.values.forEach((tx) {
@@ -1877,17 +1877,20 @@ abstract class ElectrumWalletBase
 
       if (height != null && height > 0 && await checkIfMempoolAPIIsEnabled()) {
         try {
-          final blockHash = await ProxyWrapper()
-            .get(clearnetUri: Uri.parse("https://mempool.cakewallet.com/api/v1/block-height/$height"))  
-            .timeout(Duration(seconds: 15));
+          final blockHash = await http.get(
+            Uri.parse(
+              "https://mempool.cakewallet.com/api/v1/block-height/$height",
+            ),
+          );
 
           if (blockHash.statusCode == 200 &&
               blockHash.body.isNotEmpty &&
               jsonDecode(blockHash.body) != null) {
-            final blockResponse = await ProxyWrapper()
-                .get(clearnetUri: Uri.parse("https://mempool.cakewallet.com/api/v1/block/${blockHash}"))
-                .timeout(Duration(seconds: 15));
-
+            final blockResponse = await http.get(
+              Uri.parse(
+                "https://mempool.cakewallet.com/api/v1/block/${blockHash.body}",
+              ),
+            );
             if (blockResponse.statusCode == 200 &&
                 blockResponse.body.isNotEmpty &&
                 jsonDecode(blockResponse.body)['timestamp'] != null) {
@@ -1960,11 +1963,6 @@ abstract class ElectrumWalletBase
     }
   }
 
-  bool isMine(Script script) {
-    final derivedAddress = addressFromOutputScript(script, network);
-    return addressesSet.contains(derivedAddress);
-  }
-
   @override
   Future<Map<String, ElectrumTransactionInfo>> fetchTransactions() async {
     try {
@@ -2242,11 +2240,10 @@ abstract class ElectrumWalletBase
 
         if (element.hash == info.hash &&
             element.vout == info.vout &&
+            info.isFrozen &&
             element.bitcoinAddressRecord.address == info.address &&
             element.value == info.value) {
-          if (info.isFrozen) {
-            totalFrozen += element.value;
-          }
+          totalFrozen += element.value;
         }
       });
     });
@@ -2502,12 +2499,6 @@ abstract class ElectrumWalletBase
       transactionHistory.addOne(tx);
     }
   }
-
-  @override
-  String formatCryptoAmount(String amount) {
-    final amountInt = int.parse(amount);
-    return bitcoinAmountToString(amount: amountInt);
-  }
 }
 
 class ScanNode {
diff --git a/cw_bitcoin/lib/electrum_wallet_addresses.dart b/cw_bitcoin/lib/electrum_wallet_addresses.dart
index 614a06a3b..35c15e578 100644
--- a/cw_bitcoin/lib/electrum_wallet_addresses.dart
+++ b/cw_bitcoin/lib/electrum_wallet_addresses.dart
@@ -144,32 +144,27 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
       return silentAddress.toString();
     }
 
-    final typeMatchingAddresses = _addresses.where((addr) => !addr.isHidden && _isAddressPageTypeMatch(addr)).toList();
-    final typeMatchingReceiveAddresses = typeMatchingAddresses.where((addr) => !addr.isUsed).toList();
+    String receiveAddress;
 
-    if (!isEnabledAutoGenerateSubaddress) {
-      if (previousAddressRecord != null &&
-          previousAddressRecord!.type == addressPageType) {
-        return previousAddressRecord!.address;
+    final typeMatchingReceiveAddresses =
+        receiveAddresses.where(_isAddressPageTypeMatch).where((addr) => !addr.isUsed);
+
+    if ((isEnabledAutoGenerateSubaddress && receiveAddresses.isEmpty) ||
+        typeMatchingReceiveAddresses.isEmpty) {
+      receiveAddress = generateNewAddress().address;
+    } else {
+      final previousAddressMatchesType =
+          previousAddressRecord != null && previousAddressRecord!.type == addressPageType;
+
+      if (previousAddressMatchesType &&
+          typeMatchingReceiveAddresses.first.address != addressesByReceiveType.first.address) {
+        receiveAddress = previousAddressRecord!.address;
+      } else {
+        receiveAddress = typeMatchingReceiveAddresses.first.address;
       }
-
-      if (typeMatchingAddresses.isNotEmpty) {
-        return typeMatchingAddresses.first.address;
-      }
-
-      return generateNewAddress().address;
     }
 
-    if (typeMatchingAddresses.isEmpty || typeMatchingReceiveAddresses.isEmpty) {
-      return generateNewAddress().address;
-    }
-
-    final prev = previousAddressRecord;
-    if (prev != null && prev.type == addressPageType && !prev.isUsed) {
-      return prev.address;
-    }
-
-    return typeMatchingReceiveAddresses.first.address;
+    return receiveAddress;
   }
 
   @observable
diff --git a/cw_bitcoin/lib/litecoin_wallet.dart b/cw_bitcoin/lib/litecoin_wallet.dart
index 08c56c600..d54303075 100644
--- a/cw_bitcoin/lib/litecoin_wallet.dart
+++ b/cw_bitcoin/lib/litecoin_wallet.dart
@@ -329,7 +329,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
       try {
         await subscribeForUpdates();
       } catch (e) {
-        printV("failed to subscribe for updates: $e");
+        printV("failed to subcribe for updates: $e");
       }
       updateFeeRates();
       _feeRatesTimer?.cancel();
@@ -464,9 +464,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
     final oldBox = await CakeHive.openBox<MwebUtxo>(oldBoxName);
     mwebUtxosBox = await CakeHive.openBox<MwebUtxo>(newBoxName);
     for (final key in oldBox.keys) {
-      final value = oldBox.get(key);
-      await oldBox.delete(key);
-      await mwebUtxosBox.put(key, value!);
+      await mwebUtxosBox.put(key, oldBox.get(key)!);
     }
     oldBox.deleteFromDisk();
 
@@ -603,7 +601,7 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
     }
     _utxoStream = responseStream.listen(
       (Utxo sUtxo) async {
-        // we're processing utxos, so our balance could still be inaccurate:
+        // we're processing utxos, so our balance could still be innacurate:
         if (mwebSyncStatus is! SyncronizingSyncStatus && mwebSyncStatus is! SyncingSyncStatus) {
           mwebSyncStatus = SyncronizingSyncStatus();
           processingUtxos = true;
diff --git a/cw_bitcoin/lib/payjoin/manager.dart b/cw_bitcoin/lib/payjoin/manager.dart
deleted file mode 100644
index 95a523d89..000000000
--- a/cw_bitcoin/lib/payjoin/manager.dart
+++ /dev/null
@@ -1,310 +0,0 @@
-import 'dart:async';
-import 'dart:isolate';
-import 'dart:math';
-import 'dart:typed_data';
-
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:cw_bitcoin/bitcoin_wallet.dart';
-import 'package:cw_bitcoin/bitcoin_wallet_addresses.dart';
-import 'package:cw_bitcoin/payjoin/payjoin_persister.dart';
-import 'package:cw_bitcoin/payjoin/payjoin_receive_worker.dart';
-import 'package:cw_bitcoin/payjoin/payjoin_send_worker.dart';
-import 'package:cw_bitcoin/payjoin/payjoin_session_errors.dart';
-import 'package:cw_bitcoin/payjoin/storage.dart';
-import 'package:cw_bitcoin/psbt/signer.dart';
-import 'package:cw_bitcoin/psbt/utils.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:payjoin_flutter/common.dart';
-import 'package:payjoin_flutter/receive.dart';
-import 'package:payjoin_flutter/send.dart';
-import 'package:payjoin_flutter/src/config.dart' as pj_config;
-import 'package:payjoin_flutter/uri.dart' as PayjoinUri;
-
-class PayjoinManager {
-  PayjoinManager(this._payjoinStorage, this._wallet);
-
-  final PayjoinStorage _payjoinStorage;
-  final BitcoinWalletBase _wallet;
-  final Map<String, PayjoinPollerSession> _activePollers = {};
-
-  static const List<String> ohttpRelayUrls = [
-    'https://pj.bobspacebkk.com',
-    'https://ohttp.achow101.com',
-    'https://ohttp.cakewallet.com',
-  ];
-
-  static String randomOhttpRelayUrl() =>
-      ohttpRelayUrls[Random.secure().nextInt(ohttpRelayUrls.length)];
-
-  static const payjoinDirectoryUrl = 'https://payjo.in';
-
-  Future<void> initPayjoin() => pj_config.PConfig.initializeApp();
-
-  Future<void> resumeSessions() async {
-    final allSessions = _payjoinStorage.readAllOpenSessions(_wallet.id);
-
-    final spawnedSessions = allSessions.map((session) {
-      if (session.isSenderSession) {
-        printV("Resuming Payjoin Sender Session ${session.pjUri!}");
-        return _spawnSender(
-          sender: Sender.fromJson(json: session.sender!),
-          pjUri: session.pjUri!,
-        );
-      }
-      final receiver = Receiver.fromJson(json: session.receiver!);
-      printV("Resuming Payjoin Receiver Session ${receiver.id()}");
-      return spawnReceiver(receiver: receiver);
-    });
-
-    printV("Resumed ${spawnedSessions.length} Payjoin Sessions");
-    await Future.wait(spawnedSessions);
-  }
-
-  Future<Sender> initSender(
-      String pjUriString, String originalPsbt, int networkFeesSatPerVb) async {
-    try {
-      final pjUri =
-          (await PayjoinUri.Uri.fromStr(pjUriString)).checkPjSupported();
-      final minFeeRateSatPerKwu = BigInt.from(networkFeesSatPerVb * 250);
-      final senderBuilder = await SenderBuilder.fromPsbtAndUri(
-        psbtBase64: originalPsbt,
-        pjUri: pjUri,
-      );
-      final persister = PayjoinSenderPersister.impl();
-      final newSender =
-          await senderBuilder.buildRecommended(minFeeRate: minFeeRateSatPerKwu);
-      final senderToken = await newSender.persist(persister: persister);
-
-      return Sender.load(token: senderToken, persister: persister);
-    } catch (e) {
-      throw Exception('Error initializing Payjoin Sender: $e');
-    }
-  }
-
-  Future<void> spawnNewSender({
-    required Sender sender,
-    required String pjUrl,
-    required BigInt amount,
-    bool isTestnet = false,
-  }) async {
-    final pjUri = Uri.parse(pjUrl).queryParameters['pj']!;
-    await _payjoinStorage.insertSenderSession(
-        sender, pjUri, _wallet.id, amount);
-
-    return _spawnSender(isTestnet: isTestnet, sender: sender, pjUri: pjUri);
-  }
-
-  Future<void> _spawnSender({
-    required Sender sender,
-    required String pjUri,
-    bool isTestnet = false,
-  }) async {
-    final completer = Completer();
-    final receivePort = ReceivePort();
-
-    receivePort.listen((message) async {
-      if (message is Map<String, dynamic>) {
-        try {
-          switch (message['type'] as PayjoinSenderRequestTypes) {
-            case PayjoinSenderRequestTypes.requestPosted:
-              return;
-            case PayjoinSenderRequestTypes.psbtToSign:
-              final proposalPsbt = message['psbt'] as String;
-              final utxos = _wallet.getUtxoWithPrivateKeys();
-              final finalizedPsbt = await _wallet.signPsbt(proposalPsbt, utxos);
-              final txId = getTxIdFromPsbtV0(finalizedPsbt);
-              _wallet.commitPsbt(finalizedPsbt);
-
-              _cleanupSession(pjUri);
-              await _payjoinStorage.markSenderSessionComplete(pjUri, txId);
-              completer.complete();
-          }
-        } catch (e) {
-          _cleanupSession(pjUri);
-          await _payjoinStorage.markSenderSessionUnrecoverable(pjUri, e.toString());
-          completer.complete();
-        }
-      } else if (message is PayjoinSessionError) {
-        _cleanupSession(pjUri);
-        if (message is UnrecoverableError) {
-          await _payjoinStorage.markSenderSessionUnrecoverable(pjUri, message.message);
-          completer.complete();
-        } else if (message is RecoverableError) {
-          completer.complete();
-        } else {
-          completer.completeError(message);
-        }
-      }
-    });
-
-    final isolate = await Isolate.spawn(
-      PayjoinSenderWorker.run,
-      [receivePort.sendPort, sender.toJson(), pjUri],
-    );
-
-    _activePollers[pjUri] = PayjoinPollerSession(isolate, receivePort);
-
-    return completer.future;
-  }
-
-  Future<Receiver> getUnusedReceiver(String address,
-      [bool isTestnet = false]) async {
-    final session = _payjoinStorage.getUnusedActiveReceiverSession(_wallet.id);
-
-    if (session != null) {
-      await PayjoinUri.Url.fromStr(payjoinDirectoryUrl);
-
-      return Receiver.fromJson(json: session.receiver!);
-    }
-
-    return initReceiver(address);
-  }
-
-  Future<Receiver> initReceiver(String address, [bool isTestnet = false]) async {
-    final ohttpKeys = await PayjoinUri.fetchOhttpKeys(
-      ohttpRelay: await randomOhttpRelayUrl(),
-      payjoinDirectory: payjoinDirectoryUrl,
-    );
-
-    final newReceiver = await NewReceiver.create(
-      address: address,
-      network: isTestnet ? Network.testnet : Network.bitcoin,
-      directory: payjoinDirectoryUrl,
-      ohttpKeys: ohttpKeys,
-    );
-    final persister = PayjoinReceiverPersister.impl();
-    final receiverToken = await newReceiver.persist(persister: persister);
-    final receiver = await Receiver.load(persister: persister, token: receiverToken);
-
-    await _payjoinStorage.insertReceiverSession(receiver, _wallet.id);
-
-    return receiver;
-  }
-
-  Future<void> spawnReceiver({
-    required Receiver receiver,
-    bool isTestnet = false,
-  }) async {
-    final completer = Completer();
-    final receivePort = ReceivePort();
-
-    SendPort? mainToIsolateSendPort;
-    List<UtxoWithPrivateKey> utxos = [];
-    String rawAmount = '0';
-
-    receivePort.listen((message) async {
-      if (message is Map<String, dynamic>) {
-        try {
-          switch (message['type'] as PayjoinReceiverRequestTypes) {
-            case PayjoinReceiverRequestTypes.processOriginalTx:
-              final tx = message['tx'] as String;
-              rawAmount = getOutputAmountFromTx(tx, _wallet);
-              break;
-            case PayjoinReceiverRequestTypes.checkIsOwned:
-              (_wallet.walletAddresses as BitcoinWalletAddresses)
-                  .newPayjoinReceiver();
-              _payjoinStorage.markReceiverSessionInProgress(receiver.id());
-
-              final inputScript = message['input_script'] as Uint8List;
-              final isOwned =
-                  _wallet.isMine(Script.fromRaw(byteData: inputScript));
-              mainToIsolateSendPort?.send({
-                'requestId': message['requestId'],
-                'result': isOwned,
-              });
-              break;
-
-            case PayjoinReceiverRequestTypes.checkIsReceiverOutput:
-              final outputScript = message['output_script'] as Uint8List;
-              final isReceiverOutput =
-                  _wallet.isMine(Script.fromRaw(byteData: outputScript));
-              mainToIsolateSendPort?.send({
-                'requestId': message['requestId'],
-                'result': isReceiverOutput,
-              });
-              break;
-
-            case PayjoinReceiverRequestTypes.getCandidateInputs:
-              utxos = _wallet.getUtxoWithPrivateKeys();
-              if (utxos.isEmpty) {
-                await _wallet.updateAllUnspents();
-                utxos = _wallet.getUtxoWithPrivateKeys();
-              }
-              mainToIsolateSendPort?.send({
-                'requestId': message['requestId'],
-                'result': utxos,
-              });
-              break;
-
-            case PayjoinReceiverRequestTypes.processPsbt:
-              final psbt = message['psbt'] as String;
-              final signedPsbt = await _wallet.signPsbt(psbt, utxos);
-              mainToIsolateSendPort?.send({
-                'requestId': message['requestId'],
-                'result': signedPsbt,
-              });
-              break;
-
-            case PayjoinReceiverRequestTypes.proposalSent:
-              _cleanupSession(receiver.id());
-              final psbt = message['psbt'] as String;
-              await _payjoinStorage.markReceiverSessionComplete(
-                  receiver.id(), getTxIdFromPsbtV0(psbt), rawAmount);
-              completer.complete();
-          }
-        } catch (e) {
-          _cleanupSession(receiver.id());
-          await _payjoinStorage.markReceiverSessionUnrecoverable(
-              receiver.id(), e.toString());
-          completer.completeError(e);
-        }
-      } else if (message is PayjoinSessionError) {
-        _cleanupSession(receiver.id());
-        if (message is UnrecoverableError) {
-          await _payjoinStorage.markReceiverSessionUnrecoverable(
-              receiver.id(), message.message);
-          completer.complete();
-        } else if (message is RecoverableError) {
-          completer.complete();
-        } else {
-          completer.completeError(message);
-        }
-      } else if (message is SendPort) {
-        mainToIsolateSendPort = message;
-      }
-    });
-
-    final isolate = await Isolate.spawn(
-      PayjoinReceiverWorker.run,
-      [receivePort.sendPort, receiver.toJson()],
-    );
-
-    _activePollers[receiver.id()] = PayjoinPollerSession(isolate, receivePort);
-
-    return completer.future;
-  }
-
-  void cleanupSessions() {
-    final sessionIds = _activePollers.keys.toList();
-    for (final sessionId in sessionIds) {
-      _cleanupSession(sessionId);
-    }
-  }
-
-  void _cleanupSession(String sessionId) {
-    _activePollers[sessionId]?.close();
-    _activePollers.remove(sessionId);
-  }
-}
-
-class PayjoinPollerSession {
-  final Isolate isolate;
-  final ReceivePort port;
-
-  PayjoinPollerSession(this.isolate, this.port);
-
-  void close() {
-    isolate.kill();
-    port.close();
-  }
-}
diff --git a/cw_bitcoin/lib/payjoin/payjoin_persister.dart b/cw_bitcoin/lib/payjoin/payjoin_persister.dart
deleted file mode 100644
index 4e395e36a..000000000
--- a/cw_bitcoin/lib/payjoin/payjoin_persister.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-import 'package:payjoin_flutter/src/generated/api/receive.dart';
-import 'package:payjoin_flutter/src/generated/api/send.dart';
-
-class PayjoinSenderPersister implements DartSenderPersister {
-  static DartSenderPersister impl() {
-    final impl = PayjoinSenderPersister();
-    return DartSenderPersister(
-      save: (sender) => impl.save(sender: sender),
-      load: (token) => impl.load(token: token),
-    );
-  }
-
-  final Map<String, FfiSender> _store = {};
-
-  Future<SenderToken> save({required FfiSender sender}) async {
-    final token = sender.key();
-    _store[token.toBytes().toString()] = sender;
-    return token;
-  }
-
-  Future<FfiSender> load({required SenderToken token}) async {
-    final sender = _store[token.toBytes().toString()];
-    if (sender == null) {
-      throw Exception('Sender not found for the provided token.');
-    }
-    return sender;
-  }
-
-  @override
-  void dispose() => _store.clear();
-
-  @override
-  bool get isDisposed => _store.isEmpty;
-}
-
-class PayjoinReceiverPersister implements DartReceiverPersister {
-  static DartReceiverPersister impl() {
-    final impl = PayjoinReceiverPersister();
-    return DartReceiverPersister(
-      save: (receiver) => impl.save(receiver: receiver),
-      load: (token) => impl.load(token: token),
-    );
-  }
-
-  final Map<String, FfiReceiver> _store = {};
-
-  Future<ReceiverToken> save({required FfiReceiver receiver}) async {
-    final token = receiver.key();
-    _store[token.toBytes().toString()] = receiver;
-    return token;
-  }
-
-  Future<FfiReceiver> load({required ReceiverToken token}) async {
-    final receiver = _store[token.toBytes().toString()];
-    if (receiver == null) {
-      throw Exception('Receiver not found for the provided token.');
-    }
-    return receiver;
-  }
-
-  @override
-  void dispose() => _store.clear();
-
-  @override
-  bool get isDisposed => _store.isEmpty;
-}
diff --git a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart b/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart
deleted file mode 100644
index c56148de2..000000000
--- a/cw_bitcoin/lib/payjoin/payjoin_receive_worker.dart
+++ /dev/null
@@ -1,222 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:isolate';
-import 'dart:typed_data';
-
-import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:cw_bitcoin/payjoin/manager.dart';
-import 'package:cw_bitcoin/payjoin/payjoin_session_errors.dart';
-import 'package:cw_bitcoin/psbt/signer.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:payjoin_flutter/bitcoin_ffi.dart';
-import 'package:payjoin_flutter/common.dart';
-import 'package:payjoin_flutter/receive.dart';
-import 'package:payjoin_flutter/src/generated/frb_generated.dart' as pj;
-import 'package:http/http.dart' as very_insecure_http_do_not_use; // for errors
-
-enum PayjoinReceiverRequestTypes {
-  processOriginalTx,
-  proposalSent,
-  getCandidateInputs,
-  checkIsOwned,
-  checkIsReceiverOutput,
-  processPsbt;
-}
-
-class PayjoinReceiverWorker {
-  final SendPort sendPort;
-  final pendingRequests = <String, Completer<dynamic>>{};
-
-  PayjoinReceiverWorker._(this.sendPort);
-  static final client = ProxyWrapper().getHttpIOClient();
-  static Future<void> run(List<Object> args) async {
-    await pj.core.init();
-
-    final sendPort = args[0] as SendPort;
-    final receiverJson = args[1] as String;
-
-    final worker = PayjoinReceiverWorker._(sendPort);
-    final receivePort = ReceivePort();
-
-    sendPort.send(receivePort.sendPort);
-    receivePort.listen(worker.handleMessage);
-
-    try {
-      final receiver = Receiver.fromJson(json: receiverJson);
-
-      final uncheckedProposal =
-          await worker.receiveUncheckedProposal(receiver);
-
-      final originalTx = await uncheckedProposal.extractTxToScheduleBroadcast();
-      sendPort.send({
-        'type': PayjoinReceiverRequestTypes.processOriginalTx,
-        'tx': BytesUtils.toHexString(originalTx),
-      });
-
-      final payjoinProposal = await worker.processPayjoinProposal(
-        uncheckedProposal,
-      );
-      final psbt = await worker.sendFinalProposal(payjoinProposal);
-      sendPort.send({
-        'type': PayjoinReceiverRequestTypes.proposalSent,
-        'psbt': psbt,
-      });
-    } catch (e) {
-      if (e is HttpException ||
-          (e is very_insecure_http_do_not_use.ClientException &&
-              e.message.contains("Software caused connection abort"))) {
-        sendPort.send(PayjoinSessionError.recoverable(e.toString()));
-      } else {
-        sendPort.send(PayjoinSessionError.unrecoverable(e.toString()));
-      }
-    }
-  }
-
-  void handleMessage(dynamic message) async {
-    if (message is Map<String, dynamic>) {
-      final requestId = message['requestId'] as String?;
-      if (requestId != null && pendingRequests.containsKey(requestId)) {
-        pendingRequests[requestId]!.complete(message['result']);
-        pendingRequests.remove(requestId);
-      }
-    }
-  }
-
-  Future<dynamic> _sendRequest(PayjoinReceiverRequestTypes type,
-      [Map<String, dynamic> data = const {}]) async {
-    final completer = Completer<dynamic>();
-    final requestId = DateTime.now().millisecondsSinceEpoch.toString();
-    pendingRequests[requestId] = completer;
-
-    sendPort.send({
-      ...data,
-      'type': type,
-      'requestId': requestId,
-    });
-
-    return completer.future;
-  }
-
-  Future<UncheckedProposal> receiveUncheckedProposal(Receiver session) async {
-    while (true) {
-      printV("Polling for Proposal (${session.id()})");
-      final extractReq = await session.extractReq(
-        ohttpRelay: await PayjoinManager.randomOhttpRelayUrl(),
-      );
-      final request = extractReq.$1;
-
-      final url = Uri.parse(request.url.asString());
-      final httpRequest = await client.post(url,
-          headers: {'Content-Type': request.contentType}, body: request.body);
-
-      final proposal = await session.processRes(
-          body: httpRequest.bodyBytes, ctx: extractReq.$2);
-      if (proposal != null) return proposal;
-    }
-  }
-
-  Future<String> sendFinalProposal(PayjoinProposal finalProposal) async {
-    final req = await finalProposal.extractReq(
-      ohttpRelay: await PayjoinManager.randomOhttpRelayUrl(),
-    );
-    final proposalReq = req.$1;
-    final proposalCtx = req.$2;
-
-    final request = await client.post(
-      Uri.parse(proposalReq.url.asString()),
-      headers: {"Content-Type": proposalReq.contentType},
-      body: proposalReq.body,
-    );
-
-    await finalProposal.processRes(
-      res: request.bodyBytes,
-      ohttpContext: proposalCtx,
-    );
-
-    return await finalProposal.psbt();
-  }
-
-  Future<PayjoinProposal> processPayjoinProposal(
-      UncheckedProposal proposal) async {
-    await proposal.extractTxToScheduleBroadcast();
-    // TODO Handle this. send to the main port on a timer?
-
-    try {
-      // Receive Check 1: can broadcast
-      final pj1 = await proposal.assumeInteractiveReceiver();
-
-      // Receive Check 2: original PSBT has no receiver-owned inputs
-      final pj2 = await pj1.checkInputsNotOwned(
-        isOwned: (inputScript) async {
-          final result = await _sendRequest(
-            PayjoinReceiverRequestTypes.checkIsOwned,
-            {'input_script': inputScript},
-          );
-          return result as bool;
-        },
-      );
-      // Receive Check 3: sender inputs have not been seen before (prevent probing attacks)
-      final pj3 = await pj2.checkNoInputsSeenBefore(isKnown: (input) => false);
-
-      // Identify receiver outputs
-      final pj4 = await pj3.identifyReceiverOutputs(
-        isReceiverOutput: (outputScript) async {
-          final result = await _sendRequest(
-            PayjoinReceiverRequestTypes.checkIsReceiverOutput,
-            {'output_script': outputScript},
-          );
-          return result as bool;
-        },
-      );
-      final pj5 = await pj4.commitOutputs();
-
-      final listUnspent =
-          await _sendRequest(PayjoinReceiverRequestTypes.getCandidateInputs);
-      final unspent = listUnspent as List<UtxoWithPrivateKey>;
-      if (unspent.isEmpty) throw RecoverableError('No unspent outputs available');
-
-      final selectedUtxo = await _inputPairFromUtxo(unspent[0]);
-      final pj6 = await pj5.contributeInputs(replacementInputs: [selectedUtxo]);
-      final pj7 = await pj6.commitInputs();
-
-      // Finalize proposal
-      final payjoinProposal = await pj7.finalizeProposal(
-        processPsbt: (String psbt) async {
-          final result = await _sendRequest(
-              PayjoinReceiverRequestTypes.processPsbt, {'psbt': psbt});
-          return result as String;
-        },
-        // TODO set maxFeeRateSatPerVb
-        maxFeeRateSatPerVb: BigInt.from(10000),
-      );
-      return payjoinProposal;
-    } catch (e) {
-      printV('Error occurred while finalizing proposal: $e');
-      rethrow;
-    }
-  }
-
-  Future<InputPair> _inputPairFromUtxo(UtxoWithPrivateKey utxo) async {
-    final txout = TxOut(
-      value: utxo.utxo.value,
-      scriptPubkey: Uint8List.fromList(
-          utxo.ownerDetails.address.toScriptPubKey().toBytes()),
-    );
-
-    final psbtin =
-        PsbtInput(witnessUtxo: txout, redeemScript: null, witnessScript: null);
-
-    final previousOutput =
-        OutPoint(txid: utxo.utxo.txHash, vout: utxo.utxo.vout);
-
-    final txin = TxIn(
-      previousOutput: previousOutput,
-      scriptSig: await Script.newInstance(rawOutputScript: []),
-      witness: [],
-      sequence: 0,
-    );
-
-    return InputPair.newInstance(txin: txin, psbtin: psbtin);
-  }
-}
diff --git a/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart b/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart
deleted file mode 100644
index 7e85cc773..000000000
--- a/cw_bitcoin/lib/payjoin/payjoin_send_worker.dart
+++ /dev/null
@@ -1,120 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:isolate';
-
-import 'package:cw_bitcoin/payjoin/manager.dart';
-import 'package:cw_bitcoin/payjoin/payjoin_session_errors.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:payjoin_flutter/common.dart';
-import 'package:payjoin_flutter/send.dart';
-import 'package:payjoin_flutter/src/generated/frb_generated.dart' as pj;
-import 'package:payjoin_flutter/src/generated/api/send/error.dart' as pj_error;
-import 'package:payjoin_flutter/uri.dart' as pj_uri;
-
-enum PayjoinSenderRequestTypes {
-  requestPosted,
-  psbtToSign;
-}
-
-class PayjoinSenderWorker {
-  final SendPort sendPort;
-  final pendingRequests = <String, Completer<dynamic>>{};
-  final String pjUrl;
-
-  PayjoinSenderWorker._(this.sendPort, this.pjUrl);
-
-  static Future<void> run(List<Object> args) async {
-    await pj.core.init();
-
-    final sendPort = args[0] as SendPort;
-    final senderJson = args[1] as String;
-    final pjUrl = args[2] as String;
-
-    final sender = Sender.fromJson(json: senderJson);
-    final worker = PayjoinSenderWorker._(sendPort, pjUrl);
-
-    try {
-      final proposalPsbt = await worker.runSender(sender);
-      sendPort.send({
-        'type': PayjoinSenderRequestTypes.psbtToSign,
-        'psbt': proposalPsbt,
-      });
-    } catch (e) {
-      sendPort.send(e);
-    }
-  }
-  final client = ProxyWrapper().getHttpIOClient();
-
-  /// Run a payjoin sender (V2 protocol first, fallback to V1).
-  Future<String> runSender(Sender sender) async {
-
-    try {
-      return await _runSenderV2(sender);
-    } catch (e) {
-      printV(e);
-      if (e is pj_error.FfiCreateRequestError) {
-        return await _runSenderV1(sender);
-      } else if (e is HttpException) {
-        printV(e);
-        throw Exception(PayjoinSessionError.recoverable(e.toString()));
-      } else {
-        throw Exception(PayjoinSessionError.unrecoverable(e.toString()));
-      }
-    }
-  }
-
-  /// Attempt to send payjoin using the V2 of the protocol.
-  Future<String> _runSenderV2(Sender sender) async {
-    try {
-      final postRequest = await sender.extractV2(
-        ohttpProxyUrl:
-            await pj_uri.Url.fromStr(PayjoinManager.randomOhttpRelayUrl()),
-      );
-
-      final postResult = await _postRequest(postRequest.$1);
-      final getContext =
-      await postRequest.$2.processResponse(response: postResult);
-
-      sendPort.send({'type': PayjoinSenderRequestTypes.requestPosted, "pj": pjUrl});
-
-      while (true) {
-        printV('Polling V2 Proposal Request (${pjUrl})');
-
-        final getRequest = await getContext.extractReq(
-          ohttpRelay: await PayjoinManager.randomOhttpRelayUrl(),
-        );
-        final getRes = await _postRequest(getRequest.$1);
-        final proposalPsbt = await getContext.processResponse(
-          response: getRes,
-          ohttpCtx: getRequest.$2,
-        );
-        printV("$proposalPsbt");
-        if (proposalPsbt != null) return proposalPsbt;
-      }
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  /// Attempt to send payjoin using the V1 of the protocol.
-  Future<String> _runSenderV1(Sender sender) async {
-    try {
-      final postRequest = await sender.extractV1();
-      final response = await _postRequest(postRequest.$1);
-
-      sendPort.send({'type': PayjoinSenderRequestTypes.requestPosted});
-
-      return await postRequest.$2.processResponse(response: response);
-    } catch (e, stack) {
-      throw PayjoinSessionError.unrecoverable('Send V1 payjoin error: $e, $stack');
-    }
-  }
-
-  Future<List<int>> _postRequest(Request req) async {
-    final httpRequest = await client.post(Uri.parse(req.url.asString()),
-        headers: {'Content-Type': req.contentType}, body: req.body);
-
-    return httpRequest.bodyBytes;
-  }
-}
diff --git a/cw_bitcoin/lib/payjoin/payjoin_session_errors.dart b/cw_bitcoin/lib/payjoin/payjoin_session_errors.dart
deleted file mode 100644
index 06e0a5431..000000000
--- a/cw_bitcoin/lib/payjoin/payjoin_session_errors.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-class PayjoinSessionError {
-  final String message;
-
-  const PayjoinSessionError._(this.message);
-
-  factory PayjoinSessionError.recoverable(String message) = RecoverableError;
-  factory PayjoinSessionError.unrecoverable(String message) = UnrecoverableError;
-}
-
-class RecoverableError extends PayjoinSessionError {
-  const RecoverableError(super.message) : super._();
-}
-
-class UnrecoverableError extends PayjoinSessionError {
-  const UnrecoverableError(super.message) : super._();
-}
diff --git a/cw_bitcoin/lib/payjoin/storage.dart b/cw_bitcoin/lib/payjoin/storage.dart
deleted file mode 100644
index 5fb9d5716..000000000
--- a/cw_bitcoin/lib/payjoin/storage.dart
+++ /dev/null
@@ -1,104 +0,0 @@
-import 'package:cw_core/payjoin_session.dart';
-import 'package:hive/hive.dart';
-import 'package:payjoin_flutter/receive.dart';
-import 'package:payjoin_flutter/send.dart';
-
-class PayjoinStorage {
-  PayjoinStorage(this._payjoinSessionSources);
-
-  final Box<PayjoinSession> _payjoinSessionSources;
-
-  static const String _receiverPrefix = 'pj_recv_';
-  static const String _senderPrefix = 'pj_send_';
-
-  Future<void> insertReceiverSession(
-    Receiver receiver,
-    String walletId,
-  ) =>
-      _payjoinSessionSources.put(
-        "$_receiverPrefix${receiver.id()}",
-        PayjoinSession(
-          walletId: walletId,
-          receiver: receiver.toJson(),
-        ),
-      );
-
-  PayjoinSession? getUnusedActiveReceiverSession(String walletId) =>
-      _payjoinSessionSources.values
-          .where((session) =>
-              session.walletId == walletId &&
-              session.status == PayjoinSessionStatus.created.name &&
-              !session.isSenderSession)
-          .firstOrNull;
-
-  Future<void> markReceiverSessionComplete(
-      String sessionId, String txId, String amount) async {
-    final session = _payjoinSessionSources.get("$_receiverPrefix${sessionId}")!;
-
-    session.status = PayjoinSessionStatus.success.name;
-    session.txId = txId;
-    session.rawAmount = amount;
-    await session.save();
-  }
-
-  Future<void> markReceiverSessionUnrecoverable(
-      String sessionId, String reason) async {
-    final session = _payjoinSessionSources.get("$_receiverPrefix${sessionId}")!;
-
-    session.status = PayjoinSessionStatus.unrecoverable.name;
-    session.error = reason;
-    await session.save();
-  }
-
-  Future<void> markReceiverSessionInProgress(String sessionId) async {
-    final session = _payjoinSessionSources.get("$_receiverPrefix${sessionId}")!;
-
-    session.status = PayjoinSessionStatus.inProgress.name;
-    session.inProgressSince = DateTime.now();
-    await session.save();
-  }
-
-  Future<void> insertSenderSession(
-    Sender sender,
-    String pjUrl,
-    String walletId,
-    BigInt amount,
-  ) =>
-      _payjoinSessionSources.put(
-        "$_senderPrefix$pjUrl",
-        PayjoinSession(
-          walletId: walletId,
-          pjUri: pjUrl,
-          sender: sender.toJson(),
-          status: PayjoinSessionStatus.inProgress.name,
-          inProgressSince: DateTime.now(),
-          rawAmount: amount.toString(),
-        ),
-      );
-
-  Future<void> markSenderSessionComplete(String pjUrl, String txId) async {
-    final session = _payjoinSessionSources.get("$_senderPrefix$pjUrl")!;
-
-    session.status = PayjoinSessionStatus.success.name;
-    session.txId = txId;
-    await session.save();
-  }
-
-  Future<void> markSenderSessionUnrecoverable(String pjUrl, String reason) async {
-    final session = _payjoinSessionSources.get("$_senderPrefix$pjUrl")!;
-
-    session.status = PayjoinSessionStatus.unrecoverable.name;
-    session.error = reason;
-    await session.save();
-  }
-
-  List<PayjoinSession> readAllOpenSessions(String walletId) =>
-      _payjoinSessionSources.values
-          .where((session) =>
-              session.walletId == walletId &&
-              ![
-                PayjoinSessionStatus.success.name,
-                PayjoinSessionStatus.unrecoverable.name
-              ].contains(session.status))
-          .toList();
-}
diff --git a/cw_bitcoin/lib/pending_bitcoin_transaction.dart b/cw_bitcoin/lib/pending_bitcoin_transaction.dart
index 6930524eb..411c7de16 100644
--- a/cw_bitcoin/lib/pending_bitcoin_transaction.dart
+++ b/cw_bitcoin/lib/pending_bitcoin_transaction.dart
@@ -1,4 +1,3 @@
-import 'package:cw_bitcoin/electrum_wallet.dart';
 import 'package:grpc/grpc.dart';
 import 'package:cw_bitcoin/exceptions.dart';
 import 'package:bitcoin_base/bitcoin_base.dart';
@@ -26,8 +25,6 @@ class PendingBitcoinTransaction with PendingTransaction {
     this.hasTaprootInputs = false,
     this.isMweb = false,
     this.utxos = const [],
-    this.publicKeys,
-    this.commitOverride,
   }) : _listeners = <void Function(ElectrumTransactionInfo transaction)>[];
 
   final WalletType type;
@@ -46,8 +43,6 @@ class PendingBitcoinTransaction with PendingTransaction {
   String? idOverride;
   String? hexOverride;
   List<String>? outputAddresses;
-  final Map<String, PublicKeyWithDerivationPath>? publicKeys;
-  Future<void> Function()? commitOverride;
 
   @override
   String get id => idOverride ?? _tx.txId();
@@ -134,10 +129,6 @@ class PendingBitcoinTransaction with PendingTransaction {
 
   @override
   Future<void> commit() async {
-    if (commitOverride != null) {
-      return commitOverride?.call();
-    }
-
     if (isMweb) {
       await _ltcCommit();
     } else {
diff --git a/cw_bitcoin/lib/psbt/signer.dart b/cw_bitcoin/lib/psbt/signer.dart
deleted file mode 100644
index 1d0ceba8b..000000000
--- a/cw_bitcoin/lib/psbt/signer.dart
+++ /dev/null
@@ -1,263 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:collection/collection.dart';
-import 'package:cw_bitcoin/bitcoin_address_record.dart';
-import 'package:cw_bitcoin/bitcoin_unspent.dart';
-import 'package:cw_bitcoin/bitcoin_wallet.dart';
-import 'package:cw_bitcoin/utils.dart';
-import 'package:ledger_bitcoin/psbt.dart';
-import 'package:ledger_bitcoin/src/utils/buffer_writer.dart';
-
-extension PsbtSigner on PsbtV2 {
-  Uint8List extractUnsignedTX({bool getSegwit = true}) {
-    final tx = BufferWriter()..writeUInt32(getGlobalTxVersion());
-
-    final isSegwit = getInputWitnessUtxo(0) != null;
-    if (isSegwit && getSegwit) {
-      tx.writeSlice(Uint8List.fromList([0, 1]));
-    }
-
-    final inputCount = getGlobalInputCount();
-    tx.writeVarInt(inputCount);
-
-    for (var i = 0; i < inputCount; i++) {
-      tx
-        ..writeSlice(getInputPreviousTxid(i))
-        ..writeUInt32(getInputOutputIndex(i))
-        ..writeVarSlice(Uint8List(0))
-        ..writeUInt32(getInputSequence(i));
-    }
-
-    final outputCount = getGlobalOutputCount();
-    tx.writeVarInt(outputCount);
-    for (var i = 0; i < outputCount; i++) {
-      tx.writeUInt64(getOutputAmount(i));
-      tx.writeVarSlice(getOutputScript(i));
-    }
-    tx.writeUInt32(getGlobalFallbackLocktime() ?? 0);
-    return tx.buffer();
-  }
-
-  Future<void> signWithUTXO(
-      List<UtxoWithPrivateKey> utxos, UTXOSignerCallBack signer,
-      [UTXOGetterCallBack? getTaprootPair]) async {
-    final raw = BytesUtils.toHexString(extractUnsignedTX(getSegwit: false));
-    final tx = BtcTransaction.fromRaw(raw);
-
-    /// when the transaction is taproot and we must use getTaproot transaction
-    /// digest we need all of inputs amounts and owner script pub keys
-    List<BigInt> taprootAmounts = [];
-    List<Script> taprootScripts = [];
-
-    if (utxos.any((e) => e.utxo.isP2tr())) {
-      for (final input in tx.inputs) {
-        final utxo = utxos.firstWhereOrNull(
-            (u) => u.utxo.txHash == input.txId && u.utxo.vout == input.txIndex);
-
-        if (utxo == null) {
-          final trPair = await getTaprootPair!.call(input.txId, input.txIndex);
-          taprootAmounts.add(trPair.value);
-          taprootScripts.add(trPair.script);
-          continue;
-        }
-        taprootAmounts.add(utxo.utxo.value);
-        taprootScripts.add(_findLockingScript(utxo, true));
-      }
-    }
-
-    for (var i = 0; i < tx.inputs.length; i++) {
-      final utxo = utxos.firstWhereOrNull((e) =>
-          e.utxo.txHash == tx.inputs[i].txId &&
-          e.utxo.vout == tx.inputs[i].txIndex); // ToDo: More robust verify
-      if (utxo == null) continue;
-
-      /// We receive the owner's ScriptPubKey
-      final script = _findLockingScript(utxo, false);
-
-      final int sighash = utxo.utxo.isP2tr()
-          ? BitcoinOpCodeConst.TAPROOT_SIGHASH_ALL
-          : BitcoinOpCodeConst.SIGHASH_ALL;
-
-      /// We generate transaction digest for current input
-      final digest = _generateTransactionDigest(
-          script, i, utxo.utxo, tx, taprootAmounts, taprootScripts);
-
-      /// now we need sign the transaction digest
-      final sig = signer(digest, utxo, utxo.privateKey, sighash);
-
-      if (utxo.utxo.isP2tr()) {
-        setInputTapKeySig(i, Uint8List.fromList(BytesUtils.fromHexString(sig)));
-      } else {
-        setInputPartialSig(
-            i,
-            Uint8List.fromList(BytesUtils.fromHexString(utxo.public().toHex())),
-            Uint8List.fromList(BytesUtils.fromHexString(sig)));
-      }
-    }
-  }
-
-  List<int> _generateTransactionDigest(
-      Script scriptPubKeys,
-      int input,
-      BitcoinUtxo utxo,
-      BtcTransaction transaction,
-      List<BigInt> taprootAmounts,
-      List<Script> tapRootPubKeys) {
-    if (utxo.isSegwit()) {
-      if (utxo.isP2tr()) {
-        return transaction.getTransactionTaprootDigset(
-          txIndex: input,
-          scriptPubKeys: tapRootPubKeys,
-          amounts: taprootAmounts,
-        );
-      }
-      return transaction.getTransactionSegwitDigit(
-          txInIndex: input, script: scriptPubKeys, amount: utxo.value);
-    }
-    return transaction.getTransactionDigest(
-        txInIndex: input, script: scriptPubKeys);
-  }
-
-  Script _findLockingScript(UtxoWithAddress utxo, bool isTaproot) {
-    if (utxo.isMultiSig()) {
-      throw Exception("MultiSig is not supported yet");
-    }
-
-    final senderPub = utxo.public();
-    switch (utxo.utxo.scriptType) {
-      case PubKeyAddressType.p2pk:
-        return senderPub.toRedeemScript();
-      case SegwitAddresType.p2wsh:
-        if (isTaproot) {
-          return senderPub.toP2wshAddress().toScriptPubKey();
-        }
-        return senderPub.toP2wshRedeemScript();
-      case P2pkhAddressType.p2pkh:
-        return senderPub.toP2pkhAddress().toScriptPubKey();
-      case SegwitAddresType.p2wpkh:
-        if (isTaproot) {
-          return senderPub.toP2wpkhAddress().toScriptPubKey();
-        }
-        return senderPub.toP2pkhAddress().toScriptPubKey();
-      case SegwitAddresType.p2tr:
-        return senderPub
-            .toTaprootAddress(tweak: utxo.utxo.isSilentPayment != true)
-            .toScriptPubKey();
-      case SegwitAddresType.mweb:
-        return Script(script: []);
-      case P2shAddressType.p2pkhInP2sh:
-        if (isTaproot) {
-          return senderPub.toP2pkhInP2sh().toScriptPubKey();
-        }
-        return senderPub.toP2pkhAddress().toScriptPubKey();
-      case P2shAddressType.p2wpkhInP2sh:
-        if (isTaproot) {
-          return senderPub.toP2wpkhInP2sh().toScriptPubKey();
-        }
-        return senderPub.toP2pkhAddress().toScriptPubKey();
-      case P2shAddressType.p2wshInP2sh:
-        if (isTaproot) {
-          return senderPub.toP2wshInP2sh().toScriptPubKey();
-        }
-        return senderPub.toP2wshRedeemScript();
-      case P2shAddressType.p2pkInP2sh:
-        if (isTaproot) {
-          return senderPub.toP2pkInP2sh().toScriptPubKey();
-        }
-        return senderPub.toRedeemScript();
-    }
-    throw Exception("invalid bitcoin address type");
-  }
-}
-
-typedef UTXOSignerCallBack = String Function(List<int> trDigest,
-    UtxoWithAddress utxo, ECPrivate privateKey, int sighash);
-
-typedef UTXOGetterCallBack = Future<TaprootAmountScriptPair> Function(
-    String txId, int vout);
-
-class TaprootAmountScriptPair {
-  final BigInt value;
-  final Script script;
-
-  const TaprootAmountScriptPair(this.value, this.script);
-}
-
-class UtxoWithPrivateKey extends UtxoWithAddress {
-  final ECPrivate privateKey;
-
-  UtxoWithPrivateKey({
-    required super.utxo,
-    required super.ownerDetails,
-    required this.privateKey,
-  });
-
-  factory UtxoWithPrivateKey.fromUtxo(
-      UtxoWithAddress input, List<ECPrivateInfo> inputPrivateKeyInfos) {
-    ECPrivateInfo? key;
-
-    if (inputPrivateKeyInfos.isEmpty) {
-      throw Exception("No private keys generated.");
-    } else {
-      key = inputPrivateKeyInfos.firstWhereOrNull((element) {
-        final elemPubkey = element.privkey.getPublic().toHex();
-        if (elemPubkey == input.public().toHex()) {
-          return true;
-        } else {
-          return false;
-        }
-      });
-    }
-
-    if (key == null) {
-      throw Exception("${input.utxo.txHash} No Key found");
-    }
-
-    return UtxoWithPrivateKey(
-        utxo: input.utxo,
-        ownerDetails: input.ownerDetails,
-        privateKey: key.privkey);
-  }
-
-  factory UtxoWithPrivateKey.fromUnspent(
-      BitcoinUnspent input, BitcoinWalletBase wallet) {
-    final address =
-        RegexUtils.addressTypeFromStr(input.address, BitcoinNetwork.mainnet);
-
-    final newHd =
-        input.bitcoinAddressRecord.isHidden ? wallet.sideHd : wallet.hd;
-
-    ECPrivate privkey;
-    if (input.bitcoinAddressRecord is BitcoinSilentPaymentAddressRecord) {
-      final unspentAddress =
-          input.bitcoinAddressRecord as BitcoinSilentPaymentAddressRecord;
-      privkey = wallet.walletAddresses.silentAddress!.b_spend.tweakAdd(
-        BigintUtils.fromBytes(
-          BytesUtils.fromHexString(unspentAddress.silentPaymentTweak!),
-        ),
-      );
-    } else {
-      privkey = generateECPrivate(
-          hd: newHd,
-          index: input.bitcoinAddressRecord.index,
-          network: BitcoinNetwork.mainnet);
-    }
-
-    return UtxoWithPrivateKey(
-        utxo: BitcoinUtxo(
-          txHash: input.hash,
-          value: BigInt.from(input.value),
-          vout: input.vout,
-          scriptType: input.bitcoinAddressRecord.type,
-          isSilentPayment:
-              input.bitcoinAddressRecord is BitcoinSilentPaymentAddressRecord,
-        ),
-        ownerDetails: UtxoAddressDetails(
-          publicKey: privkey.getPublic().toHex(),
-          address: address,
-        ),
-        privateKey: privkey);
-  }
-}
diff --git a/cw_bitcoin/lib/psbt/utils.dart b/cw_bitcoin/lib/psbt/utils.dart
deleted file mode 100644
index 85d2530ae..000000000
--- a/cw_bitcoin/lib/psbt/utils.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-import 'dart:convert';
-
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:cw_bitcoin/bitcoin_wallet.dart';
-import 'package:cw_bitcoin/psbt/v0_deserialize.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:ledger_bitcoin/psbt.dart';
-
-String getTxIdFromPsbtV0(String psbt) {
-  final psbtV2 = PsbtV2()..deserializeV0(base64.decode(psbt));
-
-  return BtcTransaction.fromRaw(
-          BytesUtils.toHexString(psbtV2.extractUnsignedTX(false)))
-      .txId();
-}
-
-String getOutputAmountFromPsbt(String psbtV0, BitcoinWalletBase wallet) {
-  printV(psbtV0);
-  final psbt = PsbtV2()..deserializeV0(base64.decode(psbtV0));
-  int amount = 0;
-  for (var i = 0; i < psbt.getGlobalOutputCount(); i++) {
-    final script = psbt.getOutputScript(i);
-    if (wallet.isMine(Script.fromRaw(byteData: script))) {
-      amount += psbt.getOutputAmount(i);
-    }
-  }
-  return amount.toString();
-}
-
-String getOutputAmountFromTx(String originalTx, BitcoinWalletBase wallet) {
-  final tx = BtcTransaction.fromRaw(originalTx);
-  BigInt amount = BigInt.zero;
-  for (final output in tx.outputs) {
-    if (wallet.isMine(output.scriptPubKey)) {
-      amount += output.amount;
-    }
-  }
-  printV(amount);
-  return amount.toString();
-}
diff --git a/cw_bitcoin/lib/psbt/v0_deserialize.dart b/cw_bitcoin/lib/psbt/v0_deserialize.dart
deleted file mode 100644
index b908eaebf..000000000
--- a/cw_bitcoin/lib/psbt/v0_deserialize.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
-import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:flutter/foundation.dart';
-import 'package:ledger_bitcoin/psbt.dart';
-import 'package:ledger_bitcoin/src/psbt/map_extension.dart';
-import 'package:ledger_bitcoin/src/utils/buffer_reader.dart';
-import 'package:ledger_bitcoin/src/utils/uint8list_extension.dart' as ext;
-
-extension PsbtSigner on PsbtV2 {
-
-  void deserializeV0(Uint8List psbt) {
-    final bufferReader = BufferReader(psbt);
-    if (!listEquals(bufferReader.readSlice(5), Uint8List.fromList([0x70, 0x73, 0x62, 0x74, 0xff]))) {
-      throw Exception("Invalid magic bytes");
-    }
-    while (_readKeyPair(globalMap, bufferReader)) {}
-
-    final tx = BtcTransaction.fromRaw(BytesUtils.toHexString(globalMap['00']!));
-
-    setGlobalInputCount(tx.inputs.length);
-    setGlobalOutputCount(tx.outputs.length);
-    setGlobalTxVersion(Uint8List.fromList(tx.version).readUint32LE(0));
-
-    for (var i = 0; i < getGlobalInputCount(); i++) {
-      inputMaps.insert(i, <String, Uint8List>{});
-      while (_readKeyPair(inputMaps[i], bufferReader)) {}
-      final input = tx.inputs[i];
-      setInputOutputIndex(i, input.txIndex);
-      setInputPreviousTxId(i, Uint8List.fromList(BytesUtils.fromHexString(input.txId).reversed.toList()));
-      setInputSequence(i, Uint8List.fromList(input.sequence).readUint32LE(0));
-    }
-    for (var i = 0; i < getGlobalOutputCount(); i++) {
-      outputMaps.insert(i, <String, Uint8List>{});
-      while (_readKeyPair(outputMaps[i], bufferReader)) {}
-      final output = tx.outputs[i];
-      setOutputAmount(i, output.amount.toInt());
-      setOutputScript(i, Uint8List.fromList(output.scriptPubKey.toBytes()));
-    }
-  }
-
-  bool _readKeyPair(Map<String, Uint8List> map, BufferReader bufferReader) {
-    final keyLen = bufferReader.readVarInt();
-    if (keyLen == 0) return false;
-
-    final keyType = bufferReader.readUInt8();
-    final keyData = bufferReader.readSlice(keyLen - 1);
-    final value = bufferReader.readVarSlice();
-
-    map.set(keyType, keyData, value);
-    return true;
-  }
-}
diff --git a/cw_bitcoin/lib/psbt/v0_finalizer.dart b/cw_bitcoin/lib/psbt/v0_finalizer.dart
deleted file mode 100644
index 8cbecb0b1..000000000
--- a/cw_bitcoin/lib/psbt/v0_finalizer.dart
+++ /dev/null
@@ -1,143 +0,0 @@
-import "dart:typed_data";
-
-import "package:ledger_bitcoin/src/psbt/constants.dart";
-import "package:ledger_bitcoin/src/psbt/psbtv2.dart";
-import "package:ledger_bitcoin/src/utils/buffer_writer.dart";
-
-/// This roughly implements the "input finalizer" role of BIP370 (PSBTv2
-/// https://github.com/bitcoin/bips/blob/master/bip-0370.mediawiki). However
-/// the role is documented in BIP174 (PSBTv0
-/// https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki).
-///
-/// Verify that all inputs have a signature, and set inputFinalScriptwitness
-/// and/or inputFinalScriptSig depending on the type of the spent outputs. Clean
-/// fields that aren't useful anymore, partial signatures, redeem script and
-/// derivation paths.
-///
-/// @param psbt The psbt with all signatures added as partial sigs, either
-/// through PSBT_IN_PARTIAL_SIG or PSBT_IN_TAP_KEY_SIG
-extension InputFinalizer on PsbtV2 {
-  void finalizeV0() {
-
-    // First check that each input has a signature
-    for (var i = 0; i < getGlobalInputCount(); i++) {
-      if (_isFinalized(i)) continue;
-
-      final legacyPubkeys = getInputKeyDatas(i, PSBTIn.partialSig);
-      final taprootSig = getInputTapKeySig(i);
-      if (legacyPubkeys.isEmpty && taprootSig == null) {
-        continue;
-        // throw Exception('No signature for input $i present');
-      }
-      if (legacyPubkeys.isNotEmpty) {
-        if (legacyPubkeys.length > 1) {
-          throw Exception(
-              'Expected exactly one signature, got ${legacyPubkeys.length}');
-        }
-        if (taprootSig != null) {
-          throw Exception('Both taproot and non-taproot signatures present.');
-        }
-
-        final isSegwitV0 = getInputWitnessUtxo(i) != null;
-        final redeemScript = getInputRedeemScript(i);
-        final isWrappedSegwit = redeemScript != null;
-        final signature = getInputPartialSig(i, legacyPubkeys[0]);
-        if (signature == null) {
-          throw Exception('Expected partial signature for input $i');
-        }
-        if (isSegwitV0) {
-          final witnessBuf = BufferWriter()
-            ..writeVarInt(2)
-            ..writeVarInt(signature.length)
-            ..writeSlice(signature)
-            ..writeVarInt(legacyPubkeys[0].length)
-            ..writeSlice(legacyPubkeys[0]);
-          setInputFinalScriptwitness(i, witnessBuf.buffer());
-          if (isWrappedSegwit) {
-            if (redeemScript.isEmpty) {
-              throw Exception(
-                  "Expected non-empty redeemscript. Can't finalize intput $i");
-            }
-            final scriptSigBuf = BufferWriter()
-              ..writeUInt8(redeemScript.length) // Push redeemScript length
-              ..writeSlice(redeemScript);
-            setInputFinalScriptsig(i, scriptSigBuf.buffer());
-          }
-        } else {
-          // Legacy input
-          final scriptSig = BufferWriter();
-          _writePush(scriptSig, signature);
-          _writePush(scriptSig, legacyPubkeys[0]);
-          setInputFinalScriptsig(i, scriptSig.buffer());
-        }
-      } else {
-        // Taproot input
-        final signature = getInputTapKeySig(i);
-        if (signature == null) {
-          throw Exception("No taproot signature found");
-        }
-        if (signature.length != 64 && signature.length != 65) {
-          throw Exception("Unexpected length of schnorr signature.");
-        }
-        final witnessBuf = BufferWriter()
-          ..writeVarInt(1)
-          ..writeVarSlice(signature);
-        setInputFinalScriptwitness(i, witnessBuf.buffer());
-      }
-      clearFinalizedInput(i);
-    }
-  }
-
-  /// Deletes fields that are no longer neccesary from the psbt.
-  ///
-  /// Note, the spec doesn't say anything about removing ouput fields
-  /// like PSBT_OUT_BIP32_DERIVATION_PATH and others, so we keep them
-  /// without actually knowing why. I think we should remove them too.
-  void clearFinalizedInput(int inputIndex) {
-    final keyTypes = [
-      PSBTIn.bip32Derivation,
-      PSBTIn.partialSig,
-      PSBTIn.tapBip32Derivation,
-      PSBTIn.tapKeySig,
-    ];
-    final witnessUtxoAvailable = getInputWitnessUtxo(inputIndex) != null;
-    final nonWitnessUtxoAvailable = getInputNonWitnessUtxo(inputIndex) != null;
-    if (witnessUtxoAvailable && nonWitnessUtxoAvailable) {
-      // Remove NON_WITNESS_UTXO for segwit v0 as it's only needed while signing.
-      // Segwit v1 doesn't have NON_WITNESS_UTXO set.
-      // See https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki#cite_note-7
-      keyTypes.add(PSBTIn.nonWitnessUTXO);
-    }
-    deleteInputEntries(inputIndex, keyTypes);
-  }
-
-  /// Writes a script push operation to buf, which looks different
-  /// depending on the size of the data. See
-  /// https://en.bitcoin.it/wiki/Script#finalants
-  ///
-  /// [buf] the BufferWriter to write to
-  /// [data] the Buffer to be pushed.
-  void _writePush(BufferWriter buf, Uint8List data) {
-    if (data.length <= 75) {
-      buf.writeUInt8(data.length);
-    } else if (data.length <= 256) {
-      buf.writeUInt8(76);
-      buf.writeUInt8(data.length);
-    } else if (data.length <= 256 * 256) {
-      buf.writeUInt8(77);
-      final b = ByteData(2)..setUint16(0, data.length, Endian.little);
-      buf.writeSlice(b.buffer.asUint8List());
-    }
-    buf.writeSlice(data);
-  }
-
-  bool _isFinalized(int i) {
-    if (getInputFinalScriptsig(i) != null) return true;
-    try {
-      getInputFinalScriptwitness(i);
-      return true;
-    } catch (_) {
-      return false;
-    }
-  }
-}
diff --git a/cw_bitcoin/lib/psbt/transaction_builder.dart b/cw_bitcoin/lib/psbt_transaction_builder.dart
similarity index 100%
rename from cw_bitcoin/lib/psbt/transaction_builder.dart
rename to cw_bitcoin/lib/psbt_transaction_builder.dart
diff --git a/cw_bitcoin/pubspec.lock b/cw_bitcoin/pubspec.lock
index c2987894c..1ad7b0c60 100644
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@@ -5,31 +5,26 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "47.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "4.7.0"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
@@ -85,7 +80,7 @@ packages:
     description:
       path: "."
       ref: cake-update-v9
-      resolved-ref: bb4318511312a454fd91bf49042e25ecc855e4ac
+      resolved-ref: "86969a14e337383e14965f5fb45a72a63e5009bc"
       url: "https://github.com/cake-tech/bitcoin_base"
     source: git
     version: "4.7.0"
@@ -126,18 +121,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
-  build_cli_annotations:
-    dependency: transitive
-    description:
-      name: build_cli_annotations
-      sha256: b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -158,26 +145,26 @@ packages:
     dependency: "direct dev"
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.2.10"
   built_collection:
     dependency: transitive
     description:
@@ -190,10 +177,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: "8b158ab94ec6913e480dc3f752418348b5ae099eb75868b5f4775f0572999c61"
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.9.4"
   cake_backup:
     dependency: transitive
     description:
@@ -301,10 +288,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
+      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.8"
+    version: "2.2.4"
   dart_varuint_bitcoin:
     dependency: transitive
     description:
@@ -390,14 +377,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
-  flutter_rust_bridge:
-    dependency: transitive
-    description:
-      name: flutter_rust_bridge
-      sha256: "5a5c7a5deeef2cc2ffe6076a33b0429f4a20ceac22a397297aed2b1eb067e611"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.9.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -407,23 +386,15 @@ packages:
     dependency: transitive
     description:
       name: flutter_web_bluetooth
-      sha256: ad26a1b3fef95b86ea5f63793b9a0cdc1a33490f35d754e4e711046cae3ebbf8
+      sha256: "1363831def5eed1e1064d1eca04e8ccb35446e8f758579c3c519e156b77926da"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.0.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.0"
-  freezed_annotation:
-    dependency: transitive
-    description:
-      name: freezed_annotation
-      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -444,18 +415,18 @@ packages:
     dependency: transitive
     description:
       name: google_identity_services_web
-      sha256: "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454"
+      sha256: "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+1"
+    version: "0.3.3"
   googleapis_auth:
     dependency: transitive
     description:
       name: googleapis_auth
-      sha256: b81fe352cc4a330b3710d2b7ad258d9bcef6f909bb759b306bf42973a7d046db
+      sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "1.6.0"
   graphs:
     dependency: transitive
     description:
@@ -468,10 +439,10 @@ packages:
     dependency: "direct main"
     description:
       name: grpc
-      sha256: "30e1edae6846b163a64f6d8716e3443980fe1f7d2d1f086f011d24ea186f2582"
+      sha256: "5b99b7a420937d4361ece68b798c9af8e04b5bc128a7859f2a4be87427694813"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.4"
+    version: "4.0.1"
   hex:
     dependency: transitive
     description:
@@ -492,18 +463,18 @@ packages:
     dependency: "direct dev"
     description:
       name: hive_generator
-      sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4"
+      sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "1.1.3"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
   http2:
     dependency: transitive
     description:
@@ -588,7 +559,7 @@ packages:
     dependency: "direct main"
     description:
       path: "packages/ledger-bitcoin"
-      ref: trunk
+      ref: HEAD
       resolved-ref: e93254f3ff3f996fb91f65a1e7ceffb9f510b4c8
       url: "https://github.com/cake-tech/ledger-flutter-plus-plugins"
     source: git
@@ -597,10 +568,10 @@ packages:
     dependency: "direct main"
     description:
       name: ledger_flutter_plus
-      sha256: "531da5daba5731d9eca2732881ef2f039b97bf8aa3564e7098dfa99a9b07a8e6"
+      sha256: "1c03f3c4a9754b5f0170a9eb9552ec54fa86e985f8ee71a255ee2c5629b53d31"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.3"
+    version: "1.5.1"
   ledger_litecoin:
     dependency: "direct main"
     description:
@@ -626,14 +597,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -678,10 +641,10 @@ packages:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8
+      sha256: d4beb9cea4b7b014321235f8fdc7c2193ee0fe1d1198e9da7403f8bc85c4407c
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.1"
+    version: "2.3.0"
   nested:
     dependency: transitive
     description:
@@ -703,10 +666,10 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.1"
   path:
     dependency: transitive
     description:
@@ -727,10 +690,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -763,15 +726,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
-  payjoin_flutter:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: da83a23f3a011cb49eb3b6513cd485b3fb8867ff
-      resolved-ref: da83a23f3a011cb49eb3b6513cd485b3fb8867ff
-      url: "https://github.com/OmarHatem28/payjoin-flutter"
-    source: git
-    version: "0.23.0"
   petitparser:
     dependency: transitive
     description:
@@ -824,18 +778,18 @@ packages:
     dependency: transitive
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.5"
   pubspec_parse:
     dependency: transitive
     description:
@@ -872,18 +826,18 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
+      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
+      sha256: a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.10"
+    version: "2.4.6"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -936,10 +890,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "2.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -948,37 +902,27 @@ packages:
   socks5_proxy:
     dependency: transitive
     description:
-      path: "."
-      ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      url: "https://github.com/LacticWhale/socks_dart"
-    source: git
-    version: "2.1.0"
-  socks_socket:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: e6232c53c1595469931ababa878759a067c02e94
-      resolved-ref: e6232c53c1595469931ababa878759a067c02e94
-      url: "https://github.com/sneurlax/socks_socket"
-    source: git
-    version: "1.1.1"
+      name: socks5_proxy
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -1048,19 +992,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
-  tor_binary:
-    dependency: transitive
-    description:
-      path: "."
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      url: "https://github.com/MrCyjaneK/flutter-tor_binary"
-    source: git
-    version: "4.7.14"
+    version: "1.0.2"
   tuple:
     dependency: transitive
     description:
@@ -1081,10 +1016,10 @@ packages:
     dependency: transitive
     description:
       name: universal_ble
-      sha256: "35d210e93a5938c6a6d1fd3c710cf4ac90b1bdd1b11c8eb2beeb32600672e6e6"
+      sha256: "1fad089150a29db82b3b7d60327e18c5ad6b3a5bb509defc1c690b0a76b9c098"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.15.0"
   universal_platform:
     dependency: transitive
     description:
@@ -1137,18 +1072,18 @@ packages:
     dependency: transitive
     description:
       name: web_socket
-      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.2"
   xdg_directories:
     dependency: transitive
     description:
@@ -1183,4 +1118,4 @@ packages:
     version: "2.2.2"
 sdks:
   dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.24.0"
diff --git a/cw_bitcoin/pubspec.yaml b/cw_bitcoin/pubspec.yaml
index c24732c3a..253abce47 100644
--- a/cw_bitcoin/pubspec.yaml
+++ b/cw_bitcoin/pubspec.yaml
@@ -40,32 +40,23 @@ dependencies:
   bech32:
     git:
       url: https://github.com/cake-tech/bech32.git
-  payjoin_flutter:
-    git:
-      url: https://github.com/OmarHatem28/payjoin-flutter
-      ref: da83a23f3a011cb49eb3b6513cd485b3fb8867ff #cake-v2
   ledger_flutter_plus: ^1.4.1
   ledger_bitcoin:
     git:
       url: https://github.com/cake-tech/ledger-flutter-plus-plugins
       path: packages/ledger-bitcoin
-      ref: trunk
   ledger_litecoin:
     git:
       url: https://github.com/cake-tech/ledger-flutter-plus-plugins
       path: packages/ledger-litecoin
-  socks_socket:
-    git:
-      url: https://github.com/sneurlax/socks_socket
-      ref: e6232c53c1595469931ababa878759a067c02e94
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
-  build_resolvers: ^2.4.4
+  build_runner: ^2.4.7
+  build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
 
 dependency_overrides:
   watcher: ^1.1.0
diff --git a/cw_bitcoin_cash/pubspec.yaml b/cw_bitcoin_cash/pubspec.yaml
index e78261f9a..9a5c4f14f 100644
--- a/cw_bitcoin_cash/pubspec.yaml
+++ b/cw_bitcoin_cash/pubspec.yaml
@@ -7,7 +7,7 @@ homepage: https://cakewallet.com
 
 environment:
   sdk: '>=2.19.0 <3.0.0'
-  flutter: ">=1.20.0"
+  flutter: ">=1.17.0"
 
 dependencies:
   flutter:
@@ -33,9 +33,9 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
+  build_runner: ^2.4.7
   mobx_codegen: ^2.0.7
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
 
 dependency_overrides:
   watcher: ^1.1.0
diff --git a/cw_core/lib/crypto_currency.dart b/cw_core/lib/crypto_currency.dart
index 0d6ab9f3a..00d49c288 100644
--- a/cw_core/lib/crypto_currency.dart
+++ b/cw_core/lib/crypto_currency.dart
@@ -110,9 +110,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
     CryptoCurrency.wow,
     CryptoCurrency.zano,
     CryptoCurrency.ton,
-    CryptoCurrency.flip,
-    CryptoCurrency.deuro,
-    CryptoCurrency.usdtbsc,
+    CryptoCurrency.flip
   ];
 
   static const havenCurrencies = [
@@ -233,8 +231,6 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
   static const ton = CryptoCurrency(title: 'TON', fullName: 'Toncoin', raw: 95, name: 'ton', iconPath: 'assets/images/ton_icon.png', decimals: 8);
   static const zano = CryptoCurrency(title: 'ZANO', tag: 'ZANO', fullName: 'Zano', raw: 96, name: 'zano', iconPath: 'assets/images/zano_icon.png', decimals: 12);
   static const flip = CryptoCurrency(title: 'FLIP', tag: 'ETH', fullName: 'Chainflip', raw: 97, name: 'flip', iconPath: 'assets/images/flip_icon.png', decimals: 18);
-  static const deuro = CryptoCurrency(title: 'DEURO', tag: 'ETH', fullName: 'Decentralized Euro', raw: 98, name: 'deuro', iconPath: 'assets/images/deuro_icon.png', decimals: 18);
-  static const usdtbsc = CryptoCurrency(title: 'USDT', tag: 'BSC', fullName: 'USDT Binance coin', raw: 99, name: 'usdtbsc', iconPath: 'assets/images/usdtbsc_icon.png', decimals: 18);
 
   static final Map<int, CryptoCurrency> _rawCurrencyMap =
     [...all, ...havenCurrencies].fold<Map<int, CryptoCurrency>>(<int, CryptoCurrency>{}, (acc, item) {
diff --git a/cw_core/lib/erc20_token.dart b/cw_core/lib/erc20_token.dart
index fd76d28fc..f8c2afc06 100644
--- a/cw_core/lib/erc20_token.dart
+++ b/cw_core/lib/erc20_token.dart
@@ -17,11 +17,9 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {
   @HiveField(4, defaultValue: true)
   bool _enabled;
   @HiveField(5)
-  String? iconPath;
+  final String? iconPath;
   @HiveField(6)
   final String? tag;
-  @HiveField(7, defaultValue: false)
-  bool isPotentialScam;
 
   bool get enabled => _enabled;
 
@@ -35,17 +33,14 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {
     bool enabled = true,
     this.iconPath,
     this.tag,
-    this.isPotentialScam = false,
   })  : _enabled = enabled,
         super(
-          name: symbol.toLowerCase(),
-          title: symbol.toUpperCase(),
-          fullName: name,
-          tag: tag,
-          iconPath: iconPath,
-          decimals: decimal,
-          isPotentialScam: isPotentialScam,
-        );
+            name: symbol.toLowerCase(),
+            title: symbol.toUpperCase(),
+            fullName: name,
+            tag: tag,
+            iconPath: iconPath,
+            decimals: decimal);
 
   Erc20Token.copyWith(Erc20Token other, String? icon, String? tag)
       : this.name = other.name,
@@ -55,7 +50,6 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {
         this._enabled = other.enabled,
         this.tag = tag,
         this.iconPath = icon,
-        this.isPotentialScam = other.isPotentialScam,
         super(
           name: other.name,
           title: other.symbol.toUpperCase(),
@@ -63,7 +57,6 @@ class Erc20Token extends CryptoCurrency with HiveObjectMixin {
           tag: tag,
           iconPath: icon,
           decimals: other.decimal,
-          isPotentialScam: other.isPotentialScam,
         );
 
   static const typeId = ERC20_TOKEN_TYPE_ID;
diff --git a/cw_core/lib/get_height_by_date.dart b/cw_core/lib/get_height_by_date.dart
index 4786336af..aee12b423 100644
--- a/cw_core/lib/get_height_by_date.dart
+++ b/cw_core/lib/get_height_by_date.dart
@@ -1,7 +1,7 @@
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:intl/intl.dart';
 import 'dart:convert';
+import 'package:http/http.dart' as http;
 
 // FIXME: Hardcoded values; Works only for monero
 
@@ -234,14 +234,10 @@ int getHavenHeightByDate({required DateTime date}) {
 }
 
 Future<int> getHavenCurrentHeight() async {
-  final req = await ProxyWrapper().getHttpClient()
-    .getUrl(Uri.parse('https://explorer.havenprotocol.org/api/networkinfo'))
-    .timeout(Duration(seconds: 15));
-  final response = await req.close();
-  final stringResponse = await response.transform(utf8.decoder).join();
+  final response = await http.get(Uri.parse('https://explorer.havenprotocol.org/api/networkinfo'));
 
   if (response.statusCode == 200) {
-    final info = jsonDecode(stringResponse);
+    final info = jsonDecode(response.body);
     return info['data']['height'] as int;
   } else {
     throw Exception('Failed to load current blockchain height');
@@ -273,13 +269,13 @@ const bitcoinDates = {
 };
 
 Future<int> getBitcoinHeightByDateAPI({required DateTime date}) async {
-  final req = await ProxyWrapper().getHttpClient()
-    .getUrl(Uri.parse("https://mempool.cakewallet.com/api/v1/mining/blocks/timestamp/${(date.millisecondsSinceEpoch / 1000).round()}"))
-    .timeout(Duration(seconds: 15));
-  final response = await req.close();
-  final stringResponse = await response.transform(utf8.decoder).join();
+  final response = await http.get(
+    Uri.parse(
+      "https://mempool.cakewallet.com/api/v1/mining/blocks/timestamp/${(date.millisecondsSinceEpoch / 1000).round()}",
+    ),
+  );
 
-  return jsonDecode(stringResponse)['height'] as int;
+  return jsonDecode(response.body)['height'] as int;
 }
 
 int getBitcoinHeightByDate({required DateTime date}) {
diff --git a/cw_core/lib/hive_type_ids.dart b/cw_core/lib/hive_type_ids.dart
index e7c20a444..ff0f53169 100644
--- a/cw_core/lib/hive_type_ids.dart
+++ b/cw_core/lib/hive_type_ids.dart
@@ -21,4 +21,3 @@ const HARDWARE_WALLET_TYPE_TYPE_ID  = 19;
 const MWEB_UTXO_TYPE_ID             = 20;
 const HAVEN_SEED_STORE_TYPE_ID      = 21;
 const ZANO_ASSET_TYPE_ID            = 22;
-const PAYJOIN_SESSION_TYPE_ID       = 23;
diff --git a/cw_core/lib/monero_wallet_utils.dart b/cw_core/lib/monero_wallet_utils.dart
index 9682784f9..8a4990f78 100644
--- a/cw_core/lib/monero_wallet_utils.dart
+++ b/cw_core/lib/monero_wallet_utils.dart
@@ -19,15 +19,15 @@ Future<void> backupWalletFiles(String name) async {
   final newKeysFilePath = backupFileName(keysFile.path);
   final newAddressListFilePath = backupFileName(addressListFile.path);
 
-  if (cacheFile.existsSync() && !File(newCacheFilePath).existsSync()) {
+  if (cacheFile.existsSync()) {
     await cacheFile.copy(newCacheFilePath);
   }
 
-  if (keysFile.existsSync() && !File(newKeysFilePath).existsSync()) {
+  if (keysFile.existsSync()) {
     await keysFile.copy(newKeysFilePath);
   }
 
-  if (addressListFile.existsSync() && !File(newAddressListFilePath).existsSync()) {
+  if (addressListFile.existsSync()) {
     await addressListFile.copy(newAddressListFilePath);
   }
 }
@@ -83,13 +83,10 @@ Future<bool> backupWalletFilesExists(String name) async {
 Future<void> removeCache(String name) async {
   final path = await pathForWallet(name: name, type: WalletType.monero);
   final cacheFile = File(path);
-  final backgroundCacheFile = File(path + ".background");
+
   if (cacheFile.existsSync()) {
     cacheFile.deleteSync();
   }
-  if (backgroundCacheFile.existsSync()) {
-    backgroundCacheFile.deleteSync();
-  }
 }
 
 Future<void> restoreOrResetWalletFiles(String name) async {
@@ -97,8 +94,7 @@ Future<void> restoreOrResetWalletFiles(String name) async {
 
   if (backupsExists) {
     await removeCache(name);
-    // TODO(mrcyjanek): is this needed?
-    // If we remove cache then wallet should be restored from .keys file.
+
     await restoreWalletFiles(name);
   }
 }
diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
index fdffb844b..38fcde9e1 100644
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@@ -1,12 +1,12 @@
 import 'dart:io';
 import 'package:cw_core/keyable.dart';
-import 'package:cw_core/utils/proxy_socket/abstract.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'dart:convert';
+import 'package:http/http.dart' as http;
 import 'package:hive/hive.dart';
 import 'package:cw_core/hive_type_ids.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:http/io_client.dart' as ioc;
 import 'dart:math' as math;
 import 'package:convert/convert.dart';
 
@@ -184,17 +184,23 @@ class Node extends HiveObject with Keyable {
     final body = {'jsonrpc': '2.0', 'id': '0', 'method': "getinfo"};
 
     try {
+      final authenticatingClient = HttpClient();
+      authenticatingClient.badCertificateCallback =
+          ((X509Certificate cert, String host, int port) => true);
+
+      final http.Client client = ioc.IOClient(authenticatingClient);
+
       final jsonBody = json.encode(body);
 
-      final response = await ProxyWrapper().post(
-        clearnetUri: rpcUri,
+      final response = await client.post(
+        rpcUri,
         headers: {'Content-Type': 'application/json'},
         body: jsonBody,
       );
 
-      
-      final resBody = json.decode(response.body) as Map<String, dynamic>;
+      printV("node check response: ${response.body}");
 
+      final resBody = json.decode(response.body) as Map<String, dynamic>;
       return resBody['result']['height'] != null;
     } catch (e) {
       printV("error: $e");
@@ -212,7 +218,11 @@ class Node extends HiveObject with Keyable {
     final body = {'jsonrpc': '2.0', 'id': '0', 'method': methodName};
 
     try {
-      final client = ProxyWrapper().getHttpIOClient();
+      final authenticatingClient = HttpClient();
+      authenticatingClient.badCertificateCallback =
+          ((X509Certificate cert, String host, int port) => true);
+
+      final http.Client client = ioc.IOClient(authenticatingClient);
 
       final jsonBody = json.encode(body);
 
@@ -232,15 +242,15 @@ class Node extends HiveObject with Keyable {
         return !(response['offline'] as bool);
       }
 
-      final responseString = await response.body;
+      printV("node check response: ${response.body}");
 
-      if ((responseString.contains("400 Bad Request") // Some other generic error
+      if ((response.body.contains("400 Bad Request") // Some other generic error
               ||
-              responseString.contains("plain HTTP request was sent to HTTPS port") // Cloudflare
+              response.body.contains("plain HTTP request was sent to HTTPS port") // Cloudflare
               ||
               response.headers["location"] != null // Generic reverse proxy
               ||
-              responseString
+              response.body
                   .contains("301 Moved Permanently") // Poorly configured generic reverse proxy
           ) &&
           !(useSSL ?? false)) {
@@ -267,16 +277,15 @@ class Node extends HiveObject with Keyable {
   }
 
   Future<bool> requestNodeWithProxy() async {
-    if (!isValidProxyAddress && !CakeTor.instance.enabled) {
+    if (!isValidProxyAddress /* && !Tor.instance.enabled*/) {
       return false;
     }
 
     String? proxy = socksProxyAddress;
 
-    if ((proxy?.isEmpty ?? true) && CakeTor.instance.enabled) {
-      proxy = "${InternetAddress.loopbackIPv4.address}:${CakeTor.instance.port}";
-    }
-    printV("proxy: $proxy");
+    // if ((proxy?.isEmpty ?? true) && Tor.instance.enabled) {
+    //   proxy = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}";
+    // }
     if (proxy == null) {
       return false;
     }
@@ -296,9 +305,13 @@ class Node extends HiveObject with Keyable {
   // you try to communicate with it
   Future<bool> requestElectrumServer() async {
     try {
-      final ProxySocket socket;
-      socket = await ProxyWrapper().getSocksSocket(useSSL ?? false, uri.host, uri.port);
-
+      final Socket socket;
+      if (useSSL == true) {
+        socket = await SecureSocket.connect(uri.host, uri.port,
+            timeout: Duration(seconds: 5), onBadCertificate: (_) => true);
+      } else {
+        socket = await Socket.connect(uri.host, uri.port, timeout: Duration(seconds: 5));
+      }
 
       socket.destroy();
       return true;
@@ -309,8 +322,8 @@ class Node extends HiveObject with Keyable {
 
   Future<bool> requestNanoNode() async {
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
+      final response = await http.post(
+        uri,
         headers: {"Content-Type": "application/json", "nano-app": "cake-wallet"},
         body: jsonEncode(
           {
@@ -319,8 +332,7 @@ class Node extends HiveObject with Keyable {
           },
         ),
       );
-      
-      final data = jsonDecode(response.body);
+      final data = await jsonDecode(response.body);
       if (response.statusCode != 200 ||
           data["error"] != null ||
           data["balance"] == null ||
@@ -336,14 +348,13 @@ class Node extends HiveObject with Keyable {
 
   Future<bool> requestEthereumServer() async {
     try {
-      final req = await ProxyWrapper().getHttpClient()
-        .getUrl(uri,)
-        .timeout(Duration(seconds: 15));
-      final response = await req.close();
+      final response = await http.get(
+        uri,
+        headers: {'Content-Type': 'application/json'},
+      );
 
       return response.statusCode >= 200 && response.statusCode < 300;
-    } catch (err) {
-      printV("Failed to request ethereum server: $err");
+    } catch (_) {
       return false;
     }
   }
@@ -451,7 +462,7 @@ class DaemonRpc {
 
   /// Perform a JSON-RPC call with Digest Authentication.
   Future<Map<String, dynamic>> call(String method, Map<String, dynamic> params) async {
-    final client = ProxyWrapper().getHttpIOClient();
+    final http.Client client = http.Client();
     final DigestAuth digestAuth = DigestAuth(username, password);
 
     // Initial request to get the `WWW-Authenticate` header.
diff --git a/cw_core/lib/payjoin_session.dart b/cw_core/lib/payjoin_session.dart
deleted file mode 100644
index 9133b15f0..000000000
--- a/cw_core/lib/payjoin_session.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-import 'package:cw_core/hive_type_ids.dart';
-import 'package:hive/hive.dart';
-
-part 'payjoin_session.g.dart';
-
-@HiveType(typeId: PAYJOIN_SESSION_TYPE_ID)
-class PayjoinSession extends HiveObject {
-  PayjoinSession({
-    required this.walletId,
-    this.receiver,
-    this.sender,
-    this.pjUri,
-    this.status = "created",
-    this.inProgressSince,
-    this.rawAmount,
-  }) {
-    if (receiver == null) {
-      assert(sender != null);
-      assert(pjUri != null);
-    } else {
-      assert(receiver != null);
-    }
-  }
-
-  static const typeId = PAYJOIN_SESSION_TYPE_ID;
-  static const boxName = 'PayjoinSessions';
-
-  @HiveField(0)
-  final String walletId;
-
-  @HiveField(1)
-  final String? sender;
-
-  @HiveField(2)
-  final String? receiver;
-
-  @HiveField(3)
-  final String? pjUri;
-
-  @HiveField(4)
-  String status;
-
-  @HiveField(5)
-  DateTime? inProgressSince;
-
-  @HiveField(6)
-  String? txId;
-
-  @HiveField(7)
-  String? rawAmount;
-
-  @HiveField(8)
-  String? error;
-
-  bool get isSenderSession => sender != null;
-
-  BigInt get amount => BigInt.parse(rawAmount ?? "0");
-  set amount(BigInt amount) => rawAmount = amount.toString();
-
-}
-
-enum PayjoinSessionStatus {
-  created,
-  inProgress,
-  success,
-  unrecoverable,
-}
diff --git a/cw_core/lib/solana_rpc_http_service.dart b/cw_core/lib/solana_rpc_http_service.dart
index 1c6e975aa..fbe9a29dc 100644
--- a/cw_core/lib/solana_rpc_http_service.dart
+++ b/cw_core/lib/solana_rpc_http_service.dart
@@ -1,19 +1,20 @@
 import 'dart:convert';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart';
 import 'package:on_chain/solana/solana.dart';
 
 class SolanaRPCHTTPService implements SolanaJSONRPCService {
   SolanaRPCHTTPService(
-      {required this.url,
-      this.defaultRequestTimeout = const Duration(seconds: 30)});
+      {required this.url, Client? client, this.defaultRequestTimeout = const Duration(seconds: 30)})
+      : client = client ?? Client();
   @override
   final String url;
+  final Client client;
   final Duration defaultRequestTimeout;
 
-  Future<Map<String, dynamic>> call(SolanaRequestDetails params,
-      [Duration? timeout]) async {
-    final response = await ProxyWrapper().post(
-      clearnetUri: Uri.parse(url),
+  @override
+  Future<Map<String, dynamic>> call(SolanaRequestDetails params, [Duration? timeout]) async {
+    final response = await client.post(
+      Uri.parse(url),
       body: params.toRequestBody(),
       headers: {
         'Content-Type': 'application/json',
diff --git a/cw_core/lib/unspent_transaction_output.dart b/cw_core/lib/unspent_transaction_output.dart
index 31820e3a1..da71f6983 100644
--- a/cw_core/lib/unspent_transaction_output.dart
+++ b/cw_core/lib/unspent_transaction_output.dart
@@ -21,9 +21,4 @@ class Unspent with UnspentComparable {
 
   bool get isP2wpkh =>
       address.startsWith('bc') || address.startsWith('tb') || address.startsWith('ltc');
-
-  @override
-  String toString() {
-    return 'Unspent(address: $address, hash: $hash, value: $value, vout: $vout, keyImage: $keyImage, isSending: $isSending, isFrozen: $isFrozen, isChange: $isChange, note: $note)';
-  }
 }
diff --git a/cw_core/lib/utils/print_verbose.dart b/cw_core/lib/utils/print_verbose.dart
index 42014d609..de7cc8557 100644
--- a/cw_core/lib/utils/print_verbose.dart
+++ b/cw_core/lib/utils/print_verbose.dart
@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'package:flutter/foundation.dart';
 
 void printV(dynamic content) {
   CustomTrace programInfo = CustomTrace(StackTrace.current);
@@ -21,7 +20,7 @@ class CustomTrace {
     try {
       _parseTrace();
     } catch (e) {
-      if (kDebugMode) print("Unable to parse trace (printV): $e");
+      print("Unable to parse trace (printV): $e");
     }
   }
 
@@ -81,7 +80,7 @@ class CustomTrace {
       columnStr = columnStr.replaceFirst(")", "");
       this.columnNumber = int.tryParse(columnStr);
     } catch (e) {
-      if (kDebugMode) print("Unable to parse trace (printV): $e");
+      print("Unable to parse trace (printV): $e");
     }
   }
 }
diff --git a/cw_core/lib/utils/proxy_logger/abstract.dart b/cw_core/lib/utils/proxy_logger/abstract.dart
deleted file mode 100644
index 303b640f1..000000000
--- a/cw_core/lib/utils/proxy_logger/abstract.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'dart:typed_data';
-import 'package:http/http.dart' as very_insecure_http_do_not_use;
-
-enum RequestNetwork {
-  clearnet,
-  tor,
-}
-
-enum RequestMethod {
-  get,
-  post,
-  put,
-  delete,
-  
-  newHttpClient,
-  newHttpIOClient,
-  newProxySocket,
-}
-
-abstract class ProxyLogger {
-  void log({
-    required Uri? uri,
-    required RequestMethod method,
-    required Uint8List body,
-    required very_insecure_http_do_not_use.Response? response,
-    required RequestNetwork network, 
-    required String? error,
-  });
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/proxy_logger/memory_proxy_logger.dart b/cw_core/lib/utils/proxy_logger/memory_proxy_logger.dart
deleted file mode 100644
index e2929da12..000000000
--- a/cw_core/lib/utils/proxy_logger/memory_proxy_logger.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:cw_core/utils/proxy_logger/abstract.dart';
-import 'package:http/http.dart' as very_insecure_http_do_not_use;
-
-class MemoryProxyLoggerEntry {
-  MemoryProxyLoggerEntry({
-    required this.trace,
-    required this.uri,
-    required this.body,
-    required this.network,
-    required this.method,
-    required this.response,
-    required this.error,
-  }) : time = DateTime.now();
-
-  final StackTrace trace;
-  final Uri? uri;
-  final Uint8List body;
-  final RequestNetwork network;
-  final very_insecure_http_do_not_use.Response? response;
-  final RequestMethod method;
-  final String? error;
-  final DateTime time;
-  @override
-  String toString() => """MemoryProxyLoggerEntry(
-  uri: $uri,
-  body: $body,
-  network: $network,
-  method: $method,
-  response:
-    code: ${response?.statusCode},
-    headers: ${response?.headers},
-    body: ${response?.body},
-  error: $error,
-  time: $time,
-  trace: ${trace}
-);""";
-}
-
-class MemoryProxyLogger implements ProxyLogger {
-  static List<MemoryProxyLoggerEntry> logs = [];
-  @override
-  void log({
-    required Uri? uri,
-    required RequestMethod method,
-    required Uint8List body,
-    required very_insecure_http_do_not_use.Response? response,
-    required RequestNetwork network, 
-    required String? error,
-  }) {
-    final trace = StackTrace.current;
-    logs.add(MemoryProxyLoggerEntry(
-      method: method,
-      trace: trace,
-      uri: uri,
-      body: body,
-      network: network,
-      response: response,
-      error: error,),
-    );
-  }
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/proxy_logger/silent_logger.dart b/cw_core/lib/utils/proxy_logger/silent_logger.dart
deleted file mode 100644
index 1cea0d011..000000000
--- a/cw_core/lib/utils/proxy_logger/silent_logger.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:cw_core/utils/proxy_logger/abstract.dart';
-import 'package:http/http.dart' as very_insecure_http_do_not_use;
-
-// we are not doing anything
-class SilentProxyLogger implements ProxyLogger {
-  @override
-  void log({
-    required Uri? uri,
-    required RequestMethod method,
-    required Uint8List body,
-    required very_insecure_http_do_not_use.Response? response,
-    required RequestNetwork network, 
-    required String? error,
-  }) {}
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/proxy_socket/abstract.dart b/cw_core/lib/utils/proxy_socket/abstract.dart
deleted file mode 100644
index b4b628f74..000000000
--- a/cw_core/lib/utils/proxy_socket/abstract.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:cw_core/utils/proxy_socket/insecure.dart';
-import 'package:cw_core/utils/proxy_socket/secure.dart';
-import 'package:cw_core/utils/proxy_socket/socks.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:socks_socket/socks_socket.dart';
-
-class ProxyAddress {
-  final String host;
-  final int port;
-
-  ProxyAddress({required this.host, required this.port});
-}
-
-abstract class ProxySocket {
-  static Future<ProxySocket> connect(bool sslEnabled, ProxyAddress address, {Duration? connectionTimeout}) async {
-    if (CakeTor.instance.started) {
-      var socksSocket = await SOCKSSocket.create(
-          proxyHost: InternetAddress.loopbackIPv4.address,
-          proxyPort: CakeTor.instance.port,
-          sslEnabled: sslEnabled,
-      );
-      await socksSocket.connect();
-      await socksSocket.connectTo(address.host, address.port);
-      return ProxySocketSocks(socksSocket);
-    }
-    if (sslEnabled == false) {
-      return ProxySocketInsecure(await Socket.connect(address.host, address.port, timeout: connectionTimeout));
-    } else {
-      return ProxySocketSecure(await SecureSocket.connect(
-        address.host,
-        address.port,
-        timeout: connectionTimeout,
-        onBadCertificate: (_) => true,
-      ));
-    }
-  }
-
-  Future<void> close();
-  Future<void> destroy();
-  Future<void> write(String data);
-  StreamSubscription<List<int>> listen(Function(Uint8List event) onData, {Function (Object error)? onError, Function ()? onDone, bool cancelOnError = true});
-  ProxyAddress get address;
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/proxy_socket/insecure.dart b/cw_core/lib/utils/proxy_socket/insecure.dart
deleted file mode 100644
index aeac474d7..000000000
--- a/cw_core/lib/utils/proxy_socket/insecure.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-
-import 'package:cw_core/utils/proxy_socket/abstract.dart';
-import 'dart:async';
-import 'dart:typed_data';
-import 'dart:io';
-
-class ProxySocketInsecure implements ProxySocket {
-  final Socket socket;
-
-  ProxySocketInsecure(this.socket);
-  
-  ProxyAddress get address => ProxyAddress(host: socket.remoteAddress.host, port: socket.remotePort);
-  
-  @override
-  Future<void> close() => socket.close();
-  
-  @override
-  Future<void> destroy() async => socket.destroy();
-  
-  @override
-  Future<void> write(String data) async => socket.write(data);
-  
-  @override
-  StreamSubscription<List<int>> listen(Function(Uint8List event) onData, {Function(Object error)? onError, Function()? onDone, bool cancelOnError = true}) {
-    return socket.listen(
-      (data) {
-        onData(Uint8List.fromList(data));
-      },
-      onError: onError,
-      onDone: onDone,
-      cancelOnError: cancelOnError,
-    );
-  }
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/proxy_socket/secure.dart b/cw_core/lib/utils/proxy_socket/secure.dart
deleted file mode 100644
index 2efd13ee4..000000000
--- a/cw_core/lib/utils/proxy_socket/secure.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:cw_core/utils/proxy_socket/abstract.dart';
-
-class ProxySocketSecure implements ProxySocket {
-  final SecureSocket socket;
-
-  ProxySocketSecure(this.socket);
-  
-  ProxyAddress get address => ProxyAddress(host: socket.remoteAddress.host, port: socket.remotePort);
-  
-  @override
-  Future<void> close() => socket.close();
-  
-  @override
-  Future<void> destroy() async => socket.destroy();
-  
-  @override
-  Future<void> write(String data) async => socket.write(data);
-  
-  @override
-  StreamSubscription<List<int>> listen(Function(Uint8List event) onData, {Function(Object error)? onError, Function()? onDone, bool cancelOnError = true}) {
-    return socket.listen(
-      (data) {
-        onData(Uint8List.fromList(data));
-      },
-      onError: onError,
-      onDone: onDone,
-      cancelOnError: cancelOnError,
-    );
-  }
-}
diff --git a/cw_core/lib/utils/proxy_socket/socks.dart b/cw_core/lib/utils/proxy_socket/socks.dart
deleted file mode 100644
index a4e5ddeb6..000000000
--- a/cw_core/lib/utils/proxy_socket/socks.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-import 'dart:async';
-import 'dart:typed_data';
-
-import 'package:cw_core/utils/proxy_socket/abstract.dart';
-import 'package:socks_socket/socks_socket.dart';
-
-class ProxySocketSocks implements ProxySocket {
-  final SOCKSSocket socket;
-
-  ProxySocketSocks(this.socket);
-  
-  @override
-  ProxyAddress get address => ProxyAddress(host: socket.proxyHost, port: socket.proxyPort);
-  
-  @override
-  Future<void> close() => socket.close();
-  
-  @override
-  Future<void> destroy() => close();
-  
-  @override
-  Future<void> write(String data) async => socket.write(data);
-
-  @override
-  StreamSubscription<List<int>> listen(Function(Uint8List event) onData, {Function(Object error)? onError, Function()? onDone, bool cancelOnError = true}) {
-    return socket.listen(
-      (data) {
-        onData(Uint8List.fromList(data));
-      },
-      onError: onError,
-      onDone: onDone,
-      cancelOnError: cancelOnError,
-    );
-  }
-}
-
diff --git a/cw_core/lib/utils/proxy_wrapper.dart b/cw_core/lib/utils/proxy_wrapper.dart
deleted file mode 100644
index e43f34ff1..000000000
--- a/cw_core/lib/utils/proxy_wrapper.dart
+++ /dev/null
@@ -1,447 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'dart:typed_data';
-import 'package:cw_core/utils/proxy_logger/abstract.dart';
-import 'package:cw_core/utils/proxy_socket/abstract.dart';
-import 'package:cw_core/utils/tor/abstract.dart';
-import 'package:cw_core/utils/tor/android.dart';
-import 'package:cw_core/utils/tor/disabled.dart';
-import 'package:http/http.dart';
-import 'package:socks5_proxy/socks_client.dart';
-import 'package:http/io_client.dart' as ioc;
-
-class ProxyWrapper {
-  static final ProxyWrapper _proxyWrapper = ProxyWrapper._internal();
-  static ProxyLogger? logger;
-
-  factory ProxyWrapper() {
-    return _proxyWrapper;
-  }
-  
-  ProxyWrapper._internal();
-  Future<ProxySocket> getSocksSocket(bool sslEnabled, String host, int port, {Duration? connectionTimeout}) async {
-    logger?.log(
-      uri: Uri(
-        scheme: sslEnabled ? "https" : "http",
-        host: host,
-        port: port,
-      ),
-      method: RequestMethod.newProxySocket,
-      body: Uint8List(0),
-      response: null,
-      network: requestNetwork(),
-      error: null
-    );
-    return ProxySocket.connect(sslEnabled, ProxyAddress(host: host, port: port), connectionTimeout: connectionTimeout);
-  }
-
-  RequestNetwork requestNetwork() {
-    return CakeTor.instance.started ? RequestNetwork.tor : RequestNetwork.clearnet;
-  }
-
-  ioc.IOClient getHttpIOClient({int? portOverride, bool internal = false}) {
-    if (!internal) {
-      logger?.log(
-        uri: null,
-        method: RequestMethod.newHttpIOClient,
-        body: Uint8List(0),
-        response: null,
-        network: requestNetwork(),
-        error: null,
-      );
-    }
-    // ignore: deprecated_member_use_from_same_package
-    final httpClient = ProxyWrapper().getHttpClient(portOverride: portOverride, internal: true);
-    return ioc.IOClient(httpClient);
-  }
-
-  int getPort() => CakeTor.instance.port;
-
-  @Deprecated('Use ProxyWrapper().get/post/put methods instead, and provide proper clearnet and onion uri.')
-  HttpClient getHttpClient({int? portOverride, bool internal = false}) {
-    if (!internal) {
-      logger?.log(
-        uri: null,
-        method: RequestMethod.newProxySocket,
-        body: Uint8List(0),
-        response: null,
-        network: requestNetwork(),
-        error: null
-      );
-    }
-    if (CakeTor.instance.started) {
-      // Assign connection factory.
-      final client = HttpClient();
-      SocksTCPClient.assignToHttpClient(client, [
-        ProxySettings(
-          InternetAddress.loopbackIPv4,
-          CakeTor.instance.port,
-          password: null,
-        ),
-      ]);
-      return client;
-    } else {
-      return HttpClient();
-    }
-  }
-
-
-
-  Future<Response> _make({
-    required RequestMethod method,
-    required ioc.IOClient client,
-    required Uri uri,
-    required Map<String, String>? headers,
-    String? body,
-  }) async {
-    Object? error;
-    Response? resp;
-    try {
-      switch (method) {
-        case RequestMethod.get:
-          resp = await client. get(
-            uri,
-            headers: headers,
-          );
-          break;
-        case RequestMethod.delete:
-          resp = await client.delete(
-            uri,
-            headers: headers,
-            body: body,
-          );
-          break;
-        case RequestMethod.post:
-          resp = await client.post(
-            uri,
-            headers: headers,
-            body: body,
-          );
-          break;
-        case RequestMethod.put:
-          resp = await client.put(
-            uri,
-            headers: headers,
-            body: body,
-          );
-          break;
-        case RequestMethod.newHttpClient:
-        case RequestMethod.newHttpIOClient:
-        case RequestMethod.newProxySocket:
-          throw UnimplementedError();
-      }
-      return resp;
-    } catch (e) {
-      error = e;
-      rethrow;
-    } finally {
-      logger?.log(
-        uri: uri,
-        method: RequestMethod.get,
-        body: utf8.encode(body ?? ''),
-        response: resp,
-        network: requestNetwork(),
-        error: error?.toString(),
-      );
-    }
-  }
-
-  Future<Response> get({
-    Map<String, String>? headers,
-    int? portOverride,
-    Uri? clearnetUri,
-    Uri? onionUri,
-  }) async {
-    ioc.IOClient? torClient;
-    bool torEnabled = CakeTor.instance.started;
-
-    if (CakeTor.instance.started) {
-      torEnabled = true;
-    } else {
-      torEnabled = false;
-    }
-
-    // if tor is enabled, try to connect to the onion url first:
-    if (torEnabled) {
-      try {
-        // ignore: deprecated_member_use_from_same_package
-        torClient = await getHttpIOClient(portOverride: portOverride, internal: true);
-      } catch (_) {
-        rethrow;
-      }
-
-      if (onionUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.get,
-            client: torClient,
-            uri: onionUri,
-            headers: headers,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-
-      if (clearnetUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.get,
-            client: torClient,
-            uri: clearnetUri,
-            headers: headers,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-    }
-
-    if (clearnetUri != null) {
-      try {
-        return HttpOverrides.runZoned(
-          () async {
-            return await _make(
-              method: RequestMethod.get,
-              client: ioc.IOClient(),
-              uri: clearnetUri,
-              headers: headers,
-            );
-          },
-        );
-      } catch (_) {
-        // we weren't able to get a response:
-        rethrow;
-      }
-    }
-
-    throw Exception("Unable to connect to server");
-  }
-  
-
-  Future<Response> post({
-    Map<String, String>? headers,
-    int? portOverride,
-    Uri? clearnetUri,
-    Uri? onionUri,
-    String? body,
-    bool allowMitmMoneroBypassSSLCheck = false,
-  }) async {
-    HttpClient? torHttpClient;
-    HttpClient cleatnetHttpClient = HttpClient();
-    if (allowMitmMoneroBypassSSLCheck) {
-      cleatnetHttpClient.badCertificateCallback =
-          ((X509Certificate cert, String host, int port) => true);
-    }
-
-    ioc.IOClient clearnetClient = ioc.IOClient(cleatnetHttpClient);
-
-
-    bool torEnabled = CakeTor.instance.started;
-
-    if (torEnabled) {
-      try {
-        // ignore: deprecated_member_use_from_same_package
-        torHttpClient = await getHttpClient(portOverride: portOverride);
-      } catch (_) {
-        rethrow;
-      }
-      if (allowMitmMoneroBypassSSLCheck) {
-        torHttpClient.badCertificateCallback =
-            ((X509Certificate cert, String host, int port) => true);
-      }
-      if (onionUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.post,
-            client: ioc.IOClient(torHttpClient),
-            uri: onionUri,
-            headers: headers,
-            body: body,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-
-      if (clearnetUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.post,
-            client: ioc.IOClient(torHttpClient),
-            uri: clearnetUri,
-            headers: headers,
-            body: body,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-    }
-
-    if (clearnetUri != null) {
-      try {
-        return HttpOverrides.runZoned(
-          () async {
-            return await _make(
-              method: RequestMethod.post,
-              client: clearnetClient,
-              uri: clearnetUri,
-              headers: headers,
-              body: body,
-            );
-          },
-        );
-      } catch (_) {
-        rethrow;
-      }
-    }
-
-    throw Exception("Unable to connect to server");
-  }
-
-  Future<Response> put({
-    Map<String, String>? headers,
-    int? portOverride,
-    Uri? clearnetUri,
-    Uri? onionUri,
-    String? body,
-  }) async {
-    ioc.IOClient? torClient;
-    bool torEnabled = CakeTor.instance.started;
-
-    if (torEnabled) {
-      try {
-        // ignore: deprecated_member_use_from_same_package
-        torClient = await getHttpIOClient(portOverride: portOverride, internal: true);
-      } catch (_) {}
-
-      if (onionUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.put,
-            client: torClient!,
-            uri: onionUri,
-            headers: headers,
-            body: body,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-
-      if (clearnetUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.put,
-            client: torClient!,
-            uri: clearnetUri,
-            headers: headers,
-            body: body,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-    }
-
-    if (clearnetUri != null) {
-      try {
-        return HttpOverrides.runZoned(
-          () async {
-            return await _make(
-              method: RequestMethod.put,
-              client: ioc.IOClient(),
-              uri: clearnetUri,
-              headers: headers,
-              body: body,
-            );
-          },
-        );
-      } catch (_) {
-        // we weren't able to get a response:
-        rethrow;
-      }
-    }
-
-    throw Exception("Unable to connect to server");
-  }
-
-  Future<Response> delete({
-    Map<String, String>? headers,
-    int? portOverride,
-    Uri? clearnetUri,
-    Uri? onionUri,
-  }) async {
-    ioc.IOClient? torClient;
-    bool torEnabled = CakeTor.instance.started;
-
-    if (CakeTor.instance.started) {
-      torEnabled = true;
-    } else {
-      torEnabled = false;
-    }
-
-    // if tor is enabled, try to connect to the onion url first:
-    if (torEnabled) {
-      try {
-        // ignore: deprecated_member_use_from_same_package
-        torClient = await getHttpIOClient(portOverride: portOverride, internal: true);
-      } catch (_) {
-        rethrow;
-      }
-
-      if (onionUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.delete,
-            client: torClient,
-            uri: onionUri,
-            headers: headers,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-
-      if (clearnetUri != null) {
-        try {
-          return await _make(
-            method: RequestMethod.delete,
-            client: torClient,
-            uri: clearnetUri,
-            headers: headers,
-          );
-        } catch (_) {
-          rethrow;
-        }
-      }
-    }
-
-    if (clearnetUri != null) {
-      try {
-        return HttpOverrides.runZoned(
-          () async {
-            return await _make(
-              method: RequestMethod.delete,
-              client: ioc.IOClient(),
-              uri: clearnetUri,
-              headers: headers,
-            );
-          },
-        );
-      } catch (_) {
-        // we weren't able to get a response:
-        rethrow;
-      }
-    }
-
-    throw Exception("Unable to connect to server");
-  }
-}
-
-
-class CakeTor {
-  static final CakeTorInstance instance = CakeTorInstance.getInstance();
-}
diff --git a/cw_core/lib/utils/tor/abstract.dart b/cw_core/lib/utils/tor/abstract.dart
deleted file mode 100644
index aaecabc56..000000000
--- a/cw_core/lib/utils/tor/abstract.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'dart:io';
-
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/tor/android.dart';
-import 'package:cw_core/utils/tor/disabled.dart';
-import 'package:cw_core/utils/tor/tails.dart';
-
-abstract class CakeTorInstance {
-  bool get started;
-
-  int get port => -1;
-
-  bool get enabled => false;
-
-  bool get bootstrapped => false;
-
-  Future<void> start();
-  Future<void> stop();
-
-  static CakeTorInstance getInstance() {
-    if (Platform.isAndroid) {
-      return CakeTorAndroid();
-    }
-    if (Platform.isLinux) {
-      try {
-        final os = File("/etc/os-release").readAsLinesSync();
-        for (var line in os) {
-          if (!line.startsWith("ID=")) continue;
-          if (!line.contains("tails")) continue;
-          return CakeTorTails();
-        }
-      } catch (e) {
-        printV("Failed to identify linux version - /etc/os-release missing");
-      }
-    }
-    return CakeTorDisabled();
-  }
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/tor/android.dart b/cw_core/lib/utils/tor/android.dart
deleted file mode 100644
index dfc1bfbe4..000000000
--- a/cw_core/lib/utils/tor/android.dart
+++ /dev/null
@@ -1,73 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/tor/abstract.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:path/path.dart' as p;
-import 'package:tor_binary/tor_binary_platform_interface.dart';
-
-class CakeTorAndroid implements CakeTorInstance {
-  @override
-  bool get bootstrapped => _proc != null;
-
-  @override
-  bool get enabled => _proc != null;
-
-  @override
-  int get port => 42142;
-
-  @override
-  Future<void> start() async {
-    await _runEmbeddedTor();
-  }
-
-  @override
-  bool get started => _proc != null;
-
-  @override
-  Future<void> stop() async {
-    _proc?.kill();
-    await _proc?.exitCode;
-    _proc = null;
-  }
-
-  static Process? _proc;
-
-  Future<void> _runEmbeddedTor() async {
-    final dir = await getApplicationCacheDirectory();
-
-    final torBinPath = p.join((await TorBinaryPlatform.instance.getBinaryPath())!, "libtor.so");
-    printV("torPath: $torBinPath");
-
-    if (started) {
-      printV("Proxy is running");
-      return;
-    }
-
-    printV("Starting embedded tor");
-    printV("app docs: $dir");
-    final torrc = """
-SocksPort $port
-Log notice file ${p.join(dir.path, "tor.log")}
-RunAsDaemon 0
-DataDirectory ${p.join(dir.path, "tor-data")}
-""";
-    final torrcPath = p.join(dir.absolute.path, "torrc");
-    File(torrcPath).writeAsStringSync(torrc);
-
-    if (_proc != null) {
-      try {
-        _proc?.kill();
-        await _proc?.exitCode;
-        _proc = null;
-      } catch (e) {
-        printV(e);
-      }
-    }
-    printV("path: $torBinPath -f $torrcPath");
-    _proc = await Process.start(torBinPath, ["-f", torrcPath]);
-    _proc?.stdout.transform(utf8.decoder).forEach(printV);
-    _proc?.stderr.transform(utf8.decoder).forEach(printV);
-  }
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/tor/disabled.dart b/cw_core/lib/utils/tor/disabled.dart
deleted file mode 100644
index 8bd3d837e..000000000
--- a/cw_core/lib/utils/tor/disabled.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'package:cw_core/utils/tor/abstract.dart';
-
-class CakeTorDisabled implements CakeTorInstance {
-  @override
-  bool get bootstrapped => false;
-
-  @override
-  bool get enabled => false;
-
-  @override
-  int get port => -1;
-
-  @override
-  Future<void> start() => throw UnimplementedError();
-
-  @override
-  bool get started => false;
-
-  @override
-  Future<void> stop() => throw UnimplementedError();
-}
\ No newline at end of file
diff --git a/cw_core/lib/utils/tor/tails.dart b/cw_core/lib/utils/tor/tails.dart
deleted file mode 100644
index c37ee72aa..000000000
--- a/cw_core/lib/utils/tor/tails.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'package:cw_core/utils/tor/abstract.dart';
-
-class CakeTorTails implements CakeTorInstance {
-  @override
-  bool get bootstrapped => true;
-
-  @override
-  bool get enabled => true;
-
-  @override
-  int get port => 9150;
-
-  @override
-  Future<void> start() async {}
-
-  @override
-  bool get started => true;
-
-  @override
-  Future<void> stop() async {}
-}
\ No newline at end of file
diff --git a/cw_core/lib/wallet_base.dart b/cw_core/lib/wallet_base.dart
index 0ca7ff2b1..e15dca89b 100644
--- a/cw_core/lib/wallet_base.dart
+++ b/cw_core/lib/wallet_base.dart
@@ -36,8 +36,6 @@ abstract class WalletBase<BalanceType extends Balance, HistoryType extends Trans
 
   ObservableMap<CryptoCurrency, BalanceType> get balance;
 
-  String formatCryptoAmount(String amount) => amount;
-
   SyncStatus get syncStatus;
 
   set syncStatus(SyncStatus status);
diff --git a/cw_core/lib/wallet_type.dart b/cw_core/lib/wallet_type.dart
index 40a2b31d5..5ae1c1290 100644
--- a/cw_core/lib/wallet_type.dart
+++ b/cw_core/lib/wallet_type.dart
@@ -193,7 +193,7 @@ String walletTypeToDisplayName(WalletType type) {
     case WalletType.banano:
       return 'Banano (BAN)';
     case WalletType.polygon:
-      return 'Polygon (POL)';
+      return 'Polygon (MATIC)';
     case WalletType.solana:
       return 'Solana (SOL)';
     case WalletType.tron:
@@ -247,38 +247,3 @@ CryptoCurrency walletTypeToCryptoCurrency(WalletType type, {bool isTestnet = fal
           'Unexpected wallet type: ${type.toString()} for CryptoCurrency walletTypeToCryptoCurrency');
   }
 }
-
-WalletType? cryptoCurrencyToWalletType(CryptoCurrency type) {
-  switch (type) {
-    case CryptoCurrency.xmr:
-      return WalletType.monero;
-    case CryptoCurrency.btc:
-      return WalletType.bitcoin;
-    case CryptoCurrency.ltc:
-      return WalletType.litecoin;
-    case CryptoCurrency.xhv:
-      return WalletType.haven;
-    case CryptoCurrency.eth:
-      return WalletType.ethereum;
-    case CryptoCurrency.bch:
-      return WalletType.bitcoinCash;
-    case CryptoCurrency.nano:
-      return WalletType.nano;
-    case CryptoCurrency.banano:
-      return WalletType.banano;
-    case CryptoCurrency.maticpoly:
-      return WalletType.polygon;
-    case CryptoCurrency.sol:
-      return WalletType.solana;
-    case CryptoCurrency.trx:
-      return WalletType.tron;
-    case CryptoCurrency.wow:
-      return WalletType.wownero;
-    case CryptoCurrency.zano:
-      return WalletType.zano;
-    case CryptoCurrency.dcr:
-      return WalletType.decred;
-    default:
-      return null;
-  }
-}
diff --git a/cw_core/pubspec.lock b/cw_core/pubspec.lock
index d7bfdbe2a..4ba8df5c5 100644
--- a/cw_core/pubspec.lock
+++ b/cw_core/pubspec.lock
@@ -26,10 +26,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
@@ -123,10 +123,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: "8b158ab94ec6913e480dc3f752418348b5ae099eb75868b5f4775f0572999c61"
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.9.4"
   cake_backup:
     dependency: "direct main"
     description:
@@ -326,10 +326,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -462,10 +462,10 @@ packages:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8
+      sha256: "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.1"
+    version: "2.7.0"
   nested:
     dependency: transitive
     description:
@@ -479,7 +479,7 @@ packages:
     description:
       path: "."
       ref: cake-update-v2
-      resolved-ref: "096865a8c6b89c260beadfec04f7e184c40a3273"
+      resolved-ref: "93440dc5126369b873ca1fccc13c3c1240b1c5c2"
       url: "https://github.com/cake-tech/on_chain.git"
     source: git
     version: "3.7.0"
@@ -487,10 +487,10 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.1"
   path:
     dependency: transitive
     description:
@@ -511,10 +511,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -583,18 +583,18 @@ packages:
     dependency: transitive
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.5"
   pubspec_parse:
     dependency: transitive
     description:
@@ -635,21 +635,11 @@ packages:
   socks5_proxy:
     dependency: "direct main"
     description:
-      path: "."
-      ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      url: "https://github.com/LacticWhale/socks_dart"
-    source: git
-    version: "2.1.0"
-  socks_socket:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: e6232c53c1595469931ababa878759a067c02e94
-      resolved-ref: e6232c53c1595469931ababa878759a067c02e94
-      url: "https://github.com/sneurlax/socks_socket"
-    source: git
-    version: "1.1.1"
+      name: socks5_proxy
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
@@ -726,19 +716,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
-  tor_binary:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      url: "https://github.com/MrCyjaneK/flutter-tor_binary"
-    source: git
-    version: "4.7.14"
+    version: "1.0.2"
   tuple:
     dependency: transitive
     description:
@@ -799,18 +780,18 @@ packages:
     dependency: transitive
     description:
       name: web_socket
-      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.2"
   xdg_directories:
     dependency: transitive
     description:
@@ -829,4 +810,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.24.0"
diff --git a/cw_core/pubspec.yaml b/cw_core/pubspec.yaml
index 07f87475a..9b38b61a7 100644
--- a/cw_core/pubspec.yaml
+++ b/cw_core/pubspec.yaml
@@ -25,29 +25,22 @@ dependencies:
       url: https://github.com/cake-tech/cake_backup.git
       ref: main
       version: 1.0.0
-  socks5_proxy:
-    git:
-      url: https://github.com/LacticWhale/socks_dart
-      ref: 27ad7c2efae8d7460325c74b90f660085cbd0685
+  socks5_proxy: ^1.0.4
   unorm_dart: ^0.3.0
   on_chain:
     git:
       url: https://github.com/cake-tech/on_chain.git
       ref: cake-update-v2
-  socks_socket:
-    git:
-      url: https://github.com/sneurlax/socks_socket
-      ref: e6232c53c1595469931ababa878759a067c02e94
-  tor_binary:
-    git:
-      url: https://github.com/MrCyjaneK/flutter-tor_binary
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
+#  tor:
+#    git:
+#      url: https://github.com/cake-tech/tor.git
+#      ref: main
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
-  build_resolvers: ^2.4.4
+  build_runner: ^2.4.7
+  build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
   hive_generator: ^2.0.1
 
diff --git a/cw_decred/lib/api/libdcrwallet.dart b/cw_decred/lib/api/libdcrwallet.dart
index b5e5bbe73..6a26e64c6 100644
--- a/cw_decred/lib/api/libdcrwallet.dart
+++ b/cw_decred/lib/api/libdcrwallet.dart
@@ -3,6 +3,7 @@ import 'dart:ffi';
 import 'dart:io';
 import 'dart:async';
 import 'dart:isolate';
+import 'package:flutter/foundation.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_decred/api/libdcrwallet_bindings.dart';
 import 'package:cw_decred/api/util.dart';
@@ -78,12 +79,10 @@ class Libwallet {
         switch (method) {
           case "initlibdcrwallet":
             final logDir = args["logdir"] ?? "";
-            final level = args["level"] ?? "";
             final cLogDir = logDir.toCString();
-            final cLevel = level.toCString();
             executePayloadFn(
-              fn: () => dcrwalletApi.initialize(cLogDir, cLevel),
-              ptrsToFree: [cLogDir, cLevel],
+              fn: () => dcrwalletApi.initialize(cLogDir),
+              ptrsToFree: [cLogDir],
             );
             break;
           case "createwallet":
@@ -301,7 +300,7 @@ class Libwallet {
             break;
           case "shutdown":
             final name = args["name"] ?? "";
-            // final cName = name.toCString();
+            final cName = name.toCString();
             executePayloadFn(
               fn: () => dcrwalletApi.shutdown(),
               ptrsToFree: [],
@@ -327,8 +326,8 @@ class Libwallet {
 
   // initLibdcrwallet initializes libdcrwallet using the provided logDir and gets
   // it ready for use. This must be done before attempting to create, load or use
-  // a wallet. An empty string can be used to log to stdout and create no log files.
-  Future<void> initLibdcrwallet(String logDir, String level) async {
+  // a wallet.
+  Future<void> initLibdcrwallet(String logDir) async {
     if (_closed) throw StateError('Closed');
     final completer = Completer<Object?>.sync();
     final id = _idCounter++;
@@ -336,7 +335,6 @@ class Libwallet {
     final req = {
       "method": "initlibdcrwallet",
       "logdir": logDir,
-      "level": level,
     };
     _commands.send((id, req));
     await completer.future;
@@ -465,11 +463,7 @@ class Libwallet {
     };
     _commands.send((id, req));
     final res = await completer.future as PayloadResult;
-    try {
-      return jsonDecode(res.payload);
-    } catch (_) {
-      return {};
-    }
+    return jsonDecode(res.payload);
   }
 
   Future<String> estimateFee(String walletName, int numBlocks) async {
diff --git a/cw_decred/lib/wallet.dart b/cw_decred/lib/wallet.dart
index 97aee775d..028ba6cda 100644
--- a/cw_decred/lib/wallet.dart
+++ b/cw_decred/lib/wallet.dart
@@ -1,13 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:path/path.dart' as p;
 import 'package:cw_core/exceptions.dart';
 import 'package:cw_core/transaction_direction.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/pathForWallet.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:cw_decred/amount_format.dart';
 import 'package:cw_decred/pending_transaction.dart';
 import 'package:cw_decred/transaction_credentials.dart';
 import 'package:flutter/foundation.dart';
@@ -126,9 +122,6 @@ abstract class DecredWalletBase
     return _pubkey;
   }
 
-  @override
-  String formatCryptoAmount(String amount) => decredAmountToString(amount: int.parse(amount));
-
   Future<void> init() async {
     final getSeed = () async {
       if (!watchingOnly) {
@@ -225,7 +218,7 @@ abstract class DecredWalletBase
 
   Future<bool> checkSync() async {
     final syncStatusJSON = await _libwallet.syncStatus(walletInfo.name);
-    final decoded = json.decode(syncStatusJSON.isEmpty ? "{}" : syncStatusJSON);
+    final decoded = json.decode(syncStatusJSON);
 
     final syncStatusCode = decoded["syncstatuscode"] ?? 0;
     // final syncStatusStr = decoded["syncstatus"] ?? "";
@@ -309,10 +302,9 @@ abstract class DecredWalletBase
       persistantPeer = addr;
       await _libwallet.closeWallet(walletInfo.name);
       final network = isTestnet ? "testnet" : "mainnet";
-      final dirPath = await pathForWalletDir(name: walletInfo.name, type: WalletType.decred);
       final config = {
         "name": walletInfo.name,
-        "datadir": dirPath,
+        "datadir": walletInfo.dirPath,
         "net": network,
         "unsyncedaddrs": true,
       };
@@ -388,7 +380,7 @@ abstract class DecredWalletBase
         totalAmt = totalIn;
       } else if (out.cryptoAmount != null) {
         final coins = double.parse(out.cryptoAmount!);
-        amt = (coins * 1e8).round();
+        amt = (coins * 1e8).toInt();
       }
       totalAmt += amt;
       final o = {
@@ -423,7 +415,7 @@ abstract class DecredWalletBase
     };
     final fee = decoded["fee"] ?? 0;
     if (sendAll) {
-      totalAmt = (totalAmt - fee).round();
+      totalAmt = (totalAmt - fee).toInt();
     }
     return DecredPendingTransaction(
         txid: decoded["txid"] ?? "", amount: totalAmt, fee: fee, rawHex: signedHex, send: send);
@@ -483,41 +475,36 @@ abstract class DecredWalletBase
   }
 
   Future<Map<String, DecredTransactionInfo>> fetchFiveTransactions(int from) async {
-    try {
-      final res = await _libwallet.listTransactions(walletInfo.name, from.toString(), "5");
-      final decoded = json.decode(res);
-      var txs = <String, DecredTransactionInfo>{};
-      for (final d in decoded) {
-        final txid = uniqueTxID(d["txid"] ?? "", d["vout"] ?? 0);
-        var direction = TransactionDirection.outgoing;
-        if (d["category"] == "receive") {
-          direction = TransactionDirection.incoming;
-        }
-        final amountDouble = d["amount"] ?? 0.0;
-        final amount = (amountDouble * 1e8).round().abs();
-        final feeDouble = d["fee"] ?? 0.0;
-        final fee = (feeDouble * 1e8).round().abs();
-        final confs = d["confirmations"] ?? 0;
-        final sendTime = d["time"] ?? 0;
-        final height = d["height"] ?? 0;
-        final txInfo = DecredTransactionInfo(
-          id: txid,
-          amount: amount,
-          fee: fee,
-          direction: direction,
-          isPending: confs == 0,
-          date: DateTime.fromMillisecondsSinceEpoch(sendTime * 1000, isUtc: false),
-          height: height,
-          confirmations: confs,
-          to: d["address"] ?? "",
-        );
-        txs[txid] = txInfo;
+    final res = await _libwallet.listTransactions(walletInfo.name, from.toString(), "5");
+    final decoded = json.decode(res);
+    var txs = <String, DecredTransactionInfo>{};
+    for (final d in decoded) {
+      final txid = uniqueTxID(d["txid"] ?? "", d["vout"] ?? 0);
+      var direction = TransactionDirection.outgoing;
+      if (d["category"] == "receive") {
+        direction = TransactionDirection.incoming;
       }
-      return txs;
-    } catch (e) {
-      printV(e);
-      return {};
+      final amountDouble = d["amount"] ?? 0.0;
+      final amount = (amountDouble * 1e8).toInt().abs();
+      final feeDouble = d["fee"] ?? 0.0;
+      final fee = (feeDouble * 1e8).toInt().abs();
+      final confs = d["confirmations"] ?? 0;
+      final sendTime = d["time"] ?? 0;
+      final height = d["height"] ?? 0;
+      final txInfo = DecredTransactionInfo(
+        id: txid,
+        amount: amount,
+        fee: fee,
+        direction: direction,
+        isPending: confs == 0,
+        date: DateTime.fromMillisecondsSinceEpoch(sendTime * 1000, isUtc: false),
+        height: height,
+        confirmations: confs,
+        to: d["address"] ?? "",
+      );
+      txs[txid] = txInfo;
     }
+    return txs;
   }
 
   // uniqueTxID combines the tx id and vout to create a unique id.
@@ -606,25 +593,7 @@ abstract class DecredWalletBase
       throw "wallet already exists at $newDirPath";
     }
 
-    final sourceDir = Directory(currentDirPath);
-    final targetDir = Directory(newDirPath);
-
-    if (!targetDir.existsSync()) {
-      await targetDir.create(recursive: true);
-    }
-
-    await for (final entity in sourceDir.list(recursive: true)) {
-      final relativePath = entity.path.substring(sourceDir.path.length + 1);
-      final targetPath = p.join(targetDir.path, relativePath);
-
-      if (entity is File) {
-        await entity.rename(targetPath);
-      } else if (entity is Directory) {
-        await Directory(targetPath).create(recursive: true);
-      }
-    }
-
-    await sourceDir.delete(recursive: true);
+    await Directory(currentDirPath).rename(newDirPath);
   }
 
   @override
@@ -643,25 +612,21 @@ abstract class DecredWalletBase
   }
 
   Future<void> fetchUnspents() async {
-    try {
-      final res = await _libwallet.listUnspents(walletInfo.name);
-      final decoded = json.decode(res);
-      var unspents = <Unspent>[];
-      for (final d in decoded) {
-        final spendable = d["spendable"] ?? false;
-        if (!spendable) {
-          continue;
-        }
-        final amountDouble = d["amount"] ?? 0.0;
-        final amount = (amountDouble * 1e8).round().abs();
-        final utxo = Unspent(d["address"] ?? "", d["txid"] ?? "", amount, d["vout"] ?? 0, null);
-        utxo.isChange = d["ischange"] ?? false;
-        unspents.add(utxo);
+    final res = await _libwallet.listUnspents(walletInfo.name);
+    final decoded = json.decode(res);
+    var unspents = <Unspent>[];
+    for (final d in decoded) {
+      final spendable = d["spendable"] ?? false;
+      if (!spendable) {
+        continue;
       }
-      _unspents = unspents;
-    } catch (e) {
-      printV(e);
+      final amountDouble = d["amount"] ?? 0.0;
+      final amount = (amountDouble * 1e8).toInt().abs();
+      final utxo = Unspent(d["address"] ?? "", d["txid"] ?? "", amount, d["vout"] ?? 0, null);
+      utxo.isChange = d["ischange"] ?? false;
+      unspents.add(utxo);
     }
+    _unspents = unspents;
   }
 
   List<Unspent> unspents() {
@@ -732,18 +697,14 @@ abstract class DecredWalletBase
   // walletBirthdayBlockHeight checks if the wallet birthday is set and returns
   // it. Returns -1 if not.
   Future<int> walletBirthdayBlockHeight() async {
-    try {
-      final res = await _libwallet.birthState(walletInfo.name);
-      final decoded = json.decode(res);
-      // Having these values set indicates that sync has not reached the birthday
-      // yet, so no birthday is set.
-      if (decoded["setfromheight"] == true || decoded["setfromtime"] == true) {
-        return -1;
-      }
-      return decoded["height"] ?? 0;
-    } on FormatException catch (_) {
-      return 0;
+    final res = await _libwallet.birthState(walletInfo.name);
+    final decoded = json.decode(res);
+    // Having these values set indicates that sync has not reached the birthday
+    // yet, so no birthday is set.
+    if (decoded["setfromheight"] == true || decoded["setfromtime"] == true) {
+      return -1;
     }
+    return decoded["height"] ?? 0;
   }
 
   Future<bool> verifyMessage(String message, String signature, {String? address = null}) async {
diff --git a/cw_decred/lib/wallet_addresses.dart b/cw_decred/lib/wallet_addresses.dart
index 860a576d9..10970b2d6 100644
--- a/cw_decred/lib/wallet_addresses.dart
+++ b/cw_decred/lib/wallet_addresses.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:cw_core/utils/print_verbose.dart';
 import 'package:mobx/mobx.dart';
 
 import 'package:cw_core/address_info.dart';
@@ -104,18 +103,13 @@ abstract class DecredWalletAddressesBase extends WalletAddresses with Store {
     if (this.isEnabledAutoGenerateSubaddress) {
       nUnused = "3";
     }
-    try {
-      final res = await _libwallet.addresses(walletInfo.name, nUsed, nUnused);
-      final decoded = json.decode(res);
-      final usedAddrs = List<String>.from(decoded["used"] ?? []);
-      final unusedAddrs = List<String>.from(decoded["unused"] ?? []);
-      // index is the index of the first unused address.
-      final index = decoded["index"] ?? 0;
-      return new LibAddresses(usedAddrs, unusedAddrs, index);
-    } catch (e) {
-      printV(e);
-      return LibAddresses([], [], 0);
-    }
+    final res = await _libwallet.addresses(walletInfo.name, nUsed, nUnused);
+    final decoded = json.decode(res);
+    final usedAddrs = List<String>.from(decoded["used"] ?? []);
+    final unusedAddrs = List<String>.from(decoded["unused"] ?? []);
+    // index is the index of the first unused address.
+    final index = decoded["index"] ?? 0;
+    return new LibAddresses(usedAddrs, unusedAddrs, index);
   }
 
   Future<void> generateNewAddress(String label) async {
diff --git a/cw_decred/lib/wallet_service.dart b/cw_decred/lib/wallet_service.dart
index 93c708886..a54833321 100644
--- a/cw_decred/lib/wallet_service.dart
+++ b/cw_decred/lib/wallet_service.dart
@@ -8,7 +8,6 @@ import 'package:cw_core/wallet_service.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
-import 'package:path/path.dart';
 import 'package:hive/hive.dart';
 import 'package:collection/collection.dart';
 import 'package:cw_core/unspent_coins_info.dart';
@@ -28,16 +27,17 @@ class DecredWalletService extends WalletService<
   static final pubkeyRestorePathTestnet = "m/44'/1'/0'";
   final mainnet = "mainnet";
   final testnet = "testnet";
-  static Libwallet? libwallet;
+  Libwallet? libwallet;
 
   Future<void> init() async {
     if (libwallet != null) {
       return;
     }
     libwallet = await Libwallet.spawn();
-    // Init logging with no directory to force printing to stdout and only
-    // print ERROR level logs.
-    libwallet!.initLibdcrwallet("", "err");
+    // Use the general path for all dcr wallets as the general log directory.
+    // Individual wallet paths may be removed if the wallet is deleted.
+    final dcrLogDir = await pathForWalletDir(name: '', type: WalletType.decred);
+    libwallet!.initLibdcrwallet(dcrLogDir);
   }
 
   void closeLibwallet() {
@@ -58,93 +58,42 @@ class DecredWalletService extends WalletService<
   @override
   Future<DecredWallet> create(DecredNewWalletCredentials credentials, {bool? isTestnet}) async {
     await this.init();
-    final dirPath = await pathForWalletDir(name: credentials.walletInfo!.name, type: getType());
-    final network = isTestnet == true ? testnet : mainnet;
     final config = {
       "name": credentials.walletInfo!.name,
-      "datadir": dirPath,
+      "datadir": credentials.walletInfo!.dirPath,
       "pass": credentials.password!,
-      "net": network,
+      "net": isTestnet == true ? testnet : mainnet,
       "unsyncedaddrs": true,
     };
     await libwallet!.createWallet(jsonEncode(config));
     final di = DerivationInfo(
         derivationPath: isTestnet == true ? seedRestorePathTestnet : seedRestorePath);
     credentials.walletInfo!.derivationInfo = di;
-    credentials.walletInfo!.network = network;
-    // ios will move our wallet directory when updating. Since we must
-    // recalculate the new path every time we open the wallet, ensure this path
-    // is not used. An older wallet will have a directory here which is a
-    // condition for moving the wallet when opening, so this must be kept blank
-    // going forward.
-    credentials.walletInfo!.dirPath = "";
-    credentials.walletInfo!.path = "";
     final wallet = DecredWallet(credentials.walletInfo!, credentials.password!,
         this.unspentCoinsInfoSource, libwallet!, closeLibwallet);
     await wallet.init();
     return wallet;
   }
 
-  void copyDirectorySync(Directory source, Directory destination) {
-    /// create destination folder if not exist
-    if (!destination.existsSync()) {
-      destination.createSync(recursive: true);
-    }
-
-    /// get all files from source (recursive: false is important here)
-    source.listSync(recursive: false).forEach((entity) {
-      final newPath = destination.path + Platform.pathSeparator + basename(entity.path);
-      if (entity is File) {
-        entity.rename(newPath);
-      } else if (entity is Directory) {
-        copyDirectorySync(entity, Directory(newPath));
-      }
-    });
-  }
-
-  Future<void> moveWallet(String fromPath, String toPath) async {
-    final oldWalletDir = new Directory(fromPath);
-    final newWalletDir = new Directory(toPath);
-    copyDirectorySync(oldWalletDir, newWalletDir);
-    // It would be ideal to delete the old directory here, but ios will error
-    // sometimes with "OS Error: No such file or directory, errno = 2" even
-    // after checking if it exists.
-  }
-
   @override
   Future<DecredWallet> openWallet(String name, String password) async {
     final walletInfo = walletInfoSource.values
         .firstWhereOrNull((info) => info.id == WalletBase.idFor(name, getType()))!;
-    if (walletInfo.network == null || walletInfo.network == "") {
-      walletInfo.network = walletInfo.derivationInfo?.derivationPath == seedRestorePathTestnet ||
-              walletInfo.derivationInfo?.derivationPath == pubkeyRestorePathTestnet
-          ? testnet
-          : mainnet;
-    }
+    final network = walletInfo.derivationInfo?.derivationPath == seedRestorePathTestnet ||
+            walletInfo.derivationInfo?.derivationPath == pubkeyRestorePathTestnet
+        ? testnet
+        : mainnet;
 
     await this.init();
-
-    // Cake wallet version 4.27.0 and earlier gave a wallet dir that did not
-    // match the name. Move those to the correct place.
-    final dirPath = await pathForWalletDir(name: name, type: getType());
-    if (walletInfo.path != "") {
-      // On ios the stored dir no longer exists. We can only trust the basename.
-      // dirPath may already be updated and lost the basename, so look at path.
-      final randomBasename = basename(walletInfo.path);
-      final oldDir = await pathForWalletDir(name: randomBasename, type: getType());
-      if (oldDir != dirPath) {
-        await this.moveWallet(oldDir, dirPath);
-      }
-      // Clear the path so this does not trigger again.
-      walletInfo.dirPath = "";
-      walletInfo.path = "";
-      await walletInfo.save();
+    final walletDirExists = Directory(walletInfo.dirPath).existsSync();
+    if (!walletDirExists) {
+      walletInfo.dirPath = await pathForWalletDir(name: name, type: getType());
     }
 
     final config = {
-      "name": name,
-      "datadir": dirPath,
-      "net": walletInfo.network,
+      "name": walletInfo.name,
+      "datadir": walletInfo.dirPath,
+      "net": network,
       "unsyncedaddrs": true,
     };
     await libwallet!.loadWallet(jsonEncode(config));
@@ -170,20 +119,17 @@ class DecredWalletService extends WalletService<
             currentWalletInfo.derivationInfo?.derivationPath == pubkeyRestorePathTestnet
         ? testnet
         : mainnet;
-    if (libwallet == null) {
-      libwallet = await Libwallet.spawn();
-      libwallet!.initLibdcrwallet("", "err");
-    }
     final currentWallet = DecredWallet(
         currentWalletInfo, password, this.unspentCoinsInfoSource, libwallet!, closeLibwallet);
 
     await currentWallet.renameWalletFiles(newName);
 
+    final newDirPath = await pathForWalletDir(name: newName, type: getType());
     final newWalletInfo = currentWalletInfo;
     newWalletInfo.id = WalletBase.idFor(newName, getType());
     newWalletInfo.name = newName;
-    newWalletInfo.dirPath = "";
-    newWalletInfo.path = "";
+    newWalletInfo.dirPath = newDirPath;
+    newWalletInfo.network = network;
 
     await walletInfoSource.put(currentWalletInfo.key, newWalletInfo);
   }
@@ -192,23 +138,18 @@ class DecredWalletService extends WalletService<
   Future<DecredWallet> restoreFromSeed(DecredRestoreWalletFromSeedCredentials credentials,
       {bool? isTestnet}) async {
     await this.init();
-    final network = isTestnet == true ? testnet : mainnet;
-    final dirPath = await pathForWalletDir(name: credentials.walletInfo!.name, type: getType());
     final config = {
       "name": credentials.walletInfo!.name,
-      "datadir": dirPath,
+      "datadir": credentials.walletInfo!.dirPath,
       "pass": credentials.password!,
       "mnemonic": credentials.mnemonic,
-      "net": network,
+      "net": isTestnet == true ? testnet : mainnet,
       "unsyncedaddrs": true,
     };
     await libwallet!.createWallet(jsonEncode(config));
     final di = DerivationInfo(
         derivationPath: isTestnet == true ? seedRestorePathTestnet : seedRestorePath);
     credentials.walletInfo!.derivationInfo = di;
-    credentials.walletInfo!.network = network;
-    credentials.walletInfo!.dirPath = "";
-    credentials.walletInfo!.path = "";
     final wallet = DecredWallet(credentials.walletInfo!, credentials.password!,
         this.unspentCoinsInfoSource, libwallet!, closeLibwallet);
     await wallet.init();
@@ -221,22 +162,17 @@ class DecredWalletService extends WalletService<
   Future<DecredWallet> restoreFromKeys(DecredRestoreWalletFromPubkeyCredentials credentials,
       {bool? isTestnet}) async {
     await this.init();
-    final network = isTestnet == true ? testnet : mainnet;
-    final dirPath = await pathForWalletDir(name: credentials.walletInfo!.name, type: getType());
     final config = {
       "name": credentials.walletInfo!.name,
-      "datadir": dirPath,
+      "datadir": credentials.walletInfo!.dirPath,
       "pubkey": credentials.pubkey,
-      "net": network,
+      "net": isTestnet == true ? testnet : mainnet,
       "unsyncedaddrs": true,
     };
     await libwallet!.createWatchOnlyWallet(jsonEncode(config));
     final di = DerivationInfo(
         derivationPath: isTestnet == true ? pubkeyRestorePathTestnet : pubkeyRestorePath);
     credentials.walletInfo!.derivationInfo = di;
-    credentials.walletInfo!.network = network;
-    credentials.walletInfo!.dirPath = "";
-    credentials.walletInfo!.path = "";
     final wallet = DecredWallet(credentials.walletInfo!, credentials.password!,
         this.unspentCoinsInfoSource, libwallet!, closeLibwallet);
     await wallet.init();
diff --git a/cw_decred/pubspec.lock b/cw_decred/pubspec.lock
index f7a5f335d..2324e7bd2 100644
--- a/cw_decred/pubspec.lock
+++ b/cw_decred/pubspec.lock
@@ -75,42 +75,42 @@ packages:
     dependency: transitive
     description:
       name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.4"
   build_resolvers:
     dependency: "direct dev"
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.3.2"
   built_collection:
     dependency: transitive
     description:
@@ -365,10 +365,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   intl:
     dependency: transitive
     description:
@@ -646,10 +646,10 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -666,21 +666,11 @@ packages:
   socks5_proxy:
     dependency: transitive
     description:
-      path: "."
-      ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      url: "https://github.com/LacticWhale/socks_dart"
-    source: git
-    version: "2.1.0"
-  socks_socket:
-    dependency: transitive
-    description:
-      path: "."
-      ref: e6232c53c1595469931ababa878759a067c02e94
-      resolved-ref: e6232c53c1595469931ababa878759a067c02e94
-      url: "https://github.com/sneurlax/socks_socket"
-    source: git
-    version: "1.1.1"
+      name: socks5_proxy
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
@@ -761,15 +751,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
-  tor_binary:
-    dependency: transitive
-    description:
-      path: "."
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      url: "https://github.com/MrCyjaneK/flutter-tor_binary"
-    source: git
-    version: "4.7.14"
   tuple:
     dependency: transitive
     description:
diff --git a/cw_decred/pubspec.yaml b/cw_decred/pubspec.yaml
index 989831a89..fcb2ac5ec 100644
--- a/cw_decred/pubspec.yaml
+++ b/cw_decred/pubspec.yaml
@@ -19,8 +19,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
-  build_resolvers: ^2.4.4
+  build_runner: ^2.1.11
+  build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
   hive_generator: ^2.0.1
   ffigen: ^16.1.0
diff --git a/cw_ethereum/lib/default_ethereum_erc20_tokens.dart b/cw_ethereum/lib/default_ethereum_erc20_tokens.dart
index 630424967..ee60a3d6c 100644
--- a/cw_ethereum/lib/default_ethereum_erc20_tokens.dart
+++ b/cw_ethereum/lib/default_ethereum_erc20_tokens.dart
@@ -17,13 +17,6 @@ class DefaultEthereumErc20Tokens {
       decimal: 6,
       enabled: true,
     ),
-    Erc20Token(
-      name: "Decentralized Euro",
-      symbol: "DEURO",
-      contractAddress: "0xbA3f535bbCcCcA2A154b573Ca6c5A49BAAE0a3ea",
-      decimal: 18,
-      enabled: true,
-    ),
     Erc20Token(
       name: "Dai",
       symbol: "DAI",
diff --git a/cw_ethereum/lib/deuro/deuro_savings.dart b/cw_ethereum/lib/deuro/deuro_savings.dart
deleted file mode 100644
index bce05905c..000000000
--- a/cw_ethereum/lib/deuro/deuro_savings.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_ethereum/deuro/deuro_savings_contract.dart';
-import 'package:cw_ethereum/ethereum_wallet.dart';
-import 'package:cw_evm/contract/erc20.dart';
-import 'package:cw_evm/evm_chain_exceptions.dart';
-import 'package:cw_evm/evm_chain_transaction_priority.dart';
-import 'package:cw_evm/pending_evm_chain_transaction.dart';
-import 'package:web3dart/crypto.dart';
-import 'package:web3dart/web3dart.dart';
-
-const String savingsGatewayAddress = "0x073493d73258C4BEb6542e8dd3e1b2891C972303";
-
-const String dEuroAddress = "0xbA3f535bbCcCcA2A154b573Ca6c5A49BAAE0a3ea";
-const String frontendCode = "0x00000000000000000000000000000000000000000043616b652057616c6c6574";
-
-class DEuro {
-  final SavingsGateway _savingsGateway;
-  final ERC20 _dEuro;
-  final EthereumWallet _wallet;
-
-  DEuro(EthereumWallet wallet)
-      : _wallet = wallet,
-        _savingsGateway = _getSavingsGateway(wallet.getWeb3Client()!),
-        _dEuro = _getDEuroToken(wallet.getWeb3Client()!);
-
-  static SavingsGateway _getSavingsGateway(Web3Client client) => SavingsGateway(
-        address: EthereumAddress.fromHex(savingsGatewayAddress),
-        client: client,
-      );
-
-  static ERC20 _getDEuroToken(Web3Client client) => ERC20(
-        address: EthereumAddress.fromHex(dEuroAddress),
-        client: client,
-      );
-
-  EthereumAddress get _address => EthereumAddress.fromHex(_wallet.walletAddresses.primaryAddress);
-
-  Future<BigInt> get savingsBalance async =>
-      (await _savingsGateway.savings(accountOwner: _address)).saved;
-
-  Future<BigInt> get accruedInterest => _savingsGateway.accruedInterest(accountOwner: _address);
-
-  Future<BigInt> get interestRate => _savingsGateway.currentRatePPM();
-
-  Future<BigInt> get approvedBalance => _dEuro.allowance(_address, _savingsGateway.self.address);
-
-  Future<void> _checkEthBalanceForGasFees(EVMChainTransactionPriority priority) async {
-    final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
-    final currentBalance = ethBalance.getInWei;
-
-    final gasFeesModel = await _wallet.calculateActualEstimatedFeeForCreateTransaction(
-      amount: BigInt.zero,
-      contractAddress: _savingsGateway.self.address.hexEip55,
-      receivingAddressHex: _savingsGateway.self.address.hexEip55,
-      priority: priority,
-      data: _savingsGateway.self.abi.functions[17]
-          .encodeCall([BigInt.zero, hexToBytes(frontendCode)]),
-    );
-
-    final estimatedGasFee = BigInt.from(gasFeesModel.estimatedGasFee);
-    final requiredBalance = estimatedGasFee;
-
-    if (currentBalance < requiredBalance) {
-      throw DeuroGasFeeException(
-        requiredGasFee: requiredBalance,
-        currentBalance: currentBalance,
-      );
-    }
-  }
-
-  Future<PendingEVMChainTransaction> depositSavings(
-      BigInt amount, EVMChainTransactionPriority priority) async {
-    try {
-      await _checkEthBalanceForGasFees(priority);
-
-      final signedTransaction = await _savingsGateway.save(
-        (amount: amount, frontendCode: hexToBytes(frontendCode)),
-        credentials: _wallet.evmChainPrivateKey,
-      );
-
-      final fee = await _wallet.calculateActualEstimatedFeeForCreateTransaction(
-        amount: amount,
-        contractAddress: _savingsGateway.self.address.hexEip55,
-        receivingAddressHex: _savingsGateway.self.address.hexEip55,
-        priority: priority,
-        data: _savingsGateway.self.abi.functions[17].encodeCall([amount, hexToBytes(frontendCode)]),
-      );
-
-      final sendTransaction = () => _wallet.getWeb3Client()!.sendRawTransaction(signedTransaction);
-
-      return PendingEVMChainTransaction(
-        sendTransaction: sendTransaction,
-        signedTransaction: signedTransaction,
-        fee: BigInt.from(fee.estimatedGasFee),
-        amount: amount.toString(),
-        exponent: 18,
-      );
-    } catch (e) {
-      if (e.toString().contains('insufficient funds for gas')) {
-        final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
-        throw DeuroGasFeeException(
-          currentBalance: ethBalance.getInWei,
-        );
-      }
-      rethrow;
-    }
-  }
-
-  Future<PendingEVMChainTransaction> withdrawSavings(
-      BigInt amount, EVMChainTransactionPriority priority) async {
-    try {
-      await _checkEthBalanceForGasFees(priority);
-
-      final signedTransaction = await _savingsGateway.withdraw(
-        (target: _address, amount: amount, frontendCode: hexToBytes(frontendCode)),
-        credentials: _wallet.evmChainPrivateKey,
-      );
-
-      final fee = await _wallet.calculateActualEstimatedFeeForCreateTransaction(
-        amount: amount,
-        contractAddress: _savingsGateway.self.address.hexEip55,
-        receivingAddressHex: _savingsGateway.self.address.hexEip55,
-        priority: priority,
-        data: _savingsGateway.self.abi.functions[17].encodeCall([amount, hexToBytes(frontendCode)]),
-      );
-
-      final sendTransaction = () => _wallet.getWeb3Client()!.sendRawTransaction(signedTransaction);
-
-      return PendingEVMChainTransaction(
-          sendTransaction: sendTransaction,
-          signedTransaction: signedTransaction,
-          fee: BigInt.from(fee.estimatedGasFee),
-          amount: amount.toString(),
-          exponent: 18);
-    } catch (e) {
-      if (e.toString().contains('insufficient funds for gas')) {
-        final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
-        throw DeuroGasFeeException(
-          currentBalance: ethBalance.getInWei,
-        );
-      }
-      rethrow;
-    }
-  }
-
-  // Set an infinite approval to save gas in the future
-  Future<PendingEVMChainTransaction> enableSavings(EVMChainTransactionPriority priority) async {
-    try {
-      await _checkEthBalanceForGasFees(priority);
-
-      return (await _wallet.createApprovalTransaction(
-        BigInt.parse(
-          'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-          radix: 16,
-        ),
-        _savingsGateway.self.address.hexEip55,
-        CryptoCurrency.deuro,
-        priority,
-      )) as PendingEVMChainTransaction;
-    } catch (e) {
-      if (e.toString().contains('insufficient funds for gas')) {
-        final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
-        throw DeuroGasFeeException(
-          currentBalance: ethBalance.getInWei,
-        );
-      }
-      rethrow;
-    }
-  }
-}
diff --git a/cw_ethereum/lib/deuro/deuro_savings_contract.dart b/cw_ethereum/lib/deuro/deuro_savings_contract.dart
deleted file mode 100644
index ca2eb5dcc..000000000
--- a/cw_ethereum/lib/deuro/deuro_savings_contract.dart
+++ /dev/null
@@ -1,543 +0,0 @@
-// ignore_for_file: type=lint
-// ignore_for_file: unused_local_variable, unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'package:web3dart/web3dart.dart' as _i1;
-import 'dart:typed_data' as _i2;
-
-final _contractAbi = _i1.ContractAbi.fromJson(
-  '[{"inputs":[{"internalType":"contract IDecentralizedEURO","name":"deuro_","type":"address"},{"internalType":"uint24","name":"initialRatePPM","type":"uint24"},{"internalType":"address","name":"gateway_","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"ChangeNotReady","type":"error"},{"inputs":[],"name":"ModuleDisabled","type":"error"},{"inputs":[],"name":"NoPendingChange","type":"error"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":false,"internalType":"uint256","name":"interest","type":"uint256"}],"name":"InterestCollected","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint24","name":"newRate","type":"uint24"}],"name":"RateChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"who","type":"address"},{"indexed":false,"internalType":"uint24","name":"nextRate","type":"uint24"},{"indexed":false,"internalType":"uint40","name":"nextChange","type":"uint40"}],"name":"RateProposed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":false,"internalType":"uint192","name":"amount","type":"uint192"}],"name":"Saved","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":false,"internalType":"uint192","name":"amount","type":"uint192"}],"name":"Withdrawn","type":"event"},{"inputs":[],"name":"GATEWAY","outputs":[{"internalType":"contract IFrontendGateway","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"accountOwner","type":"address"}],"name":"accruedInterest","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"accountOwner","type":"address"},{"internalType":"uint256","name":"timestamp","type":"uint256"}],"name":"accruedInterest","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint192","name":"targetAmount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"adjust","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint192","name":"targetAmount","type":"uint192"}],"name":"adjust","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"applyChange","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"uint192","name":"saved","type":"uint192"},{"internalType":"uint64","name":"ticks","type":"uint64"}],"internalType":"struct Savings.Account","name":"account","type":"tuple"},{"internalType":"uint64","name":"ticks","type":"uint64"}],"name":"calculateInterest","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"currentRatePPM","outputs":[{"internalType":"uint24","name":"","type":"uint24"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"currentTicks","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"deuro","outputs":[{"internalType":"contract IERC20","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"equity","outputs":[{"internalType":"contract IReserve","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"nextChange","outputs":[{"internalType":"uint40","name":"","type":"uint40"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"nextRatePPM","outputs":[{"internalType":"uint24","name":"","type":"uint24"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint24","name":"newRatePPM_","type":"uint24"},{"internalType":"address[]","name":"helpers","type":"address[]"}],"name":"proposeChange","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"refreshBalance","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"refreshMyBalance","outputs":[{"internalType":"uint192","name":"","type":"uint192"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint192","name":"amount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint192","name":"amount","type":"uint192"}],"name":"save","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"savings","outputs":[{"internalType":"uint192","name":"saved","type":"uint192"},{"internalType":"uint64","name":"ticks","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"timestamp","type":"uint256"}],"name":"ticks","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"uint192","name":"amount","type":"uint192"},{"internalType":"bytes32","name":"frontendCode","type":"bytes32"}],"name":"withdraw","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"}]',
-  'SavingsGateway',
-);
-
-class SavingsGateway extends _i1.GeneratedContract {
-  SavingsGateway({
-    required _i1.EthereumAddress address,
-    required _i1.Web3Client client,
-    int? chainId,
-  }) : super(
-    _i1.DeployedContract(
-      _contractAbi,
-      address,
-    ),
-    client,
-    chainId,
-  );
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<_i1.EthereumAddress> GATEWAY({_i1.BlockNum? atBlock}) async {
-    final function = self.abi.functions[1];
-    assert(checkSignature(function, '338c5371'));
-    final params = [];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as _i1.EthereumAddress);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<BigInt> accruedInterest({
-        required _i1.EthereumAddress accountOwner,
-        _i1.BlockNum? atBlock,
-      }) async {
-    final function = self.abi.functions[2];
-    assert(checkSignature(function, '77267ec3'));
-    final params = [accountOwner];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as BigInt);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<BigInt> accruedInterest$2(
-      ({_i1.EthereumAddress accountOwner, BigInt timestamp}) args, {
-        _i1.BlockNum? atBlock,
-      }) async {
-    final function = self.abi.functions[3];
-    assert(checkSignature(function, 'a696399d'));
-    final params = [
-      args.accountOwner,
-      args.timestamp,
-    ];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as BigInt);
-  }
-
-  /// The optional [transaction] parameter can be used to override parameters
-  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
-  /// set by the contract.
-  Future<String> adjust(
-      ({BigInt targetAmount, _i2.Uint8List frontendCode}) args, {
-        required _i1.Credentials credentials,
-        _i1.Transaction? transaction,
-      }) async {
-    final function = self.abi.functions[4];
-    assert(checkSignature(function, '753ef93c'));
-    final params = [
-      args.targetAmount,
-      args.frontendCode,
-    ];
-    return write(
-      credentials,
-      transaction,
-      function,
-      params,
-    );
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<BigInt> calculateInterest(
-      ({dynamic account, BigInt ticks}) args, {
-        _i1.BlockNum? atBlock,
-      }) async {
-    final function = self.abi.functions[7];
-    assert(checkSignature(function, '7915ce20'));
-    final params = [
-      args.account,
-      args.ticks,
-    ];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as BigInt);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<BigInt> currentRatePPM({_i1.BlockNum? atBlock}) async {
-    final function = self.abi.functions[8];
-    assert(checkSignature(function, '06a7b376'));
-    final params = [];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as BigInt);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<BigInt> currentTicks({_i1.BlockNum? atBlock}) async {
-    final function = self.abi.functions[9];
-    assert(checkSignature(function, 'b079f163'));
-    final params = [];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as BigInt);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<_i1.EthereumAddress> deuro({_i1.BlockNum? atBlock}) async {
-    final function = self.abi.functions[10];
-    assert(checkSignature(function, '82b8eaf5'));
-    final params = [];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as _i1.EthereumAddress);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<_i1.EthereumAddress> equity({_i1.BlockNum? atBlock}) async {
-    final function = self.abi.functions[11];
-    assert(checkSignature(function, '91a0ac6a'));
-    final params = [];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as _i1.EthereumAddress);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<BigInt> nextChange({_i1.BlockNum? atBlock}) async {
-    final function = self.abi.functions[12];
-    assert(checkSignature(function, 'b6f83c17'));
-    final params = [];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as BigInt);
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<BigInt> nextRatePPM({_i1.BlockNum? atBlock}) async {
-    final function = self.abi.functions[13];
-    assert(checkSignature(function, '2e4b20ab'));
-    final params = [];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return (response[0] as BigInt);
-  }
-
-  /// The optional [transaction] parameter can be used to override parameters
-  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
-  /// set by the contract.
-  Future<String> refreshBalance(
-      ({_i1.EthereumAddress owner}) args, {
-        required _i1.Credentials credentials,
-        _i1.Transaction? transaction,
-      }) async {
-    final function = self.abi.functions[15];
-    assert(checkSignature(function, 'b77cd1c7'));
-    final params = [args.owner];
-    return write(
-      credentials,
-      transaction,
-      function,
-      params,
-    );
-  }
-
-  /// The optional [transaction] parameter can be used to override parameters
-  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
-  /// set by the contract.
-  Future<String> refreshMyBalance({
-    required _i1.Credentials credentials,
-    _i1.Transaction? transaction,
-  }) async {
-    final function = self.abi.functions[16];
-    assert(checkSignature(function, '85bd12d1'));
-    final params = [];
-    return write(
-      credentials,
-      transaction,
-      function,
-      params,
-    );
-  }
-
-  /// The optional [transaction] parameter can be used to override parameters
-  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
-  /// set by the contract.
-  Future<_i2.Uint8List> save(
-      ({BigInt amount, _i2.Uint8List frontendCode}) args, {
-        required _i1.Credentials credentials,
-        _i1.Transaction? transaction,
-      }) async {
-    final function = self.abi.functions[17];
-    assert(checkSignature(function, '9e2363dc'));
-    final params = [
-      args.amount,
-      args.frontendCode,
-    ];
-    return writeRaw(
-      credentials,
-      transaction,
-      function,
-      params,
-    );
-  }
-
-  /// The optional [transaction] parameter can be used to override parameters
-  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
-  /// set by the contract.
-  Future<_i2.Uint8List> saveTo(
-      ({
-      _i1.EthereumAddress owner,
-      BigInt amount,
-      _i2.Uint8List frontendCode
-      }) args, {
-        required _i1.Credentials credentials,
-        _i1.Transaction? transaction,
-      }) async {
-    final function = self.abi.functions[19];
-    assert(checkSignature(function, 'cbcf9676'));
-    final params = [
-      args.owner,
-      args.amount,
-      args.frontendCode,
-    ];
-    return writeRaw(
-      credentials,
-      transaction,
-      function,
-      params,
-    );
-  }
-
-  /// The optional [atBlock] parameter can be used to view historical data. When
-  /// set, the function will be evaluated in the specified block. By default, the
-  /// latest on-chain block will be used.
-  Future<Savings> savings({
-        required _i1.EthereumAddress accountOwner,
-        _i1.BlockNum? atBlock,
-      }) async {
-    final function = self.abi.functions[21];
-    assert(checkSignature(function, '1f7cdd5f'));
-    final params = [accountOwner];
-    final response = await read(
-      function,
-      params,
-      atBlock,
-    );
-    return Savings(response);
-  }
-
-  /// The optional [transaction] parameter can be used to override parameters
-  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
-  /// set by the contract.
-  Future<_i2.Uint8List> withdraw(
-    ({
-      _i1.EthereumAddress target,
-      BigInt amount,
-      _i2.Uint8List frontendCode
-    }) args, {
-    required _i1.Credentials credentials,
-    _i1.Transaction? transaction,
-  }) async {
-    final function = self.abi.functions[24];
-    assert(checkSignature(function, '829a0476'));
-    final params = [
-      args.target,
-      args.amount,
-      args.frontendCode,
-    ];
-    return writeRaw(
-      credentials,
-      transaction,
-      function,
-      params,
-    );
-  }
-
-  /// Returns a live stream of all InterestCollected events emitted by this contract.
-  Stream<InterestCollected> interestCollectedEvents({
-    _i1.BlockNum? fromBlock,
-    _i1.BlockNum? toBlock,
-  }) {
-    final event = self.event('InterestCollected');
-    final filter = _i1.FilterOptions.events(
-      contract: self,
-      event: event,
-      fromBlock: fromBlock,
-      toBlock: toBlock,
-    );
-    return client.events(filter).map((_i1.FilterEvent result) {
-      final decoded = event.decodeResults(
-        result.topics!,
-        result.data!,
-      );
-      return InterestCollected(
-        decoded,
-        result,
-      );
-    });
-  }
-
-  /// Returns a live stream of all RateChanged events emitted by this contract.
-  Stream<RateChanged> rateChangedEvents({
-    _i1.BlockNum? fromBlock,
-    _i1.BlockNum? toBlock,
-  }) {
-    final event = self.event('RateChanged');
-    final filter = _i1.FilterOptions.events(
-      contract: self,
-      event: event,
-      fromBlock: fromBlock,
-      toBlock: toBlock,
-    );
-    return client.events(filter).map((_i1.FilterEvent result) {
-      final decoded = event.decodeResults(
-        result.topics!,
-        result.data!,
-      );
-      return RateChanged(
-        decoded,
-        result,
-      );
-    });
-  }
-
-  /// Returns a live stream of all RateProposed events emitted by this contract.
-  Stream<RateProposed> rateProposedEvents({
-    _i1.BlockNum? fromBlock,
-    _i1.BlockNum? toBlock,
-  }) {
-    final event = self.event('RateProposed');
-    final filter = _i1.FilterOptions.events(
-      contract: self,
-      event: event,
-      fromBlock: fromBlock,
-      toBlock: toBlock,
-    );
-    return client.events(filter).map((_i1.FilterEvent result) {
-      final decoded = event.decodeResults(
-        result.topics!,
-        result.data!,
-      );
-      return RateProposed(
-        decoded,
-        result,
-      );
-    });
-  }
-
-  /// Returns a live stream of all Saved events emitted by this contract.
-  Stream<Saved> savedEvents({
-    _i1.BlockNum? fromBlock,
-    _i1.BlockNum? toBlock,
-  }) {
-    final event = self.event('Saved');
-    final filter = _i1.FilterOptions.events(
-      contract: self,
-      event: event,
-      fromBlock: fromBlock,
-      toBlock: toBlock,
-    );
-    return client.events(filter).map((_i1.FilterEvent result) {
-      final decoded = event.decodeResults(
-        result.topics!,
-        result.data!,
-      );
-      return Saved(
-        decoded,
-        result,
-      );
-    });
-  }
-
-  /// Returns a live stream of all Withdrawn events emitted by this contract.
-  Stream<Withdrawn> withdrawnEvents({
-    _i1.BlockNum? fromBlock,
-    _i1.BlockNum? toBlock,
-  }) {
-    final event = self.event('Withdrawn');
-    final filter = _i1.FilterOptions.events(
-      contract: self,
-      event: event,
-      fromBlock: fromBlock,
-      toBlock: toBlock,
-    );
-    return client.events(filter).map((_i1.FilterEvent result) {
-      final decoded = event.decodeResults(
-        result.topics!,
-        result.data!,
-      );
-      return Withdrawn(
-        decoded,
-        result,
-      );
-    });
-  }
-}
-
-class Savings {
-  Savings(List<dynamic> response)
-      : saved = (response[0] as BigInt),
-        ticks = (response[1] as BigInt);
-
-  final BigInt saved;
-
-  final BigInt ticks;
-}
-
-class InterestCollected {
-  InterestCollected(
-      List<dynamic> response,
-      this.event,
-      )   : account = (response[0] as _i1.EthereumAddress),
-        interest = (response[1] as BigInt);
-
-  final _i1.EthereumAddress account;
-
-  final BigInt interest;
-
-  final _i1.FilterEvent event;
-}
-
-class RateChanged {
-  RateChanged(
-      List<dynamic> response,
-      this.event,
-      ) : newRate = (response[0] as BigInt);
-
-  final BigInt newRate;
-
-  final _i1.FilterEvent event;
-}
-
-class RateProposed {
-  RateProposed(
-      List<dynamic> response,
-      this.event,
-      )   : who = (response[0] as _i1.EthereumAddress),
-        nextRate = (response[1] as BigInt),
-        nextChange = (response[2] as BigInt);
-
-  final _i1.EthereumAddress who;
-
-  final BigInt nextRate;
-
-  final BigInt nextChange;
-
-  final _i1.FilterEvent event;
-}
-
-class Saved {
-  Saved(
-      List<dynamic> response,
-      this.event,
-      )   : account = (response[0] as _i1.EthereumAddress),
-        amount = (response[1] as BigInt);
-
-  final _i1.EthereumAddress account;
-
-  final BigInt amount;
-
-  final _i1.FilterEvent event;
-}
-
-class Withdrawn {
-  Withdrawn(
-      List<dynamic> response,
-      this.event,
-      )   : account = (response[0] as _i1.EthereumAddress),
-        amount = (response[1] as BigInt);
-
-  final _i1.EthereumAddress account;
-
-  final BigInt amount;
-
-  final _i1.FilterEvent event;
-}
diff --git a/cw_ethereum/lib/ethereum_client.dart b/cw_ethereum/lib/ethereum_client.dart
index 259e7d11d..9d50fdd5b 100644
--- a/cw_ethereum/lib/ethereum_client.dart
+++ b/cw_ethereum/lib/ethereum_client.dart
@@ -19,8 +19,7 @@ class EthereumClient extends EVMChainClient {
   Future<List<EVMChainTransactionModel>> fetchTransactions(String address,
       {String? contractAddress}) async {
     try {
-      final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", {
-        "chainid": "$chainId",
+      final response = await httpClient.get(Uri.https("api.etherscan.io", "/api", {
         "module": "account",
         "action": contractAddress != null ? "tokentx" : "txlist",
         if (contractAddress != null) "contractaddress": contractAddress,
@@ -51,8 +50,7 @@ class EthereumClient extends EVMChainClient {
   @override
   Future<List<EVMChainTransactionModel>> fetchInternalTransactions(String address) async {
     try {
-      final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", {
-        "chainid": "$chainId",
+      final response = await httpClient.get(Uri.https("api.etherscan.io", "/api", {
         "module": "account",
         "action": "txlistinternal",
         "address": address,
diff --git a/cw_ethereum/lib/ethereum_wallet.dart b/cw_ethereum/lib/ethereum_wallet.dart
index c22be3cb2..765ace052 100644
--- a/cw_ethereum/lib/ethereum_wallet.dart
+++ b/cw_ethereum/lib/ethereum_wallet.dart
@@ -31,14 +31,11 @@ class EthereumWallet extends EVMChainWallet {
   }) : super(nativeCurrency: CryptoCurrency.eth);
 
   @override
-  void addInitialTokens([bool isMigration = false]) {
+  void addInitialTokens() {
     final initialErc20Tokens = DefaultEthereumErc20Tokens().initialErc20Tokens;
 
-    for (final token in initialErc20Tokens) {
-      if (!evmChainErc20TokensBox.containsKey(token.contractAddress)) {
-        if (isMigration) token.enabled = false;
-        evmChainErc20TokensBox.put(token.contractAddress, token);
-      }
+    for (var token in initialErc20Tokens) {
+      evmChainErc20TokensBox.put(token.contractAddress, token);
     }
   }
 
@@ -79,13 +76,9 @@ class EthereumWallet extends EVMChainWallet {
     await erc20TokensBox.deleteFromDisk();
 
     // Add all the previous tokens with configs to the new box
-    await evmChainErc20TokensBox.addAll(allValues);
+    evmChainErc20TokensBox.addAll(allValues);
   }
 
-  @override
-  List<String> get getDefaultTokenContractAddresses =>
-      DefaultEthereumErc20Tokens().initialErc20Tokens.map((e) => e.contractAddress).toList();
-
   @override
   EVMChainTransactionInfo getTransactionInfo(
       EVMChainTransactionModel transactionModel, String address) {
@@ -122,7 +115,6 @@ class EthereumWallet extends EVMChainWallet {
       enabled: token.enabled,
       tag: token.tag ?? "ETH",
       iconPath: iconPath,
-      isPotentialScam: token.isPotentialScam,
     );
   }
 
diff --git a/cw_ethereum/lib/ethereum_wallet_service.dart b/cw_ethereum/lib/ethereum_wallet_service.dart
index 06ba07bfc..858416055 100644
--- a/cw_ethereum/lib/ethereum_wallet_service.dart
+++ b/cw_ethereum/lib/ethereum_wallet_service.dart
@@ -53,7 +53,6 @@ class EthereumWalletService extends EVMChainWalletService<EthereumWallet> {
       );
 
       await wallet.init();
-      wallet.addInitialTokens(true);
       await wallet.save();
       saveBackup(name);
       return wallet;
diff --git a/cw_ethereum/pubspec.yaml b/cw_ethereum/pubspec.yaml
index 1da1e3b3b..462e1d77e 100644
--- a/cw_ethereum/pubspec.yaml
+++ b/cw_ethereum/pubspec.yaml
@@ -6,7 +6,7 @@ author: Cake Wallet
 homepage: https://cakewallet.com
 
 environment:
-  sdk: ^3.5.0
+  sdk: '>=2.18.2 <3.0.0'
   flutter: ">=1.17.0"
 
 dependencies:
@@ -29,7 +29,7 @@ dependency_overrides:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
+  build_runner: ^2.4.7
 
 flutter:
   # assets:
diff --git a/cw_evm/lib/evm_chain_client.dart b/cw_evm/lib/evm_chain_client.dart
index 1fecc9c1e..b505577e9 100644
--- a/cw_evm/lib/evm_chain_client.dart
+++ b/cw_evm/lib/evm_chain_client.dart
@@ -5,7 +5,6 @@ import 'dart:developer';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/erc20_token.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_evm/evm_chain_transaction_model.dart';
 import 'package:cw_evm/evm_chain_transaction_priority.dart';
 import 'package:cw_evm/evm_erc20_balance.dart';
@@ -13,12 +12,13 @@ import 'package:cw_evm/pending_evm_chain_transaction.dart';
 import 'package:cw_evm/.secrets.g.dart' as secrets;
 import 'package:flutter/foundation.dart';
 import 'package:hex/hex.dart' as hex;
+import 'package:http/http.dart';
 import 'package:web3dart/web3dart.dart';
 
 import 'contract/erc20.dart';
 
 abstract class EVMChainClient {
-  late final client = ProxyWrapper().getHttpIOClient();
+  final httpClient = Client();
   Web3Client? _client;
 
   //! To be overridden by all child classes
@@ -47,7 +47,7 @@ abstract class EVMChainClient {
       }
 
       _client =
-          Web3Client(isModifiedNodeUri ? rpcUri!.toString() : node.uri.toString(), client);
+          Web3Client(isModifiedNodeUri ? rpcUri!.toString() : node.uri.toString(), httpClient);
 
       return true;
     } catch (e) {
@@ -76,7 +76,7 @@ abstract class EVMChainClient {
   Future<int> getGasUnitPrice() async {
     try {
       final gasPrice = await _client!.getGasPrice();
-
+    
       return gasPrice.getInWei.toInt();
     } catch (_) {
       return 0;
@@ -101,7 +101,6 @@ abstract class EVMChainClient {
     String? contractAddress,
     EtherAmount? gasPrice,
     EtherAmount? maxFeePerGas,
-    Uint8List? data,
   }) async {
     try {
       if (contractAddress == null) {
@@ -109,6 +108,7 @@ abstract class EVMChainClient {
           sender: senderAddress,
           to: toAddress,
           value: value,
+          // maxFeePerGas: maxFeePerGas,
         );
 
         return estimatedGas.toInt();
@@ -124,7 +124,7 @@ abstract class EVMChainClient {
         final gasEstimate = await _client!.estimateGas(
           sender: senderAddress,
           to: EthereumAddress.fromHex(contractAddress),
-          data: data ?? transfer.encodeCall([
+          data: transfer.encodeCall([
             toAddress,
             value.getInWei,
           ]),
@@ -137,21 +137,6 @@ abstract class EVMChainClient {
     }
   }
 
-  Uint8List getEncodedDataForApprovalTransaction({
-    required EthereumAddress toAddress,
-    required EtherAmount value,
-    required EthereumAddress contractAddress,
-  }) {
-    final contract = DeployedContract(ethereumContractAbi, contractAddress);
-
-    final approve = contract.function('approve');
-
-    return approve.encodeCall([
-      toAddress,
-      value.getInWei,
-    ]);
-  }
-
   Future<PendingEVMChainTransaction> signTransaction({
     required Credentials privateKey,
     required String toAddress,
@@ -164,7 +149,6 @@ abstract class EVMChainClient {
     required int exponent,
     String? contractAddress,
     String? data,
-    int? gasPrice,
   }) async {
     assert(currency == CryptoCurrency.eth ||
         currency == CryptoCurrency.maticpoly ||
@@ -180,7 +164,6 @@ abstract class EVMChainClient {
       data: data != null ? hexToBytes(data) : null,
       maxGas: estimatedGasUnits,
       maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas),
-      gasPrice: gasPrice != null ? EtherAmount.fromInt(EtherUnit.wei, gasPrice) : null,
     );
 
     Uint8List signedTransaction;
@@ -207,7 +190,7 @@ abstract class EVMChainClient {
     _sendTransaction = () async => await sendTransaction(signedTransaction);
 
     return PendingEVMChainTransaction(
-      signedTransaction: prepareSignedTransactionForSending(signedTransaction),
+      signedTransaction: signedTransaction,
       amount: amount.toString(),
       fee: gasFee,
       sendTransaction: _sendTransaction,
@@ -215,52 +198,6 @@ abstract class EVMChainClient {
     );
   }
 
-  Future<PendingEVMChainTransaction> signApprovalTransaction({
-    required Credentials privateKey,
-    required String spender,
-    required BigInt amount,
-    required BigInt gasFee,
-    required int estimatedGasUnits,
-    required int maxFeePerGas,
-    required EVMChainTransactionPriority priority,
-    required int exponent,
-    required String contractAddress,
-    int? gasPrice,
-  }) async {
-
-    final Transaction transaction = createTransaction(
-      from: privateKey.address,
-      to: EthereumAddress.fromHex(contractAddress),
-      maxPriorityFeePerGas: EtherAmount.fromInt(EtherUnit.gwei, priority.tip),
-      amount: EtherAmount.zero(),
-      maxGas: estimatedGasUnits,
-      maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas),
-      gasPrice: gasPrice != null ? EtherAmount.fromInt(EtherUnit.wei, gasPrice) : null,
-    );
-
-    final erc20 = ERC20(
-      client: _client!,
-      address: EthereumAddress.fromHex(contractAddress),
-      chainId: chainId,
-    );
-
-    final signedTransaction = await erc20.approve(
-      EthereumAddress.fromHex(spender),
-      amount,
-      credentials: privateKey,
-      transaction: transaction,
-    );
-
-    return PendingEVMChainTransaction(
-      signedTransaction: prepareSignedTransactionForSending(signedTransaction),
-      amount: amount.toString(),
-      fee: gasFee,
-      sendTransaction: () => sendTransaction(signedTransaction),
-      exponent: exponent,
-      isInfiniteApproval: amount.toRadixString(16) == 'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
-    );
-  }
-
   Transaction createTransaction({
     required EthereumAddress from,
     required EthereumAddress to,
@@ -356,7 +293,7 @@ abstract class EVMChainClient {
         },
       );
 
-      final response = await client.get(
+      final response = await httpClient.get(
         uri,
         headers: {
           "Accept": "application/json",
diff --git a/cw_evm/lib/evm_chain_exceptions.dart b/cw_evm/lib/evm_chain_exceptions.dart
index 19bb047ef..c7509a17f 100644
--- a/cw_evm/lib/evm_chain_exceptions.dart
+++ b/cw_evm/lib/evm_chain_exceptions.dart
@@ -22,32 +22,3 @@ class EVMChainTransactionFeesException implements Exception {
   @override
   String toString() => exceptionMessage;
 }
-
-class DeuroGasFeeException implements Exception {
-  final String exceptionMessage;
-  final BigInt? requiredGasFee;
-  final BigInt? currentBalance;
-
-  DeuroGasFeeException({
-    this.requiredGasFee,
-    this.currentBalance,
-  }) : exceptionMessage = _buildMessage(requiredGasFee, currentBalance);
-
-  static String _buildMessage(BigInt? requiredGasFee, BigInt? currentBalance) {
-    const baseMessage = 'Insufficient ETH for gas fees.';
-    const addEthMessage = ' Please add ETH to your wallet to cover transaction fees.';
-    
-    if (requiredGasFee != null) {
-      final requiredEth = (requiredGasFee / BigInt.from(10).pow(18)).toStringAsFixed(8);
-      final balanceInfo = currentBalance != null 
-          ? ', Available: ${(currentBalance / BigInt.from(10).pow(18)).toStringAsFixed(8)} ETH'
-          : '';
-      return '$baseMessage Required: ~$requiredEth ETH$balanceInfo.$addEthMessage';
-    }
-    
-    return '$baseMessage$addEthMessage';
-  }
-
-  @override
-  String toString() => exceptionMessage;
-}
diff --git a/cw_evm/lib/evm_chain_wallet.dart b/cw_evm/lib/evm_chain_wallet.dart
index a1285f0e4..d3efdaa7c 100644
--- a/cw_evm/lib/evm_chain_wallet.dart
+++ b/cw_evm/lib/evm_chain_wallet.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
-import 'dart:typed_data';
 
 import 'package:bip32/bip32.dart' as bip32;
 import 'package:bip39/bip39.dart' as bip39;
@@ -137,7 +136,7 @@ abstract class EVMChainWalletBase
 
   //! Methods to be overridden by every child
 
-  void addInitialTokens([bool isMigration]);
+  void addInitialTokens();
 
   // Future<EVMChainWallet> open({
   //   required String name,
@@ -145,8 +144,6 @@ abstract class EVMChainWalletBase
   //   required WalletInfo walletInfo,
   // });
 
-  List<String> get getDefaultTokenContractAddresses;
-
   Future<void> initErc20TokensBox();
 
   String getTransactionHistoryFileName();
@@ -174,9 +171,6 @@ abstract class EVMChainWalletBase
     await walletAddresses.init();
     await transactionHistory.init();
 
-    // check for Already existing scam tokens, cuz users can get scammed twice ¯\_(ツ)_/¯
-    await _checkForExistingScamTokens();
-
     if (walletInfo.isHardwareWallet) {
       _evmChainPrivateKey = EvmLedgerCredentials(walletInfo.address);
       walletAddresses.address = walletInfo.address;
@@ -192,41 +186,6 @@ abstract class EVMChainWalletBase
     await save();
   }
 
-  Future<void> _checkForExistingScamTokens() async {
-    final baseCurrencySymbols = CryptoCurrency.all.map((e) => e.title.toUpperCase()).toList();
-
-    for (var token in erc20Currencies) {
-      bool isPotentialScam = false;
-
-      bool isWhitelisted = getDefaultTokenContractAddresses
-          .any((element) => element.toLowerCase() == token.contractAddress.toLowerCase());
-
-      final tokenSymbol = token.title.toUpperCase();
-
-      // check if the token symbol is the same as any of the base currencies symbols (ETH, SOL, POL, TRX, etc):
-      // if it is, then it's probably a scam unless it's in the whitelist
-      if (baseCurrencySymbols.contains(tokenSymbol.trim().toUpperCase()) && !isWhitelisted) {
-        isPotentialScam = true;
-      }
-
-      if (isPotentialScam) {
-        token.isPotentialScam = true;
-        token.iconPath = null;
-        await token.save();
-      }
-
-      // For fixing wrongly classified tokens
-      if (!isPotentialScam && token.isPotentialScam) {
-        token.isPotentialScam = false;
-        final iconPath = CryptoCurrency.all
-            .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
-            .iconPath;
-        token.iconPath = iconPath;
-        await token.save();
-      }
-    }
-  }
-
   @override
   int calculateEstimatedFee(TransactionPriority priority, int? amount) {
     {
@@ -266,72 +225,36 @@ abstract class EVMChainWalletBase
     required String? contractAddress,
     required String receivingAddressHex,
     required TransactionPriority priority,
-    Uint8List? data,
   }) async {
     try {
       if (priority is EVMChainTransactionPriority) {
         final priorityFee = EtherAmount.fromInt(EtherUnit.gwei, priority.tip).getInWei.toInt();
 
         int maxFeePerGas;
-        int adjustedGasPrice;
-
-        bool isPolygon = _client.chainId == 137;
-
         if (gasBaseFee != null) {
           // MaxFeePerGas with EIP1559;
           maxFeePerGas = gasBaseFee! + priorityFee;
         } else {
           // MaxFeePerGas with gasPrice
-          maxFeePerGas = gasPrice + priorityFee;
-        }
-
-        adjustedGasPrice = maxFeePerGas;
-
-        // Polygon has a minimum priority fee of 25 gwei
-        if (isPolygon) {
-          int minPriorityFee = 25;
-          int minPriorityFeeWei =
-              EtherAmount.fromInt(EtherUnit.gwei, minPriorityFee).getInWei.toInt();
-
-          // Calculate  user selected priority-based additional fee on top of minimum
-          int additionalPriorityFee = 0;
-          switch (priority) {
-            case EVMChainTransactionPriority.slow:
-              // We use minimum priority fee only
-              additionalPriorityFee = 0;
-              break;
-            case EVMChainTransactionPriority.medium:
-              // We add 15 gwei on top of minimum
-              additionalPriorityFee = EtherAmount.fromInt(EtherUnit.gwei, 15).getInWei.toInt();
-              break;
-            case EVMChainTransactionPriority.fast:
-              // We add 35 gwei on top of minimum
-              additionalPriorityFee = EtherAmount.fromInt(EtherUnit.gwei, 35).getInWei.toInt();
-              break;
-          }
-
-          int totalPriorityFee = minPriorityFeeWei + additionalPriorityFee;
-          adjustedGasPrice = gasPrice + totalPriorityFee;
-          maxFeePerGas = gasPrice + totalPriorityFee;
+          maxFeePerGas = gasPrice;
         }
 
         final estimatedGas = await _client.getEstimatedGasUnitsForTransaction(
           contractAddress: contractAddress,
           senderAddress: _evmChainPrivateKey.address,
           value: EtherAmount.fromBigInt(EtherUnit.wei, amount!),
-          gasPrice: EtherAmount.fromInt(EtherUnit.wei, adjustedGasPrice),
+          gasPrice: EtherAmount.fromInt(EtherUnit.wei, gasPrice),
           toAddress: EthereumAddress.fromHex(receivingAddressHex),
           maxFeePerGas: EtherAmount.fromInt(EtherUnit.wei, maxFeePerGas),
-          data: data,
         );
 
-        final totalGasFee = estimatedGas * adjustedGasPrice;
+        final totalGasFee = estimatedGas * maxFeePerGas;
 
         return GasParamsHandler(
           estimatedGasUnits: estimatedGas,
           estimatedGasFee: totalGasFee,
           maxFeePerGas: maxFeePerGas,
-          gasPrice: adjustedGasPrice,
+          gasPrice: gasPrice,
         );
       }
       return GasParamsHandler.zero();
@@ -520,46 +443,11 @@ abstract class EVMChainWalletBase
       contractAddress:
           transactionCurrency is Erc20Token ? transactionCurrency.contractAddress : null,
       data: hexOpReturnMemo,
-      gasPrice: maxFeePerGasForTransaction,
     );
 
     return pendingEVMChainTransaction;
   }
 
-  Future<PendingTransaction> createApprovalTransaction(BigInt amount, String spender,
-      CryptoCurrency token, EVMChainTransactionPriority priority) async {
-    final CryptoCurrency transactionCurrency =
-        balance.keys.firstWhere((element) => element.title == token.title);
-    assert(transactionCurrency is Erc20Token);
-
-    final data = _client.getEncodedDataForApprovalTransaction(
-      contractAddress: EthereumAddress.fromHex((transactionCurrency as Erc20Token).contractAddress),
-      value: EtherAmount.fromBigInt(EtherUnit.wei, amount),
-      toAddress: EthereumAddress.fromHex(spender),
-    );
-
-    final gasFeesModel = await calculateActualEstimatedFeeForCreateTransaction(
-      amount: amount,
-      receivingAddressHex: spender,
-      priority: priority,
-      contractAddress: transactionCurrency.contractAddress,
-      data: data,
-    );
-
-    return _client.signApprovalTransaction(
-      privateKey: _evmChainPrivateKey,
-      spender: spender,
-      amount: amount,
-      priority: priority,
-      gasFee: BigInt.from(gasFeesModel.estimatedGasFee),
-      maxFeePerGas: gasFeesModel.maxFeePerGas,
-      estimatedGasUnits: gasFeesModel.estimatedGasUnits,
-      exponent: transactionCurrency.decimal,
-      contractAddress: transactionCurrency.contractAddress,
-      gasPrice: gasFeesModel.gasPrice,
-    );
-  }
-
   Future<void> _updateTransactions() async {
     try {
       if (_isTransactionUpdating) {
@@ -738,13 +626,13 @@ abstract class EVMChainWalletBase
   Future<void> addErc20Token(Erc20Token token) async {
     String? iconPath;
 
-    if ((token.iconPath == null || token.iconPath!.isEmpty) && !token.isPotentialScam) {
+    if (token.iconPath == null || token.iconPath!.isEmpty) {
       try {
         iconPath = CryptoCurrency.all
             .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
             .iconPath;
       } catch (_) {}
-    } else if (!token.isPotentialScam) {
+    } else {
       iconPath = token.iconPath;
     }
 
diff --git a/cw_evm/lib/pending_evm_chain_transaction.dart b/cw_evm/lib/pending_evm_chain_transaction.dart
index 61b406470..6861b41f8 100644
--- a/cw_evm/lib/pending_evm_chain_transaction.dart
+++ b/cw_evm/lib/pending_evm_chain_transaction.dart
@@ -11,7 +11,6 @@ class PendingEVMChainTransaction with PendingTransaction {
   final BigInt fee;
   final String amount;
   final int exponent;
-  final bool isInfiniteApproval;
 
   PendingEVMChainTransaction({
     required this.sendTransaction,
@@ -19,12 +18,10 @@ class PendingEVMChainTransaction with PendingTransaction {
     required this.fee,
     required this.amount,
     required this.exponent,
-    this.isInfiniteApproval = false,
   });
 
   @override
   String get amountFormatted {
-    if (isInfiniteApproval) return "∞";
     final _amount = (BigInt.parse(amount) / BigInt.from(pow(10, exponent))).toString();
     return _amount.substring(0, min(10, _amount.length));
   }
diff --git a/cw_evm/pubspec.yaml b/cw_evm/pubspec.yaml
index 80788ca06..326ff4dc9 100644
--- a/cw_evm/pubspec.yaml
+++ b/cw_evm/pubspec.yaml
@@ -30,7 +30,6 @@ dependencies:
     git:
       url: https://github.com/cake-tech/ledger-flutter-plus-plugins
       path: packages/ledger-ethereum
-      ref: f4761cd5171d4c1e2e42fd3298261650539fb2db
 
 dependency_overrides:
   web3dart:
@@ -42,9 +41,9 @@ dependency_overrides:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
+  build_runner: ^2.4.7
   mobx_codegen: ^2.0.7
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
   flutter_lints: ^2.0.0
 
 flutter:
diff --git a/cw_monero/.gitignore b/cw_monero/.gitignore
index 2bf094c85..ebb19df82 100644
--- a/cw_monero/.gitignore
+++ b/cw_monero/.gitignore
@@ -11,5 +11,4 @@ android/.externalNativeBuild/
 android/.cxx/
 
 macos/cw_monero.podspec
-macos/External/
-*monero_libwallet2_api_c.*
\ No newline at end of file
+macos/External/
\ No newline at end of file
diff --git a/cw_monero/example/linux/flutter/generated_plugin_registrant.cc b/cw_monero/example/linux/flutter/generated_plugin_registrant.cc
new file mode 100644
index 000000000..1936c88a6
--- /dev/null
+++ b/cw_monero/example/linux/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <cw_monero/cw_monero_plugin.h>
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) cw_monero_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "CwMoneroPlugin");
+  cw_monero_plugin_register_with_registrar(cw_monero_registrar);
+}
diff --git a/cw_monero/example/linux/flutter/generated_plugin_registrant.h b/cw_monero/example/linux/flutter/generated_plugin_registrant.h
new file mode 100644
index 000000000..e0f0a47bc
--- /dev/null
+++ b/cw_monero/example/linux/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/cw_monero/example/linux/flutter/generated_plugins.cmake b/cw_monero/example/linux/flutter/generated_plugins.cmake
new file mode 100644
index 000000000..efcc9a8f9
--- /dev/null
+++ b/cw_monero/example/linux/flutter/generated_plugins.cmake
@@ -0,0 +1,24 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  cw_monero
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/cw_monero/lib/api/account_list.dart b/cw_monero/lib/api/account_list.dart
index b753b4656..0e55ce15c 100644
--- a/cw_monero/lib/api/account_list.dart
+++ b/cw_monero/lib/api/account_list.dart
@@ -1,32 +1,29 @@
-import 'dart:async';
-
 import 'package:cw_monero/api/wallet.dart';
-import 'package:cw_monero/monero_account_list.dart';
-import 'package:monero/src/wallet2.dart';
-import 'package:monero/src/monero.dart';
+import 'package:monero/monero.dart' as monero;
 
-Wallet2Wallet? currentWallet = null;
-bool get isViewOnly => int.tryParse(currentWallet!.secretSpendKey()) == 0;
+monero.wallet? wptr = null;
+bool get isViewOnly => int.tryParse(monero.Wallet_secretSpendKey(wptr!)) == 0;
 
 int _wlptrForW = 0;
-Wallet2WalletListener? _wlptr = null;
+monero.WalletListener? _wlptr = null;
 
-Wallet2WalletListener? getWlptr() {
-  if (currentWallet == null) return null;
-  _wlptrForW = currentWallet!.ffiAddress();
-  _wlptr = currentWallet!.getWalletListener();
+monero.WalletListener getWlptr() {
+  if (wptr!.address == _wlptrForW) return _wlptr!;
+  _wlptrForW = wptr!.address;
+  _wlptr = monero.MONERO_cw_getWalletListener(wptr!);
   return _wlptr!;
 }
 
-Wallet2SubaddressAccount? subaddressAccount;
+
+monero.SubaddressAccount? subaddressAccount;
 
 bool isUpdating = false;
 
 void refreshAccounts() {
   try {
     isUpdating = true;
-    subaddressAccount = currentWallet?.subaddressAccount();
-    subaddressAccount?.refresh();
+    subaddressAccount = monero.Wallet_subaddressAccount(wptr!);
+    monero.SubaddressAccount_refresh(subaddressAccount!);
     isUpdating = false;
   } catch (e) {
     isUpdating = false;
@@ -34,28 +31,44 @@ void refreshAccounts() {
   }
 }
 
-  List<Wallet2SubaddressAccountRow> getAllAccount() {
+List<monero.SubaddressAccountRow> getAllAccount() {
   // final size = monero.Wallet_numSubaddressAccounts(wptr!);
   refreshAccounts();
-  int size = subaddressAccount!.getAll_size();
+  int size = monero.SubaddressAccount_getAll_size(subaddressAccount!);
   if (size == 0) {
-    currentWallet!.addSubaddressAccount();
-    currentWallet!.status();
+    monero.Wallet_addSubaddressAccount(wptr!);
+    monero.Wallet_status(wptr!);
     return [];
   }
   return List.generate(size, (index) {
-    return subaddressAccount!.getAll_byIndex(index);
+    return monero.SubaddressAccount_getAll_byIndex(subaddressAccount!, index: index);
   });
 }
 
-void addAccount({required String label}) {
-  currentWallet!.addSubaddressAccount(label: label);
-  unawaited(store());
+void addAccountSync({required String label}) {
+  monero.Wallet_addSubaddressAccount(wptr!, label: label);
 }
 
-void setLabelForAccount({required int accountIndex, required String label}) {
-  subaddressAccount!.setLabel(accountIndex: accountIndex, label: label);
-  MoneroAccountListBase.cachedAccounts[currentWallet!.ffiAddress()] = [];
-  refreshAccounts();
-  unawaited(store());
+void setLabelForAccountSync({required int accountIndex, required String label}) {
+  // TODO(mrcyjanek): this may be wrong function?
+  monero.Wallet_setSubaddressLabel(wptr!, accountIndex: accountIndex, addressIndex: 0, label: label);
 }
+
+void _addAccount(String label) => addAccountSync(label: label);
+
+void _setLabelForAccount(Map<String, dynamic> args) {
+  final label = args['label'] as String;
+  final accountIndex = args['accountIndex'] as int;
+
+  setLabelForAccountSync(label: label, accountIndex: accountIndex);
+}
+
+Future<void> addAccount({required String label}) async {
+  _addAccount(label);
+  await store();
+}
+
+Future<void> setLabelForAccount({required int accountIndex, required String label}) async {
+    _setLabelForAccount({'accountIndex': accountIndex, 'label': label});
+    await store();
+}
\ No newline at end of file
diff --git a/cw_monero/lib/api/coins_info.dart b/cw_monero/lib/api/coins_info.dart
index b08dbb1f7..ef7d3cfd6 100644
--- a/cw_monero/lib/api/coins_info.dart
+++ b/cw_monero/lib/api/coins_info.dart
@@ -1,44 +1,22 @@
-import 'dart:ffi';
-import 'dart:isolate';
-
 import 'package:cw_monero/api/account_list.dart';
 import 'package:monero/monero.dart' as monero;
-import 'package:monero/src/wallet2.dart';
-import 'package:mutex/mutex.dart';
 
-Wallet2Coins? coins = null;
-final coinsMutex = Mutex();
+monero.Coins? coins = null;
 
-Future<void> refreshCoins(int accountIndex) async {
-  if (coinsMutex.isLocked) {
-    return;
-  }
-  coins = currentWallet!.coins();
-  final coinsPtr = coins!.ffiAddress();
-  await coinsMutex.acquire();
-  await Isolate.run(() => monero.Coins_refresh(Pointer.fromAddress(coinsPtr)));
-  coinsMutex.release();
+void refreshCoins(int accountIndex) {
+  coins = monero.Wallet_coins(wptr!);
+  monero.Coins_refresh(coins!);
 }
 
-Future<int> countOfCoins() async {
-  await coinsMutex.acquire();
-  final count = coins!.count();
-  coinsMutex.release();
-  return count;
-}
+int countOfCoins() => monero.Coins_count(coins!);
 
-Future<Wallet2CoinsInfo> getCoin(int index) async {
-  await coinsMutex.acquire();
-  final coin = coins!.coin(index);
-  coinsMutex.release();
-  return coin;
-}
+monero.CoinsInfo getCoin(int index) => monero.Coins_coin(coins!, index);
 
-Future<int?> getCoinByKeyImage(String keyImage) async {
-  final count = await countOfCoins();
+int? getCoinByKeyImage(String keyImage) {
+  final count = countOfCoins();
   for (int i = 0; i < count; i++) {
-    final coin = await getCoin(i);
-    final coinAddress = coin.keyImage;
+    final coin = getCoin(i);
+    final coinAddress = monero.CoinsInfo_keyImage(coin);
     if (keyImage == coinAddress) {
       return i;
     }
@@ -46,16 +24,6 @@ Future<int?> getCoinByKeyImage(String keyImage) async {
   return null;
 }
 
-Future<void> freezeCoin(int index) async {
-  await coinsMutex.acquire();
-  final coinsPtr = coins!.ffiAddress();
-  await Isolate.run(() => monero.Coins_setFrozen(Pointer.fromAddress(coinsPtr), index: index));
-  coinsMutex.release();
-}
+void freezeCoin(int index) => monero.Coins_setFrozen(coins!, index: index);
 
-Future<void> thawCoin(int index) async {
-  await coinsMutex.acquire();
-  final coinsPtr = coins!.ffiAddress();
-  await Isolate.run(() => monero.Coins_thaw(Pointer.fromAddress(coinsPtr), index: index));
-  coinsMutex.release();
-}
+void thawCoin(int index) => monero.Coins_thaw(coins!, index: index);
diff --git a/cw_monero/lib/api/structs/pending_transaction.dart b/cw_monero/lib/api/structs/pending_transaction.dart
index 22f974f4b..dc5fbddd0 100644
--- a/cw_monero/lib/api/structs/pending_transaction.dart
+++ b/cw_monero/lib/api/structs/pending_transaction.dart
@@ -5,11 +5,13 @@ class PendingTransactionDescription {
     required this.fee,
     required this.hash,
     required this.hex,
+    required this.txKey,
     required this.pointerAddress});
 
   final int amount;
   final int fee;
   final String hash;
   final String hex;
+  final String txKey;
   final int pointerAddress;
 }
\ No newline at end of file
diff --git a/cw_monero/lib/api/subaddress_list.dart b/cw_monero/lib/api/subaddress_list.dart
index 46bdc10bc..5db8a5d5f 100644
--- a/cw_monero/lib/api/subaddress_list.dart
+++ b/cw_monero/lib/api/subaddress_list.dart
@@ -2,8 +2,7 @@
 import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/transaction_history.dart';
 import 'package:cw_monero/api/wallet.dart';
-import 'package:monero/monero.dart';
-import 'package:monero/src/monero.dart';
+import 'package:monero/monero.dart' as monero;
 
 bool isUpdating = false;
 
@@ -17,7 +16,7 @@ class SubaddressInfoMetadata {
 SubaddressInfoMetadata? subaddress = null;
 
 String getRawLabel({required int accountIndex, required int addressIndex}) {
-  return currentWallet!.getSubaddressLabel(accountIndex: accountIndex, addressIndex: addressIndex);
+  return monero.Wallet_getSubaddressLabel(wptr!, accountIndex: accountIndex, addressIndex: addressIndex);
 }
 
 void refreshSubaddresses({required int accountIndex}) {
@@ -47,7 +46,7 @@ class Subaddress {
   final int received;
   final int txCount;
   String get label {
-    final localLabel = currentWallet!.getSubaddressLabel(accountIndex: accountIndex, addressIndex: addressIndex);
+    final localLabel = monero.Wallet_getSubaddressLabel(wptr!, accountIndex: accountIndex, addressIndex: addressIndex);
     if (localLabel.startsWith("#$addressIndex")) return localLabel; // don't duplicate the ID if it was user-providen
     return "#$addressIndex ${localLabel}".trim();
   }
@@ -67,26 +66,26 @@ int lastTxCount = 0;
 List<TinyTransactionDetails> ttDetails = [];
 
 List<Subaddress> getAllSubaddresses() {
-  txhistory = currentWallet!.history();
-  final txCount = txhistory!.count();
-  if (lastTxCount != txCount && lastWptr != currentWallet!.ffiAddress()) {
+  txhistory = monero.Wallet_history(wptr!);
+  final txCount = monero.TransactionHistory_count(txhistory!);
+  if (lastTxCount != txCount && lastWptr != wptr!.address) {
     final List<TinyTransactionDetails> newttDetails = [];
     lastTxCount = txCount;
-    lastWptr = currentWallet!.ffiAddress();
+    lastWptr = wptr!.address;
     for (var i = 0; i < txCount; i++) {
-      final tx = txhistory!.transaction(i);
-      if (tx.direction() == TransactionInfo_Direction.Out.index) continue;
-      final subaddrs = tx.subaddrIndex().split(",");
-      final account = tx.subaddrAccount();
+      final tx = monero.TransactionHistory_transaction(txhistory!, index: i);
+      if (monero.TransactionInfo_direction(tx) == monero.TransactionInfo_Direction.Out) continue;
+      final subaddrs = monero.TransactionInfo_subaddrIndex(tx).split(",");
+      final account = monero.TransactionInfo_subaddrAccount(tx);
       newttDetails.add(TinyTransactionDetails(
         address: List.generate(subaddrs.length, (index) => getAddress(accountIndex: account, addressIndex: int.tryParse(subaddrs[index])??0)),
-        amount: tx.amount(),
+        amount: monero.TransactionInfo_amount(tx),
       ));
     }
     ttDetails.clear();
     ttDetails.addAll(newttDetails);
   }
-  final size = currentWallet!.numSubaddresses(accountIndex: subaddress!.accountIndex);
+  final size = monero.Wallet_numSubaddresses(wptr!, accountIndex: subaddress!.accountIndex);
   final list = List.generate(size, (index) {
     final ttDetailsLocal = ttDetails.where((element) {
       final address = getAddress(
@@ -120,17 +119,46 @@ List<Subaddress> getAllSubaddresses() {
 }
 
 int numSubaddresses(int subaccountIndex) {
-  return currentWallet!.numSubaddresses(accountIndex: subaccountIndex);
+  return monero.Wallet_numSubaddresses(wptr!, accountIndex: subaccountIndex);
+}
+
+void addSubaddressSync({required int accountIndex, required String label}) {
+  monero.Wallet_addSubaddress(wptr!, accountIndex: accountIndex, label: label);
+  refreshSubaddresses(accountIndex: accountIndex);
+}
+
+void setLabelForSubaddressSync(
+    {required int accountIndex, required int addressIndex, required String label}) {
+  monero.Wallet_setSubaddressLabel(wptr!, accountIndex: accountIndex, addressIndex: addressIndex, label: label);
+}
+
+void _addSubaddress(Map<String, dynamic> args) {
+  final label = args['label'] as String;
+  final accountIndex = args['accountIndex'] as int;
+
+  addSubaddressSync(accountIndex: accountIndex, label: label);
+}
+
+void _setLabelForSubaddress(Map<String, dynamic> args) {
+  final label = args['label'] as String;
+  final accountIndex = args['accountIndex'] as int;
+  final addressIndex = args['addressIndex'] as int;
+
+  setLabelForSubaddressSync(
+      accountIndex: accountIndex, addressIndex: addressIndex, label: label);
 }
 
 Future<void> addSubaddress({required int accountIndex, required String label}) async {
-  currentWallet!.addSubaddress(accountIndex: accountIndex, label: label);
-  refreshSubaddresses(accountIndex: accountIndex);
+  _addSubaddress({'accountIndex': accountIndex, 'label': label});
   await store();
 }
 
 Future<void> setLabelForSubaddress(
-    {required int accountIndex, required int addressIndex, required String label}) async {
-  currentWallet!.setSubaddressLabel(accountIndex: accountIndex, addressIndex: addressIndex, label: label);
+        {required int accountIndex, required int addressIndex, required String label}) async {
+  _setLabelForSubaddress({
+    'accountIndex': accountIndex,
+    'addressIndex': addressIndex,
+    'label': label
+  });
   await store();
-}
\ No newline at end of file
+}
diff --git a/cw_monero/lib/api/transaction_history.dart b/cw_monero/lib/api/transaction_history.dart
index fd6004140..854ee01c3 100644
--- a/cw_monero/lib/api/transaction_history.dart
+++ b/cw_monero/lib/api/transaction_history.dart
@@ -1,8 +1,6 @@
-import 'dart:async';
 import 'dart:ffi';
 import 'dart:isolate';
 
-import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/exceptions/creation_transaction_exception.dart';
 import 'package:cw_monero/api/monero_output.dart';
@@ -10,77 +8,50 @@ import 'package:cw_monero/api/structs/pending_transaction.dart';
 import 'package:cw_monero/api/wallet.dart';
 import 'package:cw_monero/exceptions/monero_transaction_creation_exception.dart';
 import 'package:ffi/ffi.dart';
-import 'package:monero/src/monero.dart';
 import 'package:monero/monero.dart' as monero;
-import 'package:monero/src/wallet2.dart';
 import 'package:monero/src/generated_bindings_monero.g.dart' as monero_gen;
 import 'package:mutex/mutex.dart';
 
 
-Map<int, Map<String, String>> txKeys = {};
 String getTxKey(String txId) {
-  txKeys[currentWallet!.ffiAddress()] ??= {};
-  if (txKeys[currentWallet!.ffiAddress()]![txId] != null) {
-    return txKeys[currentWallet!.ffiAddress()]![txId]!;
-  }
-  final txKey = currentWallet!.getTxKey(txid: txId);
-  final status = currentWallet!.status();
+  final txKey = monero.Wallet_getTxKey(wptr!, txid: txId);
+  final status = monero.Wallet_status(wptr!);
   if (status != 0) {
-    currentWallet!.errorString();
-    txKeys[currentWallet!.ffiAddress()]![txId] = "";
+    final error = monero.Wallet_errorString(wptr!);
     return "";
   }
-  txKeys[currentWallet!.ffiAddress()]![txId] = txKey;
   return txKey;
 }
-
 final txHistoryMutex = Mutex();
-Wallet2TransactionHistory? txhistory;
+monero.TransactionHistory? txhistory;
 bool isRefreshingTx = false;
 Future<void> refreshTransactions() async {
   if (isRefreshingTx == true) return;
   isRefreshingTx = true;
-  txhistory ??= currentWallet!.history();
-  final ptr = txhistory!.ffiAddress();
+  txhistory ??= monero.Wallet_history(wptr!);
+  final ptr = txhistory!.address;
   await txHistoryMutex.acquire();
   await Isolate.run(() {
     monero.TransactionHistory_refresh(Pointer.fromAddress(ptr));
   });
-  await Future.delayed(Duration.zero);
   txHistoryMutex.release();
   isRefreshingTx = false;
 }
 
-int countOfTransactions() => txhistory!.count();
+int countOfTransactions() => monero.TransactionHistory_count(txhistory!);
 
 Future<List<Transaction>> getAllTransactions() async {
   List<Transaction> dummyTxs = [];
   
   await txHistoryMutex.acquire();
-  txhistory ??= currentWallet!.history();
-  final startAddress = txhistory!.ffiAddress() * currentWallet!.ffiAddress();
+  txhistory ??= monero.Wallet_history(wptr!);
   int size = countOfTransactions();
-  final list = <Transaction>[];
-  for (int index = 0; index < size; index++) {
-    if (index % 25 == 0) {
-      // Give main thread a chance to do other things.
-      await Future.delayed(Duration.zero);
-    }
-    if (txhistory!.ffiAddress() * currentWallet!.ffiAddress() != startAddress) {
-      printV("Loop broken because txhistory!.address * wptr!.address != startAddress");
-      break;
-    }
-    final txInfo = txhistory!.transaction(index);
-    final txHash = txInfo.hash();
-    txCache[currentWallet!.ffiAddress()] ??= {};
-    txCache[currentWallet!.ffiAddress()]![txHash] = Transaction(txInfo: txInfo);
-    list.add(txCache[currentWallet!.ffiAddress()]![txHash]!);
-  }
+  final list = List.generate(size, (index) => Transaction(txInfo: monero.TransactionHistory_transaction(txhistory!, index: index)));
   txHistoryMutex.release();
-  final accts = currentWallet!.numSubaddressAccounts();
+  final accts = monero.Wallet_numSubaddressAccounts(wptr!);
   for (var i = 0; i < accts; i++) {  
-    final fullBalance = currentWallet!.balance(accountIndex: i);
-    final availBalance = currentWallet!.unlockedBalance(accountIndex: i);
+    final fullBalance = monero.Wallet_balance(wptr!, accountIndex: i);
+    final availBalance = monero.Wallet_unlockedBalance(wptr!, accountIndex: i);
     if (fullBalance > availBalance) {
       if (list.where((element) => element.accountIndex == i && element.isConfirmed == false).isEmpty) {
         dummyTxs.add(
@@ -98,7 +69,7 @@ Future<List<Transaction>> getAllTransactions() async {
             isSpend: false,
             hash: "pending",
             key: "",
-            txInfo: DummyTransaction(),
+            txInfo: Pointer.fromAddress(0),
           )..timeStamp = DateTime.now()
         );
       }
@@ -108,23 +79,8 @@ Future<List<Transaction>> getAllTransactions() async {
   return list;
 }
 
-class DummyTransaction implements Wallet2TransactionInfo {
-  @override
-  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
-}
-
-Map<int, Map<String, Transaction>> txCache = {};
-Future<Transaction> getTransaction(String txId) async {
-  if (txCache[currentWallet!.ffiAddress()] != null && txCache[currentWallet!.ffiAddress()]![txId] != null) {
-    return txCache[currentWallet!.ffiAddress()]![txId]!;
-  }
-  await txHistoryMutex.acquire();
-  final tx = txhistory!.transactionById(txId);
-  final txDart = Transaction(txInfo: tx);
-  txCache[currentWallet!.ffiAddress()] ??= {};
-  txCache[currentWallet!.ffiAddress()]![txId] = txDart;
-  txHistoryMutex.release();
-  return txDart;
+Transaction getTransaction(String txId) {
+  return Transaction(txInfo: monero.TransactionHistory_transactionById(txhistory!, txid: txId));
 }
 
 Future<PendingTransactionDescription> createTransactionSync(
@@ -135,9 +91,9 @@ Future<PendingTransactionDescription> createTransactionSync(
     int accountIndex = 0,
     List<String> preferredInputs = const []}) async {
 
-  final amt = amount == null ? 0 : currentWallet!.amountFromString(amount);
+  final amt = amount == null ? 0 : monero.Wallet_amountFromString(amount);
 
-  final waddr = currentWallet!.ffiAddress();
+  final waddr = wptr!.address;
 
   // force reconnection in case the os killed the connection?
   // fixes failed to get block height error.
@@ -157,7 +113,7 @@ Future<PendingTransactionDescription> createTransactionSync(
   final paymentIdAddr = paymentId_.address;
   final preferredInputsAddr = preferredInputs_.address;
   final spaddr = monero.defaultSeparator.address;
-  final pendingTxPtr = Pointer<Void>.fromAddress(await Isolate.run(() {
+  final pendingTx = Pointer<Void>.fromAddress(await Isolate.run(() {
     final tx = monero_gen.MoneroC(DynamicLibrary.open(monero.libPath)).MONERO_Wallet_createTransaction(
       Pointer.fromAddress(waddr),
       Pointer.fromAddress(addraddr).cast(),
@@ -171,16 +127,15 @@ Future<PendingTransactionDescription> createTransactionSync(
     );
     return tx.address;
   }));
-  final Wallet2PendingTransaction pendingTx = MoneroPendingTransaction(pendingTxPtr);
   calloc.free(address_);
   calloc.free(paymentId_);
   calloc.free(preferredInputs_);
   final String? error = (() {
-    final status = pendingTx.status();
+    final status = monero.PendingTransaction_status(pendingTx);
     if (status == 0) {
       return null;
     }
-    return pendingTx.errorString();
+    return monero.PendingTransaction_errorString(pendingTx);
   })();
 
   if (error != null) {
@@ -191,110 +146,165 @@ Future<PendingTransactionDescription> createTransactionSync(
     throw CreationTransactionException(message: message);
   }
 
-  final rAmt = pendingTx.amount();
-  final rFee = pendingTx.fee();
-  final rHash = pendingTx.txid('');
-  final rHex = pendingTx.hex('');
+  final rAmt = monero.PendingTransaction_amount(pendingTx);
+  final rFee = monero.PendingTransaction_fee(pendingTx);
+  final rHash = monero.PendingTransaction_txid(pendingTx, '');
+  final rTxKey = rHash;
 
   return PendingTransactionDescription(
       amount: rAmt,
       fee: rFee,
       hash: rHash,
-      hex: rHex,
-      pointerAddress: pendingTx.ffiAddress(),
+      hex: '',
+      txKey: rTxKey,
+      pointerAddress: pendingTx.address,
     );
 }
 
-Future<PendingTransactionDescription> createTransactionMultDest(
+PendingTransactionDescription createTransactionMultDestSync(
     {required List<MoneroOutput> outputs,
     required String paymentId,
     required int priorityRaw,
     int accountIndex = 0,
-    List<String> preferredInputs = const []}) async {
+    List<String> preferredInputs = const []}) {
   
   final dstAddrs = outputs.map((e) => e.address).toList();
-  final amounts = outputs.map((e) => currentWallet!.amountFromString(e.amount)).toList();
+  final amounts = outputs.map((e) => monero.Wallet_amountFromString(e.amount)).toList();
 
-  final waddr = currentWallet!.ffiAddress();
+  // printV("multDest: dstAddrs: $dstAddrs");
+  // printV("multDest: amounts: $amounts");
 
-  // force reconnection in case the os killed the connection
-  Isolate.run(() async {
-    monero.Wallet_synchronized(Pointer.fromAddress(waddr));
-  });
-
-  final txptr = Pointer<Void>.fromAddress(await Isolate.run(() {
-    return monero.Wallet_createTransactionMultDest(
-      Pointer.fromAddress(waddr),
-      dstAddr: dstAddrs,
-      isSweepAll: false,
-      amounts: amounts,
-      mixinCount: 0,
-      pendingTransactionPriority: priorityRaw,
-      subaddr_account: accountIndex,
-    ).address;
-  }));
-
-  final Wallet2PendingTransaction tx = MoneroPendingTransaction(txptr);
-
-  if (tx.status() != 0) {
-    throw CreationTransactionException(message: tx.errorString());
+  final txptr = monero.Wallet_createTransactionMultDest(
+    wptr!,
+    dstAddr: dstAddrs,
+    isSweepAll: false,
+    amounts: amounts,
+    mixinCount: 0,
+    pendingTransactionPriority: priorityRaw,
+    subaddr_account: accountIndex,
+  );
+  if (monero.PendingTransaction_status(txptr) != 0) {
+    throw CreationTransactionException(message: monero.PendingTransaction_errorString(txptr));
   }
-
   return PendingTransactionDescription(
-    amount: tx.amount(),
-    fee: tx.fee(),
-    hash: tx.txid(''),
-    hex: tx.hex(''),
-    pointerAddress: tx.ffiAddress(),
+    amount: monero.PendingTransaction_amount(txptr),
+    fee: monero.PendingTransaction_fee(txptr),
+    hash: monero.PendingTransaction_txid(txptr, ''),
+    hex: monero.PendingTransaction_txid(txptr, ''),
+    txKey: monero.PendingTransaction_txid(txptr, ''),
+    pointerAddress: txptr.address,
   );
 }
 
-Future<String?> commitTransactionFromPointerAddress({required int address, required bool useUR}) =>
-    commitTransaction(tx: MoneroPendingTransaction(Pointer.fromAddress(address)), useUR: useUR);
+String? commitTransactionFromPointerAddress({required int address, required bool useUR}) =>
+    commitTransaction(transactionPointer: monero.PendingTransaction.fromAddress(address), useUR: useUR);
 
-Future<String?> commitTransaction({required Wallet2PendingTransaction tx, required bool useUR}) async {
+String? commitTransaction({required monero.PendingTransaction transactionPointer, required bool useUR}) {
+  final transactionPointerAddress = transactionPointer.address;
   final txCommit = useUR
-      ? tx.commitUR(120)
-      : await Isolate.run(() {
+      ? monero.PendingTransaction_commitUR(transactionPointer, 120)
+      : Isolate.run(() {
           monero.PendingTransaction_commit(
-            Pointer.fromAddress(tx.ffiAddress()),
+            Pointer.fromAddress(transactionPointerAddress),
             filename: '',
             overwrite: false,
           );
-          return null;
         });
 
   String? error = (() {
-    final status = tx.status();
+    final status = monero.PendingTransaction_status(transactionPointer.cast());
     if (status == 0) {
       return null;
     }
-    return tx.errorString();
+    return monero.PendingTransaction_errorString(transactionPointer.cast());
   })();
   if (error == null) {
     error = (() {
-      final status = currentWallet!.status();
+      final status = monero.Wallet_status(wptr!);
       if (status == 0) {
         return null;
       }
-      return currentWallet!.errorString();
+      return monero.Wallet_errorString(wptr!);
     })();
   
   }
   if (error != null && error != "no tx keys found for this txid") {
     throw CreationTransactionException(message: error);
   }
-  unawaited(() async {
-    storeSync(force: true);
-    await Future.delayed(Duration(seconds: 5));
-    storeSync(force: true);
-  }());
-  return Future.value(txCommit);
+  if (useUR) {
+    return txCommit as String?;
+  } else {
+    return null;
+  }
 }
 
+Future<PendingTransactionDescription> _createTransactionSync(Map args) async {
+  final address = args['address'] as String;
+  final paymentId = args['paymentId'] as String;
+  final amount = args['amount'] as String?;
+  final priorityRaw = args['priorityRaw'] as int;
+  final accountIndex = args['accountIndex'] as int;
+  final preferredInputs = args['preferredInputs'] as List<String>;
+
+  return createTransactionSync(
+      address: address,
+      paymentId: paymentId,
+      amount: amount,
+      priorityRaw: priorityRaw,
+      accountIndex: accountIndex,
+      preferredInputs: preferredInputs);
+}
+
+PendingTransactionDescription _createTransactionMultDestSync(Map args) {
+  final outputs = args['outputs'] as List<MoneroOutput>;
+  final paymentId = args['paymentId'] as String;
+  final priorityRaw = args['priorityRaw'] as int;
+  final accountIndex = args['accountIndex'] as int;
+  final preferredInputs = args['preferredInputs'] as List<String>;
+
+  return createTransactionMultDestSync(
+      outputs: outputs,
+      paymentId: paymentId,
+      priorityRaw: priorityRaw,
+      accountIndex: accountIndex,
+      preferredInputs: preferredInputs);
+}
+
+Future<PendingTransactionDescription> createTransaction(
+        {required String address,
+        required int priorityRaw,
+        String? amount,
+        String paymentId = '',
+        int accountIndex = 0,
+        List<String> preferredInputs = const []}) async =>
+    _createTransactionSync({
+      'address': address,
+      'paymentId': paymentId,
+      'amount': amount,
+      'priorityRaw': priorityRaw,
+      'accountIndex': accountIndex,
+      'preferredInputs': preferredInputs
+    });
+
+Future<PendingTransactionDescription> createTransactionMultDest(
+        {required List<MoneroOutput> outputs,
+        required int priorityRaw,
+        String paymentId = '',
+        int accountIndex = 0,
+        List<String> preferredInputs = const []}) async =>
+    _createTransactionMultDestSync({
+      'outputs': outputs,
+      'paymentId': paymentId,
+      'priorityRaw': priorityRaw,
+      'accountIndex': accountIndex,
+      'preferredInputs': preferredInputs
+    });
+
+
 class Transaction {
   final String displayLabel;
-  late final String subaddressLabel = currentWallet!.getSubaddressLabel(
+  late final String subaddressLabel = monero.Wallet_getSubaddressLabel(
+    wptr!,
     accountIndex: accountIndex,
     addressIndex: addressIndex,
   );
@@ -347,26 +357,26 @@ class Transaction {
   // final SubAddress? subAddress;
   // List<Transfer> transfers = [];
   // final int txIndex;
-  final Wallet2TransactionInfo txInfo;
+  final monero.TransactionInfo txInfo;
   Transaction({
     required this.txInfo,
-  })  : displayLabel = txInfo.label(),
-        hash = txInfo.hash(),
+  })  : displayLabel = monero.TransactionInfo_label(txInfo),
+        hash = monero.TransactionInfo_hash(txInfo),
         timeStamp = DateTime.fromMillisecondsSinceEpoch(
-          txInfo.timestamp() * 1000,
+          monero.TransactionInfo_timestamp(txInfo) * 1000,
         ),
-        isSpend = txInfo.direction() ==
-            monero.TransactionInfo_Direction.Out.index,
-        amount = txInfo.amount(),
-        paymentId = txInfo.paymentId(),
-        accountIndex = txInfo.subaddrAccount(),
-        addressIndex = int.tryParse(txInfo.subaddrIndex().split(", ")[0]) ?? 0,
-        addressIndexList = txInfo.subaddrIndex().split(", ").map((e) => int.tryParse(e) ?? 0).toList(),
-        blockheight = txInfo.blockHeight(),
-        confirmations = txInfo.confirmations(),
-        fee = txInfo.fee(),
-        description = txInfo.description(),
-        key = getTxKey(txInfo.hash());
+        isSpend = monero.TransactionInfo_direction(txInfo) ==
+            monero.TransactionInfo_Direction.Out,
+        amount = monero.TransactionInfo_amount(txInfo),
+        paymentId = monero.TransactionInfo_paymentId(txInfo),
+        accountIndex = monero.TransactionInfo_subaddrAccount(txInfo),
+        addressIndex = int.tryParse(monero.TransactionInfo_subaddrIndex(txInfo).split(", ")[0]) ?? 0,
+        addressIndexList = monero.TransactionInfo_subaddrIndex(txInfo).split(", ").map((e) => int.tryParse(e) ?? 0).toList(),
+        blockheight = monero.TransactionInfo_blockHeight(txInfo),
+        confirmations = monero.TransactionInfo_confirmations(txInfo),
+        fee = monero.TransactionInfo_fee(txInfo),
+        description = monero.TransactionInfo_description(txInfo),
+        key = getTxKey(monero.TransactionInfo_hash(txInfo));
 
   Transaction.dummy({
     required this.displayLabel,
diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart
index 148b271ff..755887652 100644
--- a/cw_monero/lib/api/wallet.dart
+++ b/cw_monero/lib/api/wallet.dart
@@ -2,9 +2,11 @@ import 'dart:async';
 import 'dart:ffi';
 import 'dart:isolate';
 
+import 'package:cw_core/root_dir.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/exceptions/setup_wallet_exception.dart';
+import 'package:flutter/foundation.dart';
 import 'package:monero/monero.dart' as monero;
 import 'package:mutex/mutex.dart';
 import 'package:polyseed/polyseed.dart';
@@ -13,37 +15,32 @@ bool debugMonero = false;
 
 int getSyncingHeight() {
   // final height = monero.MONERO_cw_WalletListener_height(getWlptr());
-  if (currentWallet == null) return 0;
-  final h2 = currentWallet!.blockChainHeight();
+  final h2 = monero.Wallet_blockChainHeight(wptr!);
   // printV("height: $height / $h2");
   return h2;
 }
 
 bool isNeededToRefresh() {
-  final wl = getWlptr();
-  if (wl == null) return false;
-  final ret = wl.isNeedToRefresh();
-  wl.resetNeedToRefresh();
+  final ret = monero.MONERO_cw_WalletListener_isNeedToRefresh(getWlptr());
+  monero.MONERO_cw_WalletListener_resetNeedToRefresh(getWlptr());
   return ret;
 }
 
 bool isNewTransactionExist() {
-  final wlptr = getWlptr();
-  if (wlptr == null) return false;
-  final ret = wlptr.isNewTransactionExist();
-  wlptr.resetIsNewTransactionExist();
+  final ret = monero.MONERO_cw_WalletListener_isNewTransactionExist(getWlptr());
+  monero.MONERO_cw_WalletListener_resetIsNewTransactionExist(getWlptr());
   return ret;
 }
 
-String getFilename() => currentWallet!.filename();
+String getFilename() => monero.Wallet_filename(wptr!);
 
 String getSeed() {
   // monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.seed", value: seed);
   final cakepolyseed =
-      currentWallet!.getCacheAttribute(key: "cakewallet.seed");
+      monero.Wallet_getCacheAttribute(wptr!, key: "cakewallet.seed");
   final cakepassphrase = getPassphrase();
 
-  final weirdPolyseed = currentWallet!.getPolyseed(passphrase: cakepassphrase);
+  final weirdPolyseed = monero.Wallet_getPolyseed(wptr!, passphrase: cakepassphrase);
   if (weirdPolyseed != "") return weirdPolyseed;
 
   if (cakepolyseed != "") {
@@ -61,11 +58,6 @@ String getSeed() {
     }
     return cakepolyseed;
   }
-
-  final bip39 = currentWallet!.getCacheAttribute(key: "cakewallet.seed.bip39");
-
-  if(bip39.isNotEmpty) return bip39;
-
   final legacy = getSeedLegacy(null);
   return legacy;
 }
@@ -83,30 +75,24 @@ String? getSeedLanguage(String? language) {
 
 String getSeedLegacy(String? language) {
   final cakepassphrase = getPassphrase();
+  var legacy = monero.Wallet_seed(wptr!, seedOffset: cakepassphrase);
   language = getSeedLanguage(language);
-  var legacy = currentWallet!.seed(seedOffset: cakepassphrase);
-  if (currentWallet!.status() != 0) {
-    if (currentWallet!.errorString().contains("seed_language")) {
-      currentWallet!.setSeedLanguage(language: "English");
-      legacy = currentWallet!.seed(seedOffset: cakepassphrase);
-    }
-  }
-
-  if (language != null) {
-    currentWallet!.setSeedLanguage(language: language);
-    final status = currentWallet!.status();
-    if (status != 0) {
-      final err = currentWallet!.errorString();
-      if (legacy.isNotEmpty) {
-        return "$err\n\n$legacy";
+  if (monero.Wallet_status(wptr!) != 0) {
+    if (language != null) {
+      monero.Wallet_setSeedLanguage(wptr!, language: language);
+      final status = monero.Wallet_status(wptr!);
+      if (status != 0) {
+        final err = monero.Wallet_errorString(wptr!);
+        if (legacy.isNotEmpty) {
+          return "$err\n\n$legacy";
+        }
+        return err;
       }
-      return err;
     }
-    legacy = currentWallet!.seed(seedOffset: cakepassphrase);
+    legacy = monero.Wallet_seed(wptr!, seedOffset: cakepassphrase);
   }
-
-  if (currentWallet!.status() != 0) {
-    final err = currentWallet!.errorString();
+  if (monero.Wallet_status(wptr!) != 0) {
+    final err = monero.Wallet_errorString(wptr!);
     if (legacy.isNotEmpty) {
       return "$err\n\n$legacy";
     }
@@ -116,62 +102,39 @@ String getSeedLegacy(String? language) {
 }
 
 String getPassphrase() {
-  return currentWallet?.getCacheAttribute(key: "cakewallet.passphrase") ?? "";
+  return monero.Wallet_getCacheAttribute(wptr!, key: "cakewallet.passphrase");
 }
 
 Map<int, Map<int, Map<int, String>>> addressCache = {};
 
 String getAddress({int accountIndex = 0, int addressIndex = 0}) {
-  // this is a workaround for when we switch the wallet pointer,
-  // it should never reach UI but should be good enough to prevent gray screen
-  // or other errors because of forced null check.
-  if (currentWallet == null) return "<wallet not ready ($accountIndex:$addressIndex)>";
-
   // printV("getaddress: ${accountIndex}/${addressIndex}: ${monero.Wallet_numSubaddresses(wptr!, accountIndex: accountIndex)}: ${monero.Wallet_address(wptr!, accountIndex: accountIndex, addressIndex: addressIndex)}");
   // this could be a while loop, but I'm in favor of making it if to not cause freezes
-  if (currentWallet!.numSubaddresses(accountIndex: accountIndex)-1 < addressIndex) {
-    if (currentWallet!.numSubaddressAccounts() < accountIndex) {
-      currentWallet!.addSubaddressAccount();
+  if (monero.Wallet_numSubaddresses(wptr!, accountIndex: accountIndex)-1 < addressIndex) {
+    if (monero.Wallet_numSubaddressAccounts(wptr!) < accountIndex) {
+      monero.Wallet_addSubaddressAccount(wptr!);
     } else {
-      currentWallet!.addSubaddress(accountIndex: accountIndex);
+      monero.Wallet_addSubaddress(wptr!, accountIndex: accountIndex);
     }
   }
-  addressCache[currentWallet!.ffiAddress()] ??= {};
-  addressCache[currentWallet!.ffiAddress()]![accountIndex] ??= {};
-  addressCache[currentWallet!.ffiAddress()]![accountIndex]![addressIndex] ??= currentWallet!.address(
+  addressCache[wptr!.address] ??= {};
+  addressCache[wptr!.address]![accountIndex] ??= {};
+  addressCache[wptr!.address]![accountIndex]![addressIndex] ??= monero.Wallet_address(wptr!,
         accountIndex: accountIndex, addressIndex: addressIndex);
-  return addressCache[currentWallet!.ffiAddress()]![accountIndex]![addressIndex]!;
+  return addressCache[wptr!.address]![accountIndex]![addressIndex]!;
 }
 
 int getFullBalance({int accountIndex = 0}) =>
-    currentWallet?.balance(accountIndex: accountIndex) ?? 0;
+    monero.Wallet_balance(wptr!, accountIndex: accountIndex);
 
 int getUnlockedBalance({int accountIndex = 0}) =>
-    currentWallet?.unlockedBalance(accountIndex: accountIndex) ?? 0;
+    monero.Wallet_unlockedBalance(wptr!, accountIndex: accountIndex);
 
-int getCurrentHeight() => currentWallet?.blockChainHeight() ?? 0;
+int getCurrentHeight() => monero.Wallet_blockChainHeight(wptr!);
 
+int getNodeHeightSync() => monero.Wallet_daemonBlockChainHeight(wptr!);
 
-int cachedNodeHeight = 0;
-bool isHeightRefreshing = false;
-int getNodeHeightSync() {
-  if (isHeightRefreshing == false) {
-    (() async {
-      try {
-        isHeightRefreshing = true;
-        final wptrAddress = currentWallet!.ffiAddress();
-        cachedNodeHeight = await Isolate.run(() async {
-          return monero.Wallet_daemonBlockChainHeight(Pointer.fromAddress(wptrAddress));
-        });
-      } finally {
-        isHeightRefreshing = false;
-      }
-    })();
-  }
-  return cachedNodeHeight;
-}
-
-bool isConnectedSync() => currentWallet?.connected() != 0;
+bool isConnectedSync() => monero.Wallet_connected(wptr!) != 0;
 
 Future<bool> setupNodeSync(
     {required String address,
@@ -190,7 +153,7 @@ Future<bool> setupNodeSync(
   daemonPassword: $password ?? ''
 }
 ''');
-  final addr = currentWallet!.ffiAddress();
+  final addr = wptr!.address;
   printV("init: start");
   await Isolate.run(() {
     monero.Wallet_init(Pointer.fromAddress(addr),
@@ -202,10 +165,10 @@ Future<bool> setupNodeSync(
   });
   printV("init: end");
 
-  final status = currentWallet!.status();
+  final status = monero.Wallet_status(wptr!);
 
   if (status != 0) {
-    final error = currentWallet!.errorString();
+    final error = monero.Wallet_errorString(wptr!);
     if (error != "no tx keys found for this txid") {
       printV("error: $error");
       throw SetupWalletException(message: error);
@@ -213,8 +176,8 @@ Future<bool> setupNodeSync(
   }
 
   if (true) {
-    currentWallet!.init3(
-      argv0: '',
+    monero.Wallet_init3(
+      wptr!, argv0: '',
       defaultLogBaseName: 'moneroc',
       console: true,
       logPath: '',
@@ -225,19 +188,17 @@ Future<bool> setupNodeSync(
 }
 
 void startRefreshSync() {
-  currentWallet!.startRefresh();
+  monero.Wallet_refreshAsync(wptr!);
+  monero.Wallet_startRefresh(wptr!);
 }
 
 
-void setRefreshFromBlockHeight({required int height}) {
-  currentWallet!.setRefreshFromBlockHeight(
-    refresh_from_block_height: height);
-}
+void setRefreshFromBlockHeight({required int height}) =>
+    monero.Wallet_setRefreshFromBlockHeight(wptr!,
+        refresh_from_block_height: height);
 
-void setRecoveringFromSeed({required bool isRecovery}) {
-  currentWallet!.setRecoveringFromSeed(recoveringFromSeed: isRecovery);
-  currentWallet!.store();
-}
+void setRecoveringFromSeed({required bool isRecovery}) =>
+    monero.Wallet_setRecoveringFromSeed(wptr!, recoveringFromSeed: isRecovery);
 
 final storeMutex = Mutex();
 
@@ -245,18 +206,18 @@ final storeMutex = Mutex();
 int lastStorePointer = 0;
 int lastStoreHeight = 0;
 void storeSync({bool force = false}) async {
-  final addr = currentWallet!.ffiAddress();
+  final addr = wptr!.address;
   final synchronized = await Isolate.run(() {
     return monero.Wallet_synchronized(Pointer.fromAddress(addr));
   });
-  if (lastStorePointer == addr &&
-      lastStoreHeight + 75000 > currentWallet!.blockChainHeight() &&
+  if (lastStorePointer == wptr!.address &&
+      lastStoreHeight + 5000 > monero.Wallet_blockChainHeight(wptr!) &&
       !synchronized && 
       !force) {
     return;
   }
-  lastStorePointer = currentWallet!.ffiAddress();
-  lastStoreHeight = currentWallet!.blockChainHeight();
+  lastStorePointer = wptr!.address;
+  lastStoreHeight = monero.Wallet_blockChainHeight(wptr!);
   await storeMutex.acquire();
   await Isolate.run(() {
     monero.Wallet_store(Pointer.fromAddress(addr));
@@ -265,25 +226,25 @@ void storeSync({bool force = false}) async {
 }
 
 void setPasswordSync(String password) {
-  currentWallet!.setPassword(password: password);
+  monero.Wallet_setPassword(wptr!, password: password);
 
-  final status = currentWallet!.status();
+  final status = monero.Wallet_status(wptr!);
   if (status != 0) {
-    throw Exception(currentWallet!.errorString());
+    throw Exception(monero.Wallet_errorString(wptr!));
   }
 }
 
 void closeCurrentWallet() {
-  currentWallet!.stop();
+  monero.Wallet_stop(wptr!);
 }
 
-String getSecretViewKey() => currentWallet?.secretViewKey() ?? "";
+String getSecretViewKey() => monero.Wallet_secretViewKey(wptr!);
 
-String getPublicViewKey() => currentWallet?.publicViewKey() ?? "";
+String getPublicViewKey() => monero.Wallet_publicViewKey(wptr!);
 
-String getSecretSpendKey() => currentWallet?.secretSpendKey() ?? "";
+String getSecretSpendKey() => monero.Wallet_secretSpendKey(wptr!);
 
-String getPublicSpendKey() => currentWallet?.publicSpendKey() ?? "";
+String getPublicSpendKey() => monero.Wallet_publicSpendKey(wptr!);
 
 class SyncListener {
   SyncListener(this.onNewBlock, this.onNewTransaction)
@@ -381,32 +342,50 @@ Future<bool> _setupNodeSync(Map<String, Object?> args) async {
       socksProxyAddress: socksProxyAddress);
 }
 
+bool _isConnected(Object _) => isConnectedSync();
+
+int _getNodeHeight(Object _) => getNodeHeightSync();
+
 void startRefresh() => startRefreshSync();
 
+Future<void> setupNode(
+        {required String address,
+        String? login,
+        String? password,
+        bool useSSL = false,
+        String? socksProxyAddress,
+        bool isLightWallet = false}) async =>
+    _setupNodeSync({
+      'address': address,
+      'login': login,
+      'password': password,
+      'useSSL': useSSL,
+      'isLightWallet': isLightWallet,
+      'socksProxyAddress': socksProxyAddress
+    });
+
 Future<void> store() async => _storeSync(0);
 
-Future<bool> isConnected() async => isConnectedSync();
+Future<bool> isConnected() async => _isConnected(0);
 
-Future<int> getNodeHeight() async => getNodeHeightSync();
+Future<int> getNodeHeight() async => _getNodeHeight(0);
 
-void rescanBlockchainAsync() => currentWallet!.rescanBlockchainAsync();
+void rescanBlockchainAsync() => monero.Wallet_rescanBlockchainAsync(wptr!);
 
 String getSubaddressLabel(int accountIndex, int addressIndex) {
-  return currentWallet!.getSubaddressLabel(
+  return monero.Wallet_getSubaddressLabel(wptr!,
       accountIndex: accountIndex, addressIndex: addressIndex);
 }
 
 Future setTrustedDaemon(bool trusted) async =>
-    currentWallet!.setTrustedDaemon(arg: trusted);
+    monero.Wallet_setTrustedDaemon(wptr!, arg: trusted);
 
-Future<bool> trustedDaemon() async => currentWallet!.trustedDaemon();
+Future<bool> trustedDaemon() async => monero.Wallet_trustedDaemon(wptr!);
 
 String signMessage(String message, {String address = ""}) {
-  return currentWallet!.signMessage(message: message, address: address);
+  return monero.Wallet_signMessage(wptr!, message: message, address: address);
 }
 
 bool verifyMessage(String message, String address, String signature) {
-  return currentWallet!.verifySignedMessage(message: message, address: address, signature: signature);
-}
-
-Map<String, List<int>> debugCallLength() => monero.debugCallLength;
+  return monero.Wallet_verifySignedMessage(wptr!, message: message, address: address, signature: signature);
+}
\ No newline at end of file
diff --git a/cw_monero/lib/api/wallet_manager.dart b/cw_monero/lib/api/wallet_manager.dart
index 97f1de275..bfebe4247 100644
--- a/cw_monero/lib/api/wallet_manager.dart
+++ b/cw_monero/lib/api/wallet_manager.dart
@@ -12,8 +12,6 @@ import 'package:cw_monero/api/transaction_history.dart';
 import 'package:cw_monero/api/wallet.dart';
 import 'package:cw_monero/ledger.dart';
 import 'package:flutter/foundation.dart';
-import 'package:monero/src/monero.dart';
-import 'package:monero/src/wallet2.dart';
 import 'package:monero/monero.dart' as monero;
 
 class MoneroCException implements Exception {
@@ -26,10 +24,9 @@ class MoneroCException implements Exception {
 }
 
 void checkIfMoneroCIsFine() {
-  final checksum = MoneroWalletChecksum();
-  final cppCsCpp = checksum.checksum_wallet2_api_c_cpp();
-  final cppCsH = checksum.checksum_wallet2_api_c_h();
-  final cppCsExp = checksum.checksum_wallet2_api_c_exp();
+  final cppCsCpp = monero.MONERO_checksum_wallet2_api_c_cpp();
+  final cppCsH = monero.MONERO_checksum_wallet2_api_c_h();
+  final cppCsExp = monero.MONERO_checksum_wallet2_api_c_exp();
 
   final dartCsCpp = monero.wallet2_api_c_cpp_sha256;
   final dartCsH = monero.wallet2_api_c_h_sha256;
@@ -47,35 +44,36 @@ void checkIfMoneroCIsFine() {
     throw MoneroCException("monero_c and monero.dart wrapper export list mismatch.\nLogic errors can occur.\nRefusing to run in release mode.\ncpp: '$cppCsExp'\ndart: '$dartCsExp'");
   }
 }
-Wallet2WalletManager? _wmPtr;
-Wallet2WalletManager wmPtr = (() {
+monero.WalletManager? _wmPtr;
+final monero.WalletManager wmPtr = Pointer.fromAddress((() {
   try {
     // Problems with the wallet? Crashes? Lags? this will print all calls to xmr
     // codebase, so it will be easier to debug what happens. At least easier
     // than plugging gdb in. Especially on windows/android.
     monero.printStarts = false;
     if (kDebugMode && debugMonero) {
-      MoneroWalletManagerFactory().setLogLevel(4);
+      monero.WalletManagerFactory_setLogLevel(4);
     }
-    _wmPtr ??= MoneroWalletManagerFactory().getWalletManager();
+    _wmPtr ??= monero.WalletManagerFactory_getWalletManager();
     if (kDebugMode && debugMonero) {
-      MoneroWalletManagerFactory().setLogLevel(4);
+      monero.WalletManagerFactory_setLogLevel(4);
     }
     printV("ptr: $_wmPtr");
   } catch (e) {
     printV(e);
     rethrow;
   }
-  return _wmPtr!;
-})();
+  return _wmPtr!.address;
+})());
 
-Wallet2Wallet createWalletPointer() {
-  final newWptr = wmPtr.createWallet(
+void createWalletPointer() {
+  final newWptr = monero.WalletManager_createWallet(wmPtr,
       path: "", password: "", language: "", networkType: 0);
-  return newWptr;
+
+  wptr = newWptr;
 }
 
-void createWallet(
+void createWalletSync(
     {required String path,
     required String password,
     required String language,
@@ -83,25 +81,32 @@ void createWallet(
     int nettype = 0}) {
   txhistory = null;
   language = getSeedLanguage(language)!;
-  final newW = wmPtr.createWallet(
+  final newWptr = monero.WalletManager_createWallet(wmPtr,
       path: path, password: password, language: language, networkType: 0);
 
-  int status = newW.status();
+  int status = monero.Wallet_status(newWptr);
   if (status != 0) {
-    throw WalletCreationException(message: newW.errorString());
+    throw WalletCreationException(message: monero.Wallet_errorString(newWptr));
   }
 
-  setupBackgroundSync(password, newW);
+  monero.Wallet_setupBackgroundSync(newWptr, backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
+  status = monero.Wallet_status(newWptr);
+  if (status != 0) {
+    throw WalletCreationException(message: monero.Wallet_errorString(newWptr));
+  }
 
-  currentWallet = newW;
-  currentWallet!.setCacheAttribute(key: "cakewallet.passphrase", value: passphrase);
-  currentWallet!.store(path: path);
-  openedWalletsByPath[path] = currentWallet!;
+  wptr = newWptr;
+  monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.passphrase", value: passphrase);
+  monero.Wallet_store(wptr!, path: path);
+  openedWalletsByPath[path] = wptr!;
   _lastOpenedWallet = path;
+
+  // is the line below needed?
+  // setupNodeSync(address: "node.moneroworld.com:18089");
 }
 
-bool isWalletExist({required String path}) {
-  return wmPtr.walletExists(path);
+bool isWalletExistSync({required String path}) {
+  return monero.WalletManager_walletExists(wmPtr, path);
 }
 
 void restoreWalletFromSeedSync(
@@ -112,7 +117,8 @@ void restoreWalletFromSeedSync(
     int nettype = 0,
     int restoreHeight = 0}) {
   txhistory = null;
-  final newW = wmPtr.recoveryWallet(
+  final newWptr = monero.WalletManager_recoveryWallet(
+    wmPtr,
     path: path,
     password: password,
     mnemonic: seed,
@@ -121,10 +127,10 @@ void restoreWalletFromSeedSync(
     networkType: 0,
   );
 
-  final status = newW.status();
+  final status = monero.Wallet_status(newWptr);
 
   if (status != 0) {
-    final error = newW.errorString();
+    final error = monero.Wallet_errorString(newWptr);
     if (error.contains('word list failed verification')) {
       throw WalletRestoreFromSeedException(
         message: "Seed verification failed, please make sure you entered the correct seed with the correct words order",
@@ -132,20 +138,19 @@ void restoreWalletFromSeedSync(
     }
     throw WalletRestoreFromSeedException(message: error);
   }
-  currentWallet = newW;
+  wptr = newWptr;
 
   setRefreshFromBlockHeight(height: restoreHeight);
-  setupBackgroundSync(password, newW);
 
-  currentWallet!.setCacheAttribute(key: "cakewallet.passphrase", value: passphrase);
+  monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.passphrase", value: passphrase);
 
-  openedWalletsByPath[path] = currentWallet!;
+  openedWalletsByPath[path] = wptr!;
 
-  currentWallet!.store(path: path);
+  monero.Wallet_store(wptr!);
   _lastOpenedWallet = path;
 }
 
-void restoreWalletFromKeys(
+void restoreWalletFromKeysSync(
     {required String path,
     required String password,
     required String language,
@@ -155,8 +160,8 @@ void restoreWalletFromKeys(
     int nettype = 0,
     int restoreHeight = 0}) {
   txhistory = null;
-  var newW = (spendKey != "")
-      ? wmPtr.createDeterministicWalletFromSpendKey(
+  var newWptr = (spendKey != "")
+      ? monero.WalletManager_createDeterministicWalletFromSpendKey(wmPtr,
           path: path,
           password: password,
           language: language,
@@ -164,7 +169,8 @@ void restoreWalletFromKeys(
           newWallet: true,
           // TODO(mrcyjanek): safe to remove
           restoreHeight: restoreHeight)
-      : wmPtr.createWalletFromKeys(
+      : monero.WalletManager_createWalletFromKeys(
+          wmPtr,
           path: path,
           password: password,
           restoreHeight: restoreHeight,
@@ -174,21 +180,29 @@ void restoreWalletFromKeys(
           nettype: 0,
         );
 
-  int status = newW.status();
+  int status = monero.Wallet_status(newWptr);
   if (status != 0) {
     throw WalletRestoreFromKeysException(
-        message: newW.errorString());
+        message: monero.Wallet_errorString(newWptr));
+  }
+
+  
+  monero.Wallet_setupBackgroundSync(newWptr, backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
+  status = monero.Wallet_status(newWptr);
+  if (status != 0) {
+    throw WalletCreationException(message: monero.Wallet_errorString(newWptr));
   }
 
   // CW-712 - Try to restore deterministic wallet first, if the view key doesn't
   // match the view key provided
   if (spendKey != "") {
-    final viewKeyRestored = newW.secretViewKey();
+    final viewKeyRestored = monero.Wallet_secretViewKey(newWptr);
     if (viewKey != viewKeyRestored && viewKey != "") {
-      wmPtr.closeWallet(newW, false);
+      monero.WalletManager_closeWallet(wmPtr, newWptr, false);
       File(path).deleteSync();
       File(path + ".keys").deleteSync();
-      newW = wmPtr.createWalletFromKeys(
+      newWptr = monero.WalletManager_createWalletFromKeys(
+        wmPtr,
         path: path,
         password: password,
         restoreHeight: restoreHeight,
@@ -197,19 +211,23 @@ void restoreWalletFromKeys(
         spendKeyString: spendKey,
         nettype: 0,
       );
-      int status = newW.status();
+      int status = monero.Wallet_status(newWptr);
       if (status != 0) {
         throw WalletRestoreFromKeysException(
-            message: newW.errorString());
+            message: monero.Wallet_errorString(newWptr));
+      }
+        
+      monero.Wallet_setupBackgroundSync(newWptr, backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
+      status = monero.Wallet_status(newWptr);
+      if (status != 0) {
+        throw WalletCreationException(message: monero.Wallet_errorString(newWptr));
       }
-
-      setupBackgroundSync(password, newW);
     }
   }
 
-  currentWallet = newW;
+  wptr = newWptr;
 
-  openedWalletsByPath[path] = currentWallet!;
+  openedWalletsByPath[path] = wptr!;
   _lastOpenedWallet = path;
 }
 
@@ -224,7 +242,8 @@ void restoreWalletFromPolyseedWithOffset(
     int nettype = 0}) {
 
   txhistory = null;
-  final newW = wmPtr.createWalletFromPolyseed(
+  final newWptr = monero.WalletManager_createWalletFromPolyseed(
+    wmPtr,
     path: path,
     password: password,
     networkType: nettype,
@@ -235,24 +254,28 @@ void restoreWalletFromPolyseedWithOffset(
     kdfRounds: 1,
   );
 
-  int status = newW.status();
+  int status = monero.Wallet_status(newWptr);
 
   if (status != 0) {
-    final err = newW.errorString();
+    final err = monero.Wallet_errorString(newWptr);
     printV("err: $err");
     throw WalletRestoreFromKeysException(message: err);
   }
 
-  currentWallet = newW;
+  wptr = newWptr;
 
-  currentWallet!.setCacheAttribute(key: "cakewallet.seed", value: seed);
-  currentWallet!.setCacheAttribute(key: "cakewallet.passphrase", value: seedOffset);
-  currentWallet!.store(path: path);
-
-  setupBackgroundSync(password, currentWallet!);
+  monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.seed", value: seed);
+  monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.passphrase", value: seedOffset);
+  monero.Wallet_store(wptr!);
+    
+  monero.Wallet_setupBackgroundSync(newWptr, backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
+  status = monero.Wallet_status(newWptr);
+  if (status != 0) {
+    throw WalletCreationException(message: monero.Wallet_errorString(newWptr));
+  }
   storeSync();
 
-  openedWalletsByPath[path] = currentWallet!;
+  openedWalletsByPath[path] = wptr!;
 }
 
 
@@ -277,7 +300,8 @@ void restoreWalletFromSpendKeySync(
   // );
 
   txhistory = null;
-  final newW = wmPtr.createDeterministicWalletFromSpendKey(
+  final newWptr = monero.WalletManager_createDeterministicWalletFromSpendKey(
+    wmPtr,
     path: path,
     password: password,
     language: language,
@@ -286,23 +310,27 @@ void restoreWalletFromSpendKeySync(
     restoreHeight: restoreHeight,
   );
 
-  int status = newW.status();
+  int status = monero.Wallet_status(newWptr);
 
   if (status != 0) {
-    final err = newW.errorString();
+    final err = monero.Wallet_errorString(newWptr);
     printV("err: $err");
     throw WalletRestoreFromKeysException(message: err);
   }
 
-  currentWallet = newW;
+  wptr = newWptr;
 
-  currentWallet!.setCacheAttribute(key: "cakewallet.seed", value: seed);
+  monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.seed", value: seed);
 
   storeSync();
+  
+  monero.Wallet_setupBackgroundSync(newWptr, backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
+  status = monero.Wallet_status(newWptr);
+  if (status != 0) {
+    throw WalletCreationException(message: monero.Wallet_errorString(newWptr));
+  }
 
-  setupBackgroundSync(password, currentWallet!);
-
-  openedWalletsByPath[path] = currentWallet!;
+  openedWalletsByPath[path] = wptr!;
   _lastOpenedWallet = path;
 }
 
@@ -315,42 +343,48 @@ Future<void> restoreWalletFromHardwareWallet(
     int nettype = 0,
     int restoreHeight = 0}) async {
   txhistory = null;
-  final wmPtr = MoneroWalletManagerFactory().getWalletManager().ffiAddress();
+
   final newWptrAddr = await Isolate.run(() {
-    return monero.WalletManager_createWalletFromDevice(Pointer.fromAddress(wmPtr),
+    return monero.WalletManager_createWalletFromDevice(wmPtr,
             path: path,
             password: password,
             restoreHeight: restoreHeight,
             deviceName: deviceName)
         .address;
   });
-  final newW = MoneroWallet(Pointer.fromAddress(newWptrAddr));
+  final newWptr = Pointer<Void>.fromAddress(newWptrAddr);
 
-  final status = newW.status();
+  final status = monero.Wallet_status(newWptr);
 
   if (status != 0) {
-    final error = newW.errorString();
+    final error = monero.Wallet_errorString(newWptr);
     throw WalletRestoreFromSeedException(message: error);
   }
 
-  currentWallet = newW;
-  currentWallet!.store(path: path);
+  // TODO: Check with upstream if we can use background sync here
+  // monero.Wallet_setupBackgroundSync(newWptr, backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
+  // status = monero.Wallet_status(newWptr);
+  // if (status != 0) {
+  //   throw WalletCreationException(message: monero.Wallet_errorString(newWptr));
+  // }
+
+  wptr = newWptr;
   _lastOpenedWallet = path;
-  openedWalletsByPath[path] = currentWallet!;
+  openedWalletsByPath[path] = wptr!;
 }
 
-Map<String, Wallet2Wallet> openedWalletsByPath = {};
+Map<String, monero.wallet> openedWalletsByPath = {};
 
 Future<void> loadWallet(
     {required String path, required String password, int nettype = 0}) async {
   if (openedWalletsByPath[path] != null) {
     txhistory = null;
-    currentWallet = openedWalletsByPath[path]!;
+    wptr = openedWalletsByPath[path]!;
     return;
   }
-  if (currentWallet == null || path != _lastOpenedWallet) {
-    if (currentWallet != null) {
-      final addr = currentWallet!.ffiAddress();
+  if (wptr == null || path != _lastOpenedWallet) {
+    if (wptr != null) {
+      final addr = wptr!.address;
       Isolate.run(() {
         monero.Wallet_store(Pointer.fromAddress(addr));
       });
@@ -361,24 +395,19 @@ Future<void> loadWallet(
     /// 0: Software Wallet
     /// 1: Ledger
     /// 2: Trezor
-    var deviceType = 0;
+    late final deviceType;
 
     if (Platform.isAndroid || Platform.isIOS) {
-      deviceType = wmPtr.queryWalletDevice( 
+      deviceType = monero.WalletManager_queryWalletDevice(
+        wmPtr,
         keysFileName: "$path.keys",
         password: password,
         kdfRounds: 1,
       );
-      final status = wmPtr.errorString();
+      final status = monero.WalletManager_errorString(wmPtr);
       if (status != "") {
         printV("loadWallet:"+status);
-        // This is most likely closeWallet call leaking error. This is fine.
-        if (status.contains("failed to save file")) {
-          printV("loadWallet: error leaked: $status");
-          deviceType = 0;
-        } else {
-          throw WalletOpeningException(message: status);
-        }
+        throw WalletOpeningException(message: status);
       }
     } else {
       deviceType = 0;
@@ -388,45 +417,100 @@ Future<void> loadWallet(
       if (gLedger == null) {
        throw Exception("Tried to open a ledger wallet with no ledger connected");
       }
-      enableLedgerExchange(gLedger!);
+      final dummyWPtr = wptr ??
+          monero.WalletManager_openWallet(wmPtr, path: '', password: '');
+      enableLedgerExchange(dummyWPtr, gLedger!);
     }
 
-    final addr = wmPtr.ffiAddress();
+    final addr = wmPtr.address;
     final newWptrAddr = await Isolate.run(() {
       return monero.WalletManager_openWallet(Pointer.fromAddress(addr),
               path: path, password: password)
           .address;
     });
 
-    final newW = MoneroWallet(Pointer.fromAddress(newWptrAddr));
+    final newWptr = Pointer<Void>.fromAddress(newWptrAddr);
 
-    int status = newW.status();
+    int status = monero.Wallet_status(newWptr);
     if (status != 0) {
-      final err = newW.errorString();
+      final err = monero.Wallet_errorString(newWptr);
       printV("loadWallet:"+err);
       throw WalletOpeningException(message: err);
     }
-    if (deviceType == 0) {
-      setupBackgroundSync(password, newW);
+    monero.Wallet_setupBackgroundSync(newWptr, backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
+    status = monero.Wallet_status(newWptr);
+    if (status != 0) {
+      final err = monero.Wallet_errorString(newWptr);
+      printV("loadWallet:"+err);
+      throw WalletOpeningException(message: err);
     }
 
-    currentWallet = newW;
+    wptr = newWptr;
     _lastOpenedWallet = path;
-    openedWalletsByPath[path] = currentWallet!;
+    openedWalletsByPath[path] = wptr!;
   }
 }
 
-void setupBackgroundSync(String password, Wallet2Wallet wallet) {
-  if (isViewOnlyBySpendKey(wallet)) {
-    return;
-  }
-  wallet.setupBackgroundSync(backgroundSyncType: 2, walletPassword: password, backgroundCachePassword: '');
-  if (wallet.status() != 0) {
-    // We simply ignore the error.
-    printV("setupBackgroundSync: ${wallet.errorString()}");
-  }
+void _createWallet(Map<String, dynamic> args) {
+  final path = args['path'] as String;
+  final password = args['password'] as String;
+  final language = args['language'] as String;
+  final passphrase = args['passphrase'] as String;
+
+  createWalletSync(path: path, password: password, language: language, passphrase: passphrase);
 }
 
+void _restoreFromSeed(Map<String, dynamic> args) {
+  final path = args['path'] as String;
+  final password = args['password'] as String;
+  final passphrase = args['passphrase'] as String;
+  final seed = args['seed'] as String;
+  final restoreHeight = args['restoreHeight'] as int;
+
+  return restoreWalletFromSeedSync(
+      path: path, password: password, passphrase: passphrase, seed: seed, restoreHeight: restoreHeight);
+}
+
+void _restoreFromKeys(Map<String, dynamic> args) {
+  final path = args['path'] as String;
+  final password = args['password'] as String;
+  final language = args['language'] as String;
+  final restoreHeight = args['restoreHeight'] as int;
+  final address = args['address'] as String;
+  final viewKey = args['viewKey'] as String;
+  final spendKey = args['spendKey'] as String;
+
+  restoreWalletFromKeysSync(
+      path: path,
+      password: password,
+      language: language,
+      restoreHeight: restoreHeight,
+      address: address,
+      viewKey: viewKey,
+      spendKey: spendKey);
+}
+
+void _restoreFromSpendKey(Map<String, dynamic> args) {
+  final path = args['path'] as String;
+  final password = args['password'] as String;
+  final seed = args['seed'] as String;
+  final language = args['language'] as String;
+  final spendKey = args['spendKey'] as String;
+  final restoreHeight = args['restoreHeight'] as int;
+
+  restoreWalletFromSpendKeySync(
+      path: path,
+      password: password,
+      seed: seed,
+      language: language,
+      restoreHeight: restoreHeight,
+      spendKey: spendKey);
+}
+
+Future<void> _openWallet(Map<String, String> args) async => loadWallet(
+    path: args['path'] as String, password: args['password'] as String);
+
+bool _isWalletExist(String path) => isWalletExistSync(path: path);
 
 Future<void> openWallet(
         {required String path,
@@ -434,4 +518,77 @@ Future<void> openWallet(
         int nettype = 0}) async =>
     loadWallet(path: path, password: password, nettype: nettype);
 
-bool isViewOnlyBySpendKey(Wallet2Wallet? wallet) => int.tryParse((wallet??currentWallet!).secretSpendKey()) == 0;
+Future<void> openWalletAsync(Map<String, String> args) async =>
+    _openWallet(args);
+
+Future<void> createWallet(
+        {required String path,
+        required String password,
+        required String language,
+        required String passphrase,
+        int nettype = 0}) async =>
+    _createWallet({
+      'path': path,
+      'password': password,
+      'language': language,
+      'passphrase': passphrase,
+      'nettype': nettype
+    });
+
+void restoreFromSeed(
+        {required String path,
+        required String password,
+        required String passphrase,
+        required String seed,
+        int nettype = 0,
+        int restoreHeight = 0}) =>
+    _restoreFromSeed({
+      'path': path,
+      'password': password,
+      'passphrase': passphrase,
+      'seed': seed,
+      'nettype': nettype,
+      'restoreHeight': restoreHeight
+    });
+
+Future<void> restoreFromKeys(
+        {required String path,
+        required String password,
+        required String language,
+        required String address,
+        required String viewKey,
+        required String spendKey,
+        int nettype = 0,
+        int restoreHeight = 0}) async =>
+    _restoreFromKeys({
+      'path': path,
+      'password': password,
+      'language': language,
+      'address': address,
+      'viewKey': viewKey,
+      'spendKey': spendKey,
+      'nettype': nettype,
+      'restoreHeight': restoreHeight
+    });
+
+Future<void> restoreFromSpendKey(
+        {required String path,
+        required String password,
+        required String seed,
+        required String language,
+        required String spendKey,
+        int nettype = 0,
+        int restoreHeight = 0}) async =>
+    _restoreFromSpendKey({
+      'path': path,
+      'password': password,
+      'seed': seed,
+      'language': language,
+      'spendKey': spendKey,
+      'nettype': nettype,
+      'restoreHeight': restoreHeight
+    });
+
+bool isWalletExist({required String path}) => _isWalletExist(path);
+
+bool isViewOnlyBySpendKey() => int.tryParse(monero.Wallet_secretSpendKey(wptr!)) == 0;
diff --git a/cw_monero/lib/bip39_seed.dart b/cw_monero/lib/bip39_seed.dart
deleted file mode 100644
index 338516e66..000000000
--- a/cw_monero/lib/bip39_seed.dart
+++ /dev/null
@@ -1,59 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:bip32/bip32.dart' as bip32;
-import 'package:bip39/bip39.dart' as bip39;
-import 'package:polyseed/polyseed.dart';
-
-bool isBip39Seed(String mnemonic) => bip39.validateMnemonic(mnemonic);
-
-String getBip39Seed() => bip39.generateMnemonic();
-
-String getLegacySeedFromBip39(String mnemonic,
-  {int accountIndex = 0, String passphrase = ""}) {
-  final seed = bip39.mnemonicToSeed(mnemonic, passphrase: passphrase);
-
-  final bip32KeyPair =
-      bip32.BIP32.fromSeed(seed).derivePath("m/44'/128'/$accountIndex'/0/0");
-
-  final spendKey = _reduceECKey(bip32KeyPair.privateKey!);
-
-  return LegacySeedLang.getByEnglishName("English")
-      .encodePhrase(spendKey.toHexString());
-}
-
-const _ed25519CurveOrder =
-    "1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED";
-
-Uint8List _reduceECKey(Uint8List buffer) {
-  final curveOrder = BigInt.parse(_ed25519CurveOrder, radix: 16);
-  final bigNumber = _readBytes(buffer);
-
-  var result = bigNumber % curveOrder;
-
-  final resultBuffer = Uint8List(32);
-  for (var i = 0; i < 32; i++) {
-    resultBuffer[i] = (result & BigInt.from(0xff)).toInt();
-    result = result >> 8;
-  }
-
-  return resultBuffer;
-}
-
-/// Read BigInt from a little-endian Uint8List
-/// From https://github.com/dart-lang/sdk/issues/32803#issuecomment-387405784
-BigInt _readBytes(Uint8List bytes) {
-  BigInt read(int start, int end) {
-    if (end - start <= 4) {
-      var result = 0;
-      for (int i = end - 1; i >= start; i--) {
-        result = result * 256 + bytes[i];
-      }
-      return BigInt.from(result);
-    }
-    final mid = start + ((end - start) >> 1);
-    return read(start, mid) +
-        read(mid, end) * (BigInt.one << ((mid - start) * 8));
-  }
-
-  return read(0, bytes.length);
-}
diff --git a/cw_monero/lib/ledger.dart b/cw_monero/lib/ledger.dart
index 6e32d4d68..219d45bb5 100644
--- a/cw_monero/lib/ledger.dart
+++ b/cw_monero/lib/ledger.dart
@@ -2,50 +2,75 @@ import 'dart:async';
 import 'dart:ffi';
 import 'dart:typed_data';
 
+import 'package:collection/collection.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:ffi/ffi.dart';
-import 'package:flutter/foundation.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus_dart.dart';
-import 'package:monero/src/monero.dart' as api;
+import 'package:monero/monero.dart' as monero;
 
 LedgerConnection? gLedger;
-String? latestLedgerCommand;
 
-typedef LedgerCallback = Void Function(Pointer<UnsignedChar>, UnsignedInt);
-NativeCallable<LedgerCallback>? callable;
+Timer? _ledgerExchangeTimer;
+Timer? _ledgerKeepAlive;
 
-void enableLedgerExchange(LedgerConnection connection) {
-  callable?.close();
+void enableLedgerExchange(monero.wallet ptr, LedgerConnection connection) {
+  _ledgerExchangeTimer?.cancel();
+  _ledgerExchangeTimer = Timer.periodic(Duration(milliseconds: 1), (_) async {
+    final ledgerRequestLength = monero.Wallet_getSendToDeviceLength(ptr);
+    final ledgerRequest = monero.Wallet_getSendToDevice(ptr)
+        .cast<Uint8>()
+        .asTypedList(ledgerRequestLength);
+    if (ledgerRequestLength > 0) {
+      _ledgerKeepAlive?.cancel();
 
-  void callback(Pointer<UnsignedChar> request, int requestLength) async {
-    final ledgerRequest = request.cast<Uint8>().asTypedList(requestLength);
+      final Pointer<Uint8> emptyPointer = malloc<Uint8>(0);
+      monero.Wallet_setDeviceSendData(
+          ptr, emptyPointer.cast<UnsignedChar>(), 0);
+      malloc.free(emptyPointer);
 
-    _logLedgerCommand(ledgerRequest, false);
-    final response = await exchange(connection, ledgerRequest);
-    _logLedgerCommand(response, true);
+      _logLedgerCommand(ledgerRequest, false);
+      final response = await exchange(connection, ledgerRequest);
+      _logLedgerCommand(response, true);
 
-    final Pointer<Uint8> result = malloc<Uint8>(response.length);
-    for (var i = 0; i < response.length; i++) {
-      result.asTypedList(response.length)[i] = response[i];
+      if (ListEquality().equals(response, [0x55, 0x15])) {
+        await connection.disconnect();
+        //   // TODO: Show POPUP pls unlock your device
+        // await Future.delayed(Duration(seconds: 15));
+      //   response = await exchange(connection, ledgerRequest);
+      }
+
+      final Pointer<Uint8> result = malloc<Uint8>(response.length);
+      for (var i = 0; i < response.length; i++) {
+        result.asTypedList(response.length)[i] = response[i];
+      }
+
+      monero.Wallet_setDeviceReceivedData(
+          ptr, result.cast<UnsignedChar>(), response.length);
+      malloc.free(result);
+      keepAlive(connection);
     }
+  });
+}
 
-    latestLedgerCommand = _ledgerMoneroCommands[ledgerRequest[1]];
-
-    api.MoneroWallet.setDeviceReceivedData(
-         result.cast<UnsignedChar>(), response.length);
-    api.MoneroFree().free(result.cast());
+void keepAlive(LedgerConnection connection) {
+  if (connection.connectionType == ConnectionType.ble) {
+    _ledgerKeepAlive = Timer.periodic(Duration(seconds: 10), (_) async {
+      UniversalBle.setNotifiable(
+        connection.device.id,
+        connection.device.deviceInfo.serviceId,
+        connection.device.deviceInfo.notifyCharacteristicKey,
+        BleInputProperty.notification,
+      ).onError((_, __) async {});
+    });
   }
-
-  callable = NativeCallable<LedgerCallback>.listener(callback);
-  api.MoneroWallet.setLedgerCallback(callable!.nativeFunction);
 }
 
 void disableLedgerExchange() {
-  callable?.close();
+  _ledgerExchangeTimer?.cancel();
+  _ledgerKeepAlive?.cancel();
   gLedger?.disconnect();
   gLedger = null;
-  latestLedgerCommand = null;
 }
 
 Future<Uint8List> exchange(LedgerConnection connection, Uint8List data) async =>
@@ -110,6 +135,8 @@ void _logLedgerCommand(Uint8List command, [bool isResponse = true]) {
   String toHexString(Uint8List data) =>
       data.map((e) => e.toRadixString(16).padLeft(2, '0')).join();
 
+
+
   if (isResponse) {
     printV("< ${toHexString(command)}");
   } else {
diff --git a/cw_monero/lib/monero_account_list.dart b/cw_monero/lib/monero_account_list.dart
index 4190a4a1e..aa23e276f 100644
--- a/cw_monero/lib/monero_account_list.dart
+++ b/cw_monero/lib/monero_account_list.dart
@@ -1,10 +1,9 @@
 import 'package:cw_core/monero_amount_format.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_monero/api/wallet_manager.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/account.dart';
 import 'package:cw_monero/api/account_list.dart' as account_list;
-import 'package:monero/src/monero.dart';
+import 'package:monero/monero.dart' as monero;
 
 part 'monero_account_list.g.dart';
 
@@ -45,37 +44,23 @@ abstract class MoneroAccountListBase with Store {
     }
   }
 
-  static Map<int, List<Account>> cachedAccounts = {};
-  
-  List<Account> getAll() {
-    final allAccounts = account_list.getAllAccount();
-    final currentCount = allAccounts.length;
-    cachedAccounts[account_list.currentWallet!.ffiAddress()] ??= [];
-    
-    if (cachedAccounts[account_list.currentWallet!.ffiAddress()]!.length == currentCount) {
-      return cachedAccounts[account_list.currentWallet!.ffiAddress()]!;
-    }
-    
-    cachedAccounts[account_list.currentWallet!.ffiAddress()] = allAccounts.map((accountRow) {
-        final balance = accountRow.getUnlockedBalance();
+  List<Account> getAll() => account_list.getAllAccount().map((accountRow) {
+        final balance = monero.SubaddressAccountRow_getUnlockedBalance(accountRow);
 
         return Account(
-          id: accountRow.getRowId(),
-          label: accountRow.getLabel(),
-          balance: moneroAmountToString(amount: account_list.currentWallet!.amountFromString(balance)),
+          id: monero.SubaddressAccountRow_getRowId(accountRow),
+          label: monero.SubaddressAccountRow_getLabel(accountRow),
+          balance: moneroAmountToString(amount: monero.Wallet_amountFromString(balance)),
         );
       }).toList();
-    
-    return cachedAccounts[account_list.currentWallet!.ffiAddress()]!;
-  }
 
-  void addAccount({required String label}) {
-    account_list.addAccount(label: label);
+  Future<void> addAccount({required String label}) async {
+    await account_list.addAccount(label: label);
     update();
   }
 
-  void setLabelAccount({required int accountIndex, required String label}) {
-    account_list.setLabelForAccount(accountIndex: accountIndex, label: label);
+  Future<void> setLabelAccount({required int accountIndex, required String label}) async {
+    await account_list.setLabelForAccount(accountIndex: accountIndex, label: label);
     update();
   }
 
diff --git a/cw_monero/lib/monero_unspent.dart b/cw_monero/lib/monero_unspent.dart
index a88b98323..8a104edf4 100644
--- a/cw_monero/lib/monero_unspent.dart
+++ b/cw_monero/lib/monero_unspent.dart
@@ -1,50 +1,34 @@
 import 'package:cw_core/unspent_transaction_output.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_monero/api/coins_info.dart';
-import 'package:monero/src/monero.dart';
+import 'package:monero/monero.dart' as monero;
 
 class MoneroUnspent extends Unspent {
-  static Future<MoneroUnspent> fromUnspent(String address, String hash, String keyImage, int value, bool isFrozen, bool isUnlocked) async {
-    return MoneroUnspent(
-        address: address,
-        hash: hash,
-        keyImage: keyImage,
-        value: value,
-        isFrozen: isFrozen,
-        isUnlocked: isUnlocked);
-  }
-
   MoneroUnspent(
-      {required String address,
-      required String hash,
-      required String keyImage,
-      required int value,
-      required bool isFrozen,
-      required this.isUnlocked})
+      String address, String hash, String keyImage, int value, bool isFrozen, this.isUnlocked)
       : super(address, hash, value, 0, keyImage) {
-    _frozen = isFrozen;
   }
 
-  bool _frozen = false;
-
   @override
   set isFrozen(bool freeze) {
-    _frozen = freeze;
     printV("set isFrozen: $freeze ($keyImage): $freeze");
-    getCoinByKeyImage(keyImage!).then((coinId) async {
-      if (coinId == null) return;
-      if (freeze) {
-        await freezeCoin(coinId);
-        _frozen = true;
-      } else {
-        await thawCoin(coinId);
-        _frozen = false;
-      }
-    });
+    final coinId = getCoinByKeyImage(keyImage!);
+    if (coinId == null) throw Exception("Unable to find a coin for address $address");
+    if (freeze) {
+      freezeCoin(coinId);
+    } else {
+      thawCoin(coinId);
+    }
   }
 
   @override
-  bool get isFrozen => _frozen;
+  bool get isFrozen {
+    printV("get isFrozen");
+    final coinId = getCoinByKeyImage(keyImage!);
+    if (coinId == null) throw Exception("Unable to find a coin for address $address");
+    final coin = getCoin(coinId);
+    return monero.CoinsInfo_frozen(coin);
+  }
 
   final bool isUnlocked;
 }
diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
index 9a8cb70b4..db4d30ee8 100644
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@@ -3,7 +3,6 @@ import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:cw_core/monero_amount_format.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/account.dart';
@@ -17,7 +16,6 @@ import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/sync_status.dart';
 import 'package:cw_core/transaction_direction.dart';
 import 'package:cw_core/unspent_coins_info.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
@@ -35,7 +33,6 @@ import 'package:cw_monero/monero_transaction_history.dart';
 import 'package:cw_monero/monero_transaction_info.dart';
 import 'package:cw_monero/monero_unspent.dart';
 import 'package:cw_monero/monero_wallet_addresses.dart';
-import 'package:cw_monero/monero_wallet_service.dart';
 import 'package:cw_monero/pending_monero_transaction.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
@@ -86,7 +83,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
                 monero_wallet.getUnlockedBalance(accountIndex: account.id))
       });
       _updateSubAddress(isEnabledAutoGenerateSubaddress, account: account);
-      unawaited(updateTransactions());
+      _askForUpdateTransactionHistory();
     });
 
     reaction((_) => isEnabledAutoGenerateSubaddress, (bool enabled) {
@@ -141,7 +138,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       passphrase: monero_wallet.getPassphrase());
 
   int? get restoreHeight =>
-      transactionHistory.transactions.values.firstOrNull?.height ?? currentWallet?.getRefreshFromBlockHeight();
+      transactionHistory.transactions.values.firstOrNull?.height ?? monero.Wallet_getRefreshFromBlockHeight(wptr!);
 
   monero_wallet.SyncListener? _listener;
   ReactionDisposer? _onAccountChangeReaction;
@@ -171,7 +168,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       if (monero_wallet.getCurrentHeight() <= 1) {
         monero_wallet.setRefreshFromBlockHeight(
             height: walletInfo.restoreHeight);
-        setupBackgroundSync(password, currentWallet!);
       }
     }
 
@@ -191,11 +187,14 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       final currentWalletDirPath = await pathForWalletDir(name: name, type: type);
       if (openedWalletsByPath["$currentWalletDirPath/$name"] != null) {
         printV("closing wallet");
-        final wmaddr = wmPtr.ffiAddress();
-        final waddr = openedWalletsByPath["$currentWalletDirPath/$name"]!.ffiAddress();
+        final wmaddr = wmPtr.address;
+        final waddr = openedWalletsByPath["$currentWalletDirPath/$name"]!.address;
+        await Isolate.run(() {
+          monero.WalletManager_closeWallet(
+              Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
+        });
         openedWalletsByPath.remove("$currentWalletDirPath/$name");
-        closeWalletAwaitIfShould(wmaddr, waddr);
-        currentWallet = null;
+        wptr = null;
         printV("wallet closed");
       }
     }
@@ -208,24 +207,16 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
   @override
   Future<void> connectToNode({required Node node}) async {
-    String socksProxy = node.socksProxyAddress ?? '';
-    printV("bootstrapped: ${CakeTor.instance.bootstrapped}");
-    printV("     enabled: ${CakeTor.instance.enabled}");
-    printV("        port: ${CakeTor.instance.port}");
-    printV("     started: ${CakeTor.instance.started}");
-    if (CakeTor.instance.enabled) {
-      socksProxy = "127.0.0.1:${CakeTor.instance.port}";
-    }
     try {
       syncStatus = ConnectingSyncStatus();
-      await monero_wallet.setupNodeSync(
+      await monero_wallet.setupNode(
           address: node.uri.toString(),
           login: node.login,
           password: node.password,
           useSSL: node.isSSL,
           isLightWallet: false,
           // FIXME: hardcoded value
-          socksProxyAddress: socksProxy);
+          socksProxyAddress: node.socksProxyAddress);
 
       await monero_wallet.setTrustedDaemon(node.trusted);
       syncStatus = ConnectedSyncStatus();
@@ -242,14 +233,18 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       return;
     }
     isBackgroundSyncRunning = true;
+    int status = monero.Wallet_status(wptr!);
+    if (status != 0) {
+      final err = monero.Wallet_errorString(wptr!);
+      throw Exception("unable to setup background sync: $err");
+    }
     await save();
 
-    currentWallet!.startBackgroundSync();
-    final status = currentWallet!.status();
+    monero.Wallet_startBackgroundSync(wptr!);
+    status = monero.Wallet_status(wptr!);
     if (status != 0) {
-      final err = currentWallet!.errorString();
-      isBackgroundSyncRunning = false;
-      printV("startBackgroundSync: $err");
+      final err = monero.Wallet_errorString(wptr!);
+      throw Exception("unable to start background sync: $err");
     }
     await save();
     await init();
@@ -263,12 +258,11 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
   Future<void> stopSync() async {
     if (isBackgroundSyncRunning) {
       printV("Stopping background sync");
-      currentWallet!.store();
-      currentWallet!.stopBackgroundSync('');
-      currentWallet!.store();
+      await save();
+      monero.Wallet_stopBackgroundSync(wptr!, '');
+      await save();
       isBackgroundSyncRunning = false;
     }
-    await save();
   }
 
   @action
@@ -276,9 +270,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
   Future<void> stopBackgroundSync(String password) async {
     if (isBackgroundSyncRunning) {
       printV("Stopping background sync");
-      currentWallet!.store();
-      currentWallet!.stopBackgroundSync(password);
-      currentWallet!.store();
+      await save();
+      monero.Wallet_stopBackgroundSync(wptr!, password);
+      await save();
       isBackgroundSyncRunning = false;
     }
   }
@@ -315,44 +309,44 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
   }
 
   Future<bool> submitTransactionUR(String ur) async {
-    final retStatus = currentWallet!.submitTransactionUR(ur);
-    final status = currentWallet!.status();
+    final retStatus = monero.Wallet_submitTransactionUR(wptr!, ur);
+    final status = monero.Wallet_status(wptr!);
     if (status != 0) {
-      final err = currentWallet!.errorString();
+      final err = monero.Wallet_errorString(wptr!);
       throw MoneroTransactionCreationException("unable to broadcast signed transaction: $err");
     }
     return retStatus;
   }
 
   bool importKeyImagesUR(String ur) {
-    final retStatus = currentWallet!.importKeyImagesUR(ur);
-    final status = currentWallet!.status();
+    final retStatus = monero.Wallet_importKeyImagesUR(wptr!, ur);
+    final status = monero.Wallet_status(wptr!);
     if (status != 0) {
-      final err = currentWallet!.errorString();
+      final err = monero.Wallet_errorString(wptr!);
       throw Exception("unable to import key images: $err");
     }
     return retStatus;
   }
 
   String exportOutputsUR(bool all) {
-    final str = currentWallet!.exportOutputsUR(all: all);
-    final status = currentWallet!.status();
+    final str = monero.Wallet_exportOutputsUR(wptr!, all: all);
+    final status = monero.Wallet_status(wptr!);
     if (status != 0) {
-      final err = currentWallet!.errorString();
+      final err = monero.Wallet_errorString(wptr!);
       throw MoneroTransactionCreationException("unable to export UR: $err");
     }
     return str;
   }
 
   bool needExportOutputs(int amount) {
-    if (int.tryParse(currentWallet!.secretSpendKey()) != 0) {
+    if (int.tryParse(monero.Wallet_secretSpendKey(wptr!)) != 0) {
       return false;
     }
     // viewOnlyBalance - balance that we can spend
     // TODO(mrcyjanek): remove hasUnknownKeyImages when we cleanup coin control
-    return (currentWallet!.viewOnlyBalance(
+    return (monero.Wallet_viewOnlyBalance(wptr!,
                 accountIndex: walletAddresses.account!.id) < amount) ||
-              currentWallet!.hasUnknownKeyImages();
+              monero.Wallet_hasUnknownKeyImages(wptr!);
   }
 
   @override
@@ -412,7 +406,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
               outputs: moneroOutputs,
               priorityRaw: _credentials.priority.serialize(),
               accountIndex: walletAddresses.account!.id,
-              paymentId: "",
               preferredInputs: inputs);
     } else {
       final output = outputs.first;
@@ -432,18 +425,17 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       if (inputs.isEmpty) MoneroTransactionCreationException(
         'No inputs selected');
       pendingTransactionDescription =
-          await transaction_history.createTransactionSync(
+          await transaction_history.createTransaction(
               address: address!,
               amount: amount,
               priorityRaw: _credentials.priority.serialize(),
               accountIndex: walletAddresses.account!.id,
-              preferredInputs: inputs,
-              paymentId: '');
+              preferredInputs: inputs);
     }
 
     // final status = monero.PendingTransaction_status(pendingTransactionDescription);
 
-    return PendingMoneroTransaction(pendingTransactionDescription, this);
+    return PendingMoneroTransaction(pendingTransactionDescription);
   }
 
   @override
@@ -493,25 +485,14 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     final currentWalletDirPath = await pathForWalletDir(name: name, type: type);
     if (openedWalletsByPath["$currentWalletDirPath/$name"] != null) {
       // NOTE: this is realistically only required on windows.
-      // That's why we await it only on that platform - other platforms actually understand
-      // the concept of a file properly...
       printV("closing wallet");
-      final wmaddr = wmPtr.ffiAddress();
-      final waddr = openedWalletsByPath["$currentWalletDirPath/$name"]!.ffiAddress();
+      final wmaddr = wmPtr.address;
+      final waddr = openedWalletsByPath["$currentWalletDirPath/$name"]!.address;
+      await Isolate.run(() {
+        monero.WalletManager_closeWallet(
+            Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
+      });
       openedWalletsByPath.remove("$currentWalletDirPath/$name");
-      if (Platform.isWindows) {
-        await Isolate.run(() {
-          monero.WalletManager_closeWallet(
-              Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
-          monero.WalletManager_errorString(Pointer.fromAddress(wmaddr));
-        });
-      } else {
-        unawaited(Isolate.run(() {
-          monero.WalletManager_closeWallet(
-              Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
-          monero.WalletManager_errorString(Pointer.fromAddress(wmaddr));
-        }));
-      }
       printV("wallet closed");
     }
     try {
@@ -520,33 +501,28 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
           Directory(await pathForWalletDir(name: name, type: type));
       final newWalletDirPath =
           await pathForWalletDir(name: newWalletName, type: type);
-      
-      // Create new directory if it doesn't exist
-      await Directory(newWalletDirPath).create(recursive: true);
-      
-      // -- use new waller folder to copy files with old names still --
-      final currentWalletPath = currentWalletDir.path + '/$name';
-      
-      final currentCacheFile = File(currentWalletPath);
-      final currentKeysFile = File('$currentWalletPath.keys');
-      final currentAddressListFile = File('$currentWalletPath.address.txt');
-      final backgroundSyncFile = File('$currentWalletPath.background');
+      await currentWalletDir.rename(newWalletDirPath);
+
+      // -- use new waller folder to rename files with old names still --
+      final renamedWalletPath = newWalletDirPath + '/$name';
+
+      final currentCacheFile = File(renamedWalletPath);
+      final currentKeysFile = File('$renamedWalletPath.keys');
+      final currentAddressListFile = File('$renamedWalletPath.address.txt');
+
+      final newWalletPath =
+          await pathForWallet(name: newWalletName, type: type);
 
       if (currentCacheFile.existsSync()) {
-        await currentCacheFile.copy("${newWalletDirPath}/$newWalletName");
+        await currentCacheFile.rename(newWalletPath);
       }
       if (currentKeysFile.existsSync()) {
-        await currentKeysFile.copy("${newWalletDirPath}/$newWalletName.keys");
+        await currentKeysFile.rename('$newWalletPath.keys');
       }
       if (currentAddressListFile.existsSync()) {
-        await currentAddressListFile.copy("${newWalletDirPath}/$newWalletName.address.txt");
-      }
-      if (backgroundSyncFile.existsSync()) {
-        await backgroundSyncFile.copy("${newWalletDirPath}/$newWalletName.background");
+        await currentAddressListFile.rename('$newWalletPath.address.txt');
       }
 
-      await currentWalletDir.delete(recursive: true);
-      
       await backupWalletFiles(newWalletName);
     } catch (e) {
       final currentWalletPath = await pathForWallet(name: name, type: type);
@@ -592,12 +568,11 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     walletInfo.restoreHeight = height;
     walletInfo.isRecovery = true;
     monero_wallet.setRefreshFromBlockHeight(height: height);
-    setupBackgroundSync(password, currentWallet!);
     monero_wallet.rescanBlockchainAsync();
     await startSync();
     _askForUpdateBalance();
     walletAddresses.accountList.update();
-    await updateTransactions();
+    await _askForUpdateTransactionHistory();
     await save();
     await walletInfo.save();
   }
@@ -608,23 +583,22 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
       unspentCoins.clear();
 
-      final coinCount = await countOfCoins();
+      final coinCount = countOfCoins();
       for (var i = 0; i < coinCount; i++) {
-        final coin = await getCoin(i);
-        final coinSpent = coin.spent();
-        if (coinSpent == false && coin.subaddrAccount() == walletAddresses.account!.id) {
-          final unspent = await MoneroUnspent.fromUnspent(
-            coin.address(),
-            coin.hash(),
-            coin.keyImage(),
-            coin.amount(),
-            coin.frozen(),
-            coin.unlocked(),
+        final coin = getCoin(i);
+        final coinSpent = monero.CoinsInfo_spent(coin);
+        if (coinSpent == false && monero.CoinsInfo_subaddrAccount(coin) == walletAddresses.account!.id) {
+          final unspent = MoneroUnspent(
+            monero.CoinsInfo_address(coin),
+            monero.CoinsInfo_hash(coin),
+            monero.CoinsInfo_keyImage(coin),
+            monero.CoinsInfo_amount(coin),
+            monero.CoinsInfo_frozen(coin),
+            monero.CoinsInfo_unlocked(coin),
           );
           // TODO: double-check the logic here
           if (unspent.hash.isNotEmpty) {
-            final tx = await transaction_history.getTransaction(unspent.hash);
-            unspent.isChange = tx.isSpend == true;
+            unspent.isChange = transaction_history.getTransaction(unspent.hash).isSpend == true;
           }
           unspentCoins.add(unspent);
         }
@@ -716,17 +690,14 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
   @override
   Future<Map<String, MoneroTransactionInfo>> fetchTransactions() async {
-    await transaction_history.refreshTransactions();
-    final resp = (await _getAllTransactionsOfAccount(walletAddresses.account?.id))
+    transaction_history.refreshTransactions();
+    return (await _getAllTransactionsOfAccount(walletAddresses.account?.id))
         .fold<Map<String, MoneroTransactionInfo>>(
             <String, MoneroTransactionInfo>{},
             (Map<String, MoneroTransactionInfo> acc, MoneroTransactionInfo tx) {
       acc[tx.id] = tx;
       return acc;
     });
-    // This is needed to update the transaction history when new transaction is made.
-    unawaited(updateTransactions());
-    return resp;
   }
 
   Future<void> updateTransactions() async {
@@ -737,17 +708,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
       _isTransactionUpdating = true;
       final transactions = await fetchTransactions();
-
-      final currentIds = transactionHistory.transactions.keys.toSet();
-      final newIds = transactions.keys.toSet();
-      
-      // Remove transactions that no longer exist
-      currentIds.difference(newIds).forEach((id) => 
-          transactionHistory.transactions.remove(id));
-      
-      // Add or update transactions
-      transactions.forEach((key, tx) => 
-          transactionHistory.transactions[key] = tx);
+      transactionHistory.clear();
+      transactionHistory.addMany(transactions);
       await transactionHistory.save();
       _isTransactionUpdating = false;
     } catch (e) {
@@ -814,7 +776,6 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
     monero_wallet.setRecoveringFromSeed(isRecovery: true);
     monero_wallet.setRefreshFromBlockHeight(height: height);
-    setupBackgroundSync(password, currentWallet!);
   }
 
   int _getHeightDistance(DateTime date) {
@@ -853,6 +814,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     }
   }
 
+  Future<void> _askForUpdateTransactionHistory() async =>
+      await updateTransactions();
+
   int _getUnlockedBalance() => monero_wallet.getUnlockedBalance(
       accountIndex: walletAddresses.account!.id);
 
@@ -871,13 +835,13 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     printV("onNewBlock: $height, $blocksLeft, $ptc");
     try {
       if (walletInfo.isRecovery) {
-        await updateTransactions();
+        await _askForUpdateTransactionHistory();
         _askForUpdateBalance();
         walletAddresses.accountList.update();
       }
 
       if (blocksLeft < 100) {
-        await updateTransactions();
+        await _askForUpdateTransactionHistory();
         _askForUpdateBalance();
         walletAddresses.accountList.update();
         syncStatus = SyncedSyncStatus();
@@ -900,7 +864,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
 
   void _onNewTransaction() async {
     try {
-      await updateTransactions();
+      await _askForUpdateTransactionHistory();
       _askForUpdateBalance();
       await Future<void>.delayed(Duration(seconds: 1));
     } catch (e) {
@@ -936,11 +900,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
   }
 
   void setLedgerConnection(LedgerConnection connection) {
-    enableLedgerExchange(connection);
-  }
-
-  @override
-  String formatCryptoAmount(String amount) {
-    return moneroAmountToString(amount: int.parse(amount));
+    final dummyWPtr = wptr ??
+        monero.WalletManager_openWallet(wmPtr, path: '', password: '');
+    enableLedgerExchange(dummyWPtr, connection);
   }
 }
diff --git a/cw_monero/lib/monero_wallet_addresses.dart b/cw_monero/lib/monero_wallet_addresses.dart
index d0cf87489..14b8a2b9b 100644
--- a/cw_monero/lib/monero_wallet_addresses.dart
+++ b/cw_monero/lib/monero_wallet_addresses.dart
@@ -130,8 +130,8 @@ abstract class MoneroWalletAddressesBase extends WalletAddresses with Store {
     final transactions = _moneroTransactionHistory.transactions.values.toList();
 
     transactions.forEach((element) {
-      final accountIndex = element.additionalInfo['accountIndex'] as int? ?? 0;
-      final addressIndex = element.additionalInfo['addressIndex'] as int? ?? 0;
+      final accountIndex = element.accountIndex;
+      final addressIndex = element.addressIndex;
       usedAddresses.add(getAddress(accountIndex: accountIndex, addressIndex: addressIndex));
     });
   }
diff --git a/cw_monero/lib/monero_wallet_service.dart b/cw_monero/lib/monero_wallet_service.dart
index d2e393213..598d400e5 100644
--- a/cw_monero/lib/monero_wallet_service.dart
+++ b/cw_monero/lib/monero_wallet_service.dart
@@ -1,9 +1,6 @@
-import 'dart:async';
 import 'dart:ffi';
 import 'dart:io';
-import 'dart:isolate';
 
-import 'package:collection/collection.dart';
 import 'package:cw_core/get_height_by_date.dart';
 import 'package:cw_core/monero_wallet_utils.dart';
 import 'package:cw_core/pathForWallet.dart';
@@ -17,39 +14,29 @@ import 'package:cw_core/wallet_type.dart';
 import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/wallet_manager.dart' as monero_wallet_manager;
 import 'package:cw_monero/api/wallet_manager.dart';
-import 'package:cw_monero/bip39_seed.dart';
 import 'package:cw_monero/ledger.dart';
 import 'package:cw_monero/monero_wallet.dart';
+import 'package:collection/collection.dart';
 import 'package:hive/hive.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus.dart';
-import 'package:monero/src/monero.dart' as m;
 import 'package:monero/monero.dart' as monero;
 import 'package:polyseed/polyseed.dart';
 
-enum MoneroSeedType { polyseed, legacy, bip39 }
-
 class MoneroNewWalletCredentials extends WalletCredentials {
   MoneroNewWalletCredentials(
-      {required String name,
-      required this.language,
-      required this.seedType,
-      String? password,
-      this.passphrase,
-      this.mnemonic})
+      {required String name, required this.language, required this.isPolyseed, String? password, this.passphrase})
       : super(name: name, password: password);
 
   final String language;
-  final MoneroSeedType seedType;
+  final bool isPolyseed;
   final String? passphrase;
-  final String? mnemonic;
 }
 
 class MoneroRestoreWalletFromHardwareCredentials extends WalletCredentials {
-  MoneroRestoreWalletFromHardwareCredentials(
-      {required String name,
-      required this.ledgerConnection,
-      int height = 0,
-      String? password})
+  MoneroRestoreWalletFromHardwareCredentials({required String name,
+    required this.ledgerConnection,
+    int height = 0,
+    String? password})
       : super(name: name, password: password, height: height);
   LedgerConnection ledgerConnection;
 }
@@ -73,14 +60,13 @@ class MoneroWalletLoadingException implements Exception {
 }
 
 class MoneroRestoreWalletFromKeysCredentials extends WalletCredentials {
-  MoneroRestoreWalletFromKeysCredentials(
-      {required String name,
-      required String password,
-      required this.language,
-      required this.address,
-      required this.viewKey,
-      required this.spendKey,
-      int height = 0})
+  MoneroRestoreWalletFromKeysCredentials({required String name,
+    required String password,
+    required this.language,
+    required this.address,
+    required this.viewKey,
+    required this.spendKey,
+    int height = 0})
       : super(name: name, password: password, height: height);
 
   final String language;
@@ -89,12 +75,6 @@ class MoneroRestoreWalletFromKeysCredentials extends WalletCredentials {
   final String spendKey;
 }
 
-enum OpenWalletTry {
-  initial,
-  cacheRestored,
-  cacheRemoved,
-}
-
 class MoneroWalletService extends WalletService<
     MoneroNewWalletCredentials,
     MoneroRestoreWalletFromSeedCredentials,
@@ -111,42 +91,27 @@ class MoneroWalletService extends WalletService<
   @override
   WalletType getType() => WalletType.monero;
 
-  @override
-  Future<MoneroWallet> create(MoneroNewWalletCredentials credentials,
-      {bool? isTestnet}) async {
+  @override 
+  Future<MoneroWallet> create(MoneroNewWalletCredentials credentials, {bool? isTestnet}) async {
     try {
       final path = await pathForWallet(name: credentials.name, type: getType());
 
-      if (credentials.seedType == MoneroSeedType.bip39) {
-        return _restoreFromBip39(
-          path: path,
-          password: credentials.password!,
-          mnemonic: credentials.mnemonic ?? getBip39Seed(),
-          passphrase: credentials.passphrase,
-          walletInfo: credentials.walletInfo!,
-        );
-      }
-
-      if (credentials.seedType == MoneroSeedType.polyseed) {
+      if (credentials.isPolyseed) {
         final polyseed = Polyseed.create();
         final lang = PolyseedLang.getByEnglishName(credentials.language);
 
-        if (credentials.passphrase != null)
-          polyseed.crypt(credentials.passphrase!);
+        if (credentials.passphrase != null) polyseed.crypt(credentials.passphrase!);
 
-        final heightOverride = getMoneroHeigthByDate(
-            date: DateTime.now().subtract(Duration(days: 2)));
+        final heightOverride =
+        getMoneroHeigthByDate(date: DateTime.now().subtract(Duration(days: 2)));
 
-        return _restoreFromPolyseed(path, credentials.password!, polyseed,
-            credentials.walletInfo!, lang,
+        return _restoreFromPolyseed(
+            path, credentials.password!, polyseed, credentials.walletInfo!, lang,
             overrideHeight: heightOverride, passphrase: credentials.passphrase);
       }
 
-      monero_wallet_manager.createWallet(
-          path: path,
-          password: credentials.password!,
-          language: credentials.language,
-          passphrase: credentials.passphrase ?? "");
+      await monero_wallet_manager.createWallet(
+          path: path, password: credentials.password!, language: credentials.language, passphrase: credentials.passphrase??"");
       final wallet = MoneroWallet(
           walletInfo: credentials.walletInfo!,
           unspentCoinsInfo: unspentCoinsInfoSource,
@@ -174,43 +139,45 @@ class MoneroWalletService extends WalletService<
   }
 
   @override
-  Future<MoneroWallet> openWallet(String name, String password,
-      {OpenWalletTry openWalletTry = OpenWalletTry.initial}) async {
+  Future<MoneroWallet> openWallet(String name, String password, {bool? retryOnFailure}) async {
     try {
       final path = await pathForWallet(name: name, type: getType());
 
       if (walletFilesExist(path)) await repairOldAndroidWallet(name);
 
       await monero_wallet_manager
-          .openWallet(path: path, password: password);
+          .openWalletAsync({'path': path, 'password': password});
       final walletInfo = walletInfoSource.values
           .firstWhere((info) => info.id == WalletBase.idFor(name, getType()));
       final wallet = MoneroWallet(
           walletInfo: walletInfo,
           unspentCoinsInfo: unspentCoinsInfoSource,
           password: password);
+      final isValid = wallet.walletAddresses.validate();
 
       if (wallet.isHardwareWallet) {
         wallet.setLedgerConnection(gLedger!);
         gLedger = null;
       }
 
+      if (!isValid) {
+        await restoreOrResetWalletFiles(name);
+        wallet.close(shouldCleanup: false);
+        return openWallet(name, password);
+      }
+
       await wallet.init();
 
       return wallet;
     } catch (e) {
       // TODO: Implement Exception for wallet list service.
 
-      switch (openWalletTry) {
-        case OpenWalletTry.initial:
-          await restoreOrResetWalletFiles(name);
-          return await openWallet(name, password, openWalletTry: OpenWalletTry.cacheRestored);
-        case OpenWalletTry.cacheRestored:
-          await removeCache(name);
-          return await openWallet(name, password, openWalletTry: OpenWalletTry.cacheRemoved);
-        case OpenWalletTry.cacheRemoved:
-          rethrow;
+      if (retryOnFailure == false) {
+        rethrow;
       }
+
+      await restoreOrResetWalletFiles(name);
+      return await openWallet(name, password, retryOnFailure: false);
     }
   }
 
@@ -220,11 +187,13 @@ class MoneroWalletService extends WalletService<
     if (openedWalletsByPath["$path/$wallet"] != null) {
       // NOTE: this is realistically only required on windows.
       printV("closing wallet");
-      final w = openedWalletsByPath["$path/$wallet"]!;
-      final wmaddr = wmPtr.ffiAddress();
-      final waddr = w.ffiAddress();
+      final wmaddr = wmPtr.address;
+      final waddr = openedWalletsByPath["$path/$wallet"]!.address;
+      // await Isolate.run(() {
+      monero.WalletManager_closeWallet(
+          Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), false);
+      // });
       openedWalletsByPath.remove("$path/$wallet");
-      await closeWalletAwaitIfShould(wmaddr, waddr);
       printV("wallet closed");
     }
 
@@ -264,7 +233,7 @@ class MoneroWalletService extends WalletService<
       {bool? isTestnet}) async {
     try {
       final path = await pathForWallet(name: credentials.name, type: getType());
-      monero_wallet_manager.restoreWalletFromKeys(
+      await monero_wallet_manager.restoreFromKeys(
           path: path,
           password: credentials.password!,
           language: credentials.language,
@@ -294,8 +263,9 @@ class MoneroWalletService extends WalletService<
       final password = credentials.password;
       final height = credentials.height;
 
-      enableLedgerExchange(credentials.ledgerConnection);
+      if (wptr == null) monero_wallet_manager.createWalletPointer();
 
+      enableLedgerExchange(wptr!, credentials.ledgerConnection);
       await monero_wallet_manager.restoreWalletFromHardwareWallet(
           path: path,
           password: password!,
@@ -330,29 +300,9 @@ class MoneroWalletService extends WalletService<
       rethrow;
     }
 
-    try {
-      if (isBip39Seed(credentials.mnemonic)) {
-        final path =
-            await pathForWallet(name: credentials.name, type: getType());
-
-        return _restoreFromBip39(
-          path: path,
-          password: credentials.password!,
-          mnemonic: credentials.mnemonic,
-          walletInfo: credentials.walletInfo!,
-          overrideHeight: credentials.height!,
-          passphrase: credentials.passphrase,
-        );
-      }
-    } catch (e) {
-      printV("Bip39 restore failed: $e");
-      rethrow;
-    }
-
     try {
       final path = await pathForWallet(name: credentials.name, type: getType());
-
-      monero_wallet_manager.restoreWalletFromSeedSync(
+      monero_wallet_manager.restoreFromSeed(
           path: path,
           password: credentials.password!,
           passphrase: credentials.passphrase,
@@ -372,52 +322,6 @@ class MoneroWalletService extends WalletService<
     }
   }
 
-  Future<MoneroWallet> _restoreFromBip39({
-    required String path,
-    required String password,
-    required String mnemonic,
-    required WalletInfo walletInfo,
-    String? passphrase,
-    int? overrideHeight,
-  }) async {
-    walletInfo.derivationInfo = DerivationInfo(
-        derivationType: DerivationType.bip39,
-        derivationPath: "m/44'/128'/0'/0/0",
-    );
-
-    final legacyMnemonic =
-        getLegacySeedFromBip39(mnemonic, passphrase: passphrase ?? "");
-    final height =
-        overrideHeight ?? getMoneroHeigthByDate(date: DateTime.now());
-
-    walletInfo.isRecovery = true;
-    walletInfo.restoreHeight = height;
-
-    monero_wallet_manager.restoreWalletFromSeedSync(
-      path: path,
-      password: password,
-      passphrase: '',
-      seed: legacyMnemonic,
-      restoreHeight: height,
-    );
-
-    currentWallet!.setCacheAttribute(
-        key: "cakewallet.seed.bip39", value: mnemonic);
-    currentWallet!.setCacheAttribute(
-        key: "cakewallet.passphrase", value: passphrase ?? '');
-
-    currentWallet!.store();
-
-    final wallet = MoneroWallet(
-      walletInfo: walletInfo,
-      unspentCoinsInfo: unspentCoinsInfoSource,
-      password: password,
-    );
-    await wallet.init();
-
-    return wallet;
-  }
-
   Future<MoneroWallet> restoreFromPolyseed(
       MoneroRestoreWalletFromSeedCredentials credentials) async {
     try {
@@ -437,21 +341,23 @@ class MoneroWalletService extends WalletService<
     }
   }
 
-  Future<MoneroWallet> _restoreFromPolyseed(String path, String password,
-      Polyseed polyseed, WalletInfo walletInfo, PolyseedLang lang,
+  Future<MoneroWallet> _restoreFromPolyseed(
+      String path, String password, Polyseed polyseed, WalletInfo walletInfo, PolyseedLang lang,
       {PolyseedCoin coin = PolyseedCoin.POLYSEED_MONERO,
       int? overrideHeight,
       String? passphrase}) async {
-    if (polyseed.isEncrypted == false && (passphrase ?? '') != "") {
+    
+    if (polyseed.isEncrypted == false &&
+        (passphrase??'') != "") {
       // Fallback to the different passphrase offset method, when a passphrase
       // was provided but the polyseed is not encrypted.
       monero_wallet_manager.restoreWalletFromPolyseedWithOffset(
-          path: path,
-          password: password,
-          seed: polyseed.encode(lang, coin),
-          seedOffset: passphrase ?? '',
-          language: "English");
-
+        path: path,
+        password: password,
+        seed: polyseed.encode(lang, coin),
+        seedOffset: passphrase??'',
+        language: "English");
+      
       final wallet = MoneroWallet(
         walletInfo: walletInfo,
         unspentCoinsInfo: unspentCoinsInfoSource,
@@ -472,7 +378,7 @@ class MoneroWalletService extends WalletService<
     walletInfo.isRecovery = true;
     walletInfo.restoreHeight = height;
 
-    monero_wallet_manager.restoreWalletFromSpendKeySync(
+    await monero_wallet_manager.restoreFromSpendKey(
         path: path,
         password: password,
         seed: seed,
@@ -481,8 +387,8 @@ class MoneroWalletService extends WalletService<
         spendKey: spendKey);
 
 
-    currentWallet!.setCacheAttribute(key: "cakewallet.seed", value: seed);
-    currentWallet!.setCacheAttribute(key: "cakewallet.passphrase", value: passphrase??'');
+    monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.seed", value: seed);
+    monero.Wallet_setCacheAttribute(wptr!, key: "cakewallet.passphrase", value: passphrase??'');
 
     final wallet = MoneroWallet(
       walletInfo: walletInfo,
@@ -528,8 +434,7 @@ class MoneroWalletService extends WalletService<
 
       if (walletFilesExist(path)) await repairOldAndroidWallet(name);
 
-      await monero_wallet_manager
-          .openWallet(path: path, password: password);
+      await monero_wallet_manager.openWalletAsync({'path': path, 'password': password});
       final walletInfo = walletInfoSource.values
           .firstWhere((info) => info.id == WalletBase.idFor(name, getType()));
       final wallet = MoneroWallet(
@@ -553,19 +458,3 @@ class MoneroWalletService extends WalletService<
         false;
   }
 }
-
-Future<void> closeWalletAwaitIfShould(int wmaddr, int waddr) async {
-  if (Platform.isWindows) {
-    await Isolate.run(() {
-      monero.WalletManager_closeWallet(
-          Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
-      monero.WalletManager_errorString(Pointer.fromAddress(wmaddr));
-    });
-  } else {
-    unawaited(Isolate.run(() {
-      monero.WalletManager_closeWallet(
-          Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
-      monero.WalletManager_errorString(Pointer.fromAddress(wmaddr));
-    }));
-  }
-}
\ No newline at end of file
diff --git a/cw_monero/lib/pending_monero_transaction.dart b/cw_monero/lib/pending_monero_transaction.dart
index 9909a3021..1c01a60dc 100644
--- a/cw_monero/lib/pending_monero_transaction.dart
+++ b/cw_monero/lib/pending_monero_transaction.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/structs/pending_transaction.dart';
 import 'package:cw_monero/api/transaction_history.dart'
@@ -9,7 +7,6 @@ import 'package:cw_core/amount_converter.dart';
 
 import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_monero/api/wallet.dart';
-import 'package:cw_monero/monero_wallet.dart';
 
 class DoubleSpendException implements Exception {
   DoubleSpendException();
@@ -20,10 +17,9 @@ class DoubleSpendException implements Exception {
 }
 
 class PendingMoneroTransaction with PendingTransaction {
-  PendingMoneroTransaction(this.pendingTransactionDescription, this.wallet);
+  PendingMoneroTransaction(this.pendingTransactionDescription);
 
   final PendingTransactionDescription pendingTransactionDescription;
-  final MoneroWalletBase wallet;
 
   @override
   String get id => pendingTransactionDescription.hash;
@@ -31,6 +27,8 @@ class PendingMoneroTransaction with PendingTransaction {
   @override
   String get hex => pendingTransactionDescription.hex;
 
+  String get txKey => pendingTransactionDescription.txKey;
+
   @override
   String get amountFormatted => AmountConverter.amountIntToString(
       CryptoCurrency.xmr, pendingTransactionDescription.amount);
@@ -44,7 +42,7 @@ class PendingMoneroTransaction with PendingTransaction {
   @override
   Future<void> commit() async {
     try {
-      await monero_transaction_history.commitTransactionFromPointerAddress(
+      monero_transaction_history.commitTransactionFromPointerAddress(
           address: pendingTransactionDescription.pointerAddress,
           useUR: false);
     } catch (e) {
@@ -57,23 +55,14 @@ class PendingMoneroTransaction with PendingTransaction {
       rethrow;
     }
     storeSync(force: true);
-    unawaited(() async {
-      await Future.delayed(const Duration(milliseconds: 250));
-      await wallet.fetchTransactions();
-    }());
   }
 
   @override
   Future<String?> commitUR() async {
     try {
-      final ret = await monero_transaction_history.commitTransactionFromPointerAddress(
+      final ret = monero_transaction_history.commitTransactionFromPointerAddress(
           address: pendingTransactionDescription.pointerAddress,
           useUR: true);
-      storeSync(force: true);
-      unawaited(() async {
-        await Future.delayed(const Duration(milliseconds: 250));
-        await wallet.fetchTransactions();
-      }());
       return ret;
     } catch (e) {
       final message = e.toString();
diff --git a/cw_monero/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux b/cw_monero/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
new file mode 120000
index 000000000..a2b4915e7
--- /dev/null
+++ b/cw_monero/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux
@@ -0,0 +1 @@
+/Users/user/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
\ No newline at end of file
diff --git a/cw_monero/linux/flutter/generated_plugin_registrant.cc b/cw_monero/linux/flutter/generated_plugin_registrant.cc
new file mode 100644
index 000000000..e71a16d23
--- /dev/null
+++ b/cw_monero/linux/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,11 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+}
diff --git a/cw_monero/linux/flutter/generated_plugin_registrant.h b/cw_monero/linux/flutter/generated_plugin_registrant.h
new file mode 100644
index 000000000..e0f0a47bc
--- /dev/null
+++ b/cw_monero/linux/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/cw_monero/linux/flutter/generated_plugins.cmake b/cw_monero/linux/flutter/generated_plugins.cmake
new file mode 100644
index 000000000..2e1de87a7
--- /dev/null
+++ b/cw_monero/linux/flutter/generated_plugins.cmake
@@ -0,0 +1,23 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock
index 2de22ed11..019c9f437 100644
--- a/cw_monero/pubspec.lock
+++ b/cw_monero/pubspec.lock
@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "47.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "4.7.0"
   args:
     dependency: transitive
     description:
@@ -34,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5"
+      sha256: "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.8"
+    version: "1.5.9"
   async:
     dependency: transitive
     description:
@@ -46,31 +41,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
-  bip32:
-    dependency: "direct main"
-    description:
-      name: bip32
-      sha256: "54787cd7a111e9d37394aabbf53d1fc5e2e0e0af2cd01c459147a97c0e3f8a97"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  bip39:
-    dependency: "direct main"
-    description:
-      name: bip39
-      sha256: de1ee27ebe7d96b84bb3a04a4132a0a3007dcdd5ad27dd14aa87a29d97c45edc
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.6"
   blockchain_utils:
     dependency: transitive
     description:
       path: "."
-      ref: cake-update-v4
-      resolved-ref: "437dadd0bd9bf73ec6a551299577799341f6486a"
+      ref: cake-update-v2
+      resolved-ref: "59fdf29d72068e0522a96a8953ed7272833a9f57"
       url: "https://github.com/cake-tech/blockchain_utils"
     source: git
-    version: "4.3.0"
+    version: "3.3.0"
   bluez:
     dependency: transitive
     description:
@@ -87,14 +66,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
-  bs58check:
-    dependency: transitive
-    description:
-      name: bs58check
-      sha256: c4a164d42b25c2f6bc88a8beccb9fc7d01440f3c60ba23663a20a70faf484ea9
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
   build:
     dependency: transitive
     description:
@@ -107,42 +78,42 @@ packages:
     dependency: transitive
     description:
       name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.4"
   build_resolvers:
     dependency: "direct dev"
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.2.10"
   built_collection:
     dependency: transitive
     description:
@@ -251,10 +222,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
+      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.8"
+    version: "2.2.4"
   dbus:
     dependency: transitive
     description:
@@ -377,14 +348,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.6.0"
-  hex:
-    dependency: transitive
-    description:
-      name: hex
-      sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.0"
   hive:
     dependency: transitive
     description:
@@ -397,10 +360,10 @@ packages:
     dependency: "direct dev"
     description:
       name: hive_generator
-      sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4"
+      sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "1.1.3"
   http:
     dependency: "direct main"
     description:
@@ -421,10 +384,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   intl:
     dependency: "direct main"
     description:
@@ -505,14 +468,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -557,24 +512,16 @@ packages:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: "990da80722f7d7c0017dec92040b31545d625b15d40204c36a1e63d167c73cdc"
+      sha256: d4beb9cea4b7b014321235f8fdc7c2193ee0fe1d1198e9da7403f8bc85c4407c
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
-  mockito:
-    dependency: "direct dev"
-    description:
-      name: mockito
-      sha256: f99d8d072e249f719a5531735d146d8cf04c580d93920b04de75bef6dfb2daf6
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.4.5"
+    version: "2.3.0"
   monero:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2
-      resolved-ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2
+      ref: "84e52393e395d75f449bcd81e23028889538118f"
+      resolved-ref: "84e52393e395d75f449bcd81e23028889538118f"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"
@@ -599,10 +546,10 @@ packages:
     description:
       path: "."
       ref: cake-update-v2
-      resolved-ref: "084fb7bf13ec42d74f26ac08c883ce07c10fca7e"
+      resolved-ref: "93440dc5126369b873ca1fccc13c3c1240b1c5c2"
       url: "https://github.com/cake-tech/on_chain.git"
     source: git
-    version: "6.2.0"
+    version: "3.7.0"
   package_config:
     dependency: transitive
     description:
@@ -735,10 +682,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   rational:
     dependency: transitive
     description:
@@ -759,10 +706,10 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -779,37 +726,27 @@ packages:
   socks5_proxy:
     dependency: transitive
     description:
-      path: "."
-      ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      url: "https://github.com/LacticWhale/socks_dart"
-    source: git
-    version: "2.1.0"
-  socks_socket:
-    dependency: transitive
-    description:
-      path: "."
-      ref: e6232c53c1595469931ababa878759a067c02e94
-      resolved-ref: e6232c53c1595469931ababa878759a067c02e94
-      url: "https://github.com/sneurlax/socks_socket"
-    source: git
-    version: "1.1.1"
+      name: socks5_proxy
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -870,19 +807,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
-  tor_binary:
-    dependency: transitive
-    description:
-      path: "."
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      url: "https://github.com/MrCyjaneK/flutter-tor_binary"
-    source: git
-    version: "4.7.14"
+    version: "1.0.2"
   tuple:
     dependency: transitive
     description:
diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml
index a11e85b6c..862109e94 100644
--- a/cw_monero/pubspec.yaml
+++ b/cw_monero/pubspec.yaml
@@ -2,17 +2,16 @@ name: cw_monero
 description: A new flutter plugin project.
 version: 0.0.1
 publish_to: none
+author: Cake Wallet
 homepage: https://cakewallet.com
 
 environment:
-  sdk: ^3.5.0
+  sdk: ">=2.19.0 <3.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  bip39: ^1.0.6
-  bip32: ^2.0.0
   ffi: ^2.0.1
   http: ^1.1.0
   path_provider: ^2.0.11
@@ -26,7 +25,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2
+      ref: 84e52393e395d75f449bcd81e23028889538118f
       path: impls/monero.dart
   mutex: ^3.1.0
   ledger_flutter_plus: ^1.4.1
@@ -34,11 +33,10 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
-  build_resolvers: ^2.4.4
+  build_runner: ^2.4.7
+  build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
-  mockito: ^5.4.5
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
 
 dependency_overrides:
   watcher: ^1.1.0
diff --git a/cw_monero/test/bip39_seed_test.dart b/cw_monero/test/bip39_seed_test.dart
deleted file mode 100644
index add461553..000000000
--- a/cw_monero/test/bip39_seed_test.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-import 'package:cw_monero/bip39_seed.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
-  group("Exodus Style bip39", () {
-    group("Test Wallet 1", () {
-      final bip39Seed = 'meadow tip best belt boss eyebrow control affair eternal piece very shiver';
-      final expectedLegacySeed0 = "tasked eight afraid laboratory tail feline rift reinvest vane cafe bailed foggy dormant paper jigsaw king hazard suture king dapper dummy jolted dating dwindling king";
-      final expectedLegacySeed1 = "palace pairing axes mohawk rekindle excess awful juvenile shipped talent nibs efficient dapper biggest swung fight pact innocent emerge issued titans affair nearby noises emerge";
-
-      test("Get legacy Seed from bip39", () {
-        final legacySeed = getLegacySeedFromBip39(bip39Seed);
-        expect(legacySeed, expectedLegacySeed0);
-      });
-
-      test("Get legacy Seed from bip39 with account index", () {
-        final legacySeed = getLegacySeedFromBip39(bip39Seed, accountIndex: 1);
-        expect(legacySeed, expectedLegacySeed1);
-      });
-    });
-
-    group("Test Wallet 2", () {
-      final bip39Seed = "color ranch color remove subway public water embrace before begin liberty fault";
-      final expectedLegacySeed0 = "somewhere problems gauze gigantic intended foxes upcoming saved waffle pipeline lurk bogeys empty wipeout abbey italics novelty tucks rafts elite lunar obnoxious awful bugs elite";
-      final expectedLegacySeed1 = "playful toxic wildly eluded mesh fainted february mugged maps repent vigilant hitched seventh threaten clue fetches sample diet number alkaline future cottage tuition vegan alkaline";
-
-      test("Get legacy Seed from bip39", () {
-        final legacySeed = getLegacySeedFromBip39(bip39Seed);
-        expect(legacySeed, expectedLegacySeed0);
-      });
-
-      test("Get legacy Seed from bip39 with account index", () {
-        final legacySeed = getLegacySeedFromBip39(bip39Seed, accountIndex: 1);
-        expect(legacySeed, expectedLegacySeed1);
-      });
-    });
-
-  });
-}
diff --git a/cw_monero/test/mock/path_provider.dart b/cw_monero/test/mock/path_provider.dart
deleted file mode 100644
index 7902d5bf0..000000000
--- a/cw_monero/test/mock/path_provider.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-import 'package:mockito/mockito.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:path_provider_platform_interface/path_provider_platform_interface.dart';
-import 'package:plugin_platform_interface/plugin_platform_interface.dart';
-
-class MockPathProviderPlatform extends Mock
-    with MockPlatformInterfaceMixin
-    implements PathProviderPlatform {
-  Future<String> getTemporaryPath() => throw UnimplementedError();
-
-  Future<String> getApplicationSupportPath() => throw UnimplementedError();
-
-  Future<String> getLibraryPath() => throw UnimplementedError();
-
-  Future<String> getApplicationDocumentsPath() async => "./test/data";
-
-  Future<String> getExternalStoragePath() => throw UnimplementedError();
-
-  Future<List<String>> getExternalCachePaths() => throw UnimplementedError();
-
-  Future<String> getDownloadsPath() => throw UnimplementedError();
-
-  @override
-  Future<String?> getApplicationCachePath() => throw UnimplementedError();
-
-  @override
-  Future<List<String>?> getExternalStoragePaths({StorageDirectory? type}) =>
-      throw UnimplementedError();
-}
diff --git a/cw_monero/test/monero_wallet_service_test.dart b/cw_monero/test/monero_wallet_service_test.dart
deleted file mode 100644
index a809dbc23..000000000
--- a/cw_monero/test/monero_wallet_service_test.dart
+++ /dev/null
@@ -1,148 +0,0 @@
-import 'dart:io';
-
-import 'package:cw_core/unspent_coins_info.dart';
-import 'package:cw_core/wallet_base.dart';
-import 'package:cw_core/wallet_info.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:cw_monero/monero_wallet_service.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:hive/hive.dart';
-import 'package:path_provider_platform_interface/path_provider_platform_interface.dart';
-
-import 'mock/path_provider.dart';
-import 'utils/setup_monero_c.dart';
-
-Future<void> main() async {
-  group("MoneroWalletService Tests", () {
-    Hive.init('./test/data/db');
-    late MoneroWalletService walletService;
-    late File moneroCBinary;
-
-    setUpAll(() async {
-      PathProviderPlatform.instance = MockPathProviderPlatform();
-
-      final Box<WalletInfo> walletInfoSource =
-          await Hive.openBox('testWalletInfo');
-      final Box<UnspentCoinsInfo> unspentCoinsInfoSource =
-          await Hive.openBox('testUnspentCoinsInfo');
-
-      walletService = MoneroWalletService(walletInfoSource, unspentCoinsInfoSource);
-      moneroCBinary = getMoneroCBinary().copySync(moneroCBinaryName);
-    });
-
-    tearDownAll(() {
-      Directory('./test/data').deleteSync(recursive: true);
-      moneroCBinary.deleteSync();
-    });
-
-    group("Create wallet", () {
-      test("Create Legacy Wallet", () async {
-        final credentials = _getTestCreateCredentials(
-            name: 'Create Wallet LS',
-            language: 'English',
-            seedType: MoneroSeedType.legacy);
-        final wallet = await walletService.create(credentials);
-
-        expect(wallet.seed.split(" ").length, 25);
-        expect(wallet.restoreHeight, greaterThan(3000000));
-      });
-
-      test("Create Polyseed Wallet", () async {
-        final credentials = _getTestCreateCredentials(
-            name: 'Create Wallet PS',
-            language: 'English',
-            seedType: MoneroSeedType.polyseed);
-        final wallet = await walletService.create(credentials);
-
-        expect(wallet.seed.split(" ").length, 16);
-        expect(wallet.restoreHeight, greaterThan(3000000));
-      });
-
-      test("Create Bip39 Wallet", () async {
-        final credentials = _getTestCreateCredentials(
-            name: 'Create Wallet BS',
-            language: 'English',
-            seedType: MoneroSeedType.bip39);
-        final wallet = await walletService.create(credentials);
-
-        expect(wallet.seed.split(" ").length, 12);
-        expect(wallet.restoreHeight, greaterThan(3000000));
-      });
-    });
-
-    group("Restore wallet", () {
-      test('Legacy Seed', () async {
-        final credentials = _getTestRestoreCredentials(
-          name: 'Test Wallet LS',
-          mnemonic:
-              'ability pockets lordship tomorrow gypsy match neutral uncle avatar betting bicycle junk unzip pyramid lynx mammal edgy empty uneven knowledge juvenile wiring paradise psychic betting',
-        );
-
-        final wallet = await walletService.restoreFromSeed(credentials);
-        expect(wallet.walletAddresses.primaryAddress,
-            '48tLyQXpcwt8w6uKHyb5Zs3vdnoDWAEKFQr1c198o7aX9dBzXP3BTSMVsDiuH3ozDCNqwojb4vNeQZf7xg6URimDLaNtGSN');
-      });
-
-      test('Bip39 Seed', () async {
-        final credentials = _getTestRestoreCredentials(
-            name: 'Test Wallet BS',
-            mnemonic:
-                'color ranch color remove subway public water embrace before begin liberty fault');
-
-        final wallet = await walletService.restoreFromSeed(credentials);
-        expect(wallet.walletAddresses.primaryAddress,
-            '49MggvPosJugF8Zq7WAKbsSchz6vbyL6YiUxM4ryfGQDXphs6wiWiXLFWCSshnLPcceGTWUaKfWWMHQAAKESV3TQJVQsL9a');
-      });
-    });
-  });
-}
-
-MoneroRestoreWalletFromSeedCredentials _getTestRestoreCredentials({
-  required String name,
-  required String mnemonic,
-}) {
-  final credentials = MoneroRestoreWalletFromSeedCredentials(
-      name: name, mnemonic: mnemonic, passphrase: '', password: "test");
-
-  credentials.walletInfo = WalletInfo.external(
-    id: WalletBase.idFor(name, WalletType.monero),
-    name: name,
-    type: WalletType.monero,
-    isRecovery: true,
-    restoreHeight: credentials.height ?? 0,
-    date: DateTime.now(),
-    path: '',
-    dirPath: '',
-    address: '',
-  );
-  return credentials;
-}
-
-MoneroNewWalletCredentials _getTestCreateCredentials({
-  required String name,
-  required String language,
-  required MoneroSeedType seedType,
-  String? mnemonic,
-}) {
-  final credentials = MoneroNewWalletCredentials(
-    name: name,
-    language: language,
-    seedType: seedType,
-    password: "test",
-    mnemonic: mnemonic,
-    passphrase: '',
-  );
-
-  credentials.walletInfo = WalletInfo.external(
-    id: WalletBase.idFor(name, WalletType.monero),
-    name: name,
-    type: WalletType.monero,
-    isRecovery: false,
-    restoreHeight: credentials.height ?? 0,
-    date: DateTime.now(),
-    path: '',
-    dirPath: '',
-    address: '',
-  );
-  return credentials;
-}
diff --git a/cw_monero/test/utils/setup_monero_c.dart b/cw_monero/test/utils/setup_monero_c.dart
deleted file mode 100644
index 1a0981000..000000000
--- a/cw_monero/test/utils/setup_monero_c.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'dart:io';
-
-File getMoneroCBinary() {
-  if (Platform.isWindows)
-    return File(
-        '../scripts/monero_c/release/monero/x86_64-w64-mingw32_libwallet2_api_c.dll');
-  if (Platform.isMacOS) return File('../macos/monero_libwallet2_api_c.dylib');
-  return File('../scripts/monero_c/release/monero/x86_64-linux-gnu_libwallet2_api_c.so');
-}
-
-String get moneroCBinaryName {
-  if (Platform.isWindows)
-    return "monero_libwallet2_api_c.dll";
-  if (Platform.isMacOS) return "monero_libwallet2_api_c.dylib";
-  return "/usr/lib/monero_libwallet2_api_c.so";
-}
diff --git a/cw_nano/lib/nano_client.dart b/cw_nano/lib/nano_client.dart
index c852a8c0d..b63c634ee 100644
--- a/cw_nano/lib/nano_client.dart
+++ b/cw_nano/lib/nano_client.dart
@@ -3,11 +3,11 @@ import 'dart:convert';
 
 import 'package:cw_core/nano_account_info_response.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_nano/nano_block_info_response.dart';
 import 'package:cw_core/n2_node.dart';
 import 'package:cw_nano/nano_balance.dart';
 import 'package:cw_nano/nano_transaction_model.dart';
+import 'package:http/http.dart' as http;
 import 'package:cw_core/node.dart';
 import 'package:nanoutil/nanoutil.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -66,8 +66,8 @@ class NanoClient {
   }
 
   Future<NanoBalance> getBalance(String address) async {
-    final response = await ProxyWrapper().post(
-      clearnetUri: _node!.uri,
+    final response = await http.post(
+      _node!.uri,
       headers: getHeaders(_node!.uri.host),
       body: jsonEncode(
         {
@@ -76,8 +76,7 @@ class NanoClient {
         },
       ),
     );
-    
-    final data = jsonDecode(response.body) as Map<String, dynamic>;
+    final data = await jsonDecode(response.body);
     if (response.statusCode != 200 ||
         data["error"] != null ||
         data["balance"] == null ||
@@ -94,8 +93,8 @@ class NanoClient {
 
   Future<AccountInfoResponse?> getAccountInfo(String address) async {
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: _node!.uri,
+      final response = await http.post(
+        _node!.uri,
         headers: getHeaders(_node!.uri.host),
         body: jsonEncode(
           {
@@ -105,9 +104,8 @@ class NanoClient {
           },
         ),
       );
-      
-      final data = jsonDecode(response.body) as Map<String, dynamic>;
-      return AccountInfoResponse.fromJson(data);
+      final data = await jsonDecode(response.body);
+      return AccountInfoResponse.fromJson(data as Map<String, dynamic>);
     } catch (e) {
       printV("error while getting account info $e");
       return null;
@@ -116,8 +114,8 @@ class NanoClient {
 
   Future<BlockContentsResponse?> getBlockContents(String block) async {
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: _node!.uri,
+      final response = await http.post(
+        _node!.uri,
         headers: getHeaders(_node!.uri.host),
         body: jsonEncode(
           {
@@ -127,8 +125,7 @@ class NanoClient {
           },
         ),
       );
-      
-      final data = jsonDecode(response.body) as Map<String, dynamic>;
+      final data = await jsonDecode(response.body);
       return BlockContentsResponse.fromJson(data["contents"] as Map<String, dynamic>);
     } catch (e) {
       printV("error while getting block info $e");
@@ -184,8 +181,8 @@ class NanoClient {
   }
 
   Future<String> requestWork(String hash) async {
-    final response = await ProxyWrapper().post(
-      clearnetUri: _powNode!.uri,
+    final response = await http.post(
+      _powNode!.uri,
       headers: getHeaders(_powNode!.uri.host),
       body: json.encode(
         {
@@ -194,9 +191,8 @@ class NanoClient {
         },
       ),
     );
-    
     if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body) as Map<String, dynamic>;
+      final Map<String, dynamic> decoded = json.decode(response.body) as Map<String, dynamic>;
       if (decoded.containsKey("error")) {
         throw Exception("Received error ${decoded["error"]}");
       }
@@ -228,13 +224,13 @@ class NanoClient {
       "block": block,
     });
 
-    final processResponse = await ProxyWrapper().post(
-      clearnetUri: _node!.uri,
+    final processResponse = await http.post(
+      _node!.uri,
       headers: getHeaders(_node!.uri.host),
       body: processBody,
     );
 
-    final Map<String, dynamic> decoded = jsonDecode(processResponse.body) as Map<String, dynamic>;
+    final Map<String, dynamic> decoded = json.decode(processResponse.body) as Map<String, dynamic>;
     if (decoded.containsKey("error")) {
       throw Exception("Received error ${decoded["error"]}");
     }
@@ -427,11 +423,12 @@ class NanoClient {
       "subtype": "receive",
       "block": receiveBlock,
     });
-    final processResponse = await ProxyWrapper().post(
-      clearnetUri: _node!.uri,
+    final processResponse = await http.post(
+      _node!.uri,
       headers: getHeaders(_node!.uri.host),
       body: processBody,
     );
+
     final Map<String, dynamic> decoded = json.decode(processResponse.body) as Map<String, dynamic>;
     if (decoded.containsKey("error")) {
       throw Exception("Received error ${decoded["error"]}");
@@ -443,17 +440,16 @@ class NanoClient {
     required String destinationAddress,
     required String privateKey,
   }) async {
-    final receivableResponse = await ProxyWrapper().post(
-      clearnetUri: _node!.uri,
-      headers: getHeaders(_node!.uri.host),
-      body: jsonEncode({
-        "action": "receivable",
-        "account": destinationAddress,
-        "count": "-1",
-        "source": true,
-      }),
-    );
-    final receivableData = jsonDecode(receivableResponse.body) as Map<String, dynamic>;
+    final receivableResponse = await http.post(_node!.uri,
+        headers: getHeaders(_node!.uri.host),
+        body: jsonEncode({
+          "action": "receivable",
+          "account": destinationAddress,
+          "count": "-1",
+          "source": true,
+        }));
+
+    final receivableData = await jsonDecode(receivableResponse.body);
     if (receivableData["blocks"] == "" || receivableData["blocks"] == null) {
       return 0;
     }
@@ -496,18 +492,15 @@ class NanoClient {
 
   Future<List<NanoTransactionModel>> fetchTransactions(String address) async {
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: _node!.uri,
-        headers: getHeaders(_node!.uri.host),
-        body: jsonEncode({
-          "action": "account_history",
-          "account": address,
-          "count": "100",
-          // "raw": true,
-        }),
-      );
-      
-      final data = jsonDecode(response.body) as Map<String, dynamic>;
+      final response = await http.post(_node!.uri,
+          headers: getHeaders(_node!.uri.host),
+          body: jsonEncode({
+            "action": "account_history",
+            "account": address,
+            "count": "100",
+            // "raw": true,
+          }));
+      final data = await jsonDecode(response.body);
       final transactions = data["history"] is List ? data["history"] as List<dynamic> : [];
 
       // Map the transactions list to NanoTransactionModel using the factory
@@ -523,14 +516,13 @@ class NanoClient {
 
   Future<List<N2Node>> getN2Reps() async {
     final uri = Uri.parse(N2_REPS_ENDPOINT);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
+    final response = await http.post(
+      uri,
       headers: getHeaders(uri.host),
       body: jsonEncode({"action": "reps"}),
     );
     try {
-      
-      final List<N2Node> nodes = (jsonDecode(response.body) as List<dynamic>)
+      final List<N2Node> nodes = (json.decode(response.body) as List<dynamic>)
           .map((dynamic e) => N2Node.fromJson(e as Map<String, dynamic>))
           .toList();
       return nodes;
@@ -541,8 +533,8 @@ class NanoClient {
 
   Future<int> getRepScore(String rep) async {
     final uri = Uri.parse(N2_REPS_ENDPOINT);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
+    final response = await http.post(
+      uri,
       headers: getHeaders(uri.host),
       body: jsonEncode({
         "action": "rep_info",
@@ -550,8 +542,7 @@ class NanoClient {
       }),
     );
     try {
-      
-      final N2Node node = N2Node.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
+      final N2Node node = N2Node.fromJson(json.decode(response.body) as Map<String, dynamic>);
       return node.score ?? 100;
     } catch (error) {
       return 100;
diff --git a/cw_nano/pubspec.lock b/cw_nano/pubspec.lock
index aa85d6dde..0891588f2 100644
--- a/cw_nano/pubspec.lock
+++ b/cw_nano/pubspec.lock
@@ -5,31 +5,26 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "47.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "4.7.0"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
@@ -91,10 +86,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -115,26 +110,26 @@ packages:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.4.13"
   build_runner_core:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: "0671ad4162ed510b70d0eb4ad6354c249f8429cab4ae7a4cec86bbc2886eb76e"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.2.7+1"
   built_collection:
     dependency: transitive
     description:
@@ -147,10 +142,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: "8b158ab94ec6913e480dc3f752418348b5ae099eb75868b5f4775f0572999c61"
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.9.4"
   cake_backup:
     dependency: transitive
     description:
@@ -243,10 +238,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
+      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.8"
+    version: "2.2.4"
   decimal:
     dependency: "direct main"
     description:
@@ -378,18 +373,18 @@ packages:
     dependency: "direct dev"
     description:
       name: hive_generator
-      sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4"
+      sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "1.1.3"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -478,14 +473,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -530,10 +517,10 @@ packages:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8
+      sha256: d4beb9cea4b7b014321235f8fdc7c2193ee0fe1d1198e9da7403f8bc85c4407c
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.1"
+    version: "2.3.0"
   nanodart:
     dependency: transitive
     description:
@@ -564,7 +551,7 @@ packages:
     description:
       path: "."
       ref: cake-update-v2
-      resolved-ref: "01cbbacbb05d2113aafa8b7c4a2bb766f749d8d8"
+      resolved-ref: "93440dc5126369b873ca1fccc13c3c1240b1c5c2"
       url: "https://github.com/cake-tech/on_chain.git"
     source: git
     version: "3.7.0"
@@ -572,10 +559,10 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.1"
   path:
     dependency: transitive
     description:
@@ -596,10 +583,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -676,18 +663,18 @@ packages:
     dependency: transitive
     description:
       name: provider
-      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.5"
   pubspec_parse:
     dependency: transitive
     description:
@@ -708,18 +695,18 @@ packages:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
+      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
+      sha256: a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.10"
+    version: "2.4.6"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -772,10 +759,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "2.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -784,37 +771,27 @@ packages:
   socks5_proxy:
     dependency: transitive
     description:
-      path: "."
-      ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      url: "https://github.com/LacticWhale/socks_dart"
-    source: git
-    version: "2.1.0"
-  socks_socket:
-    dependency: transitive
-    description:
-      path: "."
-      ref: e6232c53c1595469931ababa878759a067c02e94
-      resolved-ref: e6232c53c1595469931ababa878759a067c02e94
-      url: "https://github.com/sneurlax/socks_socket"
-    source: git
-    version: "1.1.1"
+      name: socks5_proxy
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -875,19 +852,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
-  tor_binary:
-    dependency: transitive
-    description:
-      path: "."
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      url: "https://github.com/MrCyjaneK/flutter-tor_binary"
-    source: git
-    version: "4.7.14"
+    version: "1.0.2"
   tuple:
     dependency: transitive
     description:
@@ -948,18 +916,18 @@ packages:
     dependency: transitive
     description:
       name: web_socket
-      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.2"
   xdg_directories:
     dependency: transitive
     description:
@@ -978,4 +946,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.24.0"
diff --git a/cw_nano/pubspec.yaml b/cw_nano/pubspec.yaml
index a85a4aee5..3ddd9769e 100644
--- a/cw_nano/pubspec.yaml
+++ b/cw_nano/pubspec.yaml
@@ -31,12 +31,13 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
+  build_runner: ^2.4.7
   mobx_codegen: ^2.0.7
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
 
 dependency_overrides:
   watcher: ^1.1.0
+  build_runner_core: 7.2.7+1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/cw_polygon/lib/default_polygon_erc20_tokens.dart b/cw_polygon/lib/default_polygon_erc20_tokens.dart
index 208a63345..deff285c0 100644
--- a/cw_polygon/lib/default_polygon_erc20_tokens.dart
+++ b/cw_polygon/lib/default_polygon_erc20_tokens.dart
@@ -31,13 +31,6 @@ class DefaultPolygonErc20Tokens {
       decimal: 6,
       enabled: true,
     ),
-    Erc20Token(
-      name: "Decentralized Euro",
-      symbol: "DEURO",
-      contractAddress: "0xC2ff25dD99e467d2589b2c26EDd270F220F14E47",
-      decimal: 18,
-      enabled: true,
-    ),
     Erc20Token(
       name: "Avalanche Token",
       symbol: "AVAX",
@@ -84,6 +77,6 @@ class DefaultPolygonErc20Tokens {
               .iconPath;
         } catch (_) {}
 
-        return Erc20Token.copyWith(token, iconPath, 'POL');
+        return Erc20Token.copyWith(token, iconPath, 'POLY');
       }).toList();
 }
diff --git a/cw_polygon/lib/polygon_client.dart b/cw_polygon/lib/polygon_client.dart
index 62dcec50e..cb8331977 100644
--- a/cw_polygon/lib/polygon_client.dart
+++ b/cw_polygon/lib/polygon_client.dart
@@ -18,20 +18,13 @@ class PolygonClient extends EVMChainClient {
     EtherAmount? gasPrice,
     EtherAmount? maxFeePerGas,
   }) {
-    EtherAmount? finalGasPrice = gasPrice;
-
-    if (gasPrice == null && maxFeePerGas != null) {
-      // If we have EIP-1559 parameters but no legacy gasPrice, then use maxFeePerGas as gasPrice
-      finalGasPrice = maxFeePerGas;
-    }
-    
     return Transaction(
       from: from,
       to: to,
       value: amount,
-      data: data,
+      // data: data,
       maxGas: maxGas,
-      gasPrice: finalGasPrice,
+      // gasPrice: gasPrice,
       // maxFeePerGas: maxFeePerGas,
       // maxPriorityFeePerGas: maxPriorityFeePerGas,
     );
@@ -47,13 +40,12 @@ class PolygonClient extends EVMChainClient {
   Future<List<EVMChainTransactionModel>> fetchTransactions(String address,
       {String? contractAddress}) async {
     try {
-      final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", {
-        "chainid": "$chainId",
+      final response = await httpClient.get(Uri.https("api.polygonscan.com", "/api", {
         "module": "account",
         "action": contractAddress != null ? "tokentx" : "txlist",
         if (contractAddress != null) "contractaddress": contractAddress,
         "address": address,
-        "apikey": secrets.etherScanApiKey,
+        "apikey": secrets.polygonScanApiKey,
       }));
 
       final jsonResponse = json.decode(response.body) as Map<String, dynamic>;
@@ -75,12 +67,11 @@ class PolygonClient extends EVMChainClient {
   @override
   Future<List<EVMChainTransactionModel>> fetchInternalTransactions(String address) async {
     try {
-      final response = await client.get(Uri.https("api.etherscan.io", "/v2/api", {
-        "chainid": "$chainId",
+      final response = await httpClient.get(Uri.https("api.polygonscan.io", "/api", {
         "module": "account",
         "action": "txlistinternal",
         "address": address,
-        "apikey": secrets.etherScanApiKey,
+        "apikey": secrets.polygonScanApiKey,
       }));
 
       final jsonResponse = json.decode(response.body) as Map<String, dynamic>;
diff --git a/cw_polygon/lib/polygon_wallet.dart b/cw_polygon/lib/polygon_wallet.dart
index 991552068..4db24b32a 100644
--- a/cw_polygon/lib/polygon_wallet.dart
+++ b/cw_polygon/lib/polygon_wallet.dart
@@ -41,26 +41,14 @@ class PolygonWallet extends EVMChainWallet {
   }
 
   @override
-  void addInitialTokens([bool isMigration = false]) {
+  void addInitialTokens() {
     final initialErc20Tokens = DefaultPolygonErc20Tokens().initialPolygonErc20Tokens;
 
-    for (final token in initialErc20Tokens) {
-      if (evmChainErc20TokensBox.containsKey(token.contractAddress)) {
-        final existingToken = evmChainErc20TokensBox.get(token.contractAddress);
-        if (existingToken?.tag != token.tag) {
-          evmChainErc20TokensBox.put(token.contractAddress, token);
-        }
-      } else {
-        if (isMigration) token.enabled = false;
-        evmChainErc20TokensBox.put(token.contractAddress, token);
-      }
+    for (var token in initialErc20Tokens) {
+      evmChainErc20TokensBox.put(token.contractAddress, token);
     }
   }
 
-  @override
-  List<String> get getDefaultTokenContractAddresses =>
-      DefaultPolygonErc20Tokens().initialPolygonErc20Tokens.map((e) => e.contractAddress).toList();
-
   @override
   Future<bool> checkIfScanProviderIsEnabled() async {
     bool isPolygonScanEnabled = (await sharedPrefs.future).getBool("use_polygonscan") ?? true;
@@ -80,7 +68,6 @@ class PolygonWallet extends EVMChainWallet {
       enabled: token.enabled,
       tag: token.tag ?? "MATIC",
       iconPath: iconPath,
-      isPotentialScam: token.isPotentialScam,
     );
   }
 
diff --git a/cw_polygon/lib/polygon_wallet_service.dart b/cw_polygon/lib/polygon_wallet_service.dart
index 05af311e7..994912e8d 100644
--- a/cw_polygon/lib/polygon_wallet_service.dart
+++ b/cw_polygon/lib/polygon_wallet_service.dart
@@ -55,7 +55,6 @@ class PolygonWalletService extends EVMChainWalletService<PolygonWallet> {
       );
 
       await wallet.init();
-      wallet.addInitialTokens(true);
       await wallet.save();
       saveBackup(name);
       return wallet;
diff --git a/cw_polygon/pubspec.yaml b/cw_polygon/pubspec.yaml
index bcbd80443..8421562b4 100644
--- a/cw_polygon/pubspec.yaml
+++ b/cw_polygon/pubspec.yaml
@@ -34,7 +34,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^2.0.0
-  build_runner: ^2.4.15
+  build_runner: ^2.4.7
 
 
 # For information on the generic Dart part of this file, see the
diff --git a/cw_shared_external/android/build.gradle b/cw_shared_external/android/build.gradle
index 360f518ff..8d2b1b13d 100644
--- a/cw_shared_external/android/build.gradle
+++ b/cw_shared_external/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.1'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/cw_solana/lib/solana_client.dart b/cw_solana/lib/solana_client.dart
index d57da5af0..0e08f9abb 100644
--- a/cw_solana/lib/solana_client.dart
+++ b/cw_solana/lib/solana_client.dart
@@ -2,10 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math' as math;
 
-import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/solana_rpc_http_service.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_solana/pending_solana_transaction.dart';
@@ -13,17 +11,14 @@ import 'package:cw_solana/solana_balance.dart';
 import 'package:cw_solana/solana_exceptions.dart';
 import 'package:cw_solana/solana_transaction_model.dart';
 import 'package:cw_solana/spl_token.dart';
+import 'package:http/http.dart' as http;
 import 'package:on_chain/solana/solana.dart';
-import 'package:on_chain/solana/src/instructions/associated_token_account/constant.dart';
 import 'package:on_chain/solana/src/models/pda/pda.dart';
 import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:on_chain/solana/src/rpc/models/models/confirmed_transaction_meta.dart';
 import '.secrets.g.dart' as secrets;
 
 class SolanaWalletClient {
-  // Minimum amount in SOL to consider a transaction valid (to filter spam)
-  static const double minValidAmount = 0.00000003;
-  final httpClient = ProxyWrapper().getHttpClient();
+  final httpClient = http.Client();
   SolanaRPC? _provider;
 
   bool connect(Node node) {
@@ -87,8 +82,7 @@ class SolanaWalletClient {
     }
   }
 
-  Future<SolanaBalance?> getSplTokenBalance(
-      String mintAddress, String walletAddress) async {
+  Future<SolanaBalance?> getSplTokenBalance(String mintAddress, String walletAddress) async {
     // Fetch the token accounts (a token can have multiple accounts for various uses)
     final tokenAccounts = await getSPLTokenAccounts(mintAddress, walletAddress);
 
@@ -124,16 +118,14 @@ class SolanaWalletClient {
         ),
       );
 
-      final fee =
-          (feeForMessage?.toDouble() ?? 0.0) / SolanaUtils.lamportsPerSol;
+      final fee = (feeForMessage?.toDouble() ?? 0.0) / SolanaUtils.lamportsPerSol;
       return fee;
     } catch (_) {
       return 0.0;
     }
   }
 
-  Future<double> getEstimatedFee(
-      SolanaPublicKey publicKey, Commitment commitment) async {
+  Future<double> getEstimatedFee(SolanaPublicKey publicKey, Commitment commitment) async {
     final message = await _getMessageForNativeTransaction(
       publicKey: publicKey,
       destinationAddress: publicKey.toAddress().address,
@@ -163,88 +155,121 @@ class SolanaWalletClient {
       if (meta == null || transaction == null) return null;
 
       final int fee = meta.fee;
-      final feeInSol = fee / SolanaUtils.lamportsPerSol;
 
       final message = transaction.message;
       final instructions = message.compiledInstructions;
 
+      String sender = "";
+      String receiver = "";
+
       String signature = (txResponse.transaction?.signatures.isEmpty ?? true)
           ? ""
           : Base58Encoder.encode(txResponse.transaction!.signatures.first);
 
-
       for (final instruction in instructions) {
         final programId = message.accountKeys[instruction.programIdIndex];
 
-        if (programId == SystemProgramConst.programId ||
-            programId == ComputeBudgetConst.programId) {
+        if (programId == SystemProgramConst.programId) {
           // For native solana transactions
           if (instruction.accounts.length < 2) continue;
+          final senderIndex = instruction.accounts[0];
+          final receiverIndex = instruction.accounts[1];
 
-          // Get the fee payer index based on transaction type
-          // For legacy transfers, the first account is usually the fee payer
-          // For versioned, the first account in instruction is usually the fee payer
-          final feePayerIndex =
-              txResponse.version == TransactionType.legacy ? 0 : instruction.accounts[0];
+          sender = message.accountKeys[senderIndex].address;
+          receiver = message.accountKeys[receiverIndex].address;
 
-          final transactionModel = await _parseNativeTransaction(
-            message: message,
-            meta: meta,
-            fee: fee,
-            feeInSol: feeInSol,
-            feePayerIndex: feePayerIndex,
-            walletAddress: walletAddress,
-            signature: signature,
-            blockTime: blockTime,
+          final feeForTx = fee / SolanaUtils.lamportsPerSol;
+
+          final preBalances = meta.preBalances;
+          final postBalances = meta.postBalances;
+
+          final amountInString =
+              (((preBalances[senderIndex] - postBalances[senderIndex]) / BigInt.from(1e9))
+                          .toDouble() -
+                      feeForTx)
+                  .toStringAsFixed(6);
+
+          final amount = double.parse(amountInString);
+
+          return SolanaTransactionModel(
+            isOutgoingTx: sender == walletAddress,
+            from: sender,
+            to: receiver,
+            id: signature,
+            amount: amount.abs(),
+            programId: SystemProgramConst.programId.address,
+            tokenSymbol: 'SOL',
+            blockTimeInInt: blockTime?.toInt() ?? 0,
+            fee: feeForTx,
           );
-
-          if (transactionModel != null) {
-            return transactionModel;
-          }
         } else if (programId == SPLTokenProgramConst.tokenProgramId) {
           // For SPL Token transactions
           if (instruction.accounts.length < 2) continue;
 
-          final transactionModel = await _parseSPLTokenTransaction(
-            message: message,
-            meta: meta,
-            fee: fee,
-            feeInSol: feeInSol,
-            instruction: instruction,
-            walletAddress: walletAddress,
-            signature: signature,
-            blockTime: blockTime,
-            splTokenSymbol: splTokenSymbol,
-          );
+          final preBalances = meta.preTokenBalances;
+          final postBalances = meta.postTokenBalances;
 
-          if (transactionModel != null) {
-            return transactionModel;
-          }
-        } else if (programId == AssociatedTokenAccountProgramConst.associatedTokenProgramId) {
-          // For ATA program, we need to check if this is a create account transaction
-          // or if it's part of a normal token transfer
+          double amount = 0.0;
+          bool isOutgoing = false;
+          String? mintAddress;
 
-          // We skip this transaction if this is the only instruction (this means that it's a create account transaction)
-          if (instructions.length == 1) {
-            return null;
-          }
+          double userPreAmount = 0.0;
+          if (preBalances != null && preBalances.isNotEmpty) {
+            for (final preBal in preBalances) {
+              if (preBal.owner?.address == walletAddress) {
+                userPreAmount = preBal.uiTokenAmount.uiAmount ?? 0.0;
 
-          // We look for a token transfer instruction in the same transaction
-          bool hasTokenTransfer = false;
-          for (final otherInstruction in instructions) {
-            final otherProgramId = message.accountKeys[otherInstruction.programIdIndex];
-            if (otherProgramId == SPLTokenProgramConst.tokenProgramId) {
-              hasTokenTransfer = true;
-              break;
+                mintAddress = preBal.mint.address;
+                break;
+              }
             }
           }
 
-          // If there's no token transfer instruction, it means this is just an ATA creation transaction
-          if (!hasTokenTransfer) {
-            return null;
+          double userPostAmount = 0.0;
+          if (postBalances != null && postBalances.isNotEmpty) {
+            for (final postBal in postBalances) {
+              if (postBal.owner?.address == walletAddress) {
+                userPostAmount = postBal.uiTokenAmount.uiAmount ?? 0.0;
+
+                mintAddress ??= postBal.mint.address;
+                break;
+              }
+            }
           }
 
-          continue;
+          final diff = userPreAmount - userPostAmount;
+          final rawAmount = diff.abs();
+
+          final amountInString = rawAmount.toStringAsFixed(6);
+          amount = double.parse(amountInString);
+
+          isOutgoing = diff > 0;
+
+          if (mintAddress == null && instruction.accounts.length >= 4) {
+            final mintIndex = instruction.accounts[3];
+            mintAddress = message.accountKeys[mintIndex].address;
+          }
+
+          final sender = message.accountKeys[instruction.accounts[0]].address;
+          final receiver = message.accountKeys[instruction.accounts[1]].address;
+
+          String? tokenSymbol = splTokenSymbol;
+          if (tokenSymbol == null && mintAddress != null) {
+            final token = await fetchSPLTokenInfo(mintAddress);
+            tokenSymbol = token?.symbol;
+          }
+
+          return SolanaTransactionModel(
+            isOutgoingTx: isOutgoing,
+            from: sender,
+            to: receiver,
+            id: signature,
+            amount: amount,
+            programId: SPLTokenProgramConst.tokenProgramId.address,
+            blockTimeInInt: blockTime?.toInt() ?? 0,
+            tokenSymbol: tokenSymbol ?? '',
+            fee: fee / SolanaUtils.lamportsPerSol,
+          );
         } else {
           return null;
         }
@@ -256,144 +281,6 @@ class SolanaWalletClient {
     return null;
   }
 
-  Future<SolanaTransactionModel?> _parseNativeTransaction({
-    required VersionedMessage message,
-    required ConfirmedTransactionMeta meta,
-    required int fee,
-    required double feeInSol,
-    required int feePayerIndex,
-    required String walletAddress,
-    required String signature,
-    required BigInt? blockTime,
-  }) async {
-    // Calculate total balance changes across all accounts
-    BigInt totalBalanceChange = BigInt.zero;
-    String? sender;
-    String? receiver;
-
-    for (int i = 0; i < meta.preBalances.length; i++) {
-      final preBalance = meta.preBalances[i];
-      final postBalance = meta.postBalances[i];
-      final balanceChange = preBalance - postBalance;
-
-      if (balanceChange > BigInt.zero) {
-        // This account sent funds
-        sender = message.accountKeys[i].address;
-        totalBalanceChange += balanceChange;
-      } else if (balanceChange < BigInt.zero) {
-        // This account received funds
-        receiver = message.accountKeys[i].address;
-      }
-    }
-
-    // We subtract the fee from total balance change if the fee payer is the sender
-    if (sender == message.accountKeys[feePayerIndex].address) {
-      totalBalanceChange -= BigInt.from(fee);
-    }
-
-    if (sender == null || receiver == null) {
-      return null;
-    }
-
-    final amount = totalBalanceChange / BigInt.from(1e9);
-    final amountInSol = amount.abs().toDouble();
-
-    // Skip transactions with very small amounts (likely spam)
-    if (amountInSol < minValidAmount) {
-      return null;
-    }
-
-    return SolanaTransactionModel(
-      isOutgoingTx: sender == walletAddress,
-      from: sender,
-      to: receiver,
-      id: signature,
-      amount: amountInSol,
-      programId: SystemProgramConst.programId.address,
-      tokenSymbol: 'SOL',
-      blockTimeInInt: blockTime?.toInt() ?? 0,
-      fee: feeInSol,
-    );
-  }
-
-  Future<SolanaTransactionModel?> _parseSPLTokenTransaction({
-    required VersionedMessage message,
-    required ConfirmedTransactionMeta meta,
-    required int fee,
-    required double feeInSol,
-    required CompiledInstruction instruction,
-    required String walletAddress,
-    required String signature,
-    required BigInt? blockTime,
-    String? splTokenSymbol,
-  }) async {
-    final preBalances = meta.preTokenBalances;
-    final postBalances = meta.postTokenBalances;
-
-    double amount = 0.0;
-    bool isOutgoing = false;
-    String? mintAddress;
-
-    double userPreAmount = 0.0;
-    if (preBalances != null && preBalances.isNotEmpty) {
-      for (final preBal in preBalances) {
-        if (preBal.owner?.address == walletAddress) {
-          userPreAmount = preBal.uiTokenAmount.uiAmount ?? 0.0;
-
-          mintAddress = preBal.mint.address;
-          break;
-        }
-      }
-    }
-
-    double userPostAmount = 0.0;
-    if (postBalances != null && postBalances.isNotEmpty) {
-      for (final postBal in postBalances) {
-        if (postBal.owner?.address == walletAddress) {
-          userPostAmount = postBal.uiTokenAmount.uiAmount ?? 0.0;
-
-          mintAddress ??= postBal.mint.address;
-          break;
-        }
-      }
-    }
-
-    final diff = userPreAmount - userPostAmount;
-    final rawAmount = diff.abs();
-
-    final amountInString = rawAmount.toStringAsFixed(6);
-    amount = double.parse(amountInString);
-
-    isOutgoing = diff > 0;
-
-    if (mintAddress == null && instruction.accounts.length >= 4) {
-      final mintIndex = instruction.accounts[3];
-      mintAddress = message.accountKeys[mintIndex].address;
-    }
-
-    final sender = message.accountKeys[instruction.accounts[0]].address;
-    final receiver = message.accountKeys[instruction.accounts[1]].address;
-
-    String? tokenSymbol = splTokenSymbol;
-
-    if (tokenSymbol == null && mintAddress != null) {
-      final token = await getTokenInfo(mintAddress);
-      tokenSymbol = token?.symbol;
-    }
-
-    return SolanaTransactionModel(
-      isOutgoingTx: isOutgoing,
-      from: sender,
-      to: receiver,
-      id: signature,
-      amount: amount,
-      programId: SPLTokenProgramConst.tokenProgramId.address,
-      blockTimeInInt: blockTime?.toInt() ?? 0,
-      tokenSymbol: tokenSymbol ?? '',
-      fee: feeInSol,
-    );
-  }
-
   /// Load the Address's transactions into the account
   Future<List<SolanaTransactionModel>> fetchTransactions(
     SolAddress address, {
@@ -401,9 +288,9 @@ class SolanaWalletClient {
     int? splTokenDecimal,
     Commitment? commitment,
     SolAddress? walletAddress,
-    required void Function(List<SolanaTransactionModel>) onUpdate,
   }) async {
     List<SolanaTransactionModel> transactions = [];
+
     try {
       final signatures = await _provider!.request(
         SolanaRPCGetSignaturesForAddress(
@@ -412,11 +299,10 @@ class SolanaWalletClient {
         ),
       );
 
-      // The maximum concurrent batch size.
-      const int batchSize = 10;
+      final List<VersionedTransactionResponse?> transactionDetails = [];
 
-      for (int i = 0; i < signatures.length; i += batchSize) {
-        final batch = signatures.skip(i).take(batchSize).toList();
+      for (int i = 0; i < signatures.length; i += 20) {
+        final batch = signatures.skip(i).take(20).toList(); // Get the next 20 signatures
 
         final batchResponses = await Future.wait(batch.map((signature) async {
           try {
@@ -428,33 +314,27 @@ class SolanaWalletClient {
               ),
             );
           } catch (e) {
-            // printV("Error fetching transaction: $e");
+            printV("Error fetching transaction: $e");
             return null;
           }
         }));
 
-        final versionedBatchResponses =
-            batchResponses.whereType<VersionedTransactionResponse>();
+        transactionDetails.addAll(batchResponses.whereType<VersionedTransactionResponse>());
 
-        final parsedTransactionsFutures =
-            versionedBatchResponses.map((tx) => parseTransaction(
-                  txResponse: tx,
-                  splTokenSymbol: splTokenSymbol,
-                  walletAddress: walletAddress?.address ?? address.address,
-                ));
-
-        final parsedTransactions = await Future.wait(parsedTransactionsFutures);
-
-        transactions.addAll(
-            parsedTransactions.whereType<SolanaTransactionModel>().toList());
-
-        // Only update UI if we have new valid transactions
-        if (parsedTransactions.isNotEmpty) {
-          onUpdate(List<SolanaTransactionModel>.from(transactions));
+        // to avoid reaching the node RPS limit
+        if (i + 20 < signatures.length) {
+          await Future.delayed(const Duration(milliseconds: 500));
         }
+      }
 
-        if (i + batchSize < signatures.length) {
-          await Future.delayed(const Duration(milliseconds: 300));
+      for (final tx in transactionDetails) {
+        final parsedTx = await parseTransaction(
+          txResponse: tx,
+          splTokenSymbol: splTokenSymbol,
+          walletAddress: walletAddress?.address ?? address.address,
+        );
+        if (parsedTx != null) {
+          transactions.add(parsedTx);
         }
       }
 
@@ -470,7 +350,6 @@ class SolanaWalletClient {
     required String splTokenSymbol,
     required int splTokenDecimal,
     required SolanaPrivateKey privateKey,
-    required void Function(List<SolanaTransactionModel>) onUpdate,
   }) async {
     ProgramDerivedAddress? associatedTokenAccount;
     final ownerWalletAddress = privateKey.publicKey().toAddress();
@@ -494,29 +373,14 @@ class SolanaWalletClient {
       splTokenSymbol: splTokenSymbol,
       splTokenDecimal: splTokenDecimal,
       walletAddress: ownerWalletAddress,
-      onUpdate: onUpdate,
     );
 
     return tokenTransactions;
   }
 
-  final Map<String, SPLToken?> tokenInfoCache = {};
-
-  Future<SPLToken?> getTokenInfo(String mintAddress) async {
-    if (tokenInfoCache.containsKey(mintAddress)) {
-      return tokenInfoCache[mintAddress];
-    } else {
-      final token = await fetchSPLTokenInfo(mintAddress);
-      if (token != null) {
-        tokenInfoCache[mintAddress] = token;
-      }
-      return token;
-    }
-  }
-
   Future<SPLToken?> fetchSPLTokenInfo(String mintAddress) async {
-    final programAddress = MetaplexTokenMetaDataProgramUtils.findMetadataPda(
-        mint: SolAddress(mintAddress));
+    final programAddress =
+        MetaplexTokenMetaDataProgramUtils.findMetadataPda(mint: SolAddress(mintAddress));
 
     final token = await _provider!.request(
       SolanaRPCGetMetadataAccount(
@@ -537,9 +401,8 @@ class SolanaWalletClient {
     //   iconPath = await _client.getIconImageFromTokenUri(metadata.uri);
     // } catch (_) {}
 
-    String filteredTokenSymbol = metadata.symbol
-        .replaceFirst(RegExp('^\\\$'), '')
-        .replaceAll('\u0000', '');
+    String filteredTokenSymbol =
+        metadata.symbol.replaceFirst(RegExp('^\\\$'), '').replaceAll('\u0000', '');
 
     return SPLToken.fromMetadata(
       name: metadata.name,
@@ -655,8 +518,7 @@ class SolanaWalletClient {
     return message;
   }
 
-  Future<double> _getFeeFromCompiledMessage(
-      Message message, Commitment commitment) async {
+  Future<double> _getFeeFromCompiledMessage(Message message, Commitment commitment) async {
     final base64Message = base64Encode(message.serialize());
 
     final fee = await getFeeForMessage(base64Message, commitment);
@@ -795,8 +657,7 @@ class SolanaWalletClient {
     required SolAddress mintAddress,
     required bool shouldCreateATA,
   }) async {
-    final associatedTokenAccount =
-        AssociatedTokenAccountProgramUtils.associatedTokenAccount(
+    final associatedTokenAccount = AssociatedTokenAccountProgramUtils.associatedTokenAccount(
       mint: mintAddress,
       owner: ownerAddress,
     );
@@ -804,24 +665,19 @@ class SolanaWalletClient {
     SolanaAccountInfo? accountInfo;
     try {
       accountInfo = await _provider!.request(
-        SolanaRPCGetAccountInfo(
-          account: associatedTokenAccount.address,
-          commitment: Commitment.confirmed,
-        ),
+        SolanaRPCGetAccountInfo(account: associatedTokenAccount.address),
       );
     } catch (e) {
       accountInfo = null;
     }
 
-    // If account exists, we return the associated token account
+    // If aacountInfo is null, signifies that the associatedTokenAccount has only been created locally and not been broadcasted to the blockchain.
     if (accountInfo != null) return associatedTokenAccount;
 
     if (!shouldCreateATA) return null;
 
-    final payerAddress = payerPrivateKey.publicKey().toAddress();
-
     final createAssociatedTokenAccount = AssociatedTokenAccountProgram.associatedTokenAccount(
-      payer: payerAddress,
+      payer: payerPrivateKey.publicKey().toAddress(),
       associatedToken: associatedTokenAccount.address,
       owner: ownerAddress,
       mint: mintAddress,
@@ -830,23 +686,19 @@ class SolanaWalletClient {
     final blockhash = await _getLatestBlockhash(Commitment.confirmed);
 
     final transaction = SolanaTransaction(
-      payerKey: payerAddress,
+      payerKey: payerPrivateKey.publicKey().toAddress(),
       instructions: [createAssociatedTokenAccount],
       recentBlockhash: blockhash,
-      type: TransactionType.v0,
     );
 
-    final serializedTransaction = await _signTransactionInternal(
-      ownerPrivateKey: payerPrivateKey,
-      transaction: transaction,
-    );
+    transaction.sign([payerPrivateKey]);
 
     await sendTransaction(
-      serializedTransaction: serializedTransaction,
+      serializedTransaction: transaction.serializeString(),
       commitment: Commitment.confirmed,
     );
 
-    // Wait for confirmation
+    // Delay for propagation on the blockchain for newly created associated token addresses
     await Future.delayed(const Duration(seconds: 2));
 
     return associatedTokenAccount;
@@ -867,8 +719,7 @@ class SolanaWalletClient {
     final amount = (inputAmount * math.pow(10, tokenDecimals)).toInt();
     ProgramDerivedAddress? associatedSenderAccount;
     try {
-      associatedSenderAccount =
-          AssociatedTokenAccountProgramUtils.associatedTokenAccount(
+      associatedSenderAccount = AssociatedTokenAccountProgramUtils.associatedTokenAccount(
         mint: mintAddress,
         owner: ownerPrivateKey.publicKey().toAddress(),
       );
@@ -896,7 +747,9 @@ class SolanaWalletClient {
     } catch (e) {
       associatedRecipientAccount = null;
 
-      throw SolanaCreateAssociatedTokenAccountException(e.toString());
+      throw SolanaCreateAssociatedTokenAccountException(
+        'Error fetching recipient associated token account: ${e.toString()}',
+      );
     }
 
     if (associatedRecipientAccount == null) {
@@ -972,7 +825,6 @@ class SolanaWalletClient {
   }) async {
     /// Sign the transaction with the owner's private key.
     final ownerSignature = ownerPrivateKey.sign(transaction.serializeMessage());
-
     transaction.addSignature(ownerPrivateKey.publicKey().toAddress(), ownerSignature);
 
     /// Serialize the transaction.
@@ -1003,8 +855,7 @@ class SolanaWalletClient {
     if (uri.isEmpty || uri == '…') return null;
 
     try {
-      final client = ProxyWrapper().getHttpIOClient();
-      final response = await client.get(Uri.parse(uri));
+      final response = await httpClient.get(Uri.parse(uri));
 
       final jsonResponse = json.decode(response.body) as Map<String, dynamic>;
 
diff --git a/cw_solana/lib/solana_wallet.dart b/cw_solana/lib/solana_wallet.dart
index ec65642bc..1495189db 100644
--- a/cw_solana/lib/solana_wallet.dart
+++ b/cw_solana/lib/solana_wallet.dart
@@ -167,10 +167,10 @@ abstract class SolanaWalletBase
 
     try {
       final keypairBytes = Base58Decoder.decode(privateKey!);
-      return SolanaPrivateKey.fromBytes(keypairBytes);
+      return SolanaPrivateKey.fromSeed(keypairBytes);
     } catch (_) {
       final privateKeyBytes = HEX.decode(privateKey!);
-      return SolanaPrivateKey.fromSeed(privateKeyBytes);
+      return SolanaPrivateKey.fromBytes(privateKeyBytes);
     }
   }
 
@@ -292,14 +292,9 @@ abstract class SolanaWalletBase
   @override
   Future<Map<String, SolanaTransactionInfo>> fetchTransactions() async => {};
 
-  void updateTransactions(List<SolanaTransactionModel> updatedTx) {
-    _addTransactionsToTransactionHistory(updatedTx);
-  }
-
   /// Fetches the native SOL transactions linked to the wallet Public Key
   Future<void> _updateNativeSOLTransactions() async {
-    final transactions =
-        await _client.fetchTransactions(_solanaPublicKey.toAddress(), onUpdate: updateTransactions);
+    final transactions = await _client.fetchTransactions(_solanaPublicKey.toAddress());
 
     await _addTransactionsToTransactionHistory(transactions);
   }
@@ -318,7 +313,6 @@ abstract class SolanaWalletBase
           splTokenSymbol: token.symbol,
           splTokenDecimal: token.decimal,
           privateKey: _solanaPrivateKey,
-          onUpdate: updateTransactions,
         );
 
         // splTokenTransactions.addAll(tokenTxs);
diff --git a/cw_solana/lib/spl_token.dart b/cw_solana/lib/spl_token.dart
index fe793bbf6..97538a706 100644
--- a/cw_solana/lib/spl_token.dart
+++ b/cw_solana/lib/spl_token.dart
@@ -6,7 +6,6 @@ part 'spl_token.g.dart';
 
 @HiveType(typeId: SPLToken.typeId)
 class SPLToken extends CryptoCurrency with HiveObjectMixin {
-  @override
   @HiveField(0)
   final String name;
 
@@ -25,18 +24,12 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
   @HiveField(5)
   final String mint;
 
-  @override
   @HiveField(6)
   final String? iconPath;
 
-  @override
   @HiveField(7)
   final String? tag;
 
-  @override
-  @HiveField(8, defaultValue: false)
-  final bool isPotentialScam;
-
   SPLToken({
     required this.name,
     required this.symbol,
@@ -46,7 +39,6 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
     this.iconPath,
     this.tag = 'SOL',
     bool enabled = true,
-    this.isPotentialScam = false,
   })  : _enabled = enabled,
         super(
           name: mint.toLowerCase(),
@@ -55,7 +47,6 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
           tag: tag,
           iconPath: iconPath,
           decimals: decimal,
-          isPotentialScam: isPotentialScam,
         );
 
   factory SPLToken.fromMetadata({
@@ -64,7 +55,6 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
     required String symbol,
     required String mintAddress,
     String? iconPath,
-    bool isPotentialScam = false,
   }) {
     return SPLToken(
       name: name,
@@ -73,14 +63,28 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
       decimal: 0,
       mint: mint,
       iconPath: iconPath,
-      isPotentialScam: isPotentialScam,
     );
   }
 
-  @override
+  factory SPLToken.cryptoCurrency({
+    required String name,
+    required String symbol,
+    required int decimals,
+    required String iconPath,
+    required String mint,
+  }) {
+    return SPLToken(
+      name: name,
+      symbol: symbol,
+      decimal: decimals,
+      mint: mint,
+      iconPath: iconPath,
+      mintAddress: '',
+    );
+  }
+
   bool get enabled => _enabled;
 
-  @override
   set enabled(bool value) => _enabled = value;
 
   SPLToken.copyWith(SPLToken other, String? icon, String? tag)
@@ -92,7 +96,6 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
         mint = other.mint,
         tag = other.tag,
         iconPath = icon,
-        isPotentialScam = other.isPotentialScam,
         super(
           title: other.symbol.toUpperCase(),
           name: other.symbol.toLowerCase(),
@@ -100,7 +103,6 @@ class SPLToken extends CryptoCurrency with HiveObjectMixin {
           fullName: other.name,
           tag: other.tag,
           iconPath: icon,
-          isPotentialScam: other.isPotentialScam,
         );
 
   static const typeId = SPL_TOKEN_TYPE_ID;
diff --git a/cw_solana/pubspec.yaml b/cw_solana/pubspec.yaml
index c91ca6efc..82b5a2bc0 100644
--- a/cw_solana/pubspec.yaml
+++ b/cw_solana/pubspec.yaml
@@ -33,9 +33,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^2.0.0
-  build_runner: ^2.4.15
+  build_runner: ^2.4.7
   mobx_codegen: ^2.0.7
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
 
 dependency_overrides:
   watcher: ^1.1.0
diff --git a/cw_tron/lib/tron_client.dart b/cw_tron/lib/tron_client.dart
index cceec5327..8eca02af6 100644
--- a/cw_tron/lib/tron_client.dart
+++ b/cw_tron/lib/tron_client.dart
@@ -5,7 +5,6 @@ import 'dart:developer';
 import 'package:blockchain_utils/blockchain_utils.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_tron/pending_tron_transaction.dart';
 import 'package:cw_tron/tron_abi.dart';
 import 'package:cw_tron/tron_balance.dart';
@@ -14,12 +13,12 @@ import 'package:cw_tron/tron_token.dart';
 import 'package:cw_tron/tron_transaction_model.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
+import 'package:http/http.dart';
 import '.secrets.g.dart' as secrets;
 import 'package:on_chain/on_chain.dart';
 
 class TronClient {
-  late final client = ProxyWrapper().getHttpIOClient();
-
+  final httpClient = Client();
   TronProvider? _provider;
   // This is an internal tracker, so we don't have to "refetch".
   int _nativeTxEstimatedFee = 0;
@@ -29,7 +28,7 @@ class TronClient {
   Future<List<TronTransactionModel>> fetchTransactions(String address,
       {String? contractAddress}) async {
     try {
-      final response = await client.get(
+      final response = await httpClient.get(
         Uri.https(
           "api.trongrid.io",
           "/v1/accounts/$address/transactions",
@@ -62,7 +61,7 @@ class TronClient {
 
   Future<List<TronTRC20TransactionModel>> fetchTrc20ExcludedTransactions(String address) async {
     try {
-      final response = await client.get(
+      final response = await httpClient.get(
         Uri.https(
           "api.trongrid.io",
           "/v1/accounts/$address/transactions/trc20",
@@ -429,7 +428,7 @@ class TronClient {
     if (!request.isSuccess) {
       log("Tron TRC20 error: ${request.error} \n ${request.respose}");
       throw Exception(
-        'An error occurred while creating the transfer request. Please try again.',
+        'An error occured while creating the transfer request. Please try again.',
       );
     }
 
diff --git a/cw_tron/lib/tron_http_provider.dart b/cw_tron/lib/tron_http_provider.dart
index 420ff85b0..8a3301f87 100644
--- a/cw_tron/lib/tron_http_provider.dart
+++ b/cw_tron/lib/tron_http_provider.dart
@@ -1,22 +1,22 @@
 import 'dart:convert';
 
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 import 'package:on_chain/tron/tron.dart';
 import '.secrets.g.dart' as secrets;
 
 class TronHTTPProvider implements TronServiceProvider {
   TronHTTPProvider(
       {required this.url,
-      this.defaultRequestTimeout = const Duration(seconds: 30)});
-
+      http.Client? client,
+      this.defaultRequestTimeout = const Duration(seconds: 30)})
+      : client = client ?? http.Client();
   @override
   final String url;
-  late final client = ProxyWrapper().getHttpIOClient();
+  final http.Client client;
   final Duration defaultRequestTimeout;
 
   @override
-  Future<Map<String, dynamic>> get(TronRequestDetails params,
-      [Duration? timeout]) async {
+  Future<Map<String, dynamic>> get(TronRequestDetails params, [Duration? timeout]) async {
     final response = await client.get(Uri.parse(params.url(url)), headers: {
       'Content-Type': 'application/json',
       if (url.contains("trongrid")) 'TRON-PRO-API-KEY': secrets.tronGridApiKey,
@@ -27,16 +27,13 @@ class TronHTTPProvider implements TronServiceProvider {
   }
 
   @override
-  Future<Map<String, dynamic>> post(TronRequestDetails params,
-      [Duration? timeout]) async {
+  Future<Map<String, dynamic>> post(TronRequestDetails params, [Duration? timeout]) async {
     final response = await client
         .post(Uri.parse(params.url(url)),
             headers: {
               'Content-Type': 'application/json',
-              if (url.contains("trongrid"))
-                'TRON-PRO-API-KEY': secrets.tronGridApiKey,
-              if (url.contains("nownodes"))
-                'api-key': secrets.tronNowNodesApiKey,
+              if (url.contains("trongrid")) 'TRON-PRO-API-KEY': secrets.tronGridApiKey,
+              if (url.contains("nownodes")) 'api-key': secrets.tronNowNodesApiKey,
             },
             body: params.toRequestBody())
         .timeout(timeout ?? defaultRequestTimeout);
diff --git a/cw_tron/lib/tron_token.dart b/cw_tron/lib/tron_token.dart
index 182b84884..8c45ab486 100644
--- a/cw_tron/lib/tron_token.dart
+++ b/cw_tron/lib/tron_token.dart
@@ -25,13 +25,10 @@ class TronToken extends CryptoCurrency with HiveObjectMixin {
 
   @HiveField(5)
   final String? iconPath;
-
+  
   @HiveField(6)
   final String? tag;
 
-  @HiveField(7, defaultValue: false)
-  final bool isPotentialScam;
-
   bool get enabled => _enabled;
 
   set enabled(bool value) => _enabled = value;
@@ -44,17 +41,14 @@ class TronToken extends CryptoCurrency with HiveObjectMixin {
     bool enabled = true,
     this.iconPath,
     this.tag = 'TRX',
-    this.isPotentialScam = false,
   })  : _enabled = enabled,
         super(
-          name: symbol.toLowerCase(),
-          title: symbol.toUpperCase(),
-          fullName: name,
-          tag: tag,
-          iconPath: iconPath,
-          decimals: decimal,
-          isPotentialScam: isPotentialScam,
-        );
+            name: symbol.toLowerCase(),
+            title: symbol.toUpperCase(),
+            fullName: name,
+            tag: tag,
+            iconPath: iconPath,
+            decimals: decimal);
 
   TronToken.copyWith(TronToken other, String? icon, String? tag)
       : name = other.name,
@@ -64,7 +58,6 @@ class TronToken extends CryptoCurrency with HiveObjectMixin {
         _enabled = other.enabled,
         tag = tag ?? other.tag,
         iconPath = icon ?? other.iconPath,
-        isPotentialScam = other.isPotentialScam,
         super(
           name: other.name,
           title: other.symbol.toUpperCase(),
@@ -72,7 +65,6 @@ class TronToken extends CryptoCurrency with HiveObjectMixin {
           tag: tag ?? other.tag,
           iconPath: icon ?? other.iconPath,
           decimals: other.decimal,
-          isPotentialScam: other.isPotentialScam,
         );
 
   static const typeId = TRON_TOKEN_TYPE_ID;
diff --git a/cw_tron/lib/tron_wallet.dart b/cw_tron/lib/tron_wallet.dart
index eb80696ce..c6175dd32 100644
--- a/cw_tron/lib/tron_wallet.dart
+++ b/cw_tron/lib/tron_wallet.dart
@@ -509,15 +509,11 @@ abstract class TronWalletBase
 
   Future<void> addTronToken(TronToken token) async {
     String? iconPath;
-    if ((token.iconPath == null || token.iconPath!.isEmpty) && !token.isPotentialScam) {
-      try {
-        iconPath = CryptoCurrency.all
-            .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
-            .iconPath;
-      } catch (_) {}
-    } else if (!token.isPotentialScam) {
-      iconPath = token.iconPath;
-    }
+    try {
+      iconPath = CryptoCurrency.all
+          .firstWhere((element) => element.title.toUpperCase() == token.symbol.toUpperCase())
+          .iconPath;
+    } catch (_) {}
 
     final newToken = TronToken(
       name: token.name,
@@ -527,7 +523,6 @@ abstract class TronWalletBase
       enabled: token.enabled,
       tag: token.tag ?? "TRX",
       iconPath: iconPath,
-      isPotentialScam: token.isPotentialScam,
     );
 
     await tronTokensBox.put(newToken.contractAddress, newToken);
diff --git a/cw_tron/pubspec.yaml b/cw_tron/pubspec.yaml
index 57c99286c..80ea7ee51 100644
--- a/cw_tron/pubspec.yaml
+++ b/cw_tron/pubspec.yaml
@@ -31,9 +31,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^2.0.0
-  build_runner: ^2.4.15
+  build_runner: ^2.3.3
   mobx_codegen: ^2.1.1
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
 flutter:
   # assets:
   #   - images/a_dot_burr.jpeg
diff --git a/cw_wownero/lib/api/account_list.dart b/cw_wownero/lib/api/account_list.dart
index 5bd18d51e..a73e4dcd2 100644
--- a/cw_wownero/lib/api/account_list.dart
+++ b/cw_wownero/lib/api/account_list.dart
@@ -48,7 +48,8 @@ void addAccountSync({required String label}) {
 }
 
 void setLabelForAccountSync({required int accountIndex, required String label}) {
-  wownero.SubaddressAccount_setLabel(subaddressAccount!, accountIndex: accountIndex, label: label);
+  // TODO(mrcyjanek): this may be wrong function?
+  wownero.Wallet_setSubaddressLabel(wptr!, accountIndex: accountIndex, addressIndex: 0, label: label);
 }
 
 void _addAccount(String label) => addAccountSync(label: label);
diff --git a/cw_wownero/lib/api/wallet.dart b/cw_wownero/lib/api/wallet.dart
index a4ba8cbb2..e124e2979 100644
--- a/cw_wownero/lib/api/wallet.dart
+++ b/cw_wownero/lib/api/wallet.dart
@@ -110,16 +110,7 @@ int getUnlockedBalance({int accountIndex = 0}) =>
 
 int getCurrentHeight() => wownero.Wallet_blockChainHeight(wptr!);
 
-int cachedNodeHeight = 0;
-int getNodeHeightSync() {
-  (() async {
-    final wptrAddress = wptr!.address;
-    cachedNodeHeight = await Isolate.run(() async {
-      return wownero.Wallet_daemonBlockChainHeight(Pointer.fromAddress(wptrAddress));
-    });
-  })();
-  return cachedNodeHeight;
-}
+int getNodeHeightSync() => wownero.Wallet_daemonBlockChainHeight(wptr!);
 
 bool isConnectedSync() => wownero.Wallet_connected(wptr!) != 0;
 
@@ -163,7 +154,7 @@ Future<bool> setupNodeSync(
 }
 
 void startRefreshSync() {
-  // wownero.Wallet_refreshAsync(wptr!);
+  wownero.Wallet_refreshAsync(wptr!);
   wownero.Wallet_startRefresh(wptr!);
 }
 
@@ -363,5 +354,3 @@ String signMessage(String message, {String address = ""}) {
 bool verifyMessage(String message, String address, String signature) {
   return wownero.Wallet_verifySignedMessage(wptr!, message: message, address: address, signature: signature);
 }
-
-Map<String, List<int>> debugCallLength() => wownero.debugCallLength;
\ No newline at end of file
diff --git a/cw_wownero/lib/wownero_wallet.dart b/cw_wownero/lib/wownero_wallet.dart
index 2befaa20d..6f4630b60 100644
--- a/cw_wownero/lib/wownero_wallet.dart
+++ b/cw_wownero/lib/wownero_wallet.dart
@@ -16,7 +16,6 @@ import 'package:cw_core/transaction_direction.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wownero_amount_format.dart';
@@ -184,14 +183,6 @@ abstract class WowneroWalletBase
 
   @override
   Future<void> connectToNode({required Node node}) async {
-    String socksProxy = node.socksProxyAddress ?? '';
-    printV("bootstrapped: ${CakeTor.instance.bootstrapped}");
-    printV("     enabled: ${CakeTor.instance.enabled}");
-    printV("        port: ${CakeTor.instance.port}");
-    printV("     started: ${CakeTor.instance.started}");
-    if (CakeTor.instance.enabled) {
-      socksProxy = "127.0.0.1:${CakeTor.instance.port}";
-    }
     try {
       syncStatus = ConnectingSyncStatus();
       await wownero_wallet.setupNode(
@@ -201,7 +192,7 @@ abstract class WowneroWalletBase
           useSSL: node.isSSL,
           isLightWallet: false,
           // FIXME: hardcoded value
-          socksProxyAddress: socksProxy);
+          socksProxyAddress: node.socksProxyAddress);
 
       wownero_wallet.setTrustedDaemon(node.trusted);
       syncStatus = ConnectedSyncStatus();
@@ -779,9 +770,4 @@ abstract class WowneroWalletBase
 
     return wownero_wallet.verifyMessage(message, address, signature);
   }
-
-  @override
-  String formatCryptoAmount(String amount) {
-    return wowneroAmountToString(amount: int.parse(amount));
-  }
 }
diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock
index 0fa39123b..6d4493874 100644
--- a/cw_wownero/pubspec.lock
+++ b/cw_wownero/pubspec.lock
@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "47.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "4.7.0"
   args:
     dependency: transitive
     description:
@@ -34,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5"
+      sha256: "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.8"
+    version: "1.5.9"
   async:
     dependency: transitive
     description:
@@ -75,42 +70,42 @@ packages:
     dependency: transitive
     description:
       name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.4"
   build_resolvers:
     dependency: "direct dev"
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.2.10"
   built_collection:
     dependency: transitive
     description:
@@ -219,10 +214,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
+      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.8"
+    version: "2.2.4"
   decimal:
     dependency: transitive
     description:
@@ -341,10 +336,10 @@ packages:
     dependency: "direct dev"
     description:
       name: hive_generator
-      sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4"
+      sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "1.1.3"
   http:
     dependency: "direct main"
     description:
@@ -365,10 +360,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   intl:
     dependency: "direct main"
     description:
@@ -433,14 +428,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -485,16 +472,16 @@ packages:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8
+      sha256: d4beb9cea4b7b014321235f8fdc7c2193ee0fe1d1198e9da7403f8bc85c4407c
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.1"
+    version: "2.3.0"
   monero:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2
-      resolved-ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2
+      ref: "84e52393e395d75f449bcd81e23028889538118f"
+      resolved-ref: "84e52393e395d75f449bcd81e23028889538118f"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"
@@ -647,10 +634,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   rational:
     dependency: transitive
     description:
@@ -663,10 +650,10 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -683,37 +670,27 @@ packages:
   socks5_proxy:
     dependency: transitive
     description:
-      path: "."
-      ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      url: "https://github.com/LacticWhale/socks_dart"
-    source: git
-    version: "2.1.0"
-  socks_socket:
-    dependency: transitive
-    description:
-      path: "."
-      ref: e6232c53c1595469931ababa878759a067c02e94
-      resolved-ref: e6232c53c1595469931ababa878759a067c02e94
-      url: "https://github.com/sneurlax/socks_socket"
-    source: git
-    version: "1.1.1"
+      name: socks5_proxy
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -774,19 +751,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
-  tor_binary:
-    dependency: transitive
-    description:
-      path: "."
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      url: "https://github.com/MrCyjaneK/flutter-tor_binary"
-    source: git
-    version: "4.7.14"
+    version: "1.0.2"
   tuple:
     dependency: transitive
     description:
diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml
index 4fda054b5..b35f36071 100644
--- a/cw_wownero/pubspec.yaml
+++ b/cw_wownero/pubspec.yaml
@@ -2,6 +2,7 @@ name: cw_wownero
 description: A new flutter plugin project.
 version: 0.0.1
 publish_to: none
+author: Cake Wallet
 homepage: https://cakewallet.com
 
 environment:
@@ -24,17 +25,17 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2 # monero_c hash
+      ref: 84e52393e395d75f449bcd81e23028889538118f # monero_c hash
       path: impls/monero.dart
   mutex: ^3.1.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
-  build_resolvers: ^2.4.4
+  build_runner: ^2.4.7
+  build_resolvers: ^2.0.9
   mobx_codegen: ^2.0.7
-  hive_generator: ^2.0.1
+  hive_generator: ^1.1.3
 
 dependency_overrides:
   watcher: ^1.1.0
diff --git a/cw_zano/lib/api/model/destination.dart b/cw_zano/lib/api/model/destination.dart
index 13f4673ab..3db4f6652 100644
--- a/cw_zano/lib/api/model/destination.dart
+++ b/cw_zano/lib/api/model/destination.dart
@@ -1,5 +1,5 @@
 class Destination {
-  final BigInt amount;     // transferred as string
+  final BigInt amount;     // transfered as string
   final String address;
   final String assetId;
 
diff --git a/cw_zano/lib/zano_formatter.dart b/cw_zano/lib/zano_formatter.dart
index 4aa35b1b1..e20e3a5f7 100644
--- a/cw_zano/lib/zano_formatter.dart
+++ b/cw_zano/lib/zano_formatter.dart
@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:cw_zano/zano_wallet_api.dart';
 import 'package:decimal/decimal.dart';
 import 'package:decimal/intl.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -56,9 +57,7 @@ class ZanoFormatter {
   static int parseAmount(String amount, [int decimalPoint = defaultDecimalPoint]) {
     final resultBigInt = (Decimal.parse(amount) * Decimal.fromBigInt(BigInt.from(10).pow(decimalPoint))).toBigInt();
     if (!resultBigInt.isValidInt) {
-      try {
-        Fluttertoast.showToast(msg: 'Cannot transfer $amount. Maximum is ${intAmountToString(resultBigInt.toInt(), decimalPoint)}.');
-      } catch (_) {}
+      Fluttertoast.showToast(msg: 'Cannot transfer $amount. Maximum is ${intAmountToString(resultBigInt.toInt(), decimalPoint)}.');
     }
     return resultBigInt.toInt();
   }
diff --git a/cw_zano/lib/zano_wallet_api.dart b/cw_zano/lib/zano_wallet_api.dart
index f10e0b2d6..f2c5469c4 100644
--- a/cw_zano/lib/zano_wallet_api.dart
+++ b/cw_zano/lib/zano_wallet_api.dart
@@ -508,6 +508,4 @@ Future<String> _closeWallet(int hWallet) async {
   });
   printV("Closing wallet: $str");
   return str;
-}
-
-Map<String, List<int>> debugCallLength() => zano.debugCallLength;
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/cw_zano/pubspec.lock b/cw_zano/pubspec.lock
index 41edf154e..74ec7206f 100644
--- a/cw_zano/pubspec.lock
+++ b/cw_zano/pubspec.lock
@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "47.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "4.7.0"
   args:
     dependency: transitive
     description:
@@ -34,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5"
+      sha256: "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.8"
+    version: "1.5.9"
   async:
     dependency: transitive
     description:
@@ -75,42 +70,42 @@ packages:
     dependency: transitive
     description:
       name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.0.4"
   build_resolvers:
     dependency: "direct dev"
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.4.13"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.2.10"
   built_collection:
     dependency: transitive
     description:
@@ -219,10 +214,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
+      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.8"
+    version: "2.2.4"
   decimal:
     dependency: "direct main"
     description:
@@ -338,10 +333,10 @@ packages:
     dependency: "direct dev"
     description:
       name: hive_generator
-      sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4"
+      sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "1.1.3"
   http:
     dependency: "direct main"
     description:
@@ -362,10 +357,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   intl:
     dependency: "direct main"
     description:
@@ -438,14 +433,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -490,16 +477,16 @@ packages:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: e0abbbc651a69550440f6b65c99ec222a1e2a4afd7baec8ba0f3088c7ca582a8
+      sha256: d4beb9cea4b7b014321235f8fdc7c2193ee0fe1d1198e9da7403f8bc85c4407c
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.1"
+    version: "2.3.0"
   monero:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2
-      resolved-ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2
+      ref: "84e52393e395d75f449bcd81e23028889538118f"
+      resolved-ref: "84e52393e395d75f449bcd81e23028889538118f"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"
@@ -644,10 +631,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   rational:
     dependency: transitive
     description:
@@ -660,10 +647,10 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -680,37 +667,27 @@ packages:
   socks5_proxy:
     dependency: transitive
     description:
-      path: "."
-      ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      resolved-ref: "27ad7c2efae8d7460325c74b90f660085cbd0685"
-      url: "https://github.com/LacticWhale/socks_dart"
-    source: git
-    version: "2.1.0"
-  socks_socket:
-    dependency: transitive
-    description:
-      path: "."
-      ref: e6232c53c1595469931ababa878759a067c02e94
-      resolved-ref: e6232c53c1595469931ababa878759a067c02e94
-      url: "https://github.com/sneurlax/socks_socket"
-    source: git
-    version: "1.1.1"
+      name: socks5_proxy
+      sha256: "616818a0ea1064a4823b53c9f7eaf8da64ed82dcd51ed71371c7e54751ed5053"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -775,15 +752,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
-  tor_binary:
-    dependency: transitive
-    description:
-      path: "."
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      resolved-ref: cb811c610871a9517d47134b87c2f590c15c96c5
-      url: "https://github.com/MrCyjaneK/flutter-tor_binary"
-    source: git
-    version: "4.7.14"
   tuple:
     dependency: transitive
     description:
diff --git a/cw_zano/pubspec.yaml b/cw_zano/pubspec.yaml
index 529fe04eb..9bf9c66eb 100644
--- a/cw_zano/pubspec.yaml
+++ b/cw_zano/pubspec.yaml
@@ -2,6 +2,7 @@ name: cw_zano
 description: A new flutter plugin project.
 version: 0.0.1
 publish_to: none
+author: Cake Wallet
 homepage: https://cakewallet.com
 
 environment:
@@ -25,15 +26,15 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: a27fbcb24d91143715ed930a05aaa4d853fba1f2 # monero_c hash
+      ref: 84e52393e395d75f449bcd81e23028889538118f # monero_c hash
       path: impls/monero.dart
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.4.15
+  build_runner: ^2.4.7
   mobx_codegen: ^2.1.1
-  build_resolvers: ^2.4.4
-  hive_generator: ^2.0.1
+  build_resolvers: ^2.0.9
+  hive_generator: ^1.1.3
 
 dependency_overrides:
   watcher: ^1.1.0
diff --git a/devtools_options.yaml b/devtools_options.yaml
new file mode 100644
index 000000000..7e7e7f67d
--- /dev/null
+++ b/devtools_options.yaml
@@ -0,0 +1 @@
+extensions:
diff --git a/docs/builds/ANDROID.md b/docs/builds/ANDROID.md
index d7bc584ad..9e4e75685 100644
--- a/docs/builds/ANDROID.md
+++ b/docs/builds/ANDROID.md
@@ -8,6 +8,8 @@ You can find the latest instructions for installing Docker on your given OS on t
 
 - <https://docs.docker.com/engine/install/>
 
+NOTE: If building on a Mac with an M-series CPU (arm64), you may encounter segmentation faults when building. If you do, simply retry the build.
+
 ## Building Cake Wallet or Monero.com
 
 ### Using the pre-built builder image
@@ -18,8 +20,8 @@ In order to build the latest version of Cake Wallet, simply run the following:
 git clone --branch main https://github.com/cake-tech/cake_wallet.git
 # NOTE: Replace `main` with the latest release tag available at https://github.com/cake-tech/cake_wallet/releases/latest.
 cd cake_wallet
-# docker build -t ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly . # Uncomment to build the docker image yourself instead of pulling it from the registry
-docker run -v$(pwd):$(pwd) -w $(pwd) -i --rm ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly bash -x << EOF
+# docker build -t ghcr.io/cake-tech/cake_wallet:main-linux . # Uncomment to build the docker image yourself instead of pulling it from the registry
+docker run -v$(pwd):$(pwd) -w $(pwd) -i --rm ghcr.io/cake-tech/cake_wallet:main-linux bash -x << EOF
 set -x -e
 pushd scripts/android
     source ./app_env.sh cakewallet
diff --git a/docs/builds/IOS.md b/docs/builds/IOS.md
index 1d23b917c..44abaa805 100644
--- a/docs/builds/IOS.md
+++ b/docs/builds/IOS.md
@@ -7,7 +7,7 @@ The following are the system requirements to build Cake Wallet for your iOS devi
 ```txt
 macOS 15.3.1
 Xcode 16.2
-Flutter 3.27.0
+Flutter 3.27.4
 ```
 
 NOTE: Newer versions of macOS and Xcode may also work, but have not been confirmed to work by the Cake team.
@@ -43,9 +43,9 @@ To enable iOS build support for Xcode, perform the following:
 
 ### 3. Installing Flutter
 
-Install Flutter, specifically version `3.27.0` by following the [official docs](https://docs.flutter.dev/get-started/install/macos/desktop?tab=download).
+Install Flutter, specifically version `3.27.4` by following the [official docs](https://docs.flutter.dev/get-started/install/macos/desktop?tab=download).
 
-NOTE: as `3.27.0` is not the latest version, you'll need to download it from <https://docs.flutter.dev/release/archive> instead of the link in the docs above.
+NOTE: as `3.27.4` is not the latest version, you'll need to download it from <https://docs.flutter.dev/release/archive> instead of the link in the docs above.
 
 ### 4. Installing Rust
 
@@ -65,7 +65,7 @@ The output of this command should appear like this, indicating successful instal
 
 ```zsh
 Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 3.27.0, on macOS 15.x.x)
+[✓] Flutter (Channel stable, 3.27.4, on macOS 15.x.x)
 [✓] Xcode - develop for iOS and macOS (Xcode 16.2)
 ```
 
diff --git a/docs/builds/LINUX.md b/docs/builds/LINUX.md
index 0f438a1d6..cd8466e6d 100644
--- a/docs/builds/LINUX.md
+++ b/docs/builds/LINUX.md
@@ -20,8 +20,8 @@ In order to build the latest version of Cake Wallet, simply run the following:
 git clone --branch main https://github.com/cake-tech/cake_wallet.git
 # NOTE: Replace `main` with the latest release tag available at https://github.com/cake-tech/cake_wallet/releases/latest.
 cd cake_wallet
-# docker build -t ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly . # Uncomment to build the docker image yourself instead of pulling it from the registry
-docker run --privileged -v$(pwd):$(pwd) -w $(pwd) -i --rm ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly bash -x << EOF
+# docker build -t ghcr.io/cake-tech/cake_wallet:main-linux . # Uncomment to build the docker image yourself instead of pulling it from the registry
+docker run -v$(pwd):$(pwd) -w $(pwd) -i --rm ghcr.io/cake-tech/cake_wallet:main-linux bash -x << EOF
 set -x -e
 pushd scripts
     ./gen_android_manifest.sh
@@ -37,13 +37,6 @@ flutter clean
 dart run tool/generate_localization.dart
 dart run tool/generate_new_secrets.dart
 flutter build linux
-cp -r build/linux/x64 build/linux/current
-# use line below if you are building on arm64
-# cp -r build/linux/arm64 build/linux/current
-# If you want to build flatpak you need --privileged flag
-flatpak-builder --force-clean flatpak-build com.cakewallet.CakeWallet.yml
-flatpak build-export export flatpak-build
-flatpak build-bundle export build/linux/current/cake_wallet.flatpak com.cakewallet.CakeWallet
 EOF
 ```
 
@@ -58,11 +51,46 @@ Building Linux application...
 ✓ Built build/linux/x64/release/bundle/cake_wallet
 ```
 
-Final builds can be found in `build/linux/current/release/bundle/` as seen above.
+Final builds can be found in `build/linux/x64/release/bundle/` as seen above.
 
 
+## Flatpak (optional)
+
+To package the built binaries as a flatpak, you need first to install `flatpak` and `flatpak-builder`:
+
+```bash
+sudo apt install flatpak flatpak-builder
+```
+
+Add the necessary Flathub:
+
+```bash
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+```
+
+Then need to install freedesktop runtime and sdk:
+
+```bash
+flatpak install flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
+```
+
+Next, build the flatpak bundle:
+
+```bash
+flatpak-builder --force-clean flatpak-build com.cakewallet.CakeWallet.yml
+```
+
+And then export bundle:
+
+```bash
+flatpak build-export export flatpak-build
+flatpak build-bundle export cake_wallet.flatpak com.cakewallet.CakeWallet
+```
+
+The Flatpak file, `cake_wallet.flatpak`, should be generated in the current directory.
+
 To install the newly built Flatpak, run:
 
 ```bash
-flatpak --user install build/linux/current/cake_wallet.flatpak
+flatpak --user install cake_wallet.flatpak
 ```
diff --git a/docs/builds/MACOS.md b/docs/builds/MACOS.md
index 7e0f39aab..46a9842a4 100644
--- a/docs/builds/MACOS.md
+++ b/docs/builds/MACOS.md
@@ -7,7 +7,7 @@ The following are the system requirements to build Cake Wallet for your macOS de
 ```txt
 macOS 15.3.1
 Xcode 16.2
-Flutter 3.27.0
+Flutter 3.27.4
 ```
 
 ### 1. Installing dependencies
@@ -34,9 +34,9 @@ sudo xcodebuild -runFirstLaunch
 
 ### 3. Installing Flutter
 
-Install Flutter, specifically version `3.27.0` by following the [official docs](https://docs.flutter.dev/get-started/install/macos/desktop?tab=download).
+Install Flutter, specifically version `3.27.4` by following the [official docs](https://docs.flutter.dev/get-started/install/macos/desktop?tab=download).
 
-NOTE: as `3.27.0` is not the latest version, you'll need to download it from <https://docs.flutter.dev/release/archive> instead of the link in the docs above.
+NOTE: as `3.27.4` is not the latest version, you'll need to download it from <https://docs.flutter.dev/release/archive> instead of the link in the docs above.
 
 ### 4. Installing Rust
 
@@ -56,7 +56,7 @@ The output of this command should appear like this, indicating successful instal
 
 ```zsh
 Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 3.27.0, on macOS 15.x.x)
+[✓] Flutter (Channel stable, 3.27.4, on macOS 15.x.x)
 ...
 [✓] Xcode - develop for iOS and macOS (Xcode 16.2)
 ...
diff --git a/docs/builds/WINDOWS.md b/docs/builds/WINDOWS.md
index 7a86dac49..4fec78dc0 100644
--- a/docs/builds/WINDOWS.md
+++ b/docs/builds/WINDOWS.md
@@ -6,18 +6,18 @@ The following are the system requirements to build Cake Wallet for your Windows
 
 ```txt
 Windows 10 or later (64-bit), x86-64 based
-Flutter 3.27.0
+Flutter 3.27.4
 ```
 
 ### 1. Installing Flutter
 
-Install Flutter, specifically version `3.27.0` by following the [official docs](https://docs.flutter.dev/get-started/install/windows).
+Install Flutter, specifically version `3.27.4` by following the [official docs](https://docs.flutter.dev/get-started/install/windows).
 
 In order for Flutter to function, you'll also need to enable Developer Mode:
 
 Start Menu > search for "Run" > type `ms-settings:developers`, and turn on Developer Mode.
 
-NOTE: as `3.27.0` is not the latest version, you'll need to download it from <https://docs.flutter.dev/release/archive> instead of the link in the docs above.
+NOTE: as `3.27.4` is not the latest version, you'll need to download it from <https://docs.flutter.dev/release/archive> instead of the link in the docs above.
 
 ### 2. Install Development Tools
 
diff --git a/integration_test/robots/new_wallet_type_page_robot.dart b/integration_test/robots/new_wallet_type_page_robot.dart
index eb1a1900a..89fc8d390 100644
--- a/integration_test/robots/new_wallet_type_page_robot.dart
+++ b/integration_test/robots/new_wallet_type_page_robot.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/new_wallet/new_wallet_type_page.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/integration_test/robots/wallet_keys_robot.dart b/integration_test/robots/wallet_keys_robot.dart
index 38a605b9d..189929737 100644
--- a/integration_test/robots/wallet_keys_robot.dart
+++ b/integration_test/robots/wallet_keys_robot.dart
@@ -70,10 +70,7 @@ class WalletKeysAndSeedPageRobot {
     if (walletType == WalletType.bitcoin ||
         walletType == WalletType.litecoin ||
         walletType == WalletType.bitcoinCash) {
-      final seedWords = appStore.wallet!.seed!.split(" ");
-      for (var seedWord in seedWords) {
-        commonTestCases.hasTextAtLestOnce(seedWord);
-      }
+      commonTestCases.hasText(appStore.wallet!.seed!);
       tester.printToConsole('$walletName wallet has seeds properly displayed');
     }
 
@@ -81,14 +78,10 @@ class WalletKeysAndSeedPageRobot {
         walletType == WalletType.solana ||
         walletType == WalletType.tron) {
       if (hasSeed) {
-        final seedWords = appStore.wallet!.seed!.split(" ");
-        for (var seedWord in seedWords) {
-          commonTestCases.hasTextAtLestOnce(seedWord);
-        }
+        commonTestCases.hasText(appStore.wallet!.seed!);
         tester.printToConsole('$walletName wallet has seeds properly displayed');
       }
       if (hasPrivateKey) {
-        await commonTestCases.tapItemByKey('wallet_keys_page_keys');
         commonTestCases.hasText(appStore.wallet!.privateKey!);
         tester.printToConsole('$walletName wallet has private key properly displayed');
       }
@@ -96,19 +89,14 @@ class WalletKeysAndSeedPageRobot {
 
     if (walletType == WalletType.nano || walletType == WalletType.banano) {
       if (hasSeed) {
-        final seedWords = appStore.wallet!.seed!.split(" ");
-        for (var seedWord in seedWords) {
-          commonTestCases.hasTextAtLestOnce(seedWord);
-        }
+        commonTestCases.hasText(appStore.wallet!.seed!);
         tester.printToConsole('$walletName wallet has seeds properly displayed');
       }
       if (hasHexSeed) {
-        await commonTestCases.tapItemByKey('wallet_keys_page_keys');
         commonTestCases.hasText(appStore.wallet!.hexSeed!);
         tester.printToConsole('$walletName wallet has hexSeed properly displayed');
       }
       if (hasPrivateKey) {
-        await commonTestCases.tapItemByKey('wallet_keys_page_keys');
         commonTestCases.hasText(appStore.wallet!.privateKey!);
         tester.printToConsole('$walletName wallet has private key properly displayed');
       }
@@ -141,39 +129,35 @@ class WalletKeysAndSeedPageRobot {
     final hasSeedLegacy = Polyseed.isValidSeed(seed);
 
     if (hasPublicSpendKey) {
-      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.publicSpendKey);
       tester.printToConsole('$walletName wallet has public spend key properly displayed');
     }
     if (hasPrivateSpendKey) {
-      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.privateSpendKey);
       tester.printToConsole('$walletName wallet has private spend key properly displayed');
     }
     if (hasPublicViewKey) {
-      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.publicViewKey);
       tester.printToConsole('$walletName wallet has public view key properly displayed');
     }
     if (hasPrivateViewKey) {
-      await commonTestCases.tapItemByKey('wallet_keys_page_keys');
       commonTestCases.hasText(keys.privateViewKey);
       tester.printToConsole('$walletName wallet has private view key properly displayed');
     }
     if (hasSeeds) {
-      await commonTestCases.tapItemByKey('wallet_keys_page_seed');
-      final seedWords = seed.split(" ");
-      for (var seedWord in seedWords) {
-        commonTestCases.hasTextAtLestOnce(seedWord);
-      }
+      await commonTestCases.dragUntilVisible(
+        '${walletName}_wallet_seed_item_key',
+        'wallet_keys_page_credentials_list_view_key',
+      );
+      commonTestCases.hasText(seed);
       tester.printToConsole('$walletName wallet has seeds properly displayed');
     }
     if (hasSeedLegacy) {
-      await commonTestCases.tapItemByKey('wallet_keys_page_seed_legacy');
-      final seedWords = legacySeed.split(" ");
-      for (var seedWord in seedWords) {
-        commonTestCases.hasTextAtLestOnce(seedWord);
-      }
+      await commonTestCases.dragUntilVisible(
+        '${walletName}_wallet_seed_legacy_item_key',
+        'wallet_keys_page_credentials_list_view_key',
+      );
+      commonTestCases.hasText(legacySeed);
       tester.printToConsole('$walletName wallet has legacy seeds properly displayed');
     }
   }
diff --git a/ios/Podfile b/ios/Podfile
index cf24cb605..f0a0721a6 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '13.0'
+platform :ios, '12.0'
 source 'https://github.com/CocoaPods/Specs.git'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
@@ -43,7 +43,7 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
     
     target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
             '$(inherited)',
 
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index abbd40673..fc70b4fb6 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,7 +1,10 @@
 PODS:
   - connectivity_plus (0.0.1):
     - Flutter
-  - CryptoSwift (1.8.4)
+    - ReachabilitySwift
+  - CryptoSwift (1.8.3)
+  - cw_mweb (0.0.1):
+    - Flutter
   - cw_decred (0.0.1):
     - Flutter
   - cw_mweb (0.0.1):
@@ -58,8 +61,6 @@ PODS:
     - OrderedSet (~> 6.0.3)
   - flutter_local_authentication (1.2.0):
     - Flutter
-  - flutter_local_notifications (0.0.1):
-    - Flutter
   - flutter_mailer (0.0.1):
     - Flutter
   - flutter_secure_storage (6.0.0):
@@ -76,15 +77,12 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - payjoin_flutter (0.23.0)
   - permission_handler_apple (9.3.0):
     - Flutter
-  - reown_yttrium (0.0.1):
-    - Flutter
-    - YttriumWrapper (= 0.8.35)
-  - SDWebImage (5.20.0):
-    - SDWebImage/Core (= 5.20.0)
-  - SDWebImage/Core (5.20.0)
+  - ReachabilitySwift (5.2.4)
+  - SDWebImage (5.19.7):
+    - SDWebImage/Core (= 5.19.7)
+  - SDWebImage/Core (5.19.7)
   - sensitive_clipboard (0.0.1):
     - Flutter
   - share_plus (0.0.1):
@@ -104,11 +102,11 @@ PODS:
     - Flutter
   - wakelock_plus (0.0.1):
     - Flutter
-  - YttriumWrapper (0.8.35)
 
 DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - CryptoSwift
+  - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
   - cw_decred (from `.symlinks/plugins/cw_decred/ios`)
   - cw_mweb (from `.symlinks/plugins/cw_mweb/ios`)
   - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
@@ -119,7 +117,6 @@ DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_local_authentication (from `.symlinks/plugins/flutter_local_authentication/ios`)
-  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
@@ -127,9 +124,7 @@ DEPENDENCIES:
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - payjoin_flutter (from `.symlinks/plugins/payjoin_flutter/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - reown_yttrium (from `.symlinks/plugins/reown_yttrium/ios`)
   - 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`)
@@ -145,13 +140,15 @@ SPEC REPOS:
     - DKImagePickerController
     - DKPhotoGallery
     - OrderedSet
+    - ReachabilitySwift
     - SDWebImage
     - SwiftyGif
-    - YttriumWrapper
 
 EXTERNAL SOURCES:
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
+  cw_mweb:
+    :path: ".symlinks/plugins/cw_mweb/ios"
   cw_decred:
     :path: ".symlinks/plugins/cw_decred/ios"
   cw_mweb:
@@ -172,8 +169,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_local_authentication:
     :path: ".symlinks/plugins/flutter_local_authentication/ios"
-  flutter_local_notifications:
-    :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_mailer:
     :path: ".symlinks/plugins/flutter_mailer/ios"
   flutter_secure_storage:
@@ -188,12 +183,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  payjoin_flutter:
-    :path: ".symlinks/plugins/payjoin_flutter/ios"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  reown_yttrium:
-    :path: ".symlinks/plugins/reown_yttrium/ios"
   sensitive_clipboard:
     :path: ".symlinks/plugins/sensitive_clipboard/ios"
   share_plus:
@@ -212,44 +203,42 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
-  CryptoSwift: e64e11850ede528a02a0f3e768cec8e9d92ecb90
-  cw_decred: 9c0e1df74745b51a1289ec5e91fb9e24b68fa14a
-  cw_mweb: 22cd01dfb8ad2d39b15332006f22046aaa8352a3
-  device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
-  devicelocale: 35ba84dc7f45f527c3001535d8c8d104edd5d926
+  connectivity_plus: 481668c94744c30c53b8895afb39159d1e619bdf
+  CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
+  cw_decred: a02cf30175a46971c1e2fa22c48407534541edc6
+  cw_mweb: 3aea2fb35b2bd04d8b2d21b83216f3b8fb768d85
+  device_display_brightness: 04374ebd653619292c1d996f00f42877ea19f17f
+  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
+  devicelocale: bd64aa714485a8afdaded0892c1e7d5b7f680cf8
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  fast_scanner: 44c00940355a51258cd6c2085734193cd23d95bc
-  file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
+  fast_scanner: 2cb1ad3e69e645e9980fb4961396ce5804caa3e3
+  file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
-  flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
-  flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f
-  in_app_review: a31b5257259646ea78e0e35fc914979b0031d011
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_authentication: 989278c681612f1ee0e36019e149137f114b9d7f
+  flutter_mailer: 3a8cd4f36c960fb04528d5471097270c19fec1c4
+  flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
+  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
+  in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  payjoin_flutter: d9d4c8aa16bd5dfedb9b21d0edc8199e0187d96e
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  reown_yttrium: c0e87e5965fa60a3559564cc35cffbba22976089
-  SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
-  sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sp_scanner: eaa617fa827396b967116b7f1f43549ca62e9a12
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
+  SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
+  sensitive_clipboard: 161e9abc3d56b3131309d8a321eb4690a803c16b
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sp_scanner: b1bc9321690980bdb44bba7ec85d5543e716d1b5
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  wakelock_plus: 76957ab028e12bfa4e66813c99e46637f367fc7e
-  YttriumWrapper: 31e937fe9fbe0f1314d2ca6be9ce9b379a059966
+  Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
+  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
+  universal_ble: ff19787898040d721109c6324472e5dd4bc86adc
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
 
-PODFILE CHECKSUM: 5296465b1c6d14d506230356756826012f65d97a
+PODFILE CHECKSUM: e448f662d4c41f0c0b1ccbb78afd57dbf895a597
 
 COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 794305883..d9ff6b66e 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -501,7 +501,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -649,7 +649,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -690,7 +690,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index bd04914ae..df5cf1cc5 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,134 +1,114 @@
 {
-  "images": [
+  "images" : [
     {
-      "filename": "AppIcon@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "60x60"
+      "filename" : "Icon-App-40x40@1x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "60x60"
+      "filename" : "Icon-App-20x20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "filename" : "Icon-App-29x29@2x 1.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "76x76"
+      "filename" : "Icon-App-29x29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon-83.5@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "83.5x83.5"
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-40@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "40x40"
+      "filename" : "Icon-App-40x40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-40@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "40x40"
+      "filename" : "app_icon_120.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "filename": "AppIcon-40~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename" : "app_icon_180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "filename": "AppIcon-40@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "40x40"
+      "filename" : "Icon-App-20x20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon-20@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "20x20"
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon-20@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "20x20"
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon-20~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon-20@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "20x20"
+      "filename" : "Icon-App-40x40@1x 1.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-29.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-29@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "29x29"
+      "filename" : "Icon-App-76x76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "filename": "AppIcon-29@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "29x29"
+      "filename" : "Icon-App-76x76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "filename": "AppIcon-29~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "filename": "AppIcon-29@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "29x29"
-    },
-    {
-      "filename": "AppIcon-60@2x~car.png",
-      "idiom": "car",
-      "scale": "2x",
-      "size": "60x60"
-    },
-    {
-      "filename": "AppIcon-60@3x~car.png",
-      "idiom": "car",
-      "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "AppIcon~ios-marketing.png",
-      "idiom": "ios-marketing",
-      "scale": "1x",
-      "size": "1024x1024"
+      "filename" : "app_icon_1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
-  "info": {
-    "author": "iconkitchen",
-    "version": 1
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
new file mode 100644
index 000000000..369d8d9a4
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
new file mode 100644
index 000000000..65ed7f3db
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
new file mode 100644
index 000000000..fb14bfc55
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
new file mode 100644
index 000000000..d24d594a3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x 1.png
new file mode 100644
index 000000000..07acd0a82
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x 1.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
new file mode 100644
index 000000000..07acd0a82
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
new file mode 100644
index 000000000..bdc20091d
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png
new file mode 100644
index 000000000..65ed7f3db
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x 1.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
new file mode 100644
index 000000000..65ed7f3db
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
new file mode 100644
index 000000000..80e78be41
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
new file mode 100644
index 000000000..e06998b67
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
new file mode 100644
index 000000000..78a2ccfb1
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
new file mode 100644
index 000000000..0ba8d647c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/InfoBase.plist b/ios/Runner/InfoBase.plist
index 40868aa9f..f27ef8d4f 100644
--- a/ios/Runner/InfoBase.plist
+++ b/ios/Runner/InfoBase.plist
@@ -327,7 +327,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>FlutterDeepLinkingEnabled</key>
-	<false/>
 </dict>
 </plist>
diff --git a/lib/anonpay/anonpay_api.dart b/lib/anonpay/anonpay_api.dart
index 6f401ae3f..acab662d1 100644
--- a/lib/anonpay/anonpay_api.dart
+++ b/lib/anonpay/anonpay_api.dart
@@ -6,9 +6,8 @@ import 'package:cake_wallet/anonpay/anonpay_status_response.dart';
 import 'package:cake_wallet/core/fiat_conversion_service.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/exchange/limits.dart';
-import 'package:cake_wallet/wallet_type_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/wallet_base.dart';
+import 'package:http/http.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
@@ -21,21 +20,17 @@ class AnonPayApi {
   final WalletBase wallet;
 
   static const anonpayRef = secrets.anonPayReferralCode;
+  static const onionApiAuthority = 'tqzngtf2hybjbexznel6dhgsvbynjzezoybvtv6iofomx7gchqfssgqd.onion';
   static const clearNetAuthority = 'trocador.app';
-  // static const onionApiAuthority = 'tqzngtf2hybjbexznel6dhgsvbynjzezoybvtv6iofomx7gchqfssgqd.onion';
-  static const onionApiAuthority = clearNetAuthority;
   static const markup = secrets.trocadorExchangeMarkup;
   static const anonPayPath = '/anonpay';
   static const anonPayStatus = '/anonpay/status';
   static const coinPath = 'api/coin';
-  static final apiKey = isMoneroOnly ? secrets.trocadorMoneroApiKey : secrets.trocadorApiKey;
+  static const apiKey = secrets.trocadorApiKey;
 
   Future<AnonpayStatusResponse> paymentStatus(String id) async {
-    final response = await ProxyWrapper().get(
-      clearnetUri: Uri.https(clearNetAuthority, "$anonPayStatus/$id"),
-      onionUri: Uri.https(onionApiAuthority, "$anonPayStatus/$id"),
-    );
-    
+    final authority = await _getAuthority();
+    final response = await get(Uri.https(authority, "$anonPayStatus/$id"));
     final responseJSON = json.decode(response.body) as Map<String, dynamic>;
     final status = responseJSON['Status'] as String;
     final fiatAmount = responseJSON['Fiat_Amount'] as double?;
@@ -74,11 +69,10 @@ class AnonPayApi {
     if (request.fiatEquivalent != null) {
       body['fiat_equiv'] = request.fiatEquivalent;
     }
-    final response = await ProxyWrapper().get(
-      clearnetUri: Uri.https(clearNetAuthority, anonPayPath, body),
-      onionUri: Uri.https(onionApiAuthority, anonPayPath, body),
-    );
-    
+    final authority = await _getAuthority();
+
+    final response = await get(Uri.https(authority, anonPayPath, body));
+
     final responseJSON = json.decode(response.body) as Map<String, dynamic>;
     final id = responseJSON['ID'] as String;
     final url = responseJSON['url'] as String;
@@ -152,16 +146,17 @@ class AnonPayApi {
       'name': cryptoCurrency.name,
     };
 
-    final response = await ProxyWrapper().get(
-      clearnetUri: Uri.https(clearNetAuthority, coinPath, params),
-      onionUri: Uri.https(onionApiAuthority, coinPath, params),
-    );
-    
-    final responseJSON = json.decode(response.body) as List<dynamic>;
+    final String apiAuthority = await _getAuthority();
+    final uri = Uri.https(apiAuthority, coinPath, params);
+
+    final response = await get(uri);
+
     if (response.statusCode != 200) {
       throw Exception('Unexpected http status: ${response.statusCode}');
     }
 
+    final responseJSON = json.decode(response.body) as List<dynamic>;
+
     if (responseJSON.isEmpty) {
       throw Exception('No data');
     }
@@ -202,4 +197,17 @@ class AnonPayApi {
         return tag.toLowerCase();
     }
   }
+
+  Future<String> _getAuthority() async {
+    try {
+      if (useTorOnly) {
+        return onionApiAuthority;
+      }
+      final uri = Uri.https(onionApiAuthority, '/anonpay');
+      await get(uri);
+      return onionApiAuthority;
+    } catch (e) {
+      return clearNetAuthority;
+    }
+  }
 }
diff --git a/lib/anypay/anypay_api.dart b/lib/anypay/anypay_api.dart
index 20187484b..0b81d24c2 100644
--- a/lib/anypay/anypay_api.dart
+++ b/lib/anypay/anypay_api.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'package:cake_wallet/anypay/any_pay_payment_committed_info.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:flutter/foundation.dart';
+import 'package:http/http.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/anypay/any_pay_payment.dart';
 import 'package:cake_wallet/anypay/any_pay_trasnaction.dart';
@@ -53,12 +53,8 @@ class AnyPayApi {
 		final body = <String, dynamic>{
 			'chain': chainByScheme(scheme),
 			'currency': currencyByScheme(scheme).title};
-		final response = await ProxyWrapper().post(
-      clearnetUri: url,
-      headers: headers,
-      body: json.encode(body),
-    );
-    
+		final response = await post(url, headers: headers, body: utf8.encode(json.encode(body)));
+
     if (response.statusCode != 200) {
 			await ExceptionHandler.onError(FlutterErrorDetails(exception: response));
       throw Exception('Unexpected response http code: ${response.statusCode}');
@@ -83,12 +79,7 @@ class AnyPayApi {
 			'chain': chain,
 			'currency': currency,
 			'transactions': transactions.map((tx) => {'tx': tx.tx, 'tx_hash': tx.id, 'tx_key': tx.key}).toList()};
-		final response = await ProxyWrapper().post(
-      clearnetUri: Uri.parse(uri),
-      headers: headers,
-      body: json.encode(body),
-    );
-    
+		final response = await post(Uri.parse(uri), headers: headers, body: utf8.encode(json.encode(body)));
 		if (response.statusCode == 400) {
 			final decodedBody = json.decode(response.body) as Map<String, dynamic>;
 			throw Exception(decodedBody['message'] as String? ?? 'Unexpected response\nError code: 400');
diff --git a/lib/bitcoin/cw_bitcoin.dart b/lib/bitcoin/cw_bitcoin.dart
index 131bc3a02..f93ba9550 100644
--- a/lib/bitcoin/cw_bitcoin.dart
+++ b/lib/bitcoin/cw_bitcoin.dart
@@ -109,29 +109,26 @@ class CWBitcoin extends Bitcoin {
     required TransactionPriority priority,
     int? feeRate,
     UnspentCoinType coinTypeToSpendFrom = UnspentCoinType.any,
-    String? payjoinUri,
   }) {
     final bitcoinFeeRate =
-        priority == BitcoinTransactionPriority.custom && feeRate != null
-            ? feeRate
-            : null;
+        priority == BitcoinTransactionPriority.custom && feeRate != null ? feeRate : null;
     return BitcoinTransactionCredentials(
-        outputs
-            .map((out) => OutputInfo(
-                fiatAmount: out.fiatAmount,
-                cryptoAmount: out.cryptoAmount,
-                address: out.address,
-                note: out.note,
-                sendAll: out.sendAll,
-                extractedAddress: out.extractedAddress,
-                isParsedAddress: out.isParsedAddress,
-                formattedCryptoAmount: out.formattedCryptoAmount,
-                memo: out.memo))
-            .toList(),
-        priority: priority as BitcoinTransactionPriority,
-        feeRate: bitcoinFeeRate,
-        coinTypeToSpendFrom: coinTypeToSpendFrom,
-        payjoinUri: payjoinUri);
+      outputs
+          .map((out) => OutputInfo(
+              fiatAmount: out.fiatAmount,
+              cryptoAmount: out.cryptoAmount,
+              address: out.address,
+              note: out.note,
+              sendAll: out.sendAll,
+              extractedAddress: out.extractedAddress,
+              isParsedAddress: out.isParsedAddress,
+              formattedCryptoAmount: out.formattedCryptoAmount,
+              memo: out.memo))
+          .toList(),
+      priority: priority as BitcoinTransactionPriority,
+      feeRate: bitcoinFeeRate,
+      coinTypeToSpendFrom: coinTypeToSpendFrom,
+    );
   }
 
   @override
@@ -227,14 +224,9 @@ class CWBitcoin extends Bitcoin {
     await bitcoinWallet.updateAllUnspents();
   }
 
-  WalletService createBitcoinWalletService(
-      Box<WalletInfo> walletInfoSource,
-      Box<UnspentCoinsInfo> unspentCoinSource,
-      Box<PayjoinSession> payjoinSessionSource,
-      bool alwaysScan,
-      bool isDirect) {
-    return BitcoinWalletService(walletInfoSource, unspentCoinSource,
-        payjoinSessionSource, alwaysScan, isDirect);
+  WalletService createBitcoinWalletService(Box<WalletInfo> walletInfoSource,
+      Box<UnspentCoinsInfo> unspentCoinSource, bool alwaysScan, bool isDirect) {
+    return BitcoinWalletService(walletInfoSource, unspentCoinSource, alwaysScan, isDirect);
   }
 
   WalletService createLitecoinWalletService(Box<WalletInfo> walletInfoSource,
@@ -558,10 +550,6 @@ class CWBitcoin extends Bitcoin {
     return option is BitcoinReceivePageOption;
   }
 
-  @override
-  bool isPayjoinAvailable(Object wallet) =>
-      (wallet is BitcoinWallet) && (wallet as BitcoinWallet).isPayjoinAvailable;
-
   @override
   BitcoinAddressType getOptionToType(ReceivePageOption option) {
     return (option as BitcoinReceivePageOption).toType();
@@ -718,35 +706,4 @@ class CWBitcoin extends Bitcoin {
       return null;
     }
   }
-
-  @override
-  String getPayjoinEndpoint(Object wallet) {
-    final _wallet = wallet as ElectrumWallet;
-    if (!isPayjoinAvailable(wallet)) return '';
-    return (_wallet.walletAddresses as BitcoinWalletAddresses).payjoinEndpoint ?? '';
-  }
-
-  @override
-  void updatePayjoinState(Object wallet, bool value) {
-    final _wallet = wallet as ElectrumWallet;
-    if (value) {
-      (_wallet.walletAddresses as BitcoinWalletAddresses).initPayjoin();
-    } else {
-      stopPayjoinSessions(wallet);
-    }
-  }
-
-  @override
-  void resumePayjoinSessions(Object wallet) {
-    final _wallet = wallet as ElectrumWallet;
-    (_wallet.walletAddresses as BitcoinWalletAddresses).initPayjoin();
-  }
-
-  @override
-  void stopPayjoinSessions(Object wallet) {
-    final _wallet = wallet as ElectrumWallet;
-    (_wallet.walletAddresses as BitcoinWalletAddresses).payjoinManager.cleanupSessions();
-    (_wallet.walletAddresses as BitcoinWalletAddresses).currentPayjoinReceiver = null;
-    (_wallet.walletAddresses as BitcoinWalletAddresses).payjoinEndpoint = null;
-  }
 }
diff --git a/lib/buy/buy_provider.dart b/lib/buy/buy_provider.dart
index f57cc5472..ea2bcae8f 100644
--- a/lib/buy/buy_provider.dart
+++ b/lib/buy/buy_provider.dart
@@ -1,7 +1,6 @@
 import 'package:cake_wallet/buy/buy_amount.dart';
 import 'package:cake_wallet/buy/buy_quote.dart';
 import 'package:cake_wallet/buy/order.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
 import 'package:cake_wallet/buy/payment_method.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
@@ -14,15 +13,11 @@ abstract class BuyProvider {
     required this.wallet,
     required this.isTestEnvironment,
     required this.ledgerVM,
-    required this.supportedCryptoList,
-    required this.supportedFiatList
   });
 
   final WalletBase wallet;
   final bool isTestEnvironment;
   final LedgerViewModel? ledgerVM;
-  final List<TradePair<dynamic, dynamic>> supportedCryptoList;
-  final List<TradePair<dynamic, dynamic>> supportedFiatList;
 
   String get title;
 
@@ -64,7 +59,6 @@ abstract class BuyProvider {
           required bool isBuyAction,
           required String walletAddress,
           PaymentType? paymentType,
-            String? customPaymentMethodType,
           String? countryCode}) async =>
       null;
 }
diff --git a/lib/buy/buy_quote.dart b/lib/buy/buy_quote.dart
index da854faaf..1805b7e1a 100644
--- a/lib/buy/buy_quote.dart
+++ b/lib/buy/buy_quote.dart
@@ -50,7 +50,6 @@ class Quote extends SelectableOption {
     this.rampName,
     this.rampIconPath,
     this.limits,
-    this.customPaymentMethodType,
   }) : super(title: provider.isAggregator ? rampName ?? '' : provider.title);
 
   final double rate;
@@ -69,7 +68,6 @@ class Quote extends SelectableOption {
   bool _isBestRate = false;
   bool isBuyAction;
   Limits? limits;
-  String? customPaymentMethodType;
 
   late FiatCurrency _fiatCurrency;
   late CryptoCurrency _cryptoCurrency;
@@ -132,7 +130,7 @@ class Quote extends SelectableOption {
   set setLimits(Limits limits) => this.limits = limits;
 
   factory Quote.fromOnramperJson(Map<String, dynamic> json, bool isBuyAction,
-      Map<String, dynamic> metaData, PaymentType paymentType, String? customPaymentMethodType) {
+      Map<String, dynamic> metaData, PaymentType paymentType) {
     final rate = _toDouble(json['rate']) ?? 0.0;
     final networkFee = _toDouble(json['networkFee']) ?? 0.0;
     final transactionFee = _toDouble(json['transactionFee']) ?? 0.0;
@@ -185,7 +183,6 @@ class Quote extends SelectableOption {
       rampName: rampName,
       rampIconPath: rampIconPath,
       paymentType: paymentType,
-      customPaymentMethodType: customPaymentMethodType,
       quoteId: json['quoteId'] as String? ?? '',
       recommendations: enumRecommendations,
       provider: ProvidersHelper.getProviderByType(ProviderType.onramper)!,
diff --git a/lib/buy/dfx/dfx_buy_provider.dart b/lib/buy/dfx/dfx_buy_provider.dart
index eed527cf1..ac50665f0 100644
--- a/lib/buy/dfx/dfx_buy_provider.dart
+++ b/lib/buy/dfx/dfx_buy_provider.dart
@@ -3,14 +3,12 @@ import 'dart:developer';
 
 import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/buy_quote.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
 import 'package:cake_wallet/buy/payment_method.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/connect_device/connect_device_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -18,22 +16,13 @@ import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 
 class DFXBuyProvider extends BuyProvider {
-  DFXBuyProvider({
-    required WalletBase wallet,
-    bool isTestEnvironment = false,
-    LedgerViewModel? ledgerVM,
-  }) : super(
-      wallet: wallet,
-      isTestEnvironment: isTestEnvironment,
-      ledgerVM: ledgerVM,
-      supportedCryptoList: supportedCryptoToFiatPairs(
-          notSupportedCrypto: _notSupportedCrypto, notSupportedFiat: _notSupportedFiat),
-      supportedFiatList: supportedFiatToCryptoPairs(
-          notSupportedFiat: _notSupportedFiat, notSupportedCrypto: _notSupportedCrypto)
-  );
+  DFXBuyProvider(
+      {required WalletBase wallet, bool isTestEnvironment = false, LedgerViewModel? ledgerVM})
+      : super(wallet: wallet, isTestEnvironment: isTestEnvironment, ledgerVM: ledgerVM);
 
   static const _baseUrl = 'api.dfx.swiss';
 
@@ -41,9 +30,6 @@ class DFXBuyProvider extends BuyProvider {
   static const _authPath = '/v1/auth';
   static const walletName = 'CakeWallet';
 
-  static const List<CryptoCurrency> _notSupportedCrypto = [];
-  static const List<FiatCurrency> _notSupportedFiat = [];
-
   @override
   String get title => 'DFX.swiss';
 
@@ -100,12 +86,11 @@ class DFXBuyProvider extends BuyProvider {
     });
 
     final uri = Uri.https(_baseUrl, _authPath);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
+    var response = await http.post(
+      uri,
       headers: {'Content-Type': 'application/json'},
       body: requestBody,
     );
-    
 
     if (response.statusCode == 201) {
       final responseBody = jsonDecode(response.body);
@@ -138,10 +123,8 @@ class DFXBuyProvider extends BuyProvider {
     final url = Uri.https(_baseUrl, '/v1/fiat');
 
     try {
-      final response = await ProxyWrapper().get(
-        clearnetUri: url,
-        headers: {'accept': 'application/json'});
-      
+      final response = await http.get(url, headers: {'accept': 'application/json'});
+
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body) as List<dynamic>;
         for (final item in data) {
@@ -163,8 +146,8 @@ class DFXBuyProvider extends BuyProvider {
     final url = Uri.https(_baseUrl, '/v1/asset', {'blockchains': blockchain});
 
     try {
-      final response = await ProxyWrapper().get(clearnetUri: url, headers: {'accept': 'application/json'});
-      
+      final response = await http.get(url, headers: {'accept': 'application/json'});
+
       if (response.statusCode == 200) {
         final responseData = jsonDecode(response.body);
 
@@ -234,7 +217,6 @@ class DFXBuyProvider extends BuyProvider {
       required bool isBuyAction,
       required String walletAddress,
       PaymentType? paymentType,
-      String? customPaymentMethodType,
       String? countryCode}) async {
     /// if buying with any currency other than eur or chf then DFX is not supported
 
@@ -274,12 +256,7 @@ class DFXBuyProvider extends BuyProvider {
     });
 
     try {
-      final response = await ProxyWrapper().put(
-        clearnetUri: url,
-        headers: headers,
-        body: body,
-      );
-      
+      final response = await http.put(url, headers: headers, body: body);
       final responseData = jsonDecode(response.body);
 
       if (response.statusCode == 200) {
@@ -382,7 +359,7 @@ class DFXBuyProvider extends BuyProvider {
       case 'Instant':
         return PaymentType.sepa;
       default:
-        return PaymentType.unknown;
+        return PaymentType.all;
     }
   }
 
diff --git a/lib/buy/kryptonim/kryptonim.dart b/lib/buy/kryptonim/kryptonim.dart
index 1d2d10f58..c439fa2f7 100644
--- a/lib/buy/kryptonim/kryptonim.dart
+++ b/lib/buy/kryptonim/kryptonim.dart
@@ -3,28 +3,20 @@ import 'dart:convert';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/buy_quote.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
 import 'package:cake_wallet/buy/payment_method.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:flutter/material.dart';
 import 'dart:developer';
+import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 
 class KryptonimBuyProvider extends BuyProvider {
   KryptonimBuyProvider({required WalletBase wallet, bool isTestEnvironment = false})
-      : super(
-      wallet: wallet,
-      isTestEnvironment: isTestEnvironment,
-      ledgerVM: null,
-      supportedCryptoList: supportedCryptoToFiatPairs(
-          notSupportedCrypto: _notSupportedCrypto, notSupportedFiat: _notSupportedFiat),
-      supportedFiatList: supportedFiatToCryptoPairs(
-          notSupportedFiat: _notSupportedFiat, notSupportedCrypto: _notSupportedCrypto));
+      : super(wallet: wallet, isTestEnvironment: isTestEnvironment, ledgerVM: null);
 
   static const _isProduction = true;
 
@@ -35,9 +27,6 @@ class KryptonimBuyProvider extends BuyProvider {
 
   static String get _kryptonimApiKey => secrets.kryptonimApiKey;
 
-  static const List<CryptoCurrency> _notSupportedCrypto = [];
-  static const List<FiatCurrency> _notSupportedFiat = [];
-
   @override
   String get title => 'Kryptonim';
 
@@ -74,14 +63,9 @@ class KryptonimBuyProvider extends BuyProvider {
     });
 
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: url,
-        headers: headers,
-        body: body,
-      );
+      final response = await http.post(url, headers: headers, body: body);
 
       if (response.statusCode == 200 || response.statusCode == 201 || response.statusCode == 401) {
-        
         return jsonDecode(response.body) as Map<String, dynamic>;
       } else {
         return {};
@@ -118,7 +102,6 @@ class KryptonimBuyProvider extends BuyProvider {
     required bool isBuyAction,
     required String walletAddress,
     PaymentType? paymentType,
-    String? customPaymentMethodType,
     String? countryCode,
   }) async {
     log('Kryptonim: Fetching quote: ${isBuyAction ? cryptoCurrency : fiatCurrency} -> ${isBuyAction ? fiatCurrency : cryptoCurrency}, amount: $amount');
@@ -155,7 +138,7 @@ class KryptonimBuyProvider extends BuyProvider {
 
     final selectedPaymentType =
         PaymentMethod.getPaymentTypeId(selectedPaymentMethod['payment_method'] as String?);
-    final quote = Quote.fromKryptonimJson(selectedPaymentMethod, isBuyAction, selectedPaymentType ?? PaymentType.unknown);
+    final quote = Quote.fromKryptonimJson(selectedPaymentMethod, isBuyAction, selectedPaymentType);
 
     quote.setFiatCurrency = fiatCurrency;
     quote.setCryptoCurrency = cryptoCurrency;
diff --git a/lib/buy/meld/meld_buy_provider.dart b/lib/buy/meld/meld_buy_provider.dart
index 002ab0465..81ad35a40 100644
--- a/lib/buy/meld/meld_buy_provider.dart
+++ b/lib/buy/meld/meld_buy_provider.dart
@@ -3,30 +3,22 @@ import 'dart:convert';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/buy_quote.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
 import 'package:cake_wallet/buy/payment_method.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:flutter/material.dart';
 import 'dart:developer';
+import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 
 class MeldBuyProvider extends BuyProvider {
   MeldBuyProvider({required WalletBase wallet, bool isTestEnvironment = false})
-      : super(
-      wallet: wallet,
-      isTestEnvironment: isTestEnvironment,
-      ledgerVM: null,
-      supportedCryptoList: supportedCryptoToFiatPairs(
-          notSupportedCrypto: _notSupportedCrypto, notSupportedFiat: _notSupportedFiat),
-      supportedFiatList: supportedFiatToCryptoPairs(
-          notSupportedFiat: _notSupportedFiat, notSupportedCrypto: _notSupportedCrypto));
+      : super(wallet: wallet, isTestEnvironment: isTestEnvironment, ledgerVM: null);
 
   static const _isProduction = false;
 
@@ -42,9 +34,6 @@ class MeldBuyProvider extends BuyProvider {
 
   static String get _testApiKey => secrets.meldTestApiKey;
 
-  static const List<CryptoCurrency> _notSupportedCrypto = [];
-  static const List<FiatCurrency> _notSupportedFiat = [];
-
   static String get _testPublicKey => '' ; //secrets.meldTestPublicKey;
 
   @override
@@ -71,8 +60,8 @@ class MeldBuyProvider extends BuyProvider {
     final url = Uri.https(_baseUrl, path, params);
 
     try {
-      final response = await ProxyWrapper().get(
-        clearnetUri: url,
+      final response = await http.get(
+        url,
         headers: {
           'Authorization': _isProduction ? '' : _testApiKey,
           'Meld-Version': '2023-12-19',
@@ -80,7 +69,6 @@ class MeldBuyProvider extends BuyProvider {
           'content-type': 'application/json',
         },
       );
-      
 
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body) as List<dynamic>;
@@ -105,7 +93,6 @@ class MeldBuyProvider extends BuyProvider {
         required bool isBuyAction,
         required String walletAddress,
         PaymentType? paymentType,
-        String? customPaymentMethodType,
         String? countryCode}) async {
     String? paymentMethod;
     if (paymentType != null && paymentType != PaymentType.all) {
@@ -131,12 +118,7 @@ class MeldBuyProvider extends BuyProvider {
     });
 
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: url,
-        headers: headers,
-        body: body,
-      );
-      
+      final response = await http.post(url, headers: headers, body: body);
 
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body) as Map<String, dynamic>;
diff --git a/lib/buy/moonpay/moonpay_provider.dart b/lib/buy/moonpay/moonpay_provider.dart
index 1f9ab1bb1..10148dd30 100644
--- a/lib/buy/moonpay/moonpay_provider.dart
+++ b/lib/buy/moonpay/moonpay_provider.dart
@@ -7,41 +7,33 @@ import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/buy_provider_description.dart';
 import 'package:cake_wallet/buy/buy_quote.dart';
 import 'package:cake_wallet/buy/order.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
 import 'package:cake_wallet/buy/payment_method.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:flutter/material.dart';
+import 'package:http/http.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class MoonPayProvider extends BuyProvider {
   MoonPayProvider({
-    required AppStore appStore,
+    required SettingsStore settingsStore,
     required WalletBase wallet,
     bool isTestEnvironment = false,
   })  : baseSellUrl = isTestEnvironment ? _baseSellTestUrl : _baseSellProductUrl,
         baseBuyUrl = isTestEnvironment ? _baseBuyTestUrl : _baseBuyProductUrl,
-        this._appStore = appStore,
-        super(
-          wallet: wallet,
-          isTestEnvironment: isTestEnvironment,
-          ledgerVM: null,
-          supportedCryptoList: supportedCryptoToFiatPairs(
-              notSupportedCrypto: _notSupportedCrypto, notSupportedFiat: _notSupportedFiat),
-          supportedFiatList: supportedFiatToCryptoPairs(
-              notSupportedFiat: _notSupportedFiat, notSupportedCrypto: _notSupportedCrypto));
+        this._settingsStore = settingsStore,
+        super(wallet: wallet, isTestEnvironment: isTestEnvironment, ledgerVM: null);
 
-  final AppStore _appStore;
+  final SettingsStore _settingsStore;
 
   static const _baseSellTestUrl = 'sell-sandbox.moonpay.com';
   static const _baseSellProductUrl = 'sell.moonpay.com';
@@ -56,9 +48,6 @@ class MoonPayProvider extends BuyProvider {
 
   static const _transactionsSuffix = '/v1/transactions';
 
-  static const List<CryptoCurrency> _notSupportedCrypto = [];
-  static const List<FiatCurrency> _notSupportedFiat = [];
-
   final String baseBuyUrl;
   final String baseSellUrl;
 
@@ -86,24 +75,24 @@ class MoonPayProvider extends BuyProvider {
 
   static String get _exchangeHelperApiKey => secrets.exchangeHelperApiKey;
 
-  static String themeToMoonPayTheme(MaterialThemeBase theme) {
+  static String themeToMoonPayTheme(ThemeBase theme) {
     switch (theme.type) {
+      case ThemeType.bright:
       case ThemeType.light:
         return 'light';
       case ThemeType.dark:
         return 'dark';
+      case ThemeType.oled:
+        return 'dark';
     }
   }
 
   Future<String> getMoonpaySignature(String query) async {
     final uri = Uri.https(_cIdBaseUrl, "/api/moonpay");
 
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: {'Content-Type': 'application/json', 'x-api-key': _exchangeHelperApiKey},
-      body: json.encode({'query': query}),
-    );
-    
+    final response = await post(uri,
+        headers: {'Content-Type': 'application/json', 'x-api-key': _exchangeHelperApiKey},
+        body: json.encode({'query': query}));
 
     if (response.statusCode == 200) {
       return (jsonDecode(response.body) as Map<String, dynamic>)['signature'] as String;
@@ -123,11 +112,7 @@ class MoonPayProvider extends BuyProvider {
     final url = Uri.https(_baseUrl, path, params);
 
     try {
-      final response = await ProxyWrapper().get(
-        clearnetUri: url,
-        headers: {'accept': 'application/json'},
-      );
-      
+      final response = await get(url, headers: {'accept': 'application/json'});
       if (response.statusCode == 200) {
         return jsonDecode(response.body) as Map<String, dynamic>;
       } else {
@@ -166,7 +151,6 @@ class MoonPayProvider extends BuyProvider {
       required bool isBuyAction,
       required String walletAddress,
       PaymentType? paymentType,
-      String? customPaymentMethodType,
       String? countryCode}) async {
     String? paymentMethod;
 
@@ -198,8 +182,8 @@ class MoonPayProvider extends BuyProvider {
     final path = '$_currenciesPath/$formattedCryptoCurrency$quotePath';
     final url = Uri.https(_baseUrl, path, params);
     try {
-      final response = await ProxyWrapper().get(clearnetUri: url);
-      
+      final response = await get(url);
+
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body) as Map<String, dynamic>;
 
@@ -241,9 +225,9 @@ class MoonPayProvider extends BuyProvider {
       required String cryptoCurrencyAddress,
       String? countryCode}) async {
     final Map<String, String> params = {
-      'theme': themeToMoonPayTheme(_appStore.themeStore.currentTheme),
-      'language': _appStore.settingsStore.languageCode,
-      'colorCode': _appStore.themeStore.currentTheme.isDark
+      'theme': themeToMoonPayTheme(_settingsStore.currentTheme),
+      'language': _settingsStore.languageCode,
+      'colorCode': _settingsStore.currentTheme.type == ThemeType.dark
           ? '#${Palette.blueCraiola.value.toRadixString(16).substring(2, 8)}'
           : '#${Palette.moderateSlateBlue.value.toRadixString(16).substring(2, 8)}',
       'baseCurrencyCode': isBuyAction ? quote.fiatCurrency.name : quote.cryptoCurrency.name,
@@ -264,6 +248,7 @@ class MoonPayProvider extends BuyProvider {
     try {
       final uri = await requestMoonPayUrl(
           walletAddress: cryptoCurrencyAddress,
+          settingsStore: _settingsStore,
           isBuyAction: isBuyAction,
           amount: amount.toString(),
           params: params);
@@ -292,6 +277,7 @@ class MoonPayProvider extends BuyProvider {
 
   Future<Uri> requestMoonPayUrl({
     required String walletAddress,
+    required SettingsStore settingsStore,
     required bool isBuyAction,
     required Map<String, String> params,
     String? amount,
@@ -313,8 +299,7 @@ class MoonPayProvider extends BuyProvider {
   Future<Order> findOrderById(String id) async {
     final url = _apiUrl + _transactionsSuffix + '/$id' + '?apiKey=' + _apiKey;
     final uri = Uri.parse(url);
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await get(uri);
 
     if (response.statusCode != 200) {
       throw BuyException(title: providerDescription, content: 'Transaction $id is not found!');
@@ -414,7 +399,7 @@ class MoonPayProvider extends BuyProvider {
       case 'yellow_card_bank_transfer':
         return PaymentType.yellowCardBankTransfer;
       default:
-        return PaymentType.unknown;
+        return PaymentType.all;
     }
   }
 }
diff --git a/lib/buy/onramper/onramper_buy_provider.dart b/lib/buy/onramper/onramper_buy_provider.dart
index 80c9a6326..5480ab2cd 100644
--- a/lib/buy/onramper/onramper_buy_provider.dart
+++ b/lib/buy/onramper/onramper_buy_provider.dart
@@ -4,44 +4,31 @@ import 'dart:developer';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/buy_quote.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
 import 'package:cake_wallet/buy/payment_method.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 
 class OnRamperBuyProvider extends BuyProvider {
-  OnRamperBuyProvider(this._themeStore,
+  OnRamperBuyProvider(this._settingsStore,
       {required WalletBase wallet, bool isTestEnvironment = false})
-      : super(wallet: wallet,
-      isTestEnvironment: isTestEnvironment,
-      ledgerVM: null,
-      supportedCryptoList: supportedCryptoToFiatPairs(
-          notSupportedCrypto: _notSupportedCrypto, notSupportedFiat: _notSupportedFiat),
-      supportedFiatList: supportedFiatToCryptoPairs(
-          notSupportedFiat: _notSupportedFiat, notSupportedCrypto: _notSupportedCrypto));
+      : super(wallet: wallet, isTestEnvironment: isTestEnvironment, ledgerVM: null);
 
   static const _baseUrl = 'buy.onramper.com';
   static const _baseApiUrl = 'api.onramper.com';
   static const quotes = '/quotes';
   static const paymentTypes = '/payment-types';
   static const supported = '/supported';
-  static const defaultsAll = '/defaults/all';
 
-  static const List<CryptoCurrency> _notSupportedCrypto = [];
-  static const List<FiatCurrency> _notSupportedFiat = [];
-  static Map<String, dynamic> _onrampMetadata = {};
-
-  final ThemeStore _themeStore;
-
-  String? recommendedPaymentType;
+  final SettingsStore _settingsStore;
 
   String get _apiKey => secrets.onramperApiKey;
 
@@ -60,68 +47,28 @@ class OnRamperBuyProvider extends BuyProvider {
   @override
   bool get isAggregator => true;
 
-  Future<String?> getRecommendedPaymentType(bool isBuyAction) async {
-
-    final params = {'type': isBuyAction ? 'buy' : 'sell'};
-
-    final url = Uri.https(_baseApiUrl, '$supported$defaultsAll', params);
-
-    try {
-      final response = await ProxyWrapper().get(
-        clearnetUri: url,
-        headers: {'Authorization': _apiKey, 'accept': 'application/json'},
-      );
-
-      if (response.statusCode == 200) {
-        final Map<String, dynamic> data = jsonDecode(response.body) as Map<String, dynamic>;
-        final recommended = data['message']['recommended'] as Map<String, dynamic>;
-
-        final recommendedPaymentType = recommended['paymentMethod'] as String?;
-
-        return recommendedPaymentType ;
-      } else {
-        final responseBody =
-        jsonDecode(response.body) as Map<String, dynamic>;
-        printV('Failed to fetch available payment types: ${responseBody['message']}');
-      }
-    } catch (e) {
-      printV('Failed to fetch available payment types: $e');
-    }
-    return null;
-  }
-
   Future<List<PaymentMethod>> getAvailablePaymentTypes(
       String fiatCurrency, CryptoCurrency cryptoCurrency, bool isBuyAction) async {
+    final params = {
+      'fiatCurrency': fiatCurrency,
+      'type': isBuyAction ? 'buy' : 'sell',
+      'isRecurringPayment': 'false'
+    };
 
-    final normalizedCryptoCurrency =
-        cryptoCurrency.title + _getNormalizeNetwork(cryptoCurrency);
-
-    final sourceCurrency = (isBuyAction ? fiatCurrency : normalizedCryptoCurrency).toLowerCase();
-    final destinationCurrency = (isBuyAction ? normalizedCryptoCurrency : fiatCurrency).toLowerCase();
-
-    final params = {'type': isBuyAction ? 'buy' : 'sell', 'destination' : destinationCurrency};
-
-    final url = Uri.https(_baseApiUrl, '$supported$paymentTypes/$sourceCurrency', params);
+    final url = Uri.https(_baseApiUrl, '$supported$paymentTypes/$fiatCurrency', params);
 
     try {
       final response =
-          await ProxyWrapper().get(clearnetUri: url, headers: {'Authorization': _apiKey, 'accept': 'application/json'});
-      
+          await http.get(url, headers: {'Authorization': _apiKey, 'accept': 'application/json'});
+
       if (response.statusCode == 200) {
         final Map<String, dynamic> data = jsonDecode(response.body) as Map<String, dynamic>;
         final List<dynamic> message = data['message'] as List<dynamic>;
-
-        final allAvailablePaymentMethods = message
+        return message
             .map((item) => PaymentMethod.fromOnramperJson(item as Map<String, dynamic>))
             .toList();
-
-        recommendedPaymentType = await getRecommendedPaymentType(isBuyAction);
-
-        return allAvailablePaymentMethods;
       } else {
-        final responseBody =
-            jsonDecode(response.body) as Map<String, dynamic>;
-        printV('Failed to fetch available payment types: ${responseBody['message']}');
+        printV('Failed to fetch available payment types');
         return [];
       }
     } catch (e) {
@@ -135,8 +82,7 @@ class OnRamperBuyProvider extends BuyProvider {
 
     try {
       final response =
-          await ProxyWrapper().get(clearnetUri: url, headers: {'Authorization': _apiKey, 'accept': 'application/json'});
-      
+          await http.get(url, headers: {'Authorization': _apiKey, 'accept': 'application/json'});
 
       if (response.statusCode == 200) {
         final Map<String, dynamic> data = jsonDecode(response.body) as Map<String, dynamic>;
@@ -170,24 +116,26 @@ class OnRamperBuyProvider extends BuyProvider {
       required bool isBuyAction,
       required String walletAddress,
       PaymentType? paymentType,
-      String? customPaymentMethodType,
       String? countryCode}) async {
     String? paymentMethod;
 
-    if (paymentType == PaymentType.all && recommendedPaymentType != null) paymentMethod = recommendedPaymentType!;
-    else if (paymentType == PaymentType.unknown) paymentMethod = customPaymentMethodType;
-    else if (paymentType != null) paymentMethod = normalizePaymentMethod(paymentType);
+    if (paymentType != null && paymentType != PaymentType.all) {
+      paymentMethod = normalizePaymentMethod(paymentType);
+      if (paymentMethod == null) paymentMethod = paymentType.name;
+    }
 
     final actionType = isBuyAction ? 'buy' : 'sell';
 
-    final normalizedCryptoCurrency =
-        cryptoCurrency.title + _getNormalizeNetwork(cryptoCurrency).toUpperCase();
+    final normalizedCryptoCurrency = _getNormalizeCryptoCurrency(cryptoCurrency);
 
     final params = {
       'amount': amount.toString(),
       if (paymentMethod != null) 'paymentMethod': paymentMethod,
       'clientName': 'CakeWallet',
-      if (actionType == 'sell') 'type': actionType,
+      'type': actionType,
+      'walletAddress': walletAddress,
+      'isRecurringPayment': 'false',
+      'input': 'source',
     };
 
     log('Onramper: Fetching $actionType quote: ${isBuyAction ? normalizedCryptoCurrency : fiatCurrency.name} -> ${isBuyAction ? fiatCurrency.name : normalizedCryptoCurrency}, amount: $amount, paymentMethod: $paymentMethod');
@@ -199,15 +147,15 @@ class OnRamperBuyProvider extends BuyProvider {
     final headers = {'Authorization': _apiKey, 'accept': 'application/json'};
 
     try {
-      final response = await ProxyWrapper().get(clearnetUri: url, headers: headers);
-      
+      final response = await http.get(url, headers: headers);
+
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body) as List<dynamic>;
         if (data.isEmpty) return null;
 
         List<Quote> validQuotes = [];
 
-        if (_onrampMetadata.isEmpty) _onrampMetadata = await getOnrampMetadata();
+        final onrampMetadata = await getOnrampMetadata();
 
         for (var item in data) {
 
@@ -216,12 +164,12 @@ class OnRamperBuyProvider extends BuyProvider {
           final paymentMethod = (item as Map<String, dynamic>)['paymentMethod'] as String;
 
           final rampId = item['ramp'] as String?;
-          final rampMetaData = _onrampMetadata[rampId] as Map<String, dynamic>?;
+          final rampMetaData = onrampMetadata[rampId] as Map<String, dynamic>?;
 
           if (rampMetaData == null) continue;
 
           final quote = Quote.fromOnramperJson(
-              item, isBuyAction, _onrampMetadata, _getPaymentTypeByString(paymentMethod), customPaymentMethodType);
+              item, isBuyAction, onrampMetadata, _getPaymentTypeByString(paymentMethod));
           quote.setFiatCurrency = fiatCurrency;
           quote.setCryptoCurrency = cryptoCurrency;
           validQuotes.add(quote);
@@ -248,30 +196,34 @@ class OnRamperBuyProvider extends BuyProvider {
       required String cryptoCurrencyAddress,
       String? countryCode}) async {
     final actionType = isBuyAction ? 'buy' : 'sell';
+    final prefix = actionType == 'sell' ? actionType + '_' : '';
 
-    final primaryColor = getColorStr(Theme.of(context).colorScheme.primary,);
-    final secondaryColor = getColorStr(Theme.of(context).colorScheme.surface);
-    final primaryTextColor = getColorStr(Theme.of(context).colorScheme.onSurface);
+    final primaryColor = getColorStr(Theme.of(context).primaryColor);
+    final secondaryColor = getColorStr(Theme.of(context).colorScheme.background);
+    final primaryTextColor = getColorStr(Theme.of(context).extension<CakeTextTheme>()!.titleColor);
     final secondaryTextColor =
-        getColorStr(Theme.of(context).colorScheme.onSurfaceVariant);
-    final containerColor = getColorStr(Theme.of(context).colorScheme.surface);
-    var cardColor = getColorStr(Theme.of(context).colorScheme.surfaceContainer);
+        getColorStr(Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor);
+    final containerColor = getColorStr(Theme.of(context).colorScheme.background);
+    var cardColor = getColorStr(Theme.of(context).cardColor);
 
-    final defaultCrypto =
-        quote.cryptoCurrency.title + _getNormalizeNetwork(quote.cryptoCurrency).toLowerCase();
+    if (_settingsStore.currentTheme.title == S.current.high_contrast_theme) {
+      cardColor = getColorStr(Colors.white);
+    }
 
-    final paymentMethod = quote.paymentType == PaymentType.unknown ? quote.customPaymentMethodType : normalizePaymentMethod(quote.paymentType);
+    final defaultCrypto = _getNormalizeCryptoCurrency(quote.cryptoCurrency);
+
+    final paymentMethod = normalizePaymentMethod(quote.paymentType);
 
     final uri = Uri.https(_baseUrl, '', {
       'apiKey': _apiKey,
-      'txnType': actionType,
-      'txnFiat': quote.fiatCurrency.name,
-      'txnCrypto': defaultCrypto,
-      'txnAmount': amount.toString(),
-      'skipTransactionScreen': "true",
-      if (paymentMethod != null) 'txnPaymentMethod': paymentMethod,
-      'txnOnramp': quote.rampId,
-      'networkWallets': '${_tagToNetwork(quote.cryptoCurrency.tag ?? quote.cryptoCurrency.title)}:$cryptoCurrencyAddress',
+      'mode': actionType,
+      '${prefix}defaultFiat': quote.fiatCurrency.name,
+      '${prefix}defaultCrypto': defaultCrypto,
+      '${prefix}defaultAmount': amount.toString(),
+      if (paymentMethod != null) '${prefix}defaultPaymentMethod': paymentMethod,
+      'onlyOnramps': quote.rampId,
+      'networkWallets': '$defaultCrypto:$cryptoCurrencyAddress',
+      'walletAddress': cryptoCurrencyAddress,
       'supportSwap': "false",
       'primaryColor': primaryColor,
       'secondaryColor': secondaryColor,
@@ -284,7 +236,7 @@ class OnRamperBuyProvider extends BuyProvider {
     if (await canLaunchUrl(uri)) {
       await launchUrl(uri, mode: LaunchMode.externalApplication);
     } else {
-      throw Exception('Could not launch URL ${uri.toString()}');
+      throw Exception('Could not launch URL');
     }
   }
 
@@ -296,29 +248,31 @@ class OnRamperBuyProvider extends BuyProvider {
 
   String _tagToNetwork(String tag) {
     switch (tag) {
+      case 'OMNI':
+      case 'BSC':
+        return tag;
       case 'POL':
         return 'POLYGON';
-      case 'ETH':
-        return 'ETHEREUM';
-      case 'TRX':
-        return 'TRON';
-      case 'SOL':
-        return 'SOLANA';
       case 'ZEC':
         return 'ZCASH';
-      default:
-        return tag;
+    default:
+        try {
+          return CryptoCurrency.fromString(tag).fullName!;
+        } catch (_) {
+          return tag;
+        }
     }
   }
 
-  String _getNormalizeNetwork(CryptoCurrency currency) {
-    if (mainCurrency.contains(currency)) return '';
-
-    if (currency == CryptoCurrency.eos) return '_EOSIO';
-
-    if (currency.tag != null) return '_' + _tagToNetwork(currency.tag!);
-
-    return '_' + (currency.fullName?.replaceAll(' ', '') ?? currency.title);
+  String _getNormalizeCryptoCurrency(Currency currency) {
+    if (currency is CryptoCurrency) {
+      if (!mainCurrency.contains(currency)) {
+        final network = currency.tag == null ? currency.fullName : _tagToNetwork(currency.tag!);
+        return '${currency.title}_${network?.replaceAll(' ', '')}'.toUpperCase();
+      }
+      return currency.title.toUpperCase();
+    }
+    return currency.name.toUpperCase();
   }
 
   String? normalizePaymentMethod(PaymentType paymentType) {
@@ -365,8 +319,6 @@ class OnRamperBuyProvider extends BuyProvider {
         return 'dana';
       case PaymentType.ideal:
         return 'ideal';
-      case PaymentType.pixPay:
-        return 'pix';
       default:
         return null;
     }
@@ -416,10 +368,8 @@ class OnRamperBuyProvider extends BuyProvider {
         return PaymentType.dana;
       case 'ideal':
         return PaymentType.ideal;
-      case 'pix':
-        return PaymentType.pixPay;
       default:
-        return PaymentType.unknown;
+        return PaymentType.all;
     }
   }
 
diff --git a/lib/buy/pairs_utils.dart b/lib/buy/pairs_utils.dart
deleted file mode 100644
index 093b9846d..000000000
--- a/lib/buy/pairs_utils.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:cake_wallet/entities/fiat_currency.dart';
-import 'package:cw_core/crypto_currency.dart';
-
-class TradePair<T, U> {
-  TradePair({required this.from, required this.to});
-
-  final T from;
-  final U to;
-}
-
-List<TradePair<CryptoCurrency, FiatCurrency>> supportedCryptoToFiatPairs({
-  required List<CryptoCurrency> notSupportedCrypto,
-  required List<FiatCurrency> notSupportedFiat,
-}) {
-  final supportedCrypto =
-      CryptoCurrency.all.where((crypto) => !notSupportedCrypto.contains(crypto)).toList();
-  final supportedFiat = FiatCurrency.all.where((fiat) => !notSupportedFiat.contains(fiat)).toList();
-
-  return supportedCrypto
-      .expand((crypto) => supportedFiat
-          .map((fiat) => TradePair<CryptoCurrency, FiatCurrency>(from: crypto, to: fiat)))
-      .toList();
-}
-
-List<TradePair<FiatCurrency, CryptoCurrency>> supportedFiatToCryptoPairs({
-  required List<FiatCurrency> notSupportedFiat,
-  required List<CryptoCurrency> notSupportedCrypto,
-}) {
-  final supportedFiat = FiatCurrency.all.where((fiat) => !notSupportedFiat.contains(fiat)).toList();
-  final supportedCrypto =
-      CryptoCurrency.all.where((crypto) => !notSupportedCrypto.contains(crypto)).toList();
-
-  return supportedFiat
-      .expand((fiat) => supportedCrypto
-          .map((crypto) => TradePair<FiatCurrency, CryptoCurrency>(from: fiat, to: crypto)))
-      .toList();
-}
diff --git a/lib/buy/payment_method.dart b/lib/buy/payment_method.dart
index 322ca68ba..14b119aa0 100644
--- a/lib/buy/payment_method.dart
+++ b/lib/buy/payment_method.dart
@@ -34,8 +34,6 @@ enum PaymentType {
   yellowCardBankTransfer,
   fiatBalance,
   bancontact,
-  pixPay,
-  unknown,
 }
 
 extension PaymentTypeTitle on PaymentType {
@@ -103,8 +101,6 @@ extension PaymentTypeTitle on PaymentType {
         return 'Fiat Balance';
       case PaymentType.bancontact:
         return 'Bancontact';
-      case PaymentType.pixPay:
-        return 'PIX Pay';
       default:
         return null;
     }
@@ -162,14 +158,12 @@ class PaymentMethod extends SelectableOption {
     required this.customTitle,
     required this.customIconPath,
     this.customDescription,
-    this.customPaymentMethodType,
   }) : super(title: paymentMethodType.title ?? customTitle);
 
   final PaymentType paymentMethodType;
   final String customTitle;
   final String customIconPath;
   final String? customDescription;
-  final String? customPaymentMethodType;
   bool isSelected = false;
 
   @override
@@ -194,8 +188,7 @@ class PaymentMethod extends SelectableOption {
   factory PaymentMethod.fromOnramperJson(Map<String, dynamic> json) {
     final type = PaymentMethod.getPaymentTypeId(json['paymentTypeId'] as String?);
     return PaymentMethod(
-        paymentMethodType: type ?? PaymentType.unknown,
-        customPaymentMethodType: json['paymentTypeId'] as String?,
+        paymentMethodType: type,
         customTitle: json['name'] as String? ?? 'Unknown',
         customIconPath: json['icon'] as String? ?? 'assets/images/card.png',
         customDescription: json['description'] as String?);
@@ -219,7 +212,7 @@ class PaymentMethod extends SelectableOption {
     final type = PaymentMethod.getPaymentTypeId(json['paymentMethod'] as String?);
     final logos = json['logos'] as Map<String, dynamic>;
     return PaymentMethod(
-        paymentMethodType: type ?? PaymentType.unknown,
+        paymentMethodType: type,
         customTitle: json['name'] as String? ?? 'Unknown',
         customIconPath: logos['dark'] as String? ?? 'assets/images/card.png',
         customDescription: json['description'] as String?);
@@ -228,13 +221,13 @@ class PaymentMethod extends SelectableOption {
   factory PaymentMethod.fromKryptonimJson(Map<String, dynamic> json) {
     final type = PaymentMethod.getPaymentTypeId(json['payment_method'] as String?);
     return PaymentMethod(
-      paymentMethodType: type ?? PaymentType.unknown,
+      paymentMethodType: type,
       customTitle: json['payment_method'] as String? ?? 'Unknown',
       customIconPath: 'assets/images/card.png',
     );
   }
 
-  static PaymentType? getPaymentTypeId(String? type) {
+  static PaymentType getPaymentTypeId(String? type) {
     switch (type?.toLowerCase()) {
       case 'banktransfer':
       case 'bank':
@@ -296,10 +289,8 @@ class PaymentMethod extends SelectableOption {
         return PaymentType.sepaOpenBankingPayment;
       case 'bancontact':
         return PaymentType.bancontact;
-      case 'pix':
-        return PaymentType.pixPay;
       default:
-        return null;
+        return PaymentType.all;
     }
   }
 }
diff --git a/lib/buy/robinhood/robinhood_buy_provider.dart b/lib/buy/robinhood/robinhood_buy_provider.dart
index 4b9c1aa70..b44fab311 100644
--- a/lib/buy/robinhood/robinhood_buy_provider.dart
+++ b/lib/buy/robinhood/robinhood_buy_provider.dart
@@ -4,14 +4,12 @@ import 'dart:developer';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/buy_quote.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
 import 'package:cake_wallet/buy/payment_method.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/connect_device/connect_device_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -19,32 +17,16 @@ import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
 import 'package:url_launcher/url_launcher.dart';
 
 class RobinhoodBuyProvider extends BuyProvider {
   RobinhoodBuyProvider(
       {required WalletBase wallet, bool isTestEnvironment = false, LedgerViewModel? ledgerVM})
-      : super(
-      wallet: wallet,
-      isTestEnvironment: isTestEnvironment,
-      ledgerVM: ledgerVM,
-      supportedCryptoList: supportedCryptoToFiatPairs(
-          notSupportedCrypto: _notSupportedCrypto, notSupportedFiat: _notSupportedFiat),
-      supportedFiatList: supportedFiatToCryptoPairs(
-          notSupportedFiat: _notSupportedFiat, notSupportedCrypto: _notSupportedCrypto));
+      : super(wallet: wallet, isTestEnvironment: isTestEnvironment, ledgerVM: ledgerVM);
 
   static const _baseUrl = 'applink.robinhood.com';
   static const _cIdBaseUrl = 'exchange-helper.cakewallet.com';
-  static const _apiBaseUrl = 'api.robinhood.com';
-  static const _assetsPath = '/catpay/v1/supported_currencies/';
-
-  static List<CryptoCurrency> _supportedCrypto = [];
-  static final List<FiatCurrency> _supportedFiat = [FiatCurrency.usd];
-
-  static final List<CryptoCurrency> _notSupportedCrypto = [];
-
-  static final List<FiatCurrency> _notSupportedFiat =
-      FiatCurrency.all.where((fiat) => !_supportedFiat.contains(fiat)).toList();
 
   @override
   String get title => 'Robinhood Connect';
@@ -65,39 +47,6 @@ class RobinhoodBuyProvider extends BuyProvider {
 
   String get _apiSecret => secrets.exchangeHelperApiKey;
 
-  Future<List<CryptoCurrency>> getSupportedAssets() async {
-    final uri = Uri.https(_apiBaseUrl, '$_assetsPath', {'applicationId': _applicationId});
-
-    try {
-      final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'accept': 'application/json'});
-      
-
-      if (response.statusCode == 200) {
-        final responseData = jsonDecode(response.body) as Map<String, dynamic>;
-        final pairs = responseData['cryptoCurrencyPairs'] as List<dynamic>;
-
-        final supportedAssets = <CryptoCurrency>[];
-
-        for (final item in pairs) {
-          String code = item['assetCurrency']['code'] as String;
-          if (code == 'AVAX') code = 'AVAXC';
-          try {
-            final currency = CryptoCurrency.fromString(code);
-            supportedAssets.add(currency);
-          } catch (e) {
-            log('Robinhood: Unknown asset code "$code" - skipped');
-          }
-        }
-        return supportedAssets;
-      } else {
-        return [];
-      }
-    } catch (e) {
-      log('Robinhood: Failed to fetch supported assets: $e');
-      return [];
-    }
-  }
-
   Future<String> getSignature(String message) async {
     switch (wallet.type) {
       case WalletType.ethereum:
@@ -123,14 +72,12 @@ class RobinhoodBuyProvider extends BuyProvider {
 
     final uri = Uri.https(_cIdBaseUrl, "/api/robinhood");
 
-    var response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: {'Content-Type': 'application/json'},
-      body: json.encode({'valid_until': valid_until, 'wallet': walletAddress, 'signature': signature}),
-    );
+    var response = await http.post(uri,
+        headers: {'Content-Type': 'application/json'},
+        body: json
+            .encode({'valid_until': valid_until, 'wallet': walletAddress, 'signature': signature}));
 
     if (response.statusCode == 200) {
-      
       return (jsonDecode(response.body) as Map<String, dynamic>)['connectId'] as String;
     } else {
       throw Exception('Provider currently unavailable. Status: ${response.statusCode}');
@@ -195,13 +142,9 @@ class RobinhoodBuyProvider extends BuyProvider {
       required bool isBuyAction,
       required String walletAddress,
       PaymentType? paymentType,
-      String? customPaymentMethodType,
       String? countryCode}) async {
     String? paymentMethod;
 
-    if (_supportedCrypto.isEmpty) _supportedCrypto = await getSupportedAssets();
-    if (_supportedCrypto.isNotEmpty && !(_supportedCrypto.contains(cryptoCurrency))) return null;
-
     if (paymentType != null && paymentType != PaymentType.all) {
       paymentMethod = normalizePaymentMethod(paymentType);
       if (paymentMethod == null) return null;
@@ -222,8 +165,7 @@ class RobinhoodBuyProvider extends BuyProvider {
         Uri.https('api.robinhood.com', '/catpay/v1/${cryptoCurrency.title}/quote/', queryParams);
 
     try {
-      final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'accept': 'application/json'});
-      
+      final response = await http.get(uri, headers: {'accept': 'application/json'});
       final responseData = jsonDecode(response.body) as Map<String, dynamic>;
 
       if (response.statusCode == 200) {
@@ -272,7 +214,7 @@ class RobinhoodBuyProvider extends BuyProvider {
       case 'bank_transfer':
         return PaymentType.bankTransfer;
       default:
-        return PaymentType.unknown;
+        return PaymentType.all;
     }
   }
 }
diff --git a/lib/buy/wyre/wyre_buy_provider.dart b/lib/buy/wyre/wyre_buy_provider.dart
index 3f9844df6..78b109ac0 100644
--- a/lib/buy/wyre/wyre_buy_provider.dart
+++ b/lib/buy/wyre/wyre_buy_provider.dart
@@ -1,9 +1,7 @@
 import 'dart:convert';
 import 'package:cake_wallet/buy/buy_exception.dart';
-import 'package:cake_wallet/buy/pairs_utils.dart';
-import 'package:cake_wallet/entities/fiat_currency.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:http/http.dart';
 import 'package:cake_wallet/buy/buy_amount.dart';
 import 'package:cake_wallet/buy/buy_provider.dart';
 import 'package:cake_wallet/buy/buy_provider_description.dart';
@@ -16,14 +14,7 @@ import 'package:cake_wallet/.secrets.g.dart' as secrets;
 class WyreBuyProvider extends BuyProvider {
   WyreBuyProvider({required WalletBase wallet, bool isTestEnvironment = false})
       : baseApiUrl = isTestEnvironment ? _baseTestApiUrl : _baseProductApiUrl,
-        super(
-          wallet: wallet,
-          isTestEnvironment: isTestEnvironment,
-          ledgerVM: null,
-          supportedCryptoList: supportedCryptoToFiatPairs(
-              notSupportedCrypto: _notSupportedCrypto, notSupportedFiat: _notSupportedFiat),
-          supportedFiatList: supportedFiatToCryptoPairs(
-              notSupportedFiat: _notSupportedFiat, notSupportedCrypto: _notSupportedCrypto));
+        super(wallet: wallet, isTestEnvironment: isTestEnvironment, ledgerVM: null);
 
   static const _baseTestApiUrl = 'https://api.testwyre.com';
   static const _baseProductApiUrl = 'https://api.sendwyre.com';
@@ -39,9 +30,6 @@ class WyreBuyProvider extends BuyProvider {
   static const _secretKey = secrets.wyreSecretKey;
   static const _accountId = secrets.wyreAccountId;
 
-  static const List<CryptoCurrency> _notSupportedCrypto = [];
-  static const List<FiatCurrency> _notSupportedFiat = [];
-
   @override
   String get title => 'Wyre';
 
@@ -73,21 +61,18 @@ class WyreBuyProvider extends BuyProvider {
       'referrerAccountId': _accountId,
       'lockFields': ['amount', 'sourceCurrency', 'destCurrency', 'dest']
     };
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: {
-        'Authorization': 'Bearer $_secretKey',
-        'Content-Type': 'application/json',
-        'cache-control': 'no-cache'
-      },
-      body: json.encode(body),
-    );
+    final response = await post(uri,
+        headers: {
+          'Authorization': 'Bearer $_secretKey',
+          'Content-Type': 'application/json',
+          'cache-control': 'no-cache'
+        },
+        body: json.encode(body));
 
     if (response.statusCode != 200) {
       throw BuyException(title: providerDescription, content: 'Url $url is not found!');
     }
 
-    
     final responseJSON = json.decode(response.body) as Map<String, dynamic>;
     final urlFromResponse = responseJSON['url'] as String;
     return urlFromResponse;
@@ -104,21 +89,18 @@ class WyreBuyProvider extends BuyProvider {
       'country': _countryCode
     };
     final uri = Uri.parse(quoteUrl);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: {
-        'Authorization': 'Bearer $_secretKey',
-        'Content-Type': 'application/json',
-        'cache-control': 'no-cache'
-      },
-      body: json.encode(body),
-    );
+    final response = await post(uri,
+        headers: {
+          'Authorization': 'Bearer $_secretKey',
+          'Content-Type': 'application/json',
+          'cache-control': 'no-cache'
+        },
+        body: json.encode(body));
 
     if (response.statusCode != 200) {
       throw BuyException(title: providerDescription, content: 'Quote is not found!');
     }
 
-    
     final responseJSON = json.decode(response.body) as Map<String, dynamic>;
     final sourceAmount = responseJSON['sourceAmount'] as double;
     final destAmount = responseJSON['destAmount'] as double;
@@ -131,7 +113,8 @@ class WyreBuyProvider extends BuyProvider {
   Future<Order> findOrderById(String id) async {
     final orderUrl = baseApiUrl + _ordersSuffix + '/$id';
     final orderUri = Uri.parse(orderUrl);
-    final orderResponse = await ProxyWrapper().get(clearnetUri: orderUri);
+    final orderResponse = await get(orderUri);
+
     if (orderResponse.statusCode != 200) {
       throw BuyException(title: providerDescription, content: 'Order $id is not found!');
     }
@@ -147,7 +130,8 @@ class WyreBuyProvider extends BuyProvider {
 
     final transferUrl = baseApiUrl + _transferSuffix + transferId + _trackSuffix;
     final transferUri = Uri.parse(transferUrl);
-    final transferResponse = await ProxyWrapper().get(clearnetUri: transferUri);
+    final transferResponse = await get(transferUri);
+
     if (transferResponse.statusCode != 200) {
       throw BuyException(title: providerDescription, content: 'Transfer $transferId is not found!');
     }
diff --git a/lib/cake_pay/cake_pay_api.dart b/lib/cake_pay/cake_pay_api.dart
index a3c7f48d0..5f1a350c0 100644
--- a/lib/cake_pay/cake_pay_api.dart
+++ b/lib/cake_pay/cake_pay_api.dart
@@ -3,9 +3,9 @@ import 'dart:convert';
 import 'package:cake_wallet/cake_pay/cake_pay_order.dart';
 import 'package:cake_wallet/cake_pay/cake_pay_user_credentials.dart';
 import 'package:cake_wallet/cake_pay/cake_pay_vendor.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cake_wallet/entities/country.dart';
+import 'package:http/http.dart' as http;
 
 class CakePayApi {
   static const testBaseUri = false;
@@ -32,17 +32,12 @@ class CakePayApi {
         'Content-Type': 'application/json',
         'Authorization': 'Api-Key $apiKey',
       };
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        headers: headers,
-        body: json.encode({'email': email}),
-      );
+      final response = await http.post(uri, headers: headers, body: json.encode({'email': email}));
 
       if (response.statusCode != 200) {
         throw Exception('Unexpected http status: ${response.statusCode}');
       }
 
-      
       final bodyJson = json.decode(response.body) as Map<String, dynamic>;
 
       if (bodyJson.containsKey('user') && bodyJson['user']['email'] != null) {
@@ -69,17 +64,12 @@ class CakePayApi {
     };
     final query = <String, String>{'email': email, 'otp': code};
 
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(query),
-    );
+    final response = await http.post(uri, headers: headers, body: json.encode(query));
 
     if (response.statusCode != 200) {
       throw Exception('Unexpected http status: ${response.statusCode}');
     }
 
-    
     final bodyJson = json.decode(response.body) as Map<String, dynamic>;
 
     if (bodyJson.containsKey('error')) {
@@ -126,14 +116,9 @@ class CakePayApi {
     };
 
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        headers: headers,
-        body: json.encode(query),
-      );
+      final response = await http.post(uri, headers: headers, body: json.encode(query));
 
       if (response.statusCode != 201) {
-        
         final responseBody = json.decode(response.body);
         if (responseBody is List) {
           throw '${responseBody[0]}';
@@ -142,7 +127,6 @@ class CakePayApi {
         }
       }
 
-      
       final bodyJson = json.decode(response.body) as Map<String, dynamic>;
       return CakePayOrder.fromMap(bodyJson);
     } catch (e) {
@@ -161,8 +145,7 @@ class CakePayApi {
       'X-CSRFToken': CSRFToken,
     };
 
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers);
-    
+    final response = await http.get(uri, headers: headers);
 
     printV('Response: ${response.statusCode}');
 
@@ -185,11 +168,7 @@ class CakePayApi {
     };
 
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        headers: headers,
-        body: json.encode({'email': email}),
-      );
+      final response = await http.post(uri, headers: headers, body: json.encode({'email': email}));
 
       if (response.statusCode != 200) {
         throw Exception('Unexpected http status: ${response.statusCode}');
@@ -208,8 +187,8 @@ class CakePayApi {
       'Authorization': 'Api-Key $apiKey',
     };
 
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers);
-    
+    final response = await http.get(uri, headers: headers);
+
     if (response.statusCode != 200) {
       throw Exception('Unexpected http status: ${response.statusCode}');
     }
@@ -255,15 +234,14 @@ class CakePayApi {
       'Authorization': 'Api-Key $apiKey',
     };
 
-    var response = await ProxyWrapper().get(clearnetUri: uri, headers: headers);
-    
+    var response = await http.get(uri, headers: headers);
 
     if (response.statusCode != 200) {
       throw Exception(
           'Failed to fetch vendors: statusCode - ${response.statusCode}, queryParams -$queryParams, response - ${response.body}');
     }
 
-    final bodyJson = json.decode(response.body);
+    final bodyJson = json.decode(utf8.decode(response.bodyBytes));
 
     if (bodyJson is List<dynamic> && bodyJson.isEmpty) {
       return [];
diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart
index c79ac0980..911e939d1 100644
--- a/lib/core/address_validator.dart
+++ b/lib/core/address_validator.dart
@@ -38,9 +38,9 @@ class AddressValidator extends TextValidator {
             '|[0-9a-zA-Z]{105}|addr1[0-9a-zA-Z]{98}';
       case CryptoCurrency.btc:
         pattern =
-            '${P2pkhAddress.regex.pattern}|${P2shAddress.regex.pattern}|${P2wpkhAddress.regex.pattern}|${P2trAddress.regex.pattern}|${P2wshAddress.regex.pattern}|${SilentPaymentAddress.regex.pattern}';
+            '${P2pkhAddress.regex.pattern}|${P2shAddress.regex.pattern}|${RegExp(r'(bc|tb)1q[ac-hj-np-z02-9]{25,39}}').pattern}|${P2trAddress.regex.pattern}|${P2wshAddress.regex.pattern}|${SilentPaymentAddress.regex.pattern}';
       case CryptoCurrency.ltc:
-        pattern = '${P2wpkhAddress.regex.pattern}|${MwebAddress.regex.pattern}';
+        pattern = '^${RegExp(r'ltc1q[ac-hj-np-z02-9]{25,39}').pattern}\$|^${MwebAddress.regex.pattern}\$';
       case CryptoCurrency.nano:
         pattern = '[0-9a-zA-Z_]+';
       case CryptoCurrency.banano:
@@ -335,6 +335,10 @@ class AddressValidator extends TextValidator {
         }
     }
 
-    return pattern != null ? "($pattern)" : null;
+    if (pattern != null) {
+      return "$BEFORE_REGEX($pattern)$AFTER_REGEX";
+    }
+
+    return null;
   }
 }
diff --git a/lib/core/background_sync.dart b/lib/core/background_sync.dart
index a503f5c1b..0098b62b6 100644
--- a/lib/core/background_sync.dart
+++ b/lib/core/background_sync.dart
@@ -1,118 +1,37 @@
 import 'dart:async';
-import 'dart:io';
+import 'dart:math';
 
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/core/wallet_loading_service.dart';
 import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/utils/feature_flag.dart';
-import 'package:cake_wallet/utils/tor.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cw_core/sync_status.dart';
-import 'package:cw_core/transaction_direction.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_type.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter/foundation.dart';
+import 'package:http/http.dart' as http;
 
 class BackgroundSync {
-  final FlutterLocalNotificationsPlugin _notificationsPlugin = FlutterLocalNotificationsPlugin();
-  bool _isInitialized = false;
-
-  Future<void> _initializeNotifications() async {
-    if (_isInitialized) return;
-
-    const androidSettings = AndroidInitializationSettings('@mipmap/ic_launcher');
-    
-    const iosSettings = DarwinInitializationSettings(
-      requestAlertPermission: true,
-      requestBadgePermission: true,
-      requestSoundPermission: true,
-    );
-
-    const initializationSettings = InitializationSettings(
-      android: androidSettings,
-      iOS: iosSettings,
-    );
-
-    await _notificationsPlugin.initialize(initializationSettings);
-    _isInitialized = true;
-  }
-
-  Future<bool> requestPermissions() async {
-    if (Platform.isIOS || Platform.isMacOS) {
-      return await _notificationsPlugin
-          .resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()
-          ?.requestPermissions(
-            alert: true,
-            badge: true,
-            sound: true,
-          ) ?? false;
-    } else if (Platform.isAndroid) {
-      return await _notificationsPlugin
-          .resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>()
-          ?.areNotificationsEnabled() ?? false;
-    }
-    return false;
-  }
-
-  Future<void> showNotification(String title, String content) async {
-    await _initializeNotifications();
-    final hasPermission = await requestPermissions();
-    
-    if (!hasPermission) {
-      printV('Notification permissions not granted');
-      return;
-    }
-
-    const androidDetails = AndroidNotificationDetails(
-      'transactions',
-      'Transactions',
-      channelDescription: 'Channel for notifications about transactions',
-      importance: Importance.defaultImportance,
-      priority: Priority.defaultPriority,
-    );
-
-    const iosDetails = DarwinNotificationDetails();
-
-    const notificationDetails = NotificationDetails(
-      android: androidDetails,
-      iOS: iosDetails,
-    );
-
-    await _notificationsPlugin.show(
-      DateTime.now().millisecondsSinceEpoch.hashCode,
-      title,
-      content,
-      notificationDetails,
-    );
-  }
-
   Future<void> sync() async {
-    final settingsStore = getIt.get<SettingsStore>();
-    if (settingsStore.currentBuiltinTor) {
-      printV("Starting Tor");
-      await ensureTorStarted(context: null);
-    }
     printV("Background sync started");
-    await _syncWallets();
+    await _syncMonero();
     printV("Background sync completed");
   }
 
-  Future<void> _syncWallets() async {
+  Future<void> _syncMonero() async {
     final walletLoadingService = getIt.get<WalletLoadingService>();
     final walletListViewModel = getIt.get<WalletListViewModel>();
     final settingsStore = getIt.get<SettingsStore>();
 
+
     final List<WalletListItem> moneroWallets = walletListViewModel.wallets
         .where((element) => !element.isHardware)
-        .where((element) => ![WalletType.haven, WalletType.decred].contains(element.type))
+        .where((element) => [WalletType.monero].contains(element.type))
         .toList();
     for (int i = 0; i < moneroWallets.length; i++) {
-      final wallet = await walletLoadingService.load(moneroWallets[i].type, moneroWallets[i].name, isBackground: true);
+      final wallet = await walletLoadingService.load(moneroWallets[i].type, moneroWallets[i].name);
       int syncedTicks = 0;
       final keyService = getIt.get<KeyService>();
       
@@ -156,7 +75,7 @@ class BackgroundSync {
         } else {
           syncedTicks = 0;
         }
-        if (FeatureFlag.hasDevOptions) {
+        if (kDebugMode) {
           if (syncStatus is SyncingSyncStatus) {
             final blocksLeft = syncStatus.blocksLeft;
             printV("$blocksLeft Blocks Left");
@@ -181,27 +100,6 @@ class BackgroundSync {
           }
         }
       }
-      final txs = wallet.transactionHistory;
-      final sortedTxs = txs.transactions.values.toList()..sort((a, b) => a.date.compareTo(b.date));
-      final sharedPreferences = await SharedPreferences.getInstance();
-      for (final tx in sortedTxs) {
-        final lastTriggerString = sharedPreferences.getString(PreferencesKey.backgroundSyncLastTrigger(wallet.name));
-        final lastTriggerDate = lastTriggerString != null 
-            ? DateTime.parse(lastTriggerString) 
-            : DateTime.now();
-        final keys = sharedPreferences.getKeys();
-        if (tx.date.isBefore(lastTriggerDate)) {
-          printV("w: ${wallet.name}, tx: ${tx.date} is before $lastTriggerDate (lastTriggerString: $lastTriggerString) (k: ${keys.length})");
-          continue;
-        }
-        await sharedPreferences.setString(PreferencesKey.backgroundSyncLastTrigger(wallet.name), tx.date.add(Duration(minutes: 1)).toIso8601String());
-        final action = tx.direction == TransactionDirection.incoming ? "Received" : "Sent";
-        if (sharedPreferences.getBool(PreferencesKey.backgroundSyncNotificationsEnabled) ?? false) {
-          await showNotification("$action ${wallet.currency.fullName} in ${wallet.name}", "${tx.amountFormatted()}");
-        }
-        printV("${wallet.currency.fullName} in ${wallet.name}: TX: ${tx.date} ${tx.amount} ${tx.direction}");
-      }
-      wallet.id;
       await wallet.stopBackgroundSync(await keyService.getWalletPassword(walletName: wallet.name));
       await wallet.close(shouldCleanup: true);
     }
diff --git a/lib/core/backup_service.dart b/lib/core/backup_service.dart
index 87bb71ce9..2af037d44 100644
--- a/lib/core/backup_service.dart
+++ b/lib/core/backup_service.dart
@@ -1,9 +1,10 @@
 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 import 'package:cake_wallet/core/secure_storage.dart';
 import 'package:cake_wallet/entities/get_encryption_key.dart';
 import 'package:cake_wallet/entities/transaction_description.dart';
-import 'package:cake_wallet/themes/utils/theme_list.dart';
+import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cw_core/root_dir.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cw_core/utils/print_verbose.dart';
@@ -83,7 +84,7 @@ class $BackupService {
     outer:
     for (var file in zip.files) {
       final filename = file.name;
-      for (var ignore in ignoreFiles) {
+      for (var ignore in ignoreFiles) { 
         if (filename.endsWith(ignore) && !filename.contains("wallets/")) {
           printV("ignoring backup file: $filename");
           continue outer;
@@ -110,7 +111,7 @@ class $BackupService {
   }
 
   Future<void> verifyWallets() async {
-    final walletInfoSource = await reloadHiveWalletInfoBox();
+    final walletInfoSource = await _reloadHiveWalletInfoBox();
     correctWallets =
         walletInfoSource.values.where((info) => availableWalletTypes.contains(info.type)).toList();
 
@@ -119,7 +120,7 @@ class $BackupService {
     }
   }
 
-  Future<Box<WalletInfo>> reloadHiveWalletInfoBox() async {
+  Future<Box<WalletInfo>> _reloadHiveWalletInfoBox() async {
     final appDir = await getAppDir();
     await CakeHive.close();
     CakeHive.init(appDir.path);
@@ -145,7 +146,7 @@ class $BackupService {
         MapEntry(key, TransactionDescription.fromJson(value as Map<String, dynamic>)));
     var box = transactionDescriptionBox;
     if (!box.isOpen) {
-      final transactionDescriptionsBoxKey =
+      final transactionDescriptionsBoxKey = 
         await getEncryptionKey(secureStorage: _secureStorage, forKey: TransactionDescription.boxKey);
       box = await CakeHive.openBox<TransactionDescription>(
         TransactionDescription.boxName,
@@ -163,31 +164,6 @@ class $BackupService {
     }
 
     final data = json.decode(preferencesFile.readAsStringSync()) as Map<String, dynamic>;
-
-    try { // shouldn't throw an error but just in case, so it doesn't stop the backup restore
-      for (var entry in data.entries) {
-        String key = entry.key;
-        dynamic value = entry.value;
-
-        // Check the type of the value and save accordingly
-        if (value is String) {
-          await sharedPreferences.setString(key, value);
-        } else if (value is int) {
-          await sharedPreferences.setInt(key, value);
-        } else if (value is double) {
-          await sharedPreferences.setDouble(key, value);
-        } else if (value is bool) {
-          await sharedPreferences.setBool(key, value);
-        } else if (value is List<String>) {
-          await sharedPreferences.setStringList(key, value);
-        } else {
-          if (kDebugMode) {
-            printV('Skipping individual save for key "$key": Unsupported type (${value.runtimeType}). Value: $value');
-          }
-        }
-      }
-    } catch (_) {}
-
     String currentWalletName = data[PreferencesKey.currentWalletName] as String;
     int currentWalletType = data[PreferencesKey.currentWalletType] as int;
 
@@ -199,10 +175,151 @@ class $BackupService {
       currentWalletType = serializeToInt(correctWallets.first.type);
     }
 
-    if (DeviceInfo.instance.isDesktop) {
+    final currentNodeId = data[PreferencesKey.currentNodeIdKey] as int?;
+    final currentBalanceDisplayMode = data[PreferencesKey.currentBalanceDisplayModeKey] as int?;
+    final currentFiatCurrency = data[PreferencesKey.currentFiatCurrencyKey] as String?;
+    final shouldSaveRecipientAddress = data[PreferencesKey.shouldSaveRecipientAddressKey] as bool?;
+    final isAppSecure = data[PreferencesKey.isAppSecureKey] as bool?;
+    final disableTradeOption = data[PreferencesKey.disableTradeOption] as bool?;
+    final currentTransactionPriorityKeyLegacy =
+        data[PreferencesKey.currentTransactionPriorityKeyLegacy] as int?;
+    final currentBitcoinElectrumSererId =
+        data[PreferencesKey.currentBitcoinElectrumSererIdKey] as int?;
+    final currentLanguageCode = data[PreferencesKey.currentLanguageCode] as String?;
+    final displayActionListMode = data[PreferencesKey.displayActionListModeKey] as int?;
+    final fiatApiMode = data[PreferencesKey.currentFiatApiModeKey] as int?;
+    final currentTheme = data[PreferencesKey.currentTheme] as int?;
+    final exchangeStatus = data[PreferencesKey.exchangeStatusKey] as int?;
+    final currentDefaultSettingsMigrationVersion =
+        data[PreferencesKey.currentDefaultSettingsMigrationVersion] as int?;
+    final moneroTransactionPriority = data[PreferencesKey.moneroTransactionPriority] as int?;
+    final bitcoinTransactionPriority = data[PreferencesKey.bitcoinTransactionPriority] as int?;
+    final sortBalanceTokensBy = data[PreferencesKey.sortBalanceBy] as int?;
+    final pinNativeTokenAtTop = data[PreferencesKey.pinNativeTokenAtTop] as bool?;
+    final useEtherscan = data[PreferencesKey.useEtherscan] as bool?;
+    final defaultNanoRep = data[PreferencesKey.defaultNanoRep] as String?;
+    final defaultBananoRep = data[PreferencesKey.defaultBananoRep] as String?;
+    final lookupsTwitter = data[PreferencesKey.lookupsTwitter] as bool?;
+    final lookupsMastodon = data[PreferencesKey.lookupsMastodon] as bool?;
+    final lookupsYatService = data[PreferencesKey.lookupsYatService] as bool?;
+    final lookupsUnstoppableDomains = data[PreferencesKey.lookupsUnstoppableDomains] as bool?;
+    final lookupsOpenAlias = data[PreferencesKey.lookupsOpenAlias] as bool?;
+    final lookupsENS = data[PreferencesKey.lookupsENS] as bool?;
+    final lookupsWellKnown = data[PreferencesKey.lookupsWellKnown] as bool?;
+    final syncAll = data[PreferencesKey.syncAllKey] as bool?;
+    final syncMode = data[PreferencesKey.syncModeKey] as int?;
+    final autoGenerateSubaddressStatus =
+        data[PreferencesKey.autoGenerateSubaddressStatusKey] as int?;
+
+    await sharedPreferences.setString(PreferencesKey.currentWalletName, currentWalletName);
+
+    if (currentNodeId != null)
+      await sharedPreferences.setInt(PreferencesKey.currentNodeIdKey, currentNodeId);
+
+    if (currentBalanceDisplayMode != null)
+      await sharedPreferences.setInt(
+          PreferencesKey.currentBalanceDisplayModeKey, currentBalanceDisplayMode);
+
+    await sharedPreferences.setInt(PreferencesKey.currentWalletType, currentWalletType);
+
+    if (currentFiatCurrency != null)
+      await sharedPreferences.setString(
+          PreferencesKey.currentFiatCurrencyKey, currentFiatCurrency);
+
+    if (shouldSaveRecipientAddress != null)
+      await sharedPreferences.setBool(
+          PreferencesKey.shouldSaveRecipientAddressKey, shouldSaveRecipientAddress);
+
+    if (isAppSecure != null)
+      await sharedPreferences.setBool(PreferencesKey.isAppSecureKey, isAppSecure);
+
+    if (disableTradeOption != null)
+      await sharedPreferences.setBool(PreferencesKey.disableTradeOption, disableTradeOption);
+
+    if (currentTransactionPriorityKeyLegacy != null)
+      await sharedPreferences.setInt(
+          PreferencesKey.currentTransactionPriorityKeyLegacy, currentTransactionPriorityKeyLegacy);
+
+    if (currentBitcoinElectrumSererId != null)
+      await sharedPreferences.setInt(
+          PreferencesKey.currentBitcoinElectrumSererIdKey, currentBitcoinElectrumSererId);
+
+    if (currentLanguageCode != null)
+      await sharedPreferences.setString(PreferencesKey.currentLanguageCode, currentLanguageCode);
+
+    if (displayActionListMode != null)
+      await sharedPreferences.setInt(
+          PreferencesKey.displayActionListModeKey, displayActionListMode);
+
+    if (fiatApiMode != null)
+      await sharedPreferences.setInt(PreferencesKey.currentFiatApiModeKey, fiatApiMode);
+    if (autoGenerateSubaddressStatus != null)
+      await sharedPreferences.setInt(
+          PreferencesKey.autoGenerateSubaddressStatusKey, autoGenerateSubaddressStatus);
+
+    if (currentTheme != null && DeviceInfo.instance.isMobile) {
+      await sharedPreferences.setInt(PreferencesKey.currentTheme, currentTheme);
+      // enforce dark theme on desktop platforms until the design is ready:
+    } else if (DeviceInfo.instance.isDesktop) {
       await sharedPreferences.setInt(PreferencesKey.currentTheme, ThemeList.darkTheme.raw);
     }
 
+    if (exchangeStatus != null)
+      await sharedPreferences.setInt(PreferencesKey.exchangeStatusKey, exchangeStatus);
+
+    if (currentDefaultSettingsMigrationVersion != null)
+      await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion,
+          currentDefaultSettingsMigrationVersion);
+
+    if (moneroTransactionPriority != null)
+      await sharedPreferences.setInt(
+          PreferencesKey.moneroTransactionPriority, moneroTransactionPriority);
+
+    if (bitcoinTransactionPriority != null)
+      await sharedPreferences.setInt(
+          PreferencesKey.bitcoinTransactionPriority, bitcoinTransactionPriority);
+
+    if (sortBalanceTokensBy != null)
+      await sharedPreferences.setInt(PreferencesKey.sortBalanceBy, sortBalanceTokensBy);
+
+    if (pinNativeTokenAtTop != null)
+      await sharedPreferences.setBool(PreferencesKey.pinNativeTokenAtTop, pinNativeTokenAtTop);
+
+    if (useEtherscan != null)
+      await sharedPreferences.setBool(PreferencesKey.useEtherscan, useEtherscan);
+
+    if (defaultNanoRep != null)
+      await sharedPreferences.setString(PreferencesKey.defaultNanoRep, defaultNanoRep);
+
+    if (defaultBananoRep != null)
+      await sharedPreferences.setString(PreferencesKey.defaultBananoRep, defaultBananoRep);
+
+    if (syncAll != null) await sharedPreferences.setBool(PreferencesKey.syncAllKey, syncAll);
+    if (lookupsTwitter != null)
+      await sharedPreferences.setBool(PreferencesKey.lookupsTwitter, lookupsTwitter);
+
+    if (lookupsMastodon != null)
+      await sharedPreferences.setBool(PreferencesKey.lookupsMastodon, lookupsMastodon);
+
+    if (lookupsYatService != null)
+      await sharedPreferences.setBool(PreferencesKey.lookupsYatService, lookupsYatService);
+
+    if (lookupsUnstoppableDomains != null)
+      await sharedPreferences.setBool(
+          PreferencesKey.lookupsUnstoppableDomains, lookupsUnstoppableDomains);
+
+    if (lookupsOpenAlias != null)
+      await sharedPreferences.setBool(PreferencesKey.lookupsOpenAlias, lookupsOpenAlias);
+
+    if (lookupsENS != null) await sharedPreferences.setBool(PreferencesKey.lookupsENS, lookupsENS);
+
+    if (lookupsWellKnown != null)
+      await sharedPreferences.setBool(PreferencesKey.lookupsWellKnown, lookupsWellKnown);
+
+    if (syncAll != null) await sharedPreferences.setBool(PreferencesKey.syncAllKey, syncAll);
+
+    if (syncMode != null) await sharedPreferences.setInt(PreferencesKey.syncModeKey, syncMode);
+
     await preferencesFile.delete();
   }
 
@@ -251,25 +368,6 @@ class $BackupService {
       await importWalletKeychainInfo(info);
     });
 
-    if (keychainJSON['_all'] is Map<String, dynamic>) {
-      for (var key in (keychainJSON['_all'] as Map<String, dynamic>).keys) {
-        try {
-          if (!key.startsWith('MONERO_WALLET_')) continue;
-          final decodedPassword = decodeWalletPassword(
-              password: keychainJSON['_all'][key].toString());
-          final walletName = key.split('_WALLET_')[1];
-          final walletType = key.split('_WALLET_')[0].toLowerCase();
-          await importWalletKeychainInfo({
-            'name': walletName,
-            'type': "WalletType.$walletType",
-            'password': decodedPassword,
-          });
-        } catch (e) {
-          printV('Error importing wallet ($key) password: $e');
-        }
-      }
-    }
-
     keychainDumpFile.deleteSync();
   }
 
@@ -280,47 +378,83 @@ class $BackupService {
     await keyService.saveWalletPassword(walletName: name, password: password);
   }
 
+  @Deprecated('Use v2 instead')
+  Future<Uint8List> _exportKeychainDumpV1(String password,
+          {required String nonce, String keychainSalt = secrets.backupKeychainSalt}) async =>
+      throw Exception('Deprecated');
+
   Future<Uint8List> exportKeychainDumpV2(String password,
       {String keychainSalt = secrets.backupKeychainSalt}) async {
     final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
     final wallets = await Future.wait(walletInfoSource.values.map((walletInfo) async {
-      try {
-        return {
-          'name': walletInfo.name,
-          'type': walletInfo.type.toString(),
-          'password': await keyService.getWalletPassword(walletName: walletInfo.name),
-          'hardwareWalletType': walletInfo.hardwareWalletType?.index,
-        };
-      } catch (e) {
-        return {
-          'name': walletInfo.name,
-          'type': walletInfo.type.toString(),
-          'password': '',
-          'hardwareWalletType': walletInfo.hardwareWalletType?.index,
-        };
-      }
+      return {
+        'name': walletInfo.name,
+        'type': walletInfo.type.toString(),
+        'password': await keyService.getWalletPassword(walletName: walletInfo.name)
+      };
     }));
     final backupPasswordKey = generateStoreKeyFor(key: SecretStoreKey.backupPassword);
     final backupPassword = await _secureStorage.read(key: backupPasswordKey);
     final data = utf8.encode(
-        json.encode({'wallets': wallets, backupPasswordKey: backupPassword, '_all': await _secureStorage.readAll()}));
+        json.encode({'wallets': wallets, backupPasswordKey: backupPassword}));
     final encrypted = await _encryptV2(Uint8List.fromList(data), '$keychainSalt$password');
 
     return encrypted;
   }
 
-  static const List<String> _excludedPrefsKeys = [
-    PreferencesKey.currentPinLength,
-    PreferencesKey.showCameraConsent,
-    PreferencesKey.lastSeenAppVersion,
-    PreferencesKey.failedTotpTokenTrials,
-  ];
-
   Future<String> exportPreferencesJSON() async {
-    final preferences = <String, dynamic>{};
-    sharedPreferences.getKeys().forEach((key) => preferences[key] = sharedPreferences.get(key));
-
-    _excludedPrefsKeys.forEach((key) => preferences.remove(key));
+    final preferences = <String, dynamic>{
+      PreferencesKey.currentWalletName:
+          sharedPreferences.getString(PreferencesKey.currentWalletName),
+      PreferencesKey.currentNodeIdKey: sharedPreferences.getInt(PreferencesKey.currentNodeIdKey),
+      PreferencesKey.currentBalanceDisplayModeKey:
+          sharedPreferences.getInt(PreferencesKey.currentBalanceDisplayModeKey),
+      PreferencesKey.currentWalletType: sharedPreferences.getInt(PreferencesKey.currentWalletType),
+      PreferencesKey.currentFiatCurrencyKey:
+          sharedPreferences.getString(PreferencesKey.currentFiatCurrencyKey),
+      PreferencesKey.shouldSaveRecipientAddressKey:
+          sharedPreferences.getBool(PreferencesKey.shouldSaveRecipientAddressKey),
+      PreferencesKey.disableTradeOption: sharedPreferences.getBool(PreferencesKey.disableTradeOption),
+      PreferencesKey.currentTransactionPriorityKeyLegacy:
+          sharedPreferences.getInt(PreferencesKey.currentTransactionPriorityKeyLegacy),
+      PreferencesKey.currentBitcoinElectrumSererIdKey:
+          sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey),
+      PreferencesKey.currentLanguageCode:
+          sharedPreferences.getString(PreferencesKey.currentLanguageCode),
+      PreferencesKey.displayActionListModeKey:
+          sharedPreferences.getInt(PreferencesKey.displayActionListModeKey),
+      PreferencesKey.currentTheme: sharedPreferences.getInt(PreferencesKey.currentTheme),
+      PreferencesKey.exchangeStatusKey: sharedPreferences.getInt(PreferencesKey.exchangeStatusKey),
+      PreferencesKey.currentDefaultSettingsMigrationVersion:
+          sharedPreferences.getInt(PreferencesKey.currentDefaultSettingsMigrationVersion),
+      PreferencesKey.bitcoinTransactionPriority:
+          sharedPreferences.getInt(PreferencesKey.bitcoinTransactionPriority),
+      PreferencesKey.moneroTransactionPriority:
+          sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority),
+      PreferencesKey.currentFiatApiModeKey:
+          sharedPreferences.getInt(PreferencesKey.currentFiatApiModeKey),
+      PreferencesKey.sortBalanceBy: sharedPreferences.getInt(PreferencesKey.sortBalanceBy),
+      PreferencesKey.pinNativeTokenAtTop:
+          sharedPreferences.getBool(PreferencesKey.pinNativeTokenAtTop),
+      PreferencesKey.useEtherscan: sharedPreferences.getBool(PreferencesKey.useEtherscan),
+      PreferencesKey.defaultNanoRep: sharedPreferences.getString(PreferencesKey.defaultNanoRep),
+      PreferencesKey.defaultBananoRep:
+          sharedPreferences.getString(PreferencesKey.defaultBananoRep),
+      PreferencesKey.lookupsTwitter: sharedPreferences.getBool(PreferencesKey.lookupsTwitter),
+      PreferencesKey.lookupsMastodon: sharedPreferences.getBool(PreferencesKey.lookupsMastodon),
+      PreferencesKey.lookupsYatService:
+          sharedPreferences.getBool(PreferencesKey.lookupsYatService),
+      PreferencesKey.lookupsUnstoppableDomains:
+          sharedPreferences.getBool(PreferencesKey.lookupsUnstoppableDomains),
+      PreferencesKey.lookupsOpenAlias: sharedPreferences.getBool(PreferencesKey.lookupsOpenAlias),
+      PreferencesKey.lookupsENS: sharedPreferences.getBool(PreferencesKey.lookupsENS),
+      PreferencesKey.lookupsWellKnown:
+          sharedPreferences.getBool(PreferencesKey.lookupsWellKnown),
+      PreferencesKey.syncModeKey: sharedPreferences.getInt(PreferencesKey.syncModeKey),
+      PreferencesKey.syncAllKey: sharedPreferences.getBool(PreferencesKey.syncAllKey),
+      PreferencesKey.autoGenerateSubaddressStatusKey:
+          sharedPreferences.getInt(PreferencesKey.autoGenerateSubaddressStatusKey),
+    };
 
     return json.encode(preferences);
   }
@@ -332,6 +466,10 @@ class $BackupService {
     return Uint8List.fromList(bytes);
   }
 
+  @Deprecated('Use v2 instead')
+  Future<Uint8List> _encryptV1(Uint8List data, String secretKeySource, String nonceBase64) async =>
+      throw Exception('Deprecated');
+
   Future<Uint8List> _decryptV1(Uint8List data, String secretKeySource, String nonceBase64,
       {int macLength = 16}) async {
     final secretKeyHash = await Cryptography.instance.sha256().hash(utf8.encode(secretKeySource));
diff --git a/lib/core/backup_service_v3.dart b/lib/core/backup_service_v3.dart
index a0640dfd3..5f5e77b00 100644
--- a/lib/core/backup_service_v3.dart
+++ b/lib/core/backup_service_v3.dart
@@ -10,7 +10,6 @@ import 'package:cake_wallet/utils/package_info.dart';
 import 'package:crypto/crypto.dart';
 import 'package:cw_core/root_dir.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/wallet_info.dart';
 import 'package:flutter/foundation.dart';
 
 enum BackupVersion {
@@ -178,7 +177,7 @@ class BackupServiceV3 extends $BackupService {
         final archive = ZipDecoder().decodeStream(inputStream);
         final metadataFile = archive.findFile('metadata.json');
         if (metadataFile == null) {
-          return BackupVersion.unknown;
+          throw Exception('Invalid v3 backup: missing metadata.json');
         }
         final metadataBytes = metadataFile.rawContent!.readBytes();
         final metadataString = utf8.decode(metadataBytes);
@@ -189,7 +188,7 @@ class BackupServiceV3 extends $BackupService {
         }
       }
 
-      return BackupVersion.unknown;
+      throw Exception('Invalid backup file: unknown version');
     } finally {
       raf.closeSync();
     }
@@ -199,7 +198,7 @@ class BackupServiceV3 extends $BackupService {
     final version = getVersionFile(file);
     switch (version) {
       case BackupVersion.unknown:
-        throw Exception('unknown_backup_version');
+        throw Exception('Invalid backup file: unknown version');
       case BackupVersion.v1:
         final data = file.readAsBytesSync();
         final backupBytes = data.toList()..removeAt(0);
@@ -306,7 +305,6 @@ class BackupServiceV3 extends $BackupService {
 
     // Continue importing the backup the old way
     await super.verifyWallets();
-    await verifyHardwareWallets(password);
     await super.importKeychainDumpV2(password);
     await super.importPreferencesDump();
     await super.importTransactionDescriptionDump();
@@ -315,39 +313,6 @@ class BackupServiceV3 extends $BackupService {
     decryptedData.deleteSync();
   }
 
-  Future<void> verifyHardwareWallets(String password,
-      {String keychainSalt = secrets.backupKeychainSalt}) async {
-    final walletInfoSource = await reloadHiveWalletInfoBox();
-    final appDir = await getAppDir();
-    final keychainDumpFile = File('${appDir.path}/~_keychain_dump');
-    final decryptedKeychainDumpFileData = await decryptV2(
-        keychainDumpFile.readAsBytesSync(), '$keychainSalt$password');
-    final keychainJSON = json.decode(utf8.decode(decryptedKeychainDumpFileData))
-        as Map<String, dynamic>;
-    final keychainWalletsInfo = keychainJSON['wallets'] as List;
-
-    final expectedHardwareWallets = keychainWalletsInfo
-        .where((e) =>
-            (e as Map<String, dynamic>).containsKey("hardwareWalletType") &&
-            e["hardwareWalletType"] != null)
-        .toList();
-
-    for (final expectedHardwareWallet in expectedHardwareWallets) {
-      final info = expectedHardwareWallet as Map<String, dynamic>;
-      final actualWalletInfo = walletInfoSource.values
-          .where((e) =>
-              e.name == info['name'] && e.type.toString() == info['type'])
-          .firstOrNull;
-      if (actualWalletInfo != null &&
-          info["hardwareWalletType"] !=
-              actualWalletInfo.hardwareWalletType?.index) {
-        actualWalletInfo.hardwareWalletType =
-            HardwareWalletType.values[info["hardwareWalletType"] as int];
-        await actualWalletInfo.save();
-      }
-    }
-  }
-
   Future<File> exportBackupFileV3(String password, {String nonce = secrets.backupSalt}) async {
     final metadata = BackupMetadata(
       version: BackupVersion.v3,
@@ -502,4 +467,4 @@ This backup was created on ${DateTime.now().toIso8601String()}
     file.writeAsBytesSync(data);
     return file;
   }
-}
+}
\ No newline at end of file
diff --git a/lib/core/fiat_conversion_service.dart b/lib/core/fiat_conversion_service.dart
index 669e38128..8a37175b4 100644
--- a/lib/core/fiat_conversion_service.dart
+++ b/lib/core/fiat_conversion_service.dart
@@ -1,35 +1,37 @@
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'dart:convert';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
 const _fiatApiClearNetAuthority = 'fiat-api.cakewallet.com';
-const _fiatApiOnionAuthority = 'kfkyguqtz5vcnbvar5pjgddkaeawbo4j3r4fj3e22k3tzqageplosiid.onion';
+const _fiatApiOnionAuthority = 'n4z7bdcmwk2oyddxvzaap3x2peqcplh3pzdy7tpkk5ejz5n4mhfvoxqd.onion';
 const _fiatApiPath = '/v2/rates';
 
-Future<double> _fetchPrice(String crypto, String fiat, bool torOnly) async {
+Future<double> _fetchPrice(Map<String, dynamic> args) async {
+  final crypto = args['crypto'] as String;
+  final fiat = args['fiat'] as String;
+  final torOnly = args['torOnly'] as bool;
 
   final Map<String, String> queryParams = {
     'interval_count': '1',
     'base': crypto.split(".").first,
     'quote': fiat,
+    'key': secrets.fiatApiKey,
   };
 
   num price = 0.0;
 
   try {
-    final onionUri = Uri.http(_fiatApiOnionAuthority, _fiatApiPath, queryParams);
-    final clearnetUri = Uri.https(_fiatApiClearNetAuthority, _fiatApiPath, queryParams);
+    late final Uri uri;
+    if (torOnly) {
+      uri = Uri.http(_fiatApiOnionAuthority, _fiatApiPath, queryParams);
+    } else {
+      uri = Uri.https(_fiatApiClearNetAuthority, _fiatApiPath, queryParams);
+    }
 
-    final response = await ProxyWrapper().get(
-      onionUri: onionUri,
-      clearnetUri: torOnly ? onionUri : clearnetUri,
-      headers: {
-        "x-api-key": secrets.fiatApiKey,
-      }
-    );
-    
+    final response = await get(uri);
 
     if (response.statusCode != 200) {
       return 0.0;
@@ -48,11 +50,18 @@ Future<double> _fetchPrice(String crypto, String fiat, bool torOnly) async {
   }
 }
 
+Future<double> _fetchPriceAsync(CryptoCurrency crypto, FiatCurrency fiat, bool torOnly) async =>
+    compute(_fetchPrice, {
+      'fiat': fiat.toString(),
+      'crypto': crypto.toString(),
+      'torOnly': torOnly,
+    });
+
 class FiatConversionService {
   static Future<double> fetchPrice({
     required CryptoCurrency crypto,
     required FiatCurrency fiat,
     required bool torOnly,
   }) async =>
-      await _fetchPrice(crypto.toString(), fiat.toString(), torOnly);
+      await _fetchPriceAsync(crypto, fiat, torOnly);
 }
diff --git a/lib/core/node_address_validator.dart b/lib/core/node_address_validator.dart
index ce8709a3c..68478d501 100644
--- a/lib/core/node_address_validator.dart
+++ b/lib/core/node_address_validator.dart
@@ -19,7 +19,7 @@ class NodePathValidator extends TextValidator {
 }
 
 // NodeAddressValidatorDecredBlankException allows decred to send a blank ip
-// address which effectively clears the current set persistent peer.
+// address which effectively clears the current set persistant peer.
 class NodeAddressValidatorDecredBlankException extends TextValidator {
   NodeAddressValidatorDecredBlankException()
       : super(
diff --git a/lib/core/open_crypto_pay/exceptions.dart b/lib/core/open_crypto_pay/exceptions.dart
deleted file mode 100644
index 71010482f..000000000
--- a/lib/core/open_crypto_pay/exceptions.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-class OpenCryptoPayException implements Exception {
-  final String message;
-
-  OpenCryptoPayException([this.message = '']);
-
-  @override
-  String toString() =>
-      'OpenCryptoPayException${message.isNotEmpty ? ': $message' : ''}';
-}
-
-class OpenCryptoPayNotSupportedException extends OpenCryptoPayException {
-  final String provider;
-
-  OpenCryptoPayNotSupportedException(this.provider);
-
-  @override
-  String get message => "$provider does not support Open CryptoPay";
-}
diff --git a/lib/core/open_crypto_pay/lnurl.dart b/lib/core/open_crypto_pay/lnurl.dart
deleted file mode 100644
index 0087bab51..000000000
--- a/lib/core/open_crypto_pay/lnurl.dart
+++ /dev/null
@@ -1,78 +0,0 @@
-import 'dart:convert';
-
-import 'package:bech32/bech32.dart';
-
-Uri decodeLNURL(String encodedUrl) {
-  Uri decodedUri;
-
-  /// The URL doesn't have to be encoded at all as per LUD-17: Protocol schemes and raw (non bech32-encoded) URLs.
-  /// https://github.com/lnurl/luds/blob/luds/17.md
-  /// Handle non bech32-encoded LNURL
-  final lud17prefixes = ['lnurlw', 'lnurlc', 'lnurlp', 'keyauth'];
-  decodedUri = Uri.parse(encodedUrl);
-  for (final prefix in lud17prefixes) {
-    if (decodedUri.scheme.contains(prefix)) {
-      decodedUri = decodedUri.replace(scheme: prefix);
-    }
-  }
-  if (lud17prefixes.contains(decodedUri.scheme)) {
-    /// If the non-bech32 LNURL is a Tor address, the port has to be http instead of https for the clearnet LNURL so check if the host ends with '.onion' or '.onion.'
-    decodedUri = decodedUri.replace(
-        scheme: decodedUri.host.endsWith('onion') ||
-                decodedUri.host.endsWith('onion.')
-            ? 'http'
-            : 'https');
-  } else {
-    /// Try to parse the input as a lnUrl. Will throw an error if it fails.
-    final lnUrl = _findLnUrl(encodedUrl);
-
-    /// Decode the lnurl using bech32
-    final bech32 = const Bech32Codec().decode(lnUrl, lnUrl.length);
-    decodedUri = Uri.parse(utf8.decode(_convert(bech32.data, 5, 8, false)));
-  }
-  return decodedUri;
-}
-
-/// Parse and return a given lnurl string if it's valid. Will remove
-/// `lightning:` from the beginning of it if present.
-String _findLnUrl(String input) {
-  final res = RegExp(
-    r',*?((lnurl)([0-9]+[a-z0-9]+))',
-  ).allMatches(input.toLowerCase());
-
-  if (res.length == 1) {
-    return res.first.group(0)!;
-  } else {
-    throw ArgumentError('Not a valid lnurl string');
-  }
-}
-
-/// Taken from bech32 (bitcoinjs): https://github.com/bitcoinjs/bech32
-List<int> _convert(List<int> data, int inBits, int outBits, bool pad) {
-  var value = 0;
-  var bits = 0;
-  final maxV = (1 << outBits) - 1;
-
-  final result = <int>[];
-  for (final dataValue in data) {
-    value = (value << inBits) | dataValue;
-    bits += inBits;
-
-    while (bits >= outBits) {
-      bits -= outBits;
-      result.add((value >> bits) & maxV);
-    }
-  }
-
-  if (pad) {
-    if (bits > 0) result.add((value << (outBits - bits)) & maxV);
-  } else {
-    if (bits >= inBits) throw Exception('Excess padding');
-
-    if ((value << (outBits - bits)) & maxV > 0) {
-      throw Exception('Non-zero padding');
-    }
-  }
-
-  return result;
-}
diff --git a/lib/core/open_crypto_pay/models.dart b/lib/core/open_crypto_pay/models.dart
deleted file mode 100644
index 760200f8d..000000000
--- a/lib/core/open_crypto_pay/models.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-class OpenCryptoPayRequest {
-  final String receiverName;
-  final int expiry;
-  final String callbackUrl;
-  final String quote;
-  final Map<String, List<OpenCryptoPayQuoteAsset>> methods;
-
-  OpenCryptoPayRequest({
-    required this.receiverName,
-    required this.expiry,
-    required this.callbackUrl,
-    required this.quote,
-    required this.methods,
-  });
-}
-
-class OpenCryptoPayQuoteAsset {
-  final String symbol;
-  final String amount;
-
-  const OpenCryptoPayQuoteAsset(this.symbol, this.amount);
-
-  OpenCryptoPayQuoteAsset.fromJson(Map<String, dynamic> json)
-      : symbol = json['asset'] as String,
-        amount = json['amount'] as String;
-}
diff --git a/lib/core/open_crypto_pay/open_cryptopay_service.dart b/lib/core/open_crypto_pay/open_cryptopay_service.dart
deleted file mode 100644
index 4b317d9c3..000000000
--- a/lib/core/open_crypto_pay/open_cryptopay_service.dart
+++ /dev/null
@@ -1,184 +0,0 @@
-import 'dart:convert';
-import 'dart:developer';
-
-import 'package:cake_wallet/core/open_crypto_pay/exceptions.dart';
-import 'package:cake_wallet/core/open_crypto_pay/lnurl.dart';
-import 'package:cake_wallet/core/open_crypto_pay/models.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-
-class OpenCryptoPayService {
-  static bool isOpenCryptoPayQR(String value) =>
-      value.toLowerCase().contains("lightning=lnurl") ||
-      value.toLowerCase().startsWith("lnurl");
-
-  Future<String> commitOpenCryptoPayRequest(
-    String txHex, {
-    required String txId,
-    required OpenCryptoPayRequest request,
-    required CryptoCurrency asset,
-  }) async {
-    final uri = Uri.parse(request.callbackUrl.replaceAll("/cb/", "/tx/"));
-
-    final queryParams = Map.of(uri.queryParameters);
-
-    queryParams['quote'] = request.quote;
-    queryParams['asset'] = asset.title;
-    queryParams['method'] = _getMethod(asset);
-    queryParams['hex'] = txHex;
-    queryParams['tx'] = txId;
-
-    final response =
-        await ProxyWrapper().get(clearnetUri: Uri.https(uri.authority, uri.path, queryParams));
-    
-
-    if (response.statusCode == 200) {
-      final body = jsonDecode(response.body) as Map;
-
-      if (body.keys.contains("txId")) return body["txId"] as String;
-      throw OpenCryptoPayException(body.toString());
-    }
-    throw OpenCryptoPayException(
-        "Unexpected status code ${response.statusCode} ${response}");
-  }
-
-  Future<void> cancelOpenCryptoPayRequest(OpenCryptoPayRequest request) async {
-    final uri = Uri.parse(request.callbackUrl.replaceAll("/cb/", "/cancel/"));
-
-    await ProxyWrapper().delete(clearnetUri: uri);
-  }
-
-  Future<OpenCryptoPayRequest> getOpenCryptoPayInvoice(String lnUrl) async {
-    if (lnUrl.toLowerCase().startsWith("http")) {
-      final uri = Uri.parse(lnUrl);
-      final params = uri.queryParameters;
-      if (!params.containsKey("lightning")) {
-        throw OpenCryptoPayNotSupportedException(uri.authority);
-      }
-
-      lnUrl = params["lightning"] as String;
-    }
-    final url = decodeLNURL(lnUrl);
-    final params = await _getOpenCryptoPayParams(url);
-
-    return OpenCryptoPayRequest(
-      receiverName: params.$1.displayName ?? "Unknown",
-      expiry: params.$1.expiration.difference(DateTime.now()).inSeconds,
-      callbackUrl: params.$1.callbackUrl,
-      quote: params.$1.id,
-      methods: params.$2,
-    );
-  }
-
-  Future<(_OpenCryptoPayQuote, Map<String, List<OpenCryptoPayQuoteAsset>>)>
-      _getOpenCryptoPayParams(Uri uri) async {
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
-
-    if (response.statusCode == 200) {
-      final responseBody = jsonDecode(response.body) as Map;
-
-      for (final key in ['callback', 'transferAmounts', 'quote']) {
-        if (!responseBody.keys.contains(key)) {
-          throw OpenCryptoPayNotSupportedException(uri.authority);
-        }
-      }
-
-      final methods = <String, List<OpenCryptoPayQuoteAsset>>{};
-      for (final transferAmountRaw in responseBody['transferAmounts'] as List) {
-        final transferAmount = transferAmountRaw as Map;
-        final method = transferAmount['method'] as String;
-        methods[method] = [];
-        for (final assetJson in transferAmount['assets'] as List) {
-          final asset = OpenCryptoPayQuoteAsset.fromJson(
-              assetJson as Map<String, dynamic>);
-          methods[method]?.add(asset);
-        }
-      }
-
-      log(responseBody.toString());
-
-      final quote = _OpenCryptoPayQuote.fromJson(
-          responseBody['callback'] as String,
-          responseBody['displayName'] as String?,
-          responseBody['quote'] as Map<String, dynamic>);
-
-      return (quote, methods);
-    } else {
-      throw OpenCryptoPayException(
-          'Failed to get Open CryptoPay Request. Status: ${response.statusCode} ${response.body}');
-    }
-  }
-
-  Future<Uri> getOpenCryptoPayAddress(
-      OpenCryptoPayRequest request, CryptoCurrency asset) async {
-    final uri = Uri.parse(request.callbackUrl);
-    final queryParams = Map.of(uri.queryParameters);
-
-    queryParams['quote'] = request.quote;
-    queryParams['asset'] = asset.title;
-    queryParams['method'] = _getMethod(asset);
-
-    final response = await ProxyWrapper().get(clearnetUri: Uri.https(uri.authority, uri.path, queryParams));
-    
-
-    if (response.statusCode == 200) {
-      final responseBody = jsonDecode(response.body) as Map;
-
-      for (final key in ['expiryDate', 'uri']) {
-        if (!responseBody.keys.contains(key)) {
-          throw OpenCryptoPayNotSupportedException(uri.authority);
-        }
-      }
-
-      final result = Uri.parse(responseBody['uri'] as String);
-
-      if (result.queryParameters['amount'] != null) return result;
-
-      final newQueryParameters =
-          Map<String, dynamic>.from(result.queryParameters);
-
-      newQueryParameters['amount'] = _getAmountByAsset(request, asset);
-      return Uri(
-          scheme: result.scheme,
-          path: result.path.split("@").first,
-          queryParameters: newQueryParameters);
-    } else {
-      throw OpenCryptoPayException(
-          'Failed to create Open CryptoPay Request. Status: ${response.statusCode} ${response.body}');
-    }
-  }
-
-  String _getAmountByAsset(OpenCryptoPayRequest request, CryptoCurrency asset) {
-    final method = _getMethod(asset);
-    return request.methods[method]!
-        .firstWhere((e) => e.symbol.toUpperCase() == asset.title.toUpperCase())
-        .amount;
-  }
-
-  String _getMethod(CryptoCurrency asset) {
-    switch (asset.tag) {
-      case "ETH":
-        return "Ethereum";
-      case "POL":
-        return "Polygon";
-      default:
-        return asset.fullName!;
-    }
-  }
-}
-
-class _OpenCryptoPayQuote {
-  final String callbackUrl;
-  final String? displayName;
-  final String id;
-  final DateTime expiration;
-
-  _OpenCryptoPayQuote(
-      this.callbackUrl, this.displayName, this.id, this.expiration);
-
-  _OpenCryptoPayQuote.fromJson(
-      this.callbackUrl, this.displayName, Map<String, dynamic> json)
-      : id = json['id'] as String,
-        expiration = DateTime.parse(json['expiration'] as String);
-}
diff --git a/lib/core/trade_monitor.dart b/lib/core/trade_monitor.dart
deleted file mode 100644
index 3b696b88a..000000000
--- a/lib/core/trade_monitor.dart
+++ /dev/null
@@ -1,247 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';
-import 'package:cake_wallet/exchange/trade.dart';
-import 'package:cake_wallet/exchange/trade_state.dart';
-import 'package:cake_wallet/store/dashboard/trades_store.dart';
-import 'package:cake_wallet/entities/exchange_api_mode.dart';
-import 'package:cake_wallet/exchange/exchange_provider_description.dart';
-import 'package:cake_wallet/exchange/provider/chainflip_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/letsexchange_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
-import 'package:cake_wallet/exchange/provider/trocador_exchange_provider.dart';
-import 'package:cake_wallet/exchange/provider/xoswap_exchange_provider.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:hive/hive.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class TradeMonitor {
-  static const int _tradeCheckIntervalMinutes = 5;
-  static const int _maxTradeAgeHours = 24;
-
-  TradeMonitor({
-    required this.tradesStore,
-    required this.trades,
-    required this.appStore,
-    required this.preferences,
-  });
-
-  final TradesStore tradesStore;
-  final Box<Trade> trades;
-  final AppStore appStore;
-  final Map<String, Timer> _tradeTimers = {};
-  final SharedPreferences preferences;
-
-  ExchangeProvider? _getProviderByDescription(ExchangeProviderDescription description) {
-    switch (description) {
-      case ExchangeProviderDescription.changeNow:
-        return ChangeNowExchangeProvider(settingsStore: appStore.settingsStore);
-      case ExchangeProviderDescription.sideShift:
-        return SideShiftExchangeProvider();
-      case ExchangeProviderDescription.simpleSwap:
-        return SimpleSwapExchangeProvider();
-      case ExchangeProviderDescription.trocador:
-        return TrocadorExchangeProvider();
-      case ExchangeProviderDescription.exolix:
-        return ExolixExchangeProvider();
-      case ExchangeProviderDescription.thorChain:
-        return ThorChainExchangeProvider(tradesStore: trades);
-      case ExchangeProviderDescription.swapTrade:
-        return SwapTradeExchangeProvider();
-      case ExchangeProviderDescription.letsExchange:
-        return LetsExchangeExchangeProvider();
-      case ExchangeProviderDescription.stealthEx:
-        return StealthExExchangeProvider();
-      case ExchangeProviderDescription.chainflip:
-        return ChainflipExchangeProvider(tradesStore: trades);
-      case ExchangeProviderDescription.xoSwap:
-        return XOSwapExchangeProvider();
-    }
-    return null;
-  }
-
-  void monitorActiveTrades(String walletId) {
-    // Checks if the trade monitoring is permitted
-    // i.e the user has not disabled the exchange api mode or the status updates
-    final isTradeMonitoringPermitted = _isTradeMonitoringPermitted();
-    if (!isTradeMonitoringPermitted) {
-      return;
-    }
-
-    final trades = tradesStore.trades;
-    final tradesToCancel = <String>[];
-
-    for (final item in trades) {
-      final trade = item.trade;
-
-      final provider = _getProviderByDescription(trade.provider);
-
-      // Multiple checks to see if to skip the trade, if yes, we cancel the timer if it exists
-      if (_shouldSkipTrade(trade, walletId, provider)) {
-        tradesToCancel.add(trade.id);
-        continue;
-      }
-
-      if (_tradeTimers.containsKey(trade.id)) {
-        printV('Trade ${trade.id} is already being monitored');
-        continue;
-      } else {
-        _startTradeMonitoring(trade, provider!);
-      }
-    }
-
-    // After going through the list of available trades, we cancel the timers in the tradesToCancel list
-    _cancelMultipleTradeTimers(tradesToCancel);
-  }
-
-  bool _isTradeMonitoringPermitted() {
-    final disableAutomaticExchangeStatusUpdates =
-        appStore.settingsStore.disableAutomaticExchangeStatusUpdates;
-    if (disableAutomaticExchangeStatusUpdates) {
-      printV('Automatic exchange status updates are disabled');
-      return false;
-    }
-
-    final exchangeApiMode = appStore.settingsStore.exchangeStatus;
-    if (exchangeApiMode == ExchangeApiMode.disabled) {
-      printV('Exchange API mode is disabled');
-      return false;
-    }
-
-    return true;
-  }
-
-  bool _shouldSkipTrade(Trade trade, String walletId, ExchangeProvider? provider) {
-    if (trade.walletId != walletId) {
-      printV('Skipping trade ${trade.id} because it\'s not for this wallet');
-      return true;
-    }
-
-    final createdAt = trade.createdAt;
-    if (createdAt == null) {
-      printV('Skipping trade ${trade.id} because it has no createdAt');
-      return true;
-    }
-
-    if (DateTime.now().difference(createdAt).inHours > _maxTradeAgeHours) {
-      printV('Skipping trade ${trade.id} because it\'s older than ${_maxTradeAgeHours} hours');
-      return true;
-    }
-
-    if (_isFinalState(trade.state)) {
-      printV('Skipping trade ${trade.id} because it\'s in a final state');
-      return true;
-    }
-
-    if (provider == null) {
-      printV('Skipping trade ${trade.id} because the provider is not supported');
-      return true;
-    }
-
-    if (appStore.settingsStore.exchangeStatus == ExchangeApiMode.torOnly &&
-        !provider.supportsOnionAddress) {
-      printV('Skipping ${provider.description}, no TOR support');
-      return true;
-    }
-
-    return false;
-  }
-
-  void _startTradeMonitoring(Trade trade, ExchangeProvider provider) {
-    final timer = Timer.periodic(
-      Duration(minutes: _tradeCheckIntervalMinutes),
-      (_) => _checkTradeStatus(trade, provider),
-    );
-
-    _checkTradeStatus(trade, provider);
-
-    _tradeTimers[trade.id] = timer;
-  }
-
-  Future<void> _checkTradeStatus(Trade trade, ExchangeProvider provider) async {
-    final lastUpdatedAtFromPrefs = preferences.getString('trade_${trade.id}_updated_at');
-
-    if (lastUpdatedAtFromPrefs != null) {
-      final lastUpdatedAtDateTime = DateTime.parse(lastUpdatedAtFromPrefs);
-      final timeSinceLastUpdate = DateTime.now().difference(lastUpdatedAtDateTime).inMinutes;
-
-      if (timeSinceLastUpdate < _tradeCheckIntervalMinutes) {
-        printV(
-          'Skipping trade ${trade.id} status update check because it was updated less than ${_tradeCheckIntervalMinutes} minutes ago ($timeSinceLastUpdate minutes ago)',
-        );
-        return;
-      }
-    }
-
-    try {
-      final updated = await provider.findTradeById(id: trade.id);
-      trade
-        ..stateRaw = updated.state.raw
-        ..receiveAmount = updated.receiveAmount ?? trade.receiveAmount
-        ..outputTransaction = updated.outputTransaction ?? trade.outputTransaction;
-      printV('Trade ${trade.id} updated: ${trade.state}');
-      await trade.save();
-
-      await preferences.setString('trade_${trade.id}_updated_at', DateTime.now().toIso8601String());
-      printV('Trade ${trade.id} updated at: ${DateTime.now().toIso8601String()}');
-
-      // If the updated trade is in a final state, we cancel the timer
-      if (_isFinalState(updated.state)) {
-        printV('Trade ${trade.id} is in final state');
-        _cancelSingleTradeTimer(trade.id);
-      }
-    } catch (e) {
-      printV('Error fetching status for ${trade.id}: $e');
-    }
-  }
-
-  bool _isFinalState(TradeState state) {
-    return {
-      TradeState.completed.raw,
-      TradeState.success.raw,
-      TradeState.confirmed.raw,
-      TradeState.settled.raw,
-      TradeState.finished.raw,
-      TradeState.expired.raw,
-      TradeState.failed.raw,
-      TradeState.notFound.raw,
-    }.contains(state.raw);
-  }
-
-  void _cancelSingleTradeTimer(String tradeId) {
-    if (_tradeTimers.containsKey(tradeId)) {
-      _tradeTimers[tradeId]?.cancel();
-      _tradeTimers.remove(tradeId);
-      printV('Trade timer for ${tradeId} cancelled');
-    }
-  }
-
-  void _cancelMultipleTradeTimers(List<String> tradeIds) {
-    for (final tradeId in tradeIds) {
-      _cancelSingleTradeTimer(tradeId);
-    }
-  }
-
-  /// This is called when the app is brought back to foreground.
-  void resumeTradeMonitoring() {
-    if (appStore.wallet != null) {
-      monitorActiveTrades(appStore.wallet!.id);
-    }
-  }
-
-  /// There's no need to run the trade checks when the app is in background.
-  /// We only want to update the trade status when the app is in foreground.
-  /// This helps to reduce the battery usage, network usage and enhance overall privacy.
-  ///
-  /// This is called when the app is sent to background or when the app is closed.
-  void stopTradeMonitoring() {
-    printV('Stopping trade monitoring');
-    _cancelMultipleTradeTimers(_tradeTimers.keys.toList());
-  }
-}
diff --git a/lib/core/utilities.dart b/lib/core/utilities.dart
deleted file mode 100644
index 1278dfc44..000000000
--- a/lib/core/utilities.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-extension EnhancedList<T> on Iterable<T> {
-  T? firstWhereOrNull(bool Function(T element) test) {
-    try {
-      return firstWhere(test);
-    } catch (e) {
-      return null;
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/core/wallet_connect/chain_service/chain_service.dart b/lib/core/wallet_connect/chain_service/chain_service.dart
new file mode 100644
index 000000000..1e3ce3efd
--- /dev/null
+++ b/lib/core/wallet_connect/chain_service/chain_service.dart
@@ -0,0 +1,5 @@
+abstract class ChainService {
+  String getNamespace();
+  String getChainId();
+  List<String> getEvents();
+}
diff --git a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_id.dart b/lib/core/wallet_connect/chain_service/eth/evm_chain_id.dart
similarity index 78%
rename from lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_id.dart
rename to lib/core/wallet_connect/chain_service/eth/evm_chain_id.dart
index 6ecd09d35..0be21b1b2 100644
--- a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_id.dart
+++ b/lib/core/wallet_connect/chain_service/eth/evm_chain_id.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_service.dart';
+
 enum EVMChainId {
   ethereum,
   polygon,
@@ -28,6 +30,6 @@ extension EVMChainIdX on EVMChainId {
         break;
     }
 
-    return 'eip155:$name';
+    return '${EvmChainServiceImpl.namespace}:$name';
   }
 }
diff --git a/lib/core/wallet_connect/chain_service/eth/evm_chain_service.dart b/lib/core/wallet_connect/chain_service/eth/evm_chain_service.dart
new file mode 100644
index 000000000..6f3c8fa98
--- /dev/null
+++ b/lib/core/wallet_connect/chain_service/eth/evm_chain_service.dart
@@ -0,0 +1,304 @@
+import 'dart:convert';
+import 'dart:developer';
+import 'dart:typed_data';
+
+import 'package:cake_wallet/core/wallet_connect/eth_transaction_model.dart';
+import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_id.dart';
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/reactions/wallet_connect.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
+import 'package:cake_wallet/core/wallet_connect/models/connection_model.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/utils/string_parsing.dart';
+import 'package:convert/convert.dart';
+import 'package:eth_sig_util/eth_sig_util.dart';
+import 'package:eth_sig_util/util/utils.dart';
+import 'package:http/http.dart' as http;
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+import 'package:web3dart/web3dart.dart';
+import '../chain_service.dart';
+import '../../wallet_connect_key_service.dart';
+
+class EvmChainServiceImpl implements ChainService {
+  final AppStore appStore;
+  final BottomSheetService bottomSheetService;
+  final Web3Wallet wallet;
+  final WalletConnectKeyService wcKeyService;
+
+  static const namespace = 'eip155';
+  static const pSign = 'personal_sign';
+  static const eSign = 'eth_sign';
+  static const eSignTransaction = 'eth_signTransaction';
+  static const eSignTypedData = 'eth_signTypedData_v4';
+  static const eSendTransaction = 'eth_sendTransaction';
+
+  final EVMChainId reference;
+
+  final Web3Client ethClient;
+
+  EvmChainServiceImpl({
+    required this.reference,
+    required this.appStore,
+    required this.wcKeyService,
+    required this.bottomSheetService,
+    required this.wallet,
+    Web3Client? web3Client,
+  }) : ethClient = web3Client ??
+            Web3Client(
+              appStore.settingsStore.getCurrentNode(appStore.wallet!.type).uri.toString(),
+              http.Client(),
+            ) {
+    for (final String event in getEvents()) {
+      wallet.registerEventEmitter(chainId: getChainId(), event: event);
+    }
+    wallet.registerRequestHandler(
+      chainId: getChainId(),
+      method: pSign,
+      handler: personalSign,
+    );
+    wallet.registerRequestHandler(
+      chainId: getChainId(),
+      method: eSign,
+      handler: ethSign,
+    );
+    wallet.registerRequestHandler(
+      chainId: getChainId(),
+      method: eSignTransaction,
+      handler: ethSignTransaction,
+    );
+    wallet.registerRequestHandler(
+      chainId: getChainId(),
+      method: eSendTransaction,
+      handler: ethSignTransaction,
+    );
+    wallet.registerRequestHandler(
+      chainId: getChainId(),
+      method: eSignTypedData,
+      handler: ethSignTypedData,
+    );
+  }
+
+  @override
+  String getNamespace() {
+    return namespace;
+  }
+
+  @override
+  String getChainId() {
+    return reference.chain();
+  }
+
+  @override
+  List<String> getEvents() {
+    return ['chainChanged', 'accountsChanged'];
+  }
+
+  Future<String?> requestAuthorization(String? text) async {
+    // Show the bottom sheet
+    final bool? isApproved = await bottomSheetService.queueBottomSheet(
+      widget: Web3RequestModal(
+        child: ConnectionWidget(
+          title: S.current.signTransaction,
+          info: [
+            ConnectionModel(
+              text: text,
+            ),
+          ],
+        ),
+      ),
+    ) as bool?;
+
+    if (isApproved != null && isApproved == false) {
+      return 'User rejected signature';
+    }
+
+    return null;
+  }
+
+  Future<String> personalSign(String topic, dynamic parameters) async {
+    log('received personal sign request: $parameters');
+
+    final String message;
+    if (parameters[0] == null) {
+      message = '';
+    } else {
+      message = parameters[0].toString().utf8Message;
+    }
+
+    final String? authError = await requestAuthorization(message);
+
+    if (authError != null) {
+      return authError;
+    }
+
+    try {
+      // Load the private key
+      final List<ChainKeyModel> keys = wcKeyService
+          .getKeysForChain(appStore.wallet!);
+
+      final Credentials credentials = EthPrivateKey.fromHex(keys[0].privateKey);
+
+      final String signature = hex.encode(
+        credentials.signPersonalMessageToUint8List(Uint8List.fromList(utf8.encode(message))),
+      );
+
+      return '0x$signature';
+    } catch (e) {
+      log(e.toString());
+      bottomSheetService.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(
+          message: '${S.current.errorGettingCredentials} ${e.toString()}',
+        ),
+      );
+      return 'Failed: Error while getting credentials';
+    }
+  }
+
+  Future<String> ethSign(String topic, dynamic parameters) async {
+    log('received eth sign request: $parameters');
+
+    final String message;
+    if (parameters[1] == null) {
+      message = '';
+    } else {
+      message = parameters[1].toString().utf8Message;
+    }
+
+    final String? authError = await requestAuthorization(message);
+    if (authError != null) {
+      return authError;
+    }
+
+    try {
+      // Load the private key
+      final List<ChainKeyModel> keys = wcKeyService
+          .getKeysForChain(appStore.wallet!);
+
+      final EthPrivateKey credentials = EthPrivateKey.fromHex(keys[0].privateKey);
+
+      final String signature = hex.encode(
+        credentials.signPersonalMessageToUint8List(
+          Uint8List.fromList(utf8.encode(message)),
+          chainId: getChainIdBasedOnWalletType(appStore.wallet!.type),
+        ),
+      );
+      log(signature);
+
+      return '0x$signature';
+    } catch (e) {
+      log('error: ${e.toString()}');
+      bottomSheetService.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(message: '${S.current.error}: ${e.toString()}'),
+      );
+      return 'Failed';
+    }
+  }
+
+  Future<String> ethSignTransaction(String topic, dynamic parameters) async {
+    log('received eth sign transaction request: $parameters');
+
+    final paramsData = parameters[0] as Map<String, dynamic>;
+
+    final message = _convertToReadable(paramsData);
+
+    final String? authError = await requestAuthorization(message);
+
+    if (authError != null) {
+      return authError;
+    }
+
+    // Load the private key
+    final List<ChainKeyModel> keys = wcKeyService
+        .getKeysForChain(appStore.wallet!);
+
+    final Credentials credentials = EthPrivateKey.fromHex(keys[0].privateKey);
+
+    WCEthereumTransactionModel ethTransaction =
+        WCEthereumTransactionModel.fromJson(parameters[0] as Map<String, dynamic>);
+
+    final transaction = Transaction(
+      from: EthereumAddress.fromHex(ethTransaction.from),
+      to: EthereumAddress.fromHex(ethTransaction.to),
+      maxGas: ethTransaction.gasLimit != null ? int.tryParse(ethTransaction.gasLimit ?? "") : null,
+      gasPrice: ethTransaction.gasPrice != null
+          ? EtherAmount.inWei(BigInt.parse(ethTransaction.gasPrice ?? ""))
+          : null,
+      value: EtherAmount.inWei(BigInt.parse(ethTransaction.value)),
+      data: hexToBytes(ethTransaction.data ?? ""),
+      nonce: ethTransaction.nonce != null ? int.tryParse(ethTransaction.nonce ?? "") : null,
+    );
+
+    try {
+      final result = await ethClient.sendTransaction(
+        credentials,
+        transaction,
+        chainId: getChainIdBasedOnWalletType(appStore.wallet!.type),
+      );
+
+      log('Result: $result');
+
+      bottomSheetService.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(
+          message: S.current.awaitDAppProcessing,
+          isError: false,
+        ),
+      );
+
+      return result;
+    } catch (e) {
+      log('An error has occurred while signing transaction: ${e.toString()}');
+      bottomSheetService.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(
+          message: '${S.current.errorSigningTransaction}: ${e.toString()}',
+        ),
+      );
+      return 'Failed';
+    }
+  }
+
+  Future<String> ethSignTypedData(String topic, dynamic parameters) async {
+    log('received eth sign typed data request: $parameters');
+    final String? data = parameters[1] as String?;
+
+    final String? authError = await requestAuthorization(data);
+
+    if (authError != null) {
+      return authError;
+    }
+
+    final List<ChainKeyModel> keys = wcKeyService
+        .getKeysForChain(appStore.wallet!);
+
+    return EthSigUtil.signTypedData(
+      privateKey: keys[0].privateKey,
+      jsonData: data ?? '',
+      version: TypedDataVersion.V4,
+    );
+  }
+
+  String _convertToReadable(Map<String, dynamic> data) {
+    final tokenName = getTokenNameBasedOnWalletType(appStore.wallet!.type);
+    String gas = int.parse((data['gas'] as String).substring(2), radix: 16).toString();
+    String value = data['value'] != null
+        ? (int.parse((data['value'] as String).substring(2), radix: 16) / 1e18).toString() +
+            ' $tokenName'
+        : '0 $tokenName';
+    String from = data['from'] as String;
+    String to = data['to'] as String;
+
+    return '''
+ Gas: $gas\n
+ Value: $value\n
+ From: $from\n
+ To: $to
+             ''';
+  }
+}
diff --git a/lib/core/wallet_connect/chain_service/solana/entities/solana_sign_message.dart b/lib/core/wallet_connect/chain_service/solana/entities/solana_sign_message.dart
new file mode 100644
index 000000000..e462adbb5
--- /dev/null
+++ b/lib/core/wallet_connect/chain_service/solana/entities/solana_sign_message.dart
@@ -0,0 +1,28 @@
+class SolanaSignMessage {
+  final String pubkey;
+  final String message;
+
+  SolanaSignMessage({
+    required this.pubkey,
+    required this.message,
+  });
+
+  factory SolanaSignMessage.fromJson(Map<String, dynamic> json) {
+    return SolanaSignMessage(
+      pubkey: json['pubkey'] as String,
+      message: json['message'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'pubkey': pubkey,
+      'message': message,
+    };
+  }
+
+  @override
+  String toString() {
+    return 'SolanaSignMessage(pubkey: $pubkey, message: $message)';
+  }
+}
diff --git a/lib/core/wallet_connect/chain_service/solana/entities/solana_sign_transaction.dart b/lib/core/wallet_connect/chain_service/solana/entities/solana_sign_transaction.dart
new file mode 100644
index 000000000..2cdf4697e
--- /dev/null
+++ b/lib/core/wallet_connect/chain_service/solana/entities/solana_sign_transaction.dart
@@ -0,0 +1,106 @@
+class SolanaSignTransaction {
+  final String? feePayer;
+  final String? recentBlockhash;
+  final String transaction;
+  final List<SolanaInstruction>? instructions;
+
+  SolanaSignTransaction({
+    required this.feePayer,
+    required this.recentBlockhash,
+    required this.instructions,
+    required this.transaction,
+  });
+
+  factory SolanaSignTransaction.fromJson(Map<String, dynamic> json) {
+    return SolanaSignTransaction(
+      feePayer:json['feePayer'] !=null ? json['feePayer'] as String: null,
+      recentBlockhash: json['recentBlockhash']!=null? json['recentBlockhash'] as String: null,
+      instructions:json['instructions']!=null? (json['instructions'] as List<dynamic>)
+          .map((e) => SolanaInstruction.fromJson(e as Map<String, dynamic>))
+          .toList(): null,
+      transaction: json['transaction'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'feePayer': feePayer,
+      'recentBlockhash': recentBlockhash,
+      'instructions': instructions,
+      'transaction': transaction,
+    };
+  }
+
+  @override
+  String toString() {
+    return 'SolanaSignTransaction(feePayer: $feePayer, recentBlockhash: $recentBlockhash, instructions: $instructions, transaction: $transaction)';
+  }
+}
+
+class SolanaInstruction {
+  final String programId;
+  final List<SolanaKeyMetadata> keys;
+  final List<int> data;
+
+  SolanaInstruction({
+    required this.programId,
+    required this.keys,
+    required this.data,
+  });
+
+  factory SolanaInstruction.fromJson(Map<String, dynamic> json) {
+    return SolanaInstruction(
+      programId: json['programId'] as String,
+      keys: (json['keys'] as List<dynamic>)
+          .map((e) => SolanaKeyMetadata.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      data: (json['data'] as List<dynamic>).map((e) => e as int).toList(),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'programId': programId,
+      'keys': keys,
+      'data': data,
+    };
+  }
+
+  @override
+  String toString() {
+    return 'SolanaInstruction(programId: $programId, keys: $keys, data: $data)';
+  }
+}
+
+class SolanaKeyMetadata {
+  final String pubkey;
+  final bool isSigner;
+  final bool isWritable;
+
+  SolanaKeyMetadata({
+    required this.pubkey,
+    required this.isSigner,
+    required this.isWritable,
+  });
+
+  factory SolanaKeyMetadata.fromJson(Map<String, dynamic> json) {
+    return SolanaKeyMetadata(
+      pubkey: json['pubkey'] as String,
+      isSigner: json['isSigner'] as bool,
+      isWritable: json['isWritable'] as bool,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'pubkey': pubkey,
+      'isSigner': isSigner,
+      'isWritable': isWritable,
+    };
+  }
+
+  @override
+  String toString() {
+    return 'SolanaKeyMetadata(pubkey: $pubkey, isSigner: $isSigner, isWritable: $isWritable)';
+  }
+}
diff --git a/lib/core/wallet_connect/chain_service/solana/solana_chain_id.dart b/lib/core/wallet_connect/chain_service/solana/solana_chain_id.dart
new file mode 100644
index 000000000..ed80a4f3f
--- /dev/null
+++ b/lib/core/wallet_connect/chain_service/solana/solana_chain_id.dart
@@ -0,0 +1,30 @@
+import 'solana_chain_service.dart';
+
+enum SolanaChainId {
+  mainnet,
+  // testnet,
+  // devnet,
+}
+
+extension SolanaChainIdX on SolanaChainId {
+  String chain() {
+    String name = '';
+
+    switch (this) {
+      case SolanaChainId.mainnet:
+        name = '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ';
+        // solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp
+        break;
+      // case SolanaChainId.devnet:
+      //   name = '8E9rvCKLFQia2Y35HXjjpWzj8weVo44K';
+      //   // solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1
+      //   break;
+      // case SolanaChainId.testnet:
+      //   name = '';
+      //   // solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z
+      //   break;
+    }
+
+    return '${SolanaChainServiceImpl.namespace}:$name';
+  }
+}
diff --git a/lib/core/wallet_connect/chain_service/solana/solana_chain_service.dart b/lib/core/wallet_connect/chain_service/solana/solana_chain_service.dart
new file mode 100644
index 000000000..ca4017b98
--- /dev/null
+++ b/lib/core/wallet_connect/chain_service/solana/solana_chain_service.dart
@@ -0,0 +1,170 @@
+import 'dart:convert';
+import 'dart:developer';
+
+import 'package:blockchain_utils/blockchain_utils.dart';
+import 'package:cake_wallet/core/wallet_connect/chain_service/solana/entities/solana_sign_message.dart';
+import 'package:cake_wallet/core/wallet_connect/chain_service/solana/solana_chain_id.dart';
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
+import 'package:cake_wallet/core/wallet_connect/models/connection_model.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart';
+import 'package:cw_core/solana_rpc_http_service.dart';
+import 'package:cw_core/utils/print_verbose.dart';
+import 'package:on_chain/solana/solana.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+import '../chain_service.dart';
+import '../../wallet_connect_key_service.dart';
+import 'entities/solana_sign_transaction.dart';
+
+class SolanaChainServiceImpl implements ChainService {
+  final BottomSheetService bottomSheetService;
+  final Web3Wallet wallet;
+  final WalletConnectKeyService wcKeyService;
+
+  static const namespace = 'solana';
+  static const solSignTransaction = 'solana_signTransaction';
+  static const solSignMessage = 'solana_signMessage';
+
+  final SolanaChainId reference;
+
+  final SolanaRPC solanaProvider;
+
+  final SolanaPrivateKey? ownerPrivateKey;
+
+  SolanaChainServiceImpl({
+    required this.reference,
+    required this.wcKeyService,
+    required this.bottomSheetService,
+    required this.wallet,
+    required this.ownerPrivateKey,
+    required String formattedRPCUrl,
+    SolanaRPC? solanaProvider,
+  }) : solanaProvider = solanaProvider ?? SolanaRPC(SolanaRPCHTTPService(url: formattedRPCUrl)) {
+    for (final String event in getEvents()) {
+      wallet.registerEventEmitter(chainId: getChainId(), event: event);
+    }
+    wallet.registerRequestHandler(
+      chainId: getChainId(),
+      method: solSignTransaction,
+      handler: solanaSignTransaction,
+    );
+    wallet.registerRequestHandler(
+      chainId: getChainId(),
+      method: solSignMessage,
+      handler: solanaSignMessage,
+    );
+  }
+
+  @override
+  String getNamespace() {
+    return namespace;
+  }
+
+  @override
+  String getChainId() {
+    return reference.chain();
+  }
+
+  @override
+  List<String> getEvents() {
+    return ['chainChanged', 'accountsChanged'];
+  }
+
+  Future<String?> requestAuthorization(String? text) async {
+    // Show the bottom sheet
+    final bool? isApproved = await bottomSheetService.queueBottomSheet(
+      widget: Web3RequestModal(
+        child: ConnectionWidget(
+          title: S.current.signTransaction,
+          info: [
+            ConnectionModel(
+              text: text,
+            ),
+          ],
+        ),
+      ),
+    ) as bool?;
+
+    if (isApproved != null && isApproved == false) {
+      return 'User rejected signature';
+    }
+
+    return null;
+  }
+
+  Future<String> solanaSignTransaction(String topic, dynamic parameters) async {
+    log('received solana sign transaction request $parameters');
+
+    final solanaSignTx = SolanaSignTransaction.fromJson(parameters as Map<String, dynamic>);
+
+    final String? authError = await requestAuthorization('Confirm request to sign transaction?');
+
+    if (authError != null) {
+      return authError;
+    }
+
+    try {
+      // Convert transaction string to bytes
+      List<int> transactionBytes = base64Decode(solanaSignTx.transaction);
+
+      final message = SolanaTransactionUtils.deserializeMessageLegacy(transactionBytes);
+
+      final sign = ownerPrivateKey!.sign(message.serialize());
+
+      final signature = solanaProvider.request(
+        SolanaRPCSendTransaction(
+          encodedTransaction: Base58Encoder.encode(sign),
+          commitment: Commitment.confirmed,
+        ),
+      );
+
+      bottomSheetService.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(
+          message: S.current.awaitDAppProcessing,
+          isError: false,
+        ),
+      );
+
+      return signature;
+    } catch (e) {
+      log('An error has occurred while signing transaction: ${e.toString()}');
+      bottomSheetService.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(
+          message: '${S.current.errorSigningTransaction}: ${e.toString()}',
+        ),
+      );
+      return 'Failed';
+    }
+  }
+
+  Future<String> solanaSignMessage(String topic, dynamic parameters) async {
+    log('received solana sign message request: $parameters');
+
+    final solanaSignMessage = SolanaSignMessage.fromJson(parameters as Map<String, dynamic>);
+
+    final String? authError = await requestAuthorization('Confirm request to sign message?');
+
+    if (authError != null) {
+      return authError;
+    }
+    List<int>? sign;
+
+    try {
+      sign = ownerPrivateKey!.sign(Base58Decoder.decode(solanaSignMessage.message));
+    } catch (e) {
+      printV(e);
+    }
+
+    if (sign == null) {
+      return '';
+    }
+
+    final signature = Base58Encoder.encode(sign);
+
+    return signature;
+  }
+}
diff --git a/lib/core/wallet_connect/eth_transaction_model.dart b/lib/core/wallet_connect/eth_transaction_model.dart
new file mode 100644
index 000000000..deb33586f
--- /dev/null
+++ b/lib/core/wallet_connect/eth_transaction_model.dart
@@ -0,0 +1,60 @@
+class WCEthereumTransactionModel {
+  final String from;
+  final String to;
+  final String value;
+  final String? nonce;
+  final String? gasPrice;
+  final String? maxFeePerGas;
+  final String? maxPriorityFeePerGas;
+  final String? gas;
+  final String? gasLimit;
+  final String? data;
+
+  WCEthereumTransactionModel({
+    required this.from,
+    required this.to,
+    required this.value,
+    this.nonce,
+    this.gasPrice,
+    this.maxFeePerGas,
+    this.maxPriorityFeePerGas,
+    this.gas,
+    this.gasLimit,
+    this.data,
+  });
+
+  factory WCEthereumTransactionModel.fromJson(Map<String, dynamic> json) {
+    return WCEthereumTransactionModel(
+      from: json['from'] as String,
+      to: json['to'] as String,
+      value: json['value'] as String,
+      nonce: json['nonce'] as String?,
+      gasPrice: json['gasPrice'] as String?,
+      maxFeePerGas: json['maxFeePerGas'] as String?,
+      maxPriorityFeePerGas: json['maxPriorityFeePerGas'] as String?,
+      gas: json['gas'] as String?,
+      gasLimit: json['gasLimit'] as String?,
+      data: json['data'] as String?,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'from': from,
+      'to': to,
+      'value': value,
+      'nonce': nonce,
+      'gasPrice': gasPrice,
+      'maxFeePerGas': maxFeePerGas,
+      'maxPriorityFeePerGas': maxPriorityFeePerGas,
+      'gas': gas,
+      'gasLimit': gasLimit,
+      'data': data,
+    };
+  }
+
+  @override
+  String toString() {
+    return 'EthereumTransactionModel(from: $from, to: $to, nonce: $nonce, gasPrice: $gasPrice, maxFeePerGas: $maxFeePerGas, maxPriorityFeePerGas: $maxPriorityFeePerGas, gas: $gas, gasLimit: $gasLimit, value: $value, data: $data)';
+  }
+}
diff --git a/lib/core/wallet_connect/models/auth_request_model.dart b/lib/core/wallet_connect/models/auth_request_model.dart
new file mode 100644
index 000000000..f7fd984c8
--- /dev/null
+++ b/lib/core/wallet_connect/models/auth_request_model.dart
@@ -0,0 +1,16 @@
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+
+class AuthRequestModel {
+  final String iss;
+  final AuthRequest request;
+
+  AuthRequestModel({
+    required this.iss,
+    required this.request,
+  });
+
+  @override
+  String toString() {
+    return 'AuthRequestModel(iss: $iss, request: $request)';
+  }
+}
diff --git a/lib/src/screens/wallet_connect/models/bottom_sheet_queue_item_model.dart b/lib/core/wallet_connect/models/bottom_sheet_queue_item_model.dart
similarity index 90%
rename from lib/src/screens/wallet_connect/models/bottom_sheet_queue_item_model.dart
rename to lib/core/wallet_connect/models/bottom_sheet_queue_item_model.dart
index 44ee5e8a4..49eecac0f 100644
--- a/lib/src/screens/wallet_connect/models/bottom_sheet_queue_item_model.dart
+++ b/lib/core/wallet_connect/models/bottom_sheet_queue_item_model.dart
@@ -6,13 +6,11 @@ class BottomSheetQueueItemModel {
   final Widget widget;
   final bool isModalDismissible;
   final Completer<dynamic> completer;
-  final int closeAfter;
 
   BottomSheetQueueItemModel({
     required this.widget,
     required this.completer,
     this.isModalDismissible = false,
-    this.closeAfter = 0,
   });
 
   @override
diff --git a/lib/core/wallet_connect/models/chain_key_model.dart b/lib/core/wallet_connect/models/chain_key_model.dart
new file mode 100644
index 000000000..5cd2764da
--- /dev/null
+++ b/lib/core/wallet_connect/models/chain_key_model.dart
@@ -0,0 +1,16 @@
+class ChainKeyModel {
+  final List<String> chains;
+  final String privateKey;
+  final String publicKey;
+
+  ChainKeyModel({
+    required this.chains,
+    required this.privateKey,
+    required this.publicKey,
+  });
+
+  @override
+  String toString() {
+    return 'ChainKeyModel(chains: $chains, privateKey: $privateKey, publicKey: $publicKey)';
+  }
+}
diff --git a/lib/src/screens/wallet_connect/models/wc_connection_model.dart b/lib/core/wallet_connect/models/connection_model.dart
similarity index 60%
rename from lib/src/screens/wallet_connect/models/wc_connection_model.dart
rename to lib/core/wallet_connect/models/connection_model.dart
index f4cbb5723..63cc8260f 100644
--- a/lib/src/screens/wallet_connect/models/wc_connection_model.dart
+++ b/lib/core/wallet_connect/models/connection_model.dart
@@ -1,10 +1,10 @@
-class WCConnectionModel {
+class ConnectionModel {
   final String? title;
   final String? text;
   final List<String>? elements;
   final Map<String, void Function()>? elementActions;
 
-  WCConnectionModel({
+  ConnectionModel({
     this.title,
     this.text,
     this.elements,
@@ -13,6 +13,6 @@ class WCConnectionModel {
 
   @override
   String toString() {
-    return 'WCConnectionModel(title: $title, text: $text, elements: $elements, elementActions: $elementActions)';
+    return 'WalletConnectRequestModel(title: $title, text: $text, elements: $elements, elementActions: $elementActions)';
   }
 }
diff --git a/lib/core/wallet_connect/models/session_request_model.dart b/lib/core/wallet_connect/models/session_request_model.dart
new file mode 100644
index 000000000..0c7a5d876
--- /dev/null
+++ b/lib/core/wallet_connect/models/session_request_model.dart
@@ -0,0 +1,14 @@
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+
+class SessionRequestModel {
+  final ProposalData request;
+
+  SessionRequestModel({
+    required this.request,
+  });
+
+  @override
+  String toString() {
+    return 'SessionRequestModel(request: $request)';
+  }
+}
diff --git a/lib/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart b/lib/core/wallet_connect/wallet_connect_key_service.dart
similarity index 96%
rename from lib/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart
rename to lib/core/wallet_connect/wallet_connect_key_service.dart
index a7f40455c..f05adad97 100644
--- a/lib/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart
+++ b/lib/core/wallet_connect/wallet_connect_key_service.dart
@@ -1,8 +1,8 @@
 import 'package:cake_wallet/ethereum/ethereum.dart';
+import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
 import 'package:cake_wallet/polygon/polygon.dart';
 import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/solana/solana.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/chain_key_model.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_type.dart';
 
diff --git a/lib/src/screens/wallet_connect/services/bottom_sheet_service.dart b/lib/core/wallet_connect/wc_bottom_sheet_service.dart
similarity index 53%
rename from lib/src/screens/wallet_connect/services/bottom_sheet_service.dart
rename to lib/core/wallet_connect/wc_bottom_sheet_service.dart
index 44637ac1b..3da8660f0 100644
--- a/lib/src/screens/wallet_connect/services/bottom_sheet_service.dart
+++ b/lib/core/wallet_connect/wc_bottom_sheet_service.dart
@@ -1,24 +1,19 @@
 import 'dart:async';
-import 'dart:collection';
-import 'package:cake_wallet/src/screens/wallet_connect/models/bottom_sheet_queue_item_model.dart';
+import 'package:cake_wallet/core/wallet_connect/models/bottom_sheet_queue_item_model.dart';
 import 'package:flutter/material.dart';
 
-enum WCBottomSheetResult { reject, one, all }
-
 abstract class BottomSheetService {
   abstract final ValueNotifier<BottomSheetQueueItemModel?> currentSheet;
 
   Future<dynamic> queueBottomSheet({
     required Widget widget,
     bool isModalDismissible = false,
-    int closeAfter = 0,
   });
 
-  void showNext();
+  void resetCurrentSheet();
 }
 
 class BottomSheetServiceImpl implements BottomSheetService {
-  Queue<BottomSheetQueueItemModel> queue = Queue<BottomSheetQueueItemModel>();
 
   @override
   final ValueNotifier<BottomSheetQueueItemModel?> currentSheet = ValueNotifier(null);
@@ -26,7 +21,6 @@ class BottomSheetServiceImpl implements BottomSheetService {
   @override
   Future<dynamic> queueBottomSheet({
     required Widget widget,
-    int closeAfter = 0,
     bool isModalDismissible = false,
   }) async {
     // Create the bottom sheet queue item
@@ -34,28 +28,16 @@ class BottomSheetServiceImpl implements BottomSheetService {
     final queueItem = BottomSheetQueueItemModel(
       widget: widget,
       completer: completer,
-      closeAfter: closeAfter,
       isModalDismissible: isModalDismissible,
     );
 
-    // If the current sheet it null, set it to the queue item
-    if (currentSheet.value == null) {
-      currentSheet.value = queueItem;
-    } else {
-      // Otherwise, add it to the queue
-      queue.add(queueItem);
-    }
+    currentSheet.value = queueItem;
 
-    // Return the future
     return await completer.future;
   }
 
   @override
-  void showNext() {
-    if (queue.isEmpty) {
-      currentSheet.value = null;
-    } else {
-      currentSheet.value = queue.removeFirst();
-    }
+  void resetCurrentSheet() {
+    currentSheet.value = null;
   }
 }
diff --git a/lib/core/wallet_connect/web3wallet_service.dart b/lib/core/wallet_connect/web3wallet_service.dart
new file mode 100644
index 000000000..898433c62
--- /dev/null
+++ b/lib/core/wallet_connect/web3wallet_service.dart
@@ -0,0 +1,416 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:developer';
+import 'dart:typed_data';
+
+import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_id.dart';
+import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_service.dart';
+import 'package:cake_wallet/core/wallet_connect/wallet_connect_key_service.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/core/wallet_connect/models/auth_request_model.dart';
+import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
+import 'package:cake_wallet/core/wallet_connect/models/session_request_model.dart';
+import 'package:cake_wallet/reactions/wallet_connect.dart';
+import 'package:cake_wallet/solana/solana.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_request_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cw_core/utils/print_verbose.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:eth_sig_util/eth_sig_util.dart';
+import 'package:flutter/material.dart';
+import 'package:mobx/mobx.dart';
+import 'package:on_chain/solana/solana.dart' hide Store;
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+
+import 'chain_service/solana/solana_chain_id.dart';
+import 'chain_service/solana/solana_chain_service.dart';
+import 'wc_bottom_sheet_service.dart';
+import 'package:cake_wallet/.secrets.g.dart' as secrets;
+
+part 'web3wallet_service.g.dart';
+
+class Web3WalletService = Web3WalletServiceBase with _$Web3WalletService;
+
+abstract class Web3WalletServiceBase with Store {
+  final AppStore appStore;
+  final SharedPreferences sharedPreferences;
+  final BottomSheetService _bottomSheetHandler;
+  final WalletConnectKeyService walletKeyService;
+
+  late Web3Wallet _web3Wallet;
+
+  @observable
+  bool isInitialized;
+
+  /// The list of requests from the dapp
+  /// Potential types include, but aren't limited to:
+  /// [SessionProposalEvent], [AuthRequest]
+  @observable
+  ObservableList<PairingInfo> pairings;
+
+  @observable
+  ObservableList<SessionData> sessions;
+
+  @observable
+  ObservableList<StoredCacao> auth;
+
+  Web3WalletServiceBase(
+      this._bottomSheetHandler, this.walletKeyService, this.appStore, this.sharedPreferences)
+      : pairings = ObservableList<PairingInfo>(),
+        sessions = ObservableList<SessionData>(),
+        auth = ObservableList<StoredCacao>(),
+        isInitialized = false;
+
+  @action
+  void create() {
+    // Create the web3wallet client
+    _web3Wallet = Web3Wallet(
+      core: Core(projectId: secrets.walletConnectProjectId),
+      metadata: const PairingMetadata(
+        name: 'Cake Wallet',
+        description: 'Cake Wallet',
+        url: 'https://cakewallet.com',
+        icons: ['https://cakewallet.com/assets/image/cake_logo.png'],
+      ),
+    );
+
+    // Setup our accounts
+    List<ChainKeyModel> chainKeys = walletKeyService.getKeys(appStore.wallet!);
+    for (final chainKey in chainKeys) {
+      for (final chainId in chainKey.chains) {
+        _web3Wallet.registerAccount(
+          chainId: chainId,
+          accountAddress: chainKey.publicKey,
+        );
+      }
+    }
+
+    // Setup our listeners
+    log('Created instance of web3wallet');
+    _web3Wallet.core.pairing.onPairingInvalid.subscribe(_onPairingInvalid);
+    _web3Wallet.core.pairing.onPairingCreate.subscribe(_onPairingCreate);
+    _web3Wallet.core.pairing.onPairingDelete.subscribe(_onPairingDelete);
+    _web3Wallet.core.pairing.onPairingExpire.subscribe(_onPairingDelete);
+    _web3Wallet.pairings.onSync.subscribe(_onPairingsSync);
+    _web3Wallet.onSessionProposal.subscribe(_onSessionProposal);
+    _web3Wallet.onSessionProposalError.subscribe(_onSessionProposalError);
+    _web3Wallet.onSessionConnect.subscribe(_onSessionConnect);
+    _web3Wallet.onAuthRequest.subscribe(_onAuthRequest);
+  }
+
+  @action
+  Future<void> init() async {
+    // Await the initialization of the web3wallet
+    log('Intializing web3wallet');
+    if (!isInitialized) {
+      try {
+        await _web3Wallet.init();
+        log('Initialized');
+        isInitialized = true;
+      } catch (e) {
+        log('Experimentallllll: $e');
+        isInitialized = false;
+      }
+    }
+
+    _refreshPairings();
+
+    final newSessions = _web3Wallet.sessions.getAll();
+    sessions.addAll(newSessions);
+
+    final newAuthRequests = _web3Wallet.completeRequests.getAll();
+    auth.addAll(newAuthRequests);
+
+    if (isEVMCompatibleChain(appStore.wallet!.type)) {
+      for (final cId in EVMChainId.values) {
+        EvmChainServiceImpl(
+          reference: cId,
+          appStore: appStore,
+          wcKeyService: walletKeyService,
+          bottomSheetService: _bottomSheetHandler,
+          wallet: _web3Wallet,
+        );
+      }
+    }
+
+    if (appStore.wallet!.type == WalletType.solana) {
+      for (final cId in SolanaChainId.values) {
+        final node = appStore.settingsStore.getCurrentNode(appStore.wallet!.type);
+
+        String formattedUrl;
+        String protocolUsed = node.isSSL ? "https" : "http";
+
+        if (node.uriRaw == 'rpc.ankr.com') {
+          String ankrApiKey = secrets.ankrApiKey;
+
+          formattedUrl = '$protocolUsed://${node.uriRaw}/$ankrApiKey';
+        } else if (node.uriRaw == 'solana-mainnet.core.chainstack.com') {
+          String chainStackApiKey = secrets.chainStackApiKey;
+
+          formattedUrl = '$protocolUsed://${node.uriRaw}/$chainStackApiKey';
+        } else {
+          formattedUrl = '$protocolUsed://${node.uriRaw}';
+        }
+
+        SolanaChainServiceImpl(
+          reference: cId,
+          formattedRPCUrl: formattedUrl,
+          wcKeyService: walletKeyService,
+          bottomSheetService: _bottomSheetHandler,
+          wallet: _web3Wallet,
+          ownerPrivateKey: SolanaPrivateKey.fromSeedHex(solana!.getPrivateKey(appStore.wallet!)),
+        );
+      }
+    }
+  }
+
+  @action
+  FutureOr<void> onDispose() {
+    log('web3wallet dispose');
+    _web3Wallet.core.pairing.onPairingInvalid.unsubscribe(_onPairingInvalid);
+    _web3Wallet.pairings.onSync.unsubscribe(_onPairingsSync);
+    _web3Wallet.onSessionProposal.unsubscribe(_onSessionProposal);
+    _web3Wallet.onSessionProposalError.unsubscribe(_onSessionProposalError);
+    _web3Wallet.onSessionConnect.unsubscribe(_onSessionConnect);
+    _web3Wallet.onAuthRequest.unsubscribe(_onAuthRequest);
+    _web3Wallet.core.pairing.onPairingDelete.unsubscribe(_onPairingDelete);
+    _web3Wallet.core.pairing.onPairingExpire.unsubscribe(_onPairingDelete);
+    isInitialized = false;
+  }
+
+  Web3Wallet getWeb3Wallet() {
+    return _web3Wallet;
+  }
+
+  void _onPairingsSync(StoreSyncEvent? args) {
+    if (args != null) {
+      _refreshPairings();
+    }
+  }
+
+  void _onPairingDelete(PairingEvent? event) {
+    _refreshPairings();
+  }
+
+  Future<void> _onSessionProposalError(SessionProposalErrorEvent? args) async {
+    log(args.toString());
+  }
+
+  void _onSessionProposal(SessionProposalEvent? args) async {
+    if (args != null) {
+      final chaindIdNamespace = getChainNameSpaceAndIdBasedOnWalletType(appStore.wallet!.type);
+      final Widget modalWidget = Web3RequestModal(
+        child: ConnectionRequestWidget(
+          chaindIdNamespace: chaindIdNamespace,
+          wallet: _web3Wallet,
+          sessionProposal: SessionRequestModel(request: args.params),
+        ),
+      );
+      // show the bottom sheet
+      final bool? isApproved = await _bottomSheetHandler.queueBottomSheet(
+        widget: modalWidget,
+      ) as bool?;
+
+      if (isApproved != null && isApproved) {
+        _web3Wallet.approveSession(
+          id: args.id,
+          namespaces: args.params.generatedNamespaces!,
+        );
+      } else {
+        _web3Wallet.rejectSession(
+          id: args.id,
+          reason: Errors.getSdkError(
+            Errors.USER_REJECTED,
+          ),
+        );
+      }
+    }
+  }
+
+  @action
+  void _onPairingInvalid(PairingInvalidEvent? args) {
+    log('Pairing Invalid Event: $args');
+    _bottomSheetHandler.queueBottomSheet(
+      isModalDismissible: true,
+      widget: BottomSheetMessageDisplayWidget(message: '${S.current.pairingInvalidEvent}: $args'),
+    );
+  }
+
+  @action
+  Future<void> pairWithUri(Uri uri) async {
+    try {
+      log('Pairing with URI: $uri');
+      await _web3Wallet.pair(uri: uri);
+    } on WalletConnectError catch (e) {
+      _bottomSheetHandler.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(message: e.message),
+      );
+    } catch (e) {
+      _bottomSheetHandler.queueBottomSheet(
+        isModalDismissible: true,
+        widget: BottomSheetMessageDisplayWidget(message: e.toString()),
+      );
+    }
+  }
+
+  @action
+  void _refreshPairings() {
+    printV('Refreshing pairings');
+    pairings.clear();
+
+    final allPairings = _web3Wallet.pairings.getAll();
+
+    final keyForWallet = getKeyForStoringTopicsForWallet();
+
+    if (keyForWallet.isEmpty) return;
+
+    final currentTopicsForWallet = getPairingTopicsForWallet(keyForWallet);
+
+    final filteredPairings =
+        allPairings.where((pairing) => currentTopicsForWallet.contains(pairing.topic)).toList();
+
+    pairings.addAll(filteredPairings);
+  }
+
+  void _onPairingCreate(PairingEvent? args) {
+    log('Pairing Create Event: $args');
+  }
+
+  @action
+  Future<void> _onSessionConnect(SessionConnect? args) async {
+    if (args != null) {
+      log('Session Connected $args');
+
+      await savePairingTopicToLocalStorage(args.session.pairingTopic);
+
+      sessions.add(args.session);
+
+      _refreshPairings();
+    }
+  }
+
+  @action
+  Future<void> _onAuthRequest(AuthRequest? args) async {
+    if (args != null) {
+      final chaindIdNamespace = getChainNameSpaceAndIdBasedOnWalletType(appStore.wallet!.type);
+      List<ChainKeyModel> chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
+      // Create the message to be signed
+      final String iss = 'did:pkh:$chaindIdNamespace:${chainKeys.first.publicKey}';
+      final Widget modalWidget = Web3RequestModal(
+        child: ConnectionRequestWidget(
+          chaindIdNamespace: chaindIdNamespace,
+          wallet: _web3Wallet,
+          authRequest: AuthRequestModel(iss: iss, request: args),
+        ),
+      );
+      final bool? isAuthenticated = await _bottomSheetHandler.queueBottomSheet(
+        widget: modalWidget,
+      ) as bool?;
+
+      if (isAuthenticated != null && isAuthenticated) {
+        final String message = _web3Wallet.formatAuthMessage(
+          iss: iss,
+          cacaoPayload: CacaoRequestPayload.fromPayloadParams(
+            args.payloadParams,
+          ),
+        );
+
+        final String sig = EthSigUtil.signPersonalMessage(
+          message: Uint8List.fromList(message.codeUnits),
+          privateKey: chainKeys.first.privateKey,
+        );
+
+        await _web3Wallet.respondAuthRequest(
+          id: args.id,
+          iss: iss,
+          signature: CacaoSignature(
+            t: CacaoSignature.EIP191,
+            s: sig,
+          ),
+        );
+      } else {
+        await _web3Wallet.respondAuthRequest(
+          id: args.id,
+          iss: iss,
+          error: Errors.getSdkError(
+            Errors.USER_REJECTED_AUTH,
+          ),
+        );
+      }
+    }
+  }
+
+  @action
+  Future<void> disconnectSession(String topic) async {
+    final session = sessions.firstWhere((element) => element.pairingTopic == topic);
+
+    await _web3Wallet.core.pairing.disconnect(topic: topic);
+    await _web3Wallet.disconnectSession(
+        topic: session.topic, reason: Errors.getSdkError(Errors.USER_DISCONNECTED));
+  }
+
+  @action
+  List<SessionData> getSessionsForPairingInfo(PairingInfo pairing) {
+    return sessions.where((element) => element.pairingTopic == pairing.topic).toList();
+  }
+
+  String getKeyForStoringTopicsForWallet() {
+    List<ChainKeyModel> chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
+
+    if (chainKeys.isEmpty) {
+      return '';
+    }
+
+    final keyForPairingTopic =
+        PreferencesKey.walletConnectPairingTopicsListForWallet(chainKeys.first.publicKey);
+
+    return keyForPairingTopic;
+  }
+
+  List<String> getPairingTopicsForWallet(String key) {
+    // Get the JSON-encoded string from shared preferences
+    final jsonString = sharedPreferences.getString(key);
+
+    // If the string is null, return an empty list
+    if (jsonString == null) {
+      return [];
+    }
+
+    // Decode the JSON string to a list of strings
+    final List<dynamic> jsonList = jsonDecode(jsonString) as List<dynamic>;
+
+    // Cast each item to a string
+    return jsonList.map((item) => item as String).toList();
+  }
+
+  Future<void> savePairingTopicToLocalStorage(String pairingTopic) async {
+    // Get key specific to the current wallet
+    final key = getKeyForStoringTopicsForWallet();
+
+    if (key.isEmpty) return;
+
+    // Get all pairing topics attached to this key
+    final pairingTopicsForWallet = getPairingTopicsForWallet(key);
+
+    printV(pairingTopicsForWallet);
+
+    bool isPairingTopicAlreadySaved = pairingTopicsForWallet.contains(pairingTopic);
+    printV('Is Pairing Topic Saved: $isPairingTopicAlreadySaved');
+
+    if (!isPairingTopicAlreadySaved) {
+      // Update the list with the most recent pairing topic
+      pairingTopicsForWallet.add(pairingTopic);
+
+      // Convert the list of updated pairing topics to a JSON-encoded string
+      final jsonString = jsonEncode(pairingTopicsForWallet);
+
+      // Save the encoded string to shared preferences
+      await sharedPreferences.setString(key, jsonString);
+    }
+  }
+}
diff --git a/lib/core/wallet_loading_service.dart b/lib/core/wallet_loading_service.dart
index f16bf7e14..f1996bae8 100644
--- a/lib/core/wallet_loading_service.dart
+++ b/lib/core/wallet_loading_service.dart
@@ -32,36 +32,28 @@ class WalletLoadingService {
 
   Future<void> renameWallet(WalletType type, String name, String newName,
       {String? password}) async {
-    try {
-      final walletService = walletServiceFactory.call(type);
-      final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
+    final walletService = walletServiceFactory.call(type);
+    final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
 
-      // Save the current wallet's password to the new wallet name's key
-      await keyService.saveWalletPassword(walletName: newName, password: walletPassword);
+    // Save the current wallet's password to the new wallet name's key
+    await keyService.saveWalletPassword(walletName: newName, password: walletPassword);
+    // Delete previous wallet name from keyService to keep only new wallet's name
+    // otherwise keeps duplicate (old and new names)
+    await keyService.deleteWalletPassword(walletName: name);
 
-      await walletService.rename(name, walletPassword, newName);
-      // Delete previous wallet name from keyService to keep only new wallet's name
-      // otherwise keeps duplicate (old and new names)
-      await keyService.deleteWalletPassword(walletName: name);
+    await walletService.rename(name, walletPassword, newName);
 
-      // set shared preferences flag based on previous wallet name
-      if (type == WalletType.monero) {
-        final oldNameKey = PreferencesKey.moneroWalletUpdateV1Key(name);
-        final isPasswordUpdated = sharedPreferences.getBool(oldNameKey) ?? false;
-        final newNameKey = PreferencesKey.moneroWalletUpdateV1Key(newName);
-        await sharedPreferences.setBool(newNameKey, isPasswordUpdated);
-      }
-    } catch (error, stack) {
-      await ExceptionHandler.resetLastPopupDate();
-      await ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stack));
+    // set shared preferences flag based on previous wallet name
+    if (type == WalletType.monero) {
+      final oldNameKey = PreferencesKey.moneroWalletUpdateV1Key(name);
+      final isPasswordUpdated = sharedPreferences.getBool(oldNameKey) ?? false;
+      final newNameKey = PreferencesKey.moneroWalletUpdateV1Key(newName);
+      await sharedPreferences.setBool(newNameKey, isPasswordUpdated);
     }
   }
 
-  Future<WalletBase> load(WalletType type, String name, {String? password, bool isBackground = false}) async {
+  Future<WalletBase> load(WalletType type, String name, {String? password}) async {
     try {
-      if (!isBackground) {
-        await sharedPreferences.setString(PreferencesKey.backgroundSyncLastTrigger(name), DateTime.now().toIso8601String());
-      }
       final walletService = walletServiceFactory.call(type);
       final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
       final wallet = await walletService.openWallet(name, walletPassword);
@@ -73,11 +65,8 @@ class WalletLoadingService {
       return wallet;
     } catch (error, stack) {
       await ExceptionHandler.resetLastPopupDate();
-      final isLedgerError = await ExceptionHandler.isLedgerError(error);
-      if (isLedgerError) rethrow;
       await ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stack));
 
-
       // try fetching the seeds of the corrupted wallet to show it to the user
       String corruptedWalletsSeeds = "Corrupted wallets seeds (if retrievable, empty otherwise):";
       try {
diff --git a/lib/core/yat_service.dart b/lib/core/yat_service.dart
index 84aac1626..92e81e5ef 100644
--- a/lib/core/yat_service.dart
+++ b/lib/core/yat_service.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 import 'package:cake_wallet/entities/yat_record.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart';
 
 class YatService {
   static bool isDevMode = false;
@@ -33,8 +33,7 @@ class YatService {
     final yatRecords = <YatRecord>[];
 
     try {
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await get(uri);
       final resBody = json.decode(response.body) as Map<String, dynamic>;
       final results = resBody["result"] as Map<dynamic, dynamic>;
       // Favour a subaddress over a standard address.
@@ -43,7 +42,7 @@ class YatService {
         results[MONERO_STD_ADDRESS] ??
         results[tag]) as Map<String, dynamic>;
 
-      if (yatRecord.isNotEmpty) {
+      if (yatRecord != null) {
         yatRecords.add(YatRecord.fromJson(yatRecord));
       }
 
diff --git a/lib/di.dart b/lib/di.dart
index 5a7be0f1f..b20b4062f 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -15,11 +15,15 @@ import 'package:cake_wallet/core/backup_service_v3.dart';
 import 'package:cake_wallet/core/new_wallet_arguments.dart';
 import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
 import 'package:cake_wallet/core/auth_service.dart';
+import 'package:cake_wallet/core/backup_service.dart';
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/core/new_wallet_type_arguments.dart';
 import 'package:cake_wallet/core/secure_storage.dart';
 import 'package:cake_wallet/core/selectable_option.dart';
 import 'package:cake_wallet/core/totp_request_details.dart';
+import 'package:cake_wallet/core/wallet_connect/wallet_connect_key_service.dart';
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
+import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/core/wallet_loading_service.dart';
 import 'package:cake_wallet/core/yat_service.dart';
@@ -30,34 +34,18 @@ import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/hardware_wallet/require_hardware_wallet_connection.dart';
 import 'package:cake_wallet/entities/parse_address_from_domain.dart';
 import 'package:cake_wallet/exchange/provider/trocador_exchange_provider.dart';
-import 'package:cake_wallet/haven/cw_haven.dart';
 import 'package:cake_wallet/src/screens/dev/monero_background_sync.dart';
-import 'package:cake_wallet/src/screens/dev/moneroc_call_profiler.dart';
-import 'package:cake_wallet/src/screens/dev/network_requests.dart';
-import 'package:cake_wallet/src/screens/dev/secure_preferences_page.dart';
-import 'package:cake_wallet/src/screens/dev/shared_preferences_page.dart';
-import 'package:cake_wallet/src/screens/integrations/deuro/savings_page.dart';
 import 'package:cake_wallet/src/screens/settings/background_sync_page.dart';
-import 'package:cake_wallet/src/screens/start_tor/start_tor_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
 import 'package:cake_wallet/view_model/dev/monero_background_sync.dart';
-import 'package:cake_wallet/view_model/dev/secure_preferences.dart';
-import 'package:cake_wallet/view_model/dev/shared_preferences.dart';
-import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart';
 import 'package:cake_wallet/view_model/link_view_model.dart';
 import 'package:cake_wallet/tron/tron.dart';
 import 'package:cake_wallet/src/screens/transaction_details/rbf_details_page.dart';
-import 'package:cake_wallet/view_model/start_tor_view_model.dart';
 import 'package:cw_core/receive_page_option.dart';
 import 'package:cake_wallet/entities/wallet_edit_page_arguments.dart';
 import 'package:cake_wallet/entities/wallet_manager.dart';
 import 'package:cake_wallet/src/screens/buy/buy_sell_options_page.dart';
 import 'package:cake_wallet/src/screens/buy/payment_method_options_page.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_external_send_page.dart';
-import 'package:cake_wallet/src/screens/payjoin_details/payjoin_details_page.dart';
 import 'package:cake_wallet/src/screens/receive/address_list_page.dart';
 import 'package:cake_wallet/src/screens/seed/seed_verification/seed_verification_page.dart';
 import 'package:cake_wallet/src/screens/send/transaction_success_info_page.dart';
@@ -65,10 +53,7 @@ import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
 import 'package:cake_wallet/src/screens/settings/mweb_logs_page.dart';
 import 'package:cake_wallet/src/screens/settings/mweb_node_page.dart';
 import 'package:cake_wallet/src/screens/welcome/welcome_page.dart';
-import 'package:cake_wallet/store/dashboard/payjoin_transactions_store.dart';
 import 'package:cake_wallet/view_model/dashboard/sign_view_model.dart';
-import 'package:cake_wallet/view_model/payjoin_details_view_model.dart';
-import 'package:cw_core/payjoin_session.dart';
 import 'package:cake_wallet/view_model/restore/restore_wallet.dart';
 import 'package:cake_wallet/view_model/send/fees_view_model.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
@@ -141,6 +126,7 @@ import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
 import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
 import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
 import 'package:cake_wallet/src/screens/settings/silent_payments_settings.dart';
+import 'package:cake_wallet/src/screens/settings/tor_page.dart';
 import 'package:cake_wallet/src/screens/settings/trocador_providers_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart';
@@ -157,9 +143,11 @@ import 'package:cake_wallet/src/screens/wallet/wallet_edit_page.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/wc_connections_listing_view.dart';
 import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
 import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_page.dart';
+import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/view_model/buy/buy_sell_view_model.dart';
 import 'package:cake_wallet/view_model/animated_ur_model.dart';
 import 'package:cake_wallet/view_model/dashboard/desktop_sidebar_view_model.dart';
@@ -277,9 +265,6 @@ import 'buy/kryptonim/kryptonim.dart';
 import 'buy/meld/meld_buy_provider.dart';
 import 'src/screens/buy/buy_sell_page.dart';
 import 'cake_pay/cake_pay_payment_credantials.dart';
-import 'package:cake_wallet/view_model/dev/background_sync_logs_view_model.dart';
-import 'package:cake_wallet/src/screens/dev/background_sync_logs_page.dart';
-import 'package:cake_wallet/core/trade_monitor.dart';
 
 final getIt = GetIt.instance;
 
@@ -294,7 +279,6 @@ late Box<ExchangeTemplate> _exchangeTemplates;
 late Box<TransactionDescription> _transactionDescriptionBox;
 late Box<Order> _ordersSource;
 late Box<UnspentCoinsInfo> _unspentCoinsInfoSource;
-late Box<PayjoinSession> _payjoinSessionSource;
 late Box<AnonpayInvoiceInfo> _anonpayInvoiceInfoSource;
 
 Future<void> setup({
@@ -308,7 +292,6 @@ Future<void> setup({
   required Box<TransactionDescription> transactionDescriptionBox,
   required Box<Order> ordersSource,
   required Box<UnspentCoinsInfo> unspentCoinsInfoSource,
-  required Box<PayjoinSession> payjoinSessionSource,
   required Box<AnonpayInvoiceInfo> anonpayInvoiceInfoSource,
   required SecureStorage secureStorage,
   required GlobalKey<NavigatorState> navigatorKey,
@@ -323,17 +306,11 @@ Future<void> setup({
   _transactionDescriptionBox = transactionDescriptionBox;
   _ordersSource = ordersSource;
   _unspentCoinsInfoSource = unspentCoinsInfoSource;
-  _payjoinSessionSource = payjoinSessionSource;
   _anonpayInvoiceInfoSource = anonpayInvoiceInfoSource;
 
   if (!_isSetupFinished) {
     getIt.registerSingletonAsync<SharedPreferences>(() => SharedPreferences.getInstance());
     getIt.registerSingleton<SecureStorage>(secureStorage);
-    getIt.registerSingletonAsync<ThemeStore>(() async {
-      final store = ThemeStore();
-      await store.loadThemePreferences();
-      return store;
-    });
   }
 
   final isBitcoinBuyEnabled = (secrets.wyreSecretKey.isNotEmpty) &&
@@ -344,6 +321,10 @@ Future<void> setup({
     nodeSource: _nodeSource,
     powNodeSource: _powNodeSource,
     isBitcoinBuyEnabled: isBitcoinBuyEnabled,
+    // Enforce darkTheme on platforms other than mobile till the design for other themes is completed
+    initialTheme: responsiveLayoutUtil.shouldRenderMobileUI && DeviceInfo.instance.isMobile
+        ? null
+        : ThemeList.darkTheme,
   );
 
   if (_isSetupFinished) {
@@ -361,16 +342,13 @@ Future<void> setup({
       authenticationStore: getIt.get<AuthenticationStore>(),
       walletList: getIt.get<WalletListStore>(),
       settingsStore: getIt.get<SettingsStore>(),
-      nodeListStore: getIt.get<NodeListStore>(),
-      themeStore: getIt.get<ThemeStore>()));
+      nodeListStore: getIt.get<NodeListStore>()));
   getIt.registerSingleton<TradesStore>(
       TradesStore(tradesSource: _tradesSource, settingsStore: getIt.get<SettingsStore>()));
   getIt.registerSingleton<OrdersStore>(
       OrdersStore(ordersSource: _ordersSource, settingsStore: getIt.get<SettingsStore>()));
-  getIt.registerFactory(() =>
-      PayjoinTransactionsStore(payjoinSessionSource: _payjoinSessionSource));
   getIt.registerSingleton<TradeFilterStore>(TradeFilterStore());
-  getIt.registerSingleton<TransactionFilterStore>(TransactionFilterStore(getIt.get<AppStore>()));
+  getIt.registerSingleton<TransactionFilterStore>(TransactionFilterStore());
   getIt.registerSingleton<FiatConversionStore>(FiatConversionStore());
   getIt.registerSingleton<SendTemplateStore>(SendTemplateStore(templateSource: _templates));
   getIt.registerSingleton<ExchangeTemplateStore>(
@@ -512,42 +490,18 @@ Future<void> setup({
       settingsStore: getIt.get<SettingsStore>(),
       fiatConvertationStore: getIt.get<FiatConversionStore>()));
 
-  getIt.registerFactory(
-    () => ExchangeViewModel(
-      getIt.get<AppStore>(),
-      _tradesSource,
-      getIt.get<ExchangeTemplateStore>(),
-      getIt.get<TradesStore>(),
-      getIt.get<AppStore>().settingsStore,
-      getIt.get<SharedPreferences>(),
-      getIt.get<ContactListViewModel>(),
-      getIt.get<FeesViewModel>(),
-    ),
-  );
-
-  getIt.registerSingleton(
-    TradeMonitor(
-      tradesStore: getIt.get<TradesStore>(),
-      trades: _tradesSource,
-      appStore: getIt.get<AppStore>(),
-      preferences: getIt.get<SharedPreferences>(),
-    ),
-  );
-
   getIt.registerFactory(() => DashboardViewModel(
-    tradeMonitor: getIt.get<TradeMonitor>(),
-    balanceViewModel: getIt.get<BalanceViewModel>(),
-    appStore: getIt.get<AppStore>(),
-    tradesStore: getIt.get<TradesStore>(),
-    tradeFilterStore: getIt.get<TradeFilterStore>(),
-    transactionFilterStore: getIt.get<TransactionFilterStore>(),
-    settingsStore: settingsStore,
-    yatStore: getIt.get<YatStore>(),
-    ordersStore: getIt.get<OrdersStore>(),
-    anonpayTransactionsStore: getIt.get<AnonpayTransactionsStore>(),
-    payjoinTransactionsStore: getIt.get<PayjoinTransactionsStore>(),
-    sharedPreferences: getIt.get<SharedPreferences>(),
-    keyService: getIt.get<KeyService>()));
+      balanceViewModel: getIt.get<BalanceViewModel>(),
+      appStore: getIt.get<AppStore>(),
+      tradesStore: getIt.get<TradesStore>(),
+      tradeFilterStore: getIt.get<TradeFilterStore>(),
+      transactionFilterStore: getIt.get<TransactionFilterStore>(),
+      settingsStore: settingsStore,
+      yatStore: getIt.get<YatStore>(),
+      ordersStore: getIt.get<OrdersStore>(),
+      anonpayTransactionsStore: getIt.get<AnonpayTransactionsStore>(),
+      sharedPreferences: getIt.get<SharedPreferences>(),
+      keyService: getIt.get<KeyService>()));
 
   getIt.registerFactory<AuthService>(
     () => AuthService(
@@ -681,15 +635,11 @@ Future<void> setup({
 
   getIt.registerLazySingleton<WalletConnectKeyService>(() => KeyServiceImpl());
 
-  getIt.registerLazySingleton<WalletKitService>(() {
-    final WalletKitService walletKitService = WalletKitService(
-      getIt.get<BottomSheetService>(),
-      getIt.get<WalletConnectKeyService>(),
-      appStore,
-      getIt.get<SharedPreferences>(),
-    );
-    walletKitService.create();
-    return walletKitService;
+  getIt.registerLazySingleton<Web3WalletService>(() {
+    final Web3WalletService web3WalletService = Web3WalletService(getIt.get<BottomSheetService>(),
+        getIt.get<WalletConnectKeyService>(), appStore, getIt.get<SharedPreferences>());
+    web3WalletService.create();
+    return web3WalletService;
   });
 
   getIt.registerFactory(() => BalancePage(
@@ -877,7 +827,7 @@ Future<void> setup({
     if (wallet.type == WalletType.monero ||
         wallet.type == WalletType.wownero ||
         wallet.type == WalletType.haven) {
-      return MoneroAccountListViewModel(wallet,getIt.get<SettingsStore>());
+      return MoneroAccountListViewModel(wallet);
     }
     throw Exception(
         'Unexpected wallet type: ${wallet.type} for generate Monero AccountListViewModel');
@@ -928,8 +878,9 @@ Future<void> setup({
           nanoAccountCreationViewModel:
               getIt.get<NanoAccountEditOrCreateViewModel>(param1: account)));
 
-  getIt.registerFactory(() =>
-      DisplaySettingsViewModel(getIt.get<SettingsStore>(), getIt.get<ThemeStore>()));
+  getIt.registerFactory(() {
+    return DisplaySettingsViewModel(getIt.get<SettingsStore>());
+  });
 
   getIt.registerFactory(() =>
       SilentPaymentsSettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!));
@@ -937,20 +888,22 @@ Future<void> setup({
   getIt.registerFactory(
       () => MwebSettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!));
 
-  getIt.registerFactory(() =>
-      PrivacySettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!));
+  getIt.registerFactory(() {
+    return PrivacySettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!);
+  });
 
   getIt.registerFactory(() => TrocadorExchangeProvider());
 
   getIt.registerFactory(() => TrocadorProvidersViewModel(
       getIt.get<SettingsStore>(), getIt.get<TrocadorExchangeProvider>()));
 
-  getIt.registerFactory(() =>
-      OtherSettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!,
-          getIt.get<SendViewModel>()));
+  getIt.registerFactory(() {
+    return OtherSettingsViewModel(getIt.get<SettingsStore>(), getIt.get<AppStore>().wallet!,
+        getIt.get<SendViewModel>());});
 
-  getIt.registerFactory(() =>
-      SecuritySettingsViewModel(getIt.get<SettingsStore>()));
+  getIt.registerFactory(() {
+    return SecuritySettingsViewModel(getIt.get<SettingsStore>());
+  });
 
   getIt.registerFactory(() => WalletSeedViewModel(getIt.get<AppStore>().wallet!));
 
@@ -958,10 +911,6 @@ Future<void> setup({
 
   getIt.registerFactory(() => DevMoneroBackgroundSync(getIt.get<AppStore>().wallet!));
 
-  getIt.registerFactory(() => DevSharedPreferences());
-
-  getIt.registerFactory(() => DevSecurePreferences());
-
   getIt.registerFactoryParam<WalletSeedPage, bool, void>((bool isWalletCreated, _) =>
       WalletSeedPage(getIt.get<WalletSeedViewModel>(), isNewWalletCreated: isWalletCreated));
 
@@ -1058,13 +1007,13 @@ Future<void> setup({
           getIt.get<AppStore>().wallet!.isHardwareWallet ? getIt.get<LedgerViewModel>() : null));
 
   getIt.registerFactory<MoonPayProvider>(() => MoonPayProvider(
-        appStore: getIt.get<AppStore>(),
+        settingsStore: getIt.get<AppStore>().settingsStore,
         wallet: getIt.get<AppStore>().wallet!,
         isTestEnvironment: kDebugMode,
       ));
 
   getIt.registerFactory<OnRamperBuyProvider>(() => OnRamperBuyProvider(
-        getIt.get<ThemeStore>(),
+        getIt.get<AppStore>().settingsStore,
         wallet: getIt.get<AppStore>().wallet!,
       ));
 
@@ -1078,6 +1027,19 @@ Future<void> setup({
 
   getIt.registerFactoryParam<WebViewPage, String, Uri>((title, uri) => WebViewPage(title, uri));
 
+  getIt.registerFactory(
+    () => ExchangeViewModel(
+      getIt.get<AppStore>(),
+      _tradesSource,
+      getIt.get<ExchangeTemplateStore>(),
+      getIt.get<TradesStore>(),
+      getIt.get<AppStore>().settingsStore,
+      getIt.get<SharedPreferences>(),
+      getIt.get<ContactListViewModel>(),
+      getIt.get<FeesViewModel>(),
+    ),
+  );
+
   getIt.registerFactory<FeesViewModel>(
     () => FeesViewModel(
       getIt.get<AppStore>(),
@@ -1120,7 +1082,6 @@ Future<void> setup({
         return bitcoin!.createBitcoinWalletService(
           _walletInfoSource,
           _unspentCoinsInfoSource,
-          _payjoinSessionSource,
           getIt.get<SettingsStore>().silentPaymentsAlwaysScan,
           SettingsStoreBase.walletPasswordDirectInput,
         );
@@ -1154,9 +1115,8 @@ Future<void> setup({
         return zano!.createZanoWalletService(_walletInfoSource);
       case WalletType.decred:
         return decred!.createDecredWalletService(_walletInfoSource, _unspentCoinsInfoSource);
-      case WalletType.haven:
-        return HavenWalletService(_walletInfoSource);
       case WalletType.none:
+      case WalletType.haven:
         throw Exception('Unexpected token: ${param1.toString()} for generating of WalletService');
     }
   });
@@ -1242,7 +1202,8 @@ Future<void> setup({
     );
   });
 
-  getIt.registerFactory<PreSeedPage>(() => PreSeedPage());
+  getIt.registerFactoryParam<PreSeedPage, int, void>(
+      (seedPhraseLength, _) => PreSeedPage(seedPhraseLength));
 
   getIt.registerFactoryParam<TransactionSuccessPage, String, void>(
           (content, _) => TransactionSuccessPage(content: content));
@@ -1251,7 +1212,7 @@ Future<void> setup({
       TradeDetailsViewModel(
           tradeForDetails: trade,
           trades: _tradesSource,
-          appStore: getIt.get<AppStore>()));
+          settingsStore: getIt.get<SettingsStore>()));
 
   getIt.registerFactory(() => CakeFeaturesViewModel(getIt.get<CakePayService>()));
 
@@ -1446,16 +1407,7 @@ Future<void> setup({
       (AnonpayInvoiceInfo anonpayInvoiceInfo, _) => AnonpayDetailsViewModel(
             anonPayApi: getIt.get<AnonPayApi>(),
             anonpayInvoiceInfo: anonpayInvoiceInfo,
-            themeStore: getIt.get<ThemeStore>(),
-          ));
-
-  getIt.registerFactoryParam<PayjoinDetailsViewModel, String, TransactionInfo?>(
-      (String sessionId, TransactionInfo? transactionInfo) =>
-          PayjoinDetailsViewModel(
-            sessionId,
-            transactionInfo,
-            payjoinSessionSource: _payjoinSessionSource,
-            themeStore: getIt.get<ThemeStore>(),
+            settingsStore: getIt.get<SettingsStore>(),
           ));
 
   getIt.registerFactoryParam<AnonPayReceivePage, AnonpayInfoBase, void>(
@@ -1466,11 +1418,6 @@ Future<void> setup({
       (AnonpayInvoiceInfo anonpayInvoiceInfo, _) => AnonpayDetailsPage(
           anonpayDetailsViewModel: getIt.get<AnonpayDetailsViewModel>(param1: anonpayInvoiceInfo)));
 
-  getIt.registerFactoryParam<PayjoinDetailsPage, String, TransactionInfo?>(
-      (String sessionId, TransactionInfo? transactionInfo) => PayjoinDetailsPage(
-          payjoinDetailsViewModel: getIt.get<PayjoinDetailsViewModel>(
-              param1: sessionId, param2: transactionInfo)));
-
   getIt.registerFactoryParam<HomeSettingsPage, BalanceViewModel, void>((balanceViewModel, _) =>
       HomeSettingsPage(getIt.get<HomeSettingsViewModel>(param1: balanceViewModel)));
 
@@ -1493,34 +1440,15 @@ Future<void> setup({
   });
 
   getIt.registerFactory(
-    () => WalletConnectConnectionsView(walletKitService: getIt.get<WalletKitService>()),
-  );
+      () => WalletConnectConnectionsView(web3walletService: getIt.get<Web3WalletService>()));
 
   getIt.registerFactory(() => NFTViewModel(appStore, getIt.get<BottomSheetService>()));
+  getIt.registerFactory<TorPage>(() => TorPage(getIt.get<AppStore>()));
 
   getIt.registerFactory(() => SignViewModel(getIt.get<AppStore>().wallet!));
 
   getIt.registerFactory(() => SeedVerificationPage(getIt.get<WalletSeedViewModel>()));
 
   getIt.registerFactory(() => DevMoneroBackgroundSyncPage(getIt.get<DevMoneroBackgroundSync>()));
-
-  getIt.registerFactory(() => DevMoneroCallProfilerPage());
-
-  getIt.registerFactory(() => DevSharedPreferencesPage(getIt.get<DevSharedPreferences>()));
-
-  getIt.registerFactory(() => DevSecurePreferencesPage(getIt.get<DevSecurePreferences>()));
-  
-  getIt.registerFactory(() => BackgroundSyncLogsViewModel());
-  
-  getIt.registerFactory(() => DevBackgroundSyncLogsPage(getIt.get<BackgroundSyncLogsViewModel>()));
-  
-  getIt.registerFactory(() => DevNetworkRequests());
-
-  getIt.registerFactory(() => StartTorPage(StartTorViewModel(),));
-  
-  getIt.registerFactory(() => DEuroViewModel(getIt<AppStore>()));
-
-  getIt.registerFactory(() => DEuroSavingsPage(getIt<DEuroViewModel>()));
-
   _isSetupFinished = true;
 }
diff --git a/lib/entities/ens_record.dart b/lib/entities/ens_record.dart
index 78b0f4178..512244c1b 100644
--- a/lib/entities/ens_record.dart
+++ b/lib/entities/ens_record.dart
@@ -1,16 +1,14 @@
 import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/polygon/polygon.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:ens_dart/ens_dart.dart';
+import 'package:http/http.dart';
 import 'package:web3dart/web3dart.dart';
 
 class EnsRecord {
-  
   static Future<String> fetchEnsAddress(String name, {WalletBase? wallet}) async {
-
     Web3Client? _client;
 
     if (wallet != null && wallet.type == WalletType.ethereum) {
@@ -22,9 +20,7 @@ class EnsRecord {
     }
 
     if (_client == null) {
-      late final client = ProxyWrapper().getHttpIOClient();
-
-      _client = Web3Client("https://ethereum-rpc.publicnode.com", client);
+      _client = Web3Client("https://ethereum-rpc.publicnode.com", Client());
     }
 
     try {
diff --git a/lib/entities/fiat_currency.dart b/lib/entities/fiat_currency.dart
index 402c928b9..cf1112096 100644
--- a/lib/entities/fiat_currency.dart
+++ b/lib/entities/fiat_currency.dart
@@ -9,50 +9,8 @@ class FiatCurrency extends EnumerableItem<String> with Serializable<String> impl
 
   static List<FiatCurrency> get all => _all.values.toList();
 
-  static List<FiatCurrency> get currenciesAvailableToBuyWith => [
-        amd,
-        aud,
-        bgn,
-        brl,
-        cad,
-        chf,
-        clp,
-        cop,
-        czk,
-        dkk,
-        egp,
-        eur,
-        gbp,
-        gtq,
-        hkd,
-        hrk,
-        huf,
-        idr,
-        ils,
-        inr,
-        isk,
-        jpy,
-        krw,
-        mad,
-        mxn,
-        myr,
-        ngn,
-        nok,
-        nzd,
-        php,
-        pkr,
-        pln,
-        ron,
-        sek,
-        sgd,
-        thb,
-        twd,
-        usd,
-        vnd,
-        zar,
-        tur,
-        kes,
-      ];
+  static List<FiatCurrency> get currenciesAvailableToBuyWith =>
+      [amd, aud, bgn, brl, cad, chf, clp, cop, czk, dkk, egp, eur, gbp, gtq, hkd, hrk, huf, idr, ils, inr, isk, jpy, krw, mad, mxn, myr, ngn, nok, nzd, php, pkr, pln, ron, sek, sgd, thb, twd, usd, vnd, zar, tur,];
 
   static const amd = FiatCurrency(symbol: 'AMD', countryCode: "arm", fullName: "Armenian Dram");
   static const ars = FiatCurrency(symbol: 'ARS', countryCode: "arg", fullName: "Argentine Peso");
@@ -104,7 +62,6 @@ class FiatCurrency extends EnumerableItem<String> with Serializable<String> impl
   static const vnd = FiatCurrency(symbol: 'VND', countryCode: "vnm", fullName: "Vietnamese Dong đồng");
   static const zar = FiatCurrency(symbol: 'ZAR', countryCode: "saf", fullName: "South African Rand");
   static const tur = FiatCurrency(symbol: 'TRY', countryCode: "tur", fullName: "Turkish Lira");
-  static const kes = FiatCurrency(symbol: 'KES', countryCode: "ken", fullName: "Kenyan Shillings");
 
   static final _all = {
     FiatCurrency.amd.raw: FiatCurrency.amd,
@@ -157,7 +114,6 @@ class FiatCurrency extends EnumerableItem<String> with Serializable<String> impl
     FiatCurrency.vnd.raw: FiatCurrency.vnd,
     FiatCurrency.zar.raw: FiatCurrency.zar,
     FiatCurrency.tur.raw: FiatCurrency.tur,
-    FiatCurrency.kes.raw: FiatCurrency.kes,
   };
 
   static FiatCurrency deserialize({required String raw}) => _all[raw] ?? FiatCurrency.usd;
@@ -167,13 +123,13 @@ class FiatCurrency extends EnumerableItem<String> with Serializable<String> impl
 
   @override
   int get hashCode => raw.hashCode ^ title.hashCode;
-
+  
   @override
   String get name => raw;
-
+  
   @override
   String? get tag => null;
 
   @override
-  String get iconPath => "assets/images/flags/$countryCode.png";
+  String get iconPath => "assets/images/flags/$countryCode.png"; 
 }
diff --git a/lib/entities/fio_address_provider.dart b/lib/entities/fio_address_provider.dart
index dcfd79c96..a88804c97 100644
--- a/lib/entities/fio_address_provider.dart
+++ b/lib/entities/fio_address_provider.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 
 class FioAddressProvider {
   static const apiAuthority = 'fio.blockpane.com';
@@ -13,17 +13,13 @@ class FioAddressProvider {
     final body = <String, String>{"fio_name": fioAddress};
 
     final uri = Uri.https(apiAuthority, availCheck);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(body),
-    );
+    final response =
+        await http.post(uri, headers: headers, body: json.encode(body));
 
     if (response.statusCode != 200) {
       return isFioRegistered;
     }
 
-    
     final responseJSON = json.decode(response.body) as Map<String, dynamic>;
     isFioRegistered = responseJSON['is_registered'] as int == 1;
 
@@ -39,13 +35,9 @@ class FioAddressProvider {
     };
 
     final uri = Uri.https(apiAuthority, getAddress);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(body),
-    );
+    final response =
+        await http.post(uri, headers: headers, body: json.encode(body));
 
-    
     if (response.statusCode == 400) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
       final error = responseJSON['error'] as String;
diff --git a/lib/entities/main_actions.dart b/lib/entities/main_actions.dart
index 9fd1481a5..2e633bce8 100644
--- a/lib/entities/main_actions.dart
+++ b/lib/entities/main_actions.dart
@@ -9,7 +9,8 @@ class MainActions {
 
   final bool Function(DashboardViewModel viewModel)? isEnabled;
   final bool Function(DashboardViewModel viewModel)? canShow;
-  final Future<void> Function(BuildContext context, DashboardViewModel viewModel) onTap;
+  final Future<void> Function(
+      BuildContext context, DashboardViewModel viewModel) onTap;
 
   MainActions._({
     required this.name,
@@ -29,20 +30,15 @@ class MainActions {
 
   static MainActions showWalletsAction = MainActions._(
     name: (context) => S.of(context).wallets,
-    image: 'assets/images/wallet_icon.png',
+    image: 'assets/images/wallet_new.png',
     onTap: (BuildContext context, DashboardViewModel viewModel) async {
-      Navigator.pushNamed(
-        context,
-        Routes.walletList,
-        arguments: (BuildContext context) =>
-            Navigator.of(context).pushNamedAndRemoveUntil(Routes.dashboard, (route) => false),
-      );
+      Navigator.pushNamed(context, Routes.walletList);
     },
   );
 
   static MainActions receiveAction = MainActions._(
     name: (context) => S.of(context).receive,
-    image: 'assets/images/receive.png',
+    image: 'assets/images/received.png',
     onTap: (BuildContext context, DashboardViewModel viewModel) async {
       Navigator.pushNamed(context, Routes.addressPage);
     },
@@ -50,7 +46,7 @@ class MainActions {
 
   static MainActions swapAction = MainActions._(
     name: (context) => S.of(context).swap,
-    image: 'assets/images/swap.png',
+    image: 'assets/images/transfer.png',
     isEnabled: (viewModel) => viewModel.isEnabledSwapAction,
     canShow: (viewModel) => viewModel.hasSwapAction,
     onTap: (BuildContext context, DashboardViewModel viewModel) async {
@@ -62,16 +58,17 @@ class MainActions {
 
   static MainActions sendAction = MainActions._(
     name: (context) => S.of(context).send,
-    image: 'assets/images/send2.png',
+    image: 'assets/images/upload.png',
     isEnabled: (viewModel) => viewModel.canSend,
     onTap: (BuildContext context, DashboardViewModel viewModel) async {
       Navigator.pushNamed(context, Routes.send);
     },
   );
 
+
   static MainActions tradeAction = MainActions._(
-    name: (context) => S.of(context).buy,
-    image: 'assets/images/buy.png',
+    name: (context) => S.of(context).exchange,
+    image: 'assets/images/buy_sell.png',
     isEnabled: (viewModel) => viewModel.isEnabledTradeAction,
     canShow: (viewModel) => viewModel.hasTradeAction,
     onTap: (BuildContext context, DashboardViewModel viewModel) async {
@@ -79,4 +76,4 @@ class MainActions {
       await Navigator.of(context).pushNamed(Routes.buySellPage, arguments: false);
     },
   );
-}
+}
\ No newline at end of file
diff --git a/lib/entities/parse_address_from_domain.dart b/lib/entities/parse_address_from_domain.dart
index 01e6322cc..3fbbe0709 100644
--- a/lib/entities/parse_address_from_domain.dart
+++ b/lib/entities/parse_address_from_domain.dart
@@ -165,19 +165,13 @@ class AddressResolver {
     "zone"
   ];
 
-  static String? extractAddressByType(
-      {required String raw,
-      required CryptoCurrency type,
-      bool requireSurroundingWhitespaces = true}) {
-    var addressPattern = AddressValidator.getAddressFromStringPattern(type);
+  static String? extractAddressByType({required String raw, required CryptoCurrency type}) {
+    final addressPattern = AddressValidator.getAddressFromStringPattern(type);
 
     if (addressPattern == null) {
       throw Exception('Unexpected token: $type for getAddressFromStringPattern');
     }
 
-    if (requireSurroundingWhitespaces)
-      addressPattern = "$BEFORE_REGEX$addressPattern$AFTER_REGEX";
-
     final match = RegExp(addressPattern, multiLine: true).firstMatch(raw);
     return match?.group(0)?.replaceAllMapped(RegExp('[^0-9a-zA-Z]|bitcoincash:|nano_|ban_'),
         (Match match) {
diff --git a/lib/entities/preferences_key.dart b/lib/entities/preferences_key.dart
index 0f3c1fe48..9e889ff46 100644
--- a/lib/entities/preferences_key.dart
+++ b/lib/entities/preferences_key.dart
@@ -24,7 +24,6 @@ class PreferencesKey {
   static const shouldSaveRecipientAddressKey = 'save_recipient_address';
   static const isAppSecureKey = 'is_app_secure';
   static const disableTradeOption = 'disable_buy';
-  static const disableAutomaticExchangeStatusUpdates = 'disable_automatic_exchange_status_updates';
   static const disableBulletinKey = 'disable_bulletin';
   static const walletListOrder = 'wallet_list_order';
   static const contactListOrder = 'contact_list_order';
@@ -35,7 +34,6 @@ class PreferencesKey {
   static const disableExchangeKey = 'disable_exchange';
   static const exchangeStatusKey = 'exchange_status';
   static const currentTheme = 'current_theme';
-  static const themeMode = 'theme_mode';
   static const displayActionListModeKey = 'display_list_mode';
   static const currentPinLength = 'current_pin_length';
   static const currentLanguageCode = 'language_code';
@@ -66,7 +64,6 @@ class PreferencesKey {
   static const moneroWalletPasswordUpdateV1Base = 'monero_wallet_update_v1';
   static const syncModeKey = 'sync_mode';
   static const syncAllKey = 'sync_all';
-  static const builtinTorKey = 'builtin_tor';
   static const lastPopupDate = 'last_popup_date';
   static const lastAppReviewDate = 'last_app_review_date';
   static const sortBalanceBy = 'sort_balance_by';
@@ -85,8 +82,6 @@ class PreferencesKey {
   static const lookupsOpenAlias = 'looks_up_open_alias';
   static const lookupsENS = 'looks_up_ens';
   static const lookupsWellKnown = 'looks_up_well_known';
-  static const usePayjoin = 'use_payjoin';
-  static const showPayjoinCard = 'show_payjoin_card';
   static const showCameraConsent = 'show_camera_consent';
   static const showDecredInfoCard = 'show_decred_info_card';
 
@@ -110,6 +105,4 @@ class PreferencesKey {
   static const walletConnectPairingTopicsList = 'wallet_connect_pairing_topics_list';
   static String walletConnectPairingTopicsListForWallet(String publicKey) =>
       '${PreferencesKey.walletConnectPairingTopicsList}_${publicKey}';
-  static String backgroundSyncLastTrigger(String walletId) => 'background_sync_last_trigger_${walletId}';
-  static const backgroundSyncNotificationsEnabled = 'background_sync_notifications_enabled';
 }
diff --git a/lib/entities/provider_types.dart b/lib/entities/provider_types.dart
index 400b5b9d4..2d2a98379 100644
--- a/lib/entities/provider_types.dart
+++ b/lib/entities/provider_types.dart
@@ -6,6 +6,8 @@ import 'package:cake_wallet/buy/moonpay/moonpay_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
 import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
 import 'package:cake_wallet/di.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:http/http.dart';
 
 enum ProviderType { robinhood, dfx, onramper, moonpay, meld, kriptonim }
 
@@ -46,23 +48,84 @@ extension ProviderTypeName on ProviderType {
 }
 
 class ProvidersHelper {
-  static List<ProviderType> getAvailableBuyProviderTypes() => [
-    ProviderType.robinhood,
-    ProviderType.dfx,
-    ProviderType.onramper,
-    ProviderType.moonpay,
-    ProviderType.kriptonim
-  ];
+  static List<ProviderType> getAvailableBuyProviderTypes(WalletType walletType) {
+    switch (walletType) {
+      case WalletType.nano:
+      case WalletType.banano:
+      case WalletType.wownero:
+        return [ProviderType.onramper];
+      case WalletType.monero:
+        return [ProviderType.onramper, ProviderType.dfx];
+      case WalletType.bitcoin:
+      case WalletType.polygon:
+      case WalletType.ethereum:
+        return [
+          ProviderType.onramper,
+          ProviderType.dfx,
+          ProviderType.robinhood,
+          ProviderType.moonpay,
+          ProviderType.kriptonim
+        ];
+      case WalletType.litecoin:
+      case WalletType.bitcoinCash:
+      case WalletType.solana:
+        return [
+          ProviderType.onramper,
+          ProviderType.robinhood,
+          ProviderType.moonpay,
+          ProviderType.kriptonim
+        ];
+      case WalletType.tron:
+        return [
+          ProviderType.onramper,
+          ProviderType.robinhood,
+          ProviderType.moonpay,
+          ProviderType.kriptonim
+        ];
+      case WalletType.decred:
+      case WalletType.none:
+      case WalletType.haven:
+      case WalletType.zano:
+        return [];
+    }
+  }
 
-  static List<ProviderType> getAvailableSellProviderTypes() => [
-    ProviderType.robinhood,
-    ProviderType.dfx,
-    ProviderType.onramper,
-    ProviderType.moonpay,
-    ProviderType.kriptonim
-  ];
+  static List<ProviderType> getAvailableSellProviderTypes(WalletType walletType) {
+    switch (walletType) {
+      case WalletType.bitcoin:
+      case WalletType.ethereum:
+      case WalletType.polygon:
+        return [
+          ProviderType.onramper,
+          ProviderType.moonpay,
+          ProviderType.dfx,
+        ];
+      case WalletType.litecoin:
+      case WalletType.bitcoinCash:
+        return [ProviderType.moonpay];
+      case WalletType.solana:
+        return [
+          ProviderType.onramper,
+          ProviderType.moonpay,
+        ];
+      case WalletType.tron:
+        return [
+          ProviderType.moonpay,
+        ];
+      case WalletType.monero:
+        return [ProviderType.dfx];
+      case WalletType.decred:
+      case WalletType.nano:
+      case WalletType.banano:
+      case WalletType.none:
+      case WalletType.haven:
+      case WalletType.wownero:
+      case WalletType.zano:
+        return [];
+    }
+  }
 
-  static BuyProvider getProviderByType(ProviderType type) {
+  static BuyProvider? getProviderByType(ProviderType type) {
     switch (type) {
       case ProviderType.robinhood:
         return getIt.get<RobinhoodBuyProvider>();
@@ -76,6 +139,8 @@ class ProvidersHelper {
         return getIt.get<MeldBuyProvider>();
       case ProviderType.kriptonim:
         return getIt.get<KryptonimBuyProvider>();
-      }
+      default:
+        return null;
+    }
   }
 }
diff --git a/lib/entities/qr_scanner.dart b/lib/entities/qr_scanner.dart
index 31353a8f8..c4d37ad6c 100644
--- a/lib/entities/qr_scanner.dart
+++ b/lib/entities/qr_scanner.dart
@@ -15,7 +15,7 @@ Future<String?> presentQRScanner(BuildContext context) async {
   try {
     final result = await Navigator.of(context).push<String>(
       MaterialPageRoute(
-        builder: (context) {
+        builder:(context) {
           return BarcodeScannerSimple();
         },
       ),
@@ -67,7 +67,7 @@ class _BarcodeScannerSimpleState extends State<BarcodeScannerSimple> {
   void _handleBarcodeInternal(BarcodeCapture barcodes) {
     for (final barcode in barcodes.barcodes) {
       // don't handle unknown QR codes
-      if (barcode.rawValue?.trim().isEmpty ?? false == false) continue;
+      if (barcode.rawValue?.trim().isEmpty??false == false) continue;
       if (barcode.rawValue!.startsWith("ur:")) {
         if (urCodes.contains(barcode.rawValue)) continue;
         setState(() {
@@ -81,8 +81,7 @@ class _BarcodeScannerSimpleState extends State<BarcodeScannerSimple> {
           SchedulerBinding.instance.addPostFrameCallback((_) {
             Navigator.of(context).pop(ur.inputs.join("\n"));
           });
-        }
-        ;
+        };
       }
     }
     if (urCodes.isNotEmpty) return;
@@ -111,21 +110,18 @@ class _BarcodeScannerSimpleState extends State<BarcodeScannerSimple> {
           ToggleFlashlightButton(controller: ctrl),
         ],
       ),
-      backgroundColor: Theme.of(context).colorScheme.surface,
+      backgroundColor: Colors.black,
       body: Stack(
         children: [
           MobileScanner(
             onDetect: _handleBarcode,
             controller: ctrl,
           ),
-          if (ur.inputs.length != 0)
-            Center(
-              child: Text(
+          if (ur.inputs.length != 0) 
+            Center(child:
+              Text(
                 "${ur.inputs.length}/${ur.count}",
-                style: Theme.of(context)
-                    .textTheme
-                    .displayLarge
-                    ?.copyWith(color: Theme.of(context).colorScheme.onSurface),
+                style: Theme.of(context).textTheme.displayLarge?.copyWith(color: Colors.white)
               ),
             ),
           SizedBox(
@@ -162,6 +158,7 @@ class _BarcodeScannerSimpleState extends State<BarcodeScannerSimple> {
   }
 }
 
+
 class ToggleFlashlightButton extends StatelessWidget {
   const ToggleFlashlightButton({required this.controller, super.key});
 
@@ -202,9 +199,9 @@ class ToggleFlashlightButton extends StatelessWidget {
               },
             );
           case TorchState.unavailable:
-            return Icon(
+            return const Icon(
               Icons.no_flash,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
+              color: Colors.grey,
             );
         }
       },
@@ -329,14 +326,16 @@ class ProgressPainter extends CustomPainter {
     const fullAngle = 360.0;
     var startAngle = 0.0;
     for (int i = 0; i < urQrProgress.expectedPartCount.toInt(); i++) {
-      var sweepAngle = (1 / urQrProgress.expectedPartCount) * fullAngle * pi / 180.0;
-      drawSector(
-          canvas, urQrProgress.receivedPartIndexes.contains(i), rect, startAngle, sweepAngle);
+      var sweepAngle =
+          (1 / urQrProgress.expectedPartCount) * fullAngle * pi / 180.0;
+      drawSector(canvas, urQrProgress.receivedPartIndexes.contains(i), rect,
+          startAngle, sweepAngle);
       startAngle += sweepAngle;
     }
   }
 
-  void drawSector(Canvas canvas, bool isActive, Rect rect, double startAngle, double sweepAngle) {
+  void drawSector(Canvas canvas, bool isActive, Rect rect, double startAngle,
+      double sweepAngle) {
     final paint = Paint()
       ..style = PaintingStyle.stroke
       ..strokeWidth = 8
diff --git a/lib/entities/seed_type.dart b/lib/entities/seed_type.dart
index 22f0be045..20600e704 100644
--- a/lib/entities/seed_type.dart
+++ b/lib/entities/seed_type.dart
@@ -1,20 +1,17 @@
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cw_core/enumerable_item.dart';
 import 'package:cw_core/wallet_info.dart';
 
 class MoneroSeedType extends EnumerableItem<int> with Serializable<int> {
-  const MoneroSeedType({required String title, required int raw, this.shortTitle})
-      : super(title: title, raw: raw);
+  const MoneroSeedType({required String title, required int raw}) : super(title: title, raw: raw);
 
-  final String? shortTitle;
-
-  static const all = [legacy, polyseed, bip39];
+  static const all = [MoneroSeedType.legacy, MoneroSeedType.polyseed];
 
   static const defaultSeedType = polyseed;
 
-  static const legacy = MoneroSeedType(raw: 0, title: 'Legacy (25 words)', shortTitle: "Legacy");
-  static const polyseed = MoneroSeedType(raw: 1, title: 'Polyseed (16 words)', shortTitle: "Polyseed");
-  static const wowneroSeed = MoneroSeedType(raw: 2, title: 'Wownero');
-  static const bip39 = MoneroSeedType(raw: 3, title: 'BIP39 (12 words)', shortTitle: "BIP39");
+  static const legacy = MoneroSeedType(raw: 0, title: 'Legacy (25 words)');
+  static const polyseed = MoneroSeedType(raw: 1, title: 'Polyseed (16 words)');
+  static const wowneroSeed = MoneroSeedType(raw: 2, title: 'Wownero (14 words)');
 
   static MoneroSeedType deserialize({required int raw}) {
     switch (raw) {
@@ -24,15 +21,24 @@ class MoneroSeedType extends EnumerableItem<int> with Serializable<int> {
         return polyseed;
       case 2:
         return wowneroSeed;
-      case 3:
-        return bip39;
       default:
         throw Exception('Unexpected token: $raw for SeedType deserialize');
     }
   }
 
   @override
-  String toString() => title;
+  String toString() {
+    switch (this) {
+      case MoneroSeedType.legacy:
+        return S.current.seedtype_legacy;
+      case MoneroSeedType.polyseed:
+        return S.current.seedtype_polyseed;
+      case MoneroSeedType.wowneroSeed:
+        return S.current.seedtype_wownero;
+      default:
+        return '';
+    }
+  }
 }
 
 class BitcoinSeedType extends EnumerableItem<int> with Serializable<int> {
diff --git a/lib/entities/transaction_description.dart b/lib/entities/transaction_description.dart
index 05f64820e..2ac573652 100644
--- a/lib/entities/transaction_description.dart
+++ b/lib/entities/transaction_description.dart
@@ -5,7 +5,7 @@ part 'transaction_description.g.dart';
 
 @HiveType(typeId: TransactionDescription.typeId)
 class TransactionDescription extends HiveObject {
-  TransactionDescription({required this.id, this.recipientAddress, this.transactionNote, this.transactionKey});
+  TransactionDescription({required this.id, this.recipientAddress, this.transactionNote});
 
   static const typeId = TRANSACTION_TYPE_ID;
   static const boxName = 'TransactionDescriptions';
@@ -20,16 +20,12 @@ class TransactionDescription extends HiveObject {
   @HiveField(2)
   String? transactionNote;
 
-  @HiveField(3)
-  String? transactionKey;
-
   String get note => transactionNote ?? '';
 
   Map<String, dynamic> toJson() => {
     'id': id,
     'recipientAddress': recipientAddress,
     'transactionNote': transactionNote,
-    'transactionKey': transactionKey,
   };
 
   factory TransactionDescription.fromJson(Map<String, dynamic> json) {
@@ -37,7 +33,6 @@ class TransactionDescription extends HiveObject {
       id: json['id'] as String,
       recipientAddress: json['recipientAddress'] as String?,
       transactionNote: json['transactionNote'] as String?,
-      transactionKey: json['transactionKey'] as String?,
     );
   }
 }
diff --git a/lib/entities/unstoppable_domain_address.dart b/lib/entities/unstoppable_domain_address.dart
index cf6eb8945..a047c85d9 100644
--- a/lib/entities/unstoppable_domain_address.dart
+++ b/lib/entities/unstoppable_domain_address.dart
@@ -1,16 +1,15 @@
 import 'dart:convert';
 
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 
 Future<String> fetchUnstoppableDomainAddress(String domain, String ticker) async {
   var address = '';
 
   try {
     final uri = Uri.parse("https://api.unstoppabledomains.com/profile/public/${Uri.encodeQueryComponent(domain)}?fields=records");
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
-    final jsonParsed = json.decode(response.body) as Map<String, dynamic>;
+    final jsonString = await http.read(uri);
+    final jsonParsed = json.decode(jsonString) as Map<String, dynamic>;
     if (jsonParsed["records"] == null) {
       throw Exception(".records response from $uri is empty");
     };
diff --git a/lib/entities/wallet_manager.dart b/lib/entities/wallet_manager.dart
index 09b764289..8bcabcaf2 100644
--- a/lib/entities/wallet_manager.dart
+++ b/lib/entities/wallet_manager.dart
@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:cake_wallet/entities/hash_wallet_identifier.dart';
 import 'package:cake_wallet/entities/wallet_group.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -35,11 +33,7 @@ class WalletManager {
     }
 
     // Fallback to old logic
-    final address = walletInfo.parentAddress ?? walletInfo.address;
-    if (address.isEmpty) {
-      return Random().nextInt(100000).toString();
-    }
-    return address;
+    return walletInfo.parentAddress ?? walletInfo.address;
   }
 
   WalletGroup _getOrCreateGroup(String groupKey) {
diff --git a/lib/entities/wellknown_record.dart b/lib/entities/wellknown_record.dart
index 6dd94440b..dbe808281 100644
--- a/lib/entities/wellknown_record.dart
+++ b/lib/entities/wellknown_record.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 
 class WellKnownRecord {
   WellKnownRecord({
@@ -40,15 +40,14 @@ class WellKnownRecord {
       }
 
       // lookup domain/.well-known/nano-currency.json and check if it has a nano address:
-      final response = await ProxyWrapper().get(
-        clearnetUri: Uri.parse("https://$domain/.well-known/$jsonLocation.json?names=$name"),
+      final http.Response response = await http.get(
+        Uri.parse("https://$domain/.well-known/$jsonLocation.json?names=$name"),
         headers: <String, String>{"Accept": "application/json"},
       );
 
       if (response.statusCode != 200) {
         return null;
       }
-      
       final Map<String, dynamic> decoded = json.decode(response.body) as Map<String, dynamic>;
 
       // Access the first element in the names array and retrieve its address
diff --git a/lib/entities/zano_alias.dart b/lib/entities/zano_alias.dart
index ec966e225..1ddf95178 100644
--- a/lib/entities/zano_alias.dart
+++ b/lib/entities/zano_alias.dart
@@ -1,14 +1,14 @@
 import 'dart:convert';
 
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 
 class ZanoAlias {
   static Future<String?> fetchZanoAliasAddress(String alias) async {
     try {
       final uri = Uri.parse("http://zano.cakewallet.com:11211/json_rpc");
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
+      final response = await http.post(
+        uri,
         body: json.encode({
           "id": 0,
           "jsonrpc": "2.0",
@@ -16,7 +16,6 @@ class ZanoAlias {
           "params": {"alias": alias}
         }),
       );
-      
       final jsonParsed = json.decode(response.body) as Map<String, dynamic>;
 
       return jsonParsed['result']['alias_details']['address'] as String?;
diff --git a/lib/ethereum/cw_ethereum.dart b/lib/ethereum/cw_ethereum.dart
index a6a6a7205..40c7a0f77 100644
--- a/lib/ethereum/cw_ethereum.dart
+++ b/lib/ethereum/cw_ethereum.dart
@@ -67,7 +67,8 @@ class CWEthereum extends Ethereum {
   @override
   String getPublicKey(WalletBase wallet) {
     final privateKeyInUnitInt = (wallet as EthereumWallet).evmChainPrivateKey;
-    return privateKeyInUnitInt.address.hex;
+    final publicKey = privateKeyInUnitInt.address.hex;
+    return publicKey;
   }
 
   @override
@@ -137,24 +138,29 @@ class CWEthereum extends Ethereum {
   }
 
   @override
-  List<Erc20Token> getERC20Currencies(WalletBase wallet) =>
-      (wallet as EthereumWallet).erc20Currencies;
+  List<Erc20Token> getERC20Currencies(WalletBase wallet) {
+    final ethereumWallet = wallet as EthereumWallet;
+    return ethereumWallet.erc20Currencies;
+  }
 
   @override
-  Future<void> addErc20Token(WalletBase wallet, CryptoCurrency token) =>
-      (wallet as EthereumWallet).addErc20Token(token as Erc20Token);
+  Future<void> addErc20Token(WalletBase wallet, CryptoCurrency token) async {
+    await (wallet as EthereumWallet).addErc20Token(token as Erc20Token);
+  }
 
   @override
-  Future<void> deleteErc20Token(WalletBase wallet, CryptoCurrency token) =>
-      (wallet as EthereumWallet).deleteErc20Token(token as Erc20Token);
+  Future<void> deleteErc20Token(WalletBase wallet, CryptoCurrency token) async =>
+      await (wallet as EthereumWallet).deleteErc20Token(token as Erc20Token);
 
   @override
-  Future<void> removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token) =>
-      (wallet as EthereumWallet).removeTokenTransactionsInHistory(token as Erc20Token);
+  Future<void> removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token) async =>
+      await (wallet as EthereumWallet).removeTokenTransactionsInHistory(token as Erc20Token);
 
   @override
-  Future<Erc20Token?> getErc20Token(WalletBase wallet, String contractAddress) =>
-      (wallet as EthereumWallet).getErc20Token(contractAddress, 'eth');
+  Future<Erc20Token?> getErc20Token(WalletBase wallet, String contractAddress) async {
+    final ethereumWallet = wallet as EthereumWallet;
+    return await ethereumWallet.getErc20Token(contractAddress, 'eth');
+  }
 
   @override
   CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo transaction) {
@@ -171,19 +177,23 @@ class CWEthereum extends Ethereum {
   }
 
   @override
-  void updateEtherscanUsageState(WalletBase wallet, bool isEnabled) =>
-      (wallet as EthereumWallet).updateScanProviderUsageState(isEnabled);
+  void updateEtherscanUsageState(WalletBase wallet, bool isEnabled) {
+    (wallet as EthereumWallet).updateScanProviderUsageState(isEnabled);
+  }
 
   @override
-  Web3Client? getWeb3Client(WalletBase wallet) => (wallet as EthereumWallet).getWeb3Client();
+  Web3Client? getWeb3Client(WalletBase wallet) {
+    return (wallet as EthereumWallet).getWeb3Client();
+  }
 
-  @override
   String getTokenAddress(CryptoCurrency asset) => (asset as Erc20Token).contractAddress;
 
   @override
-  void setLedgerConnection(WalletBase wallet, ledger.LedgerConnection connection) {
+  void setLedgerConnection(
+      WalletBase wallet, ledger.LedgerConnection connection) {
     ((wallet as EVMChainWallet).evmChainPrivateKey as EvmLedgerCredentials)
-        .setLedgerConnection(connection, wallet.walletInfo.derivationInfo?.derivationPath);
+        .setLedgerConnection(
+            connection, wallet.walletInfo.derivationInfo?.derivationPath);
   }
 
   @override
@@ -202,49 +212,4 @@ class CWEthereum extends Ethereum {
   List<String> getDefaultTokenContractAddresses() {
     return DefaultEthereumErc20Tokens().initialErc20Tokens.map((e) => e.contractAddress).toList();
   }
-
-
-  @override
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) {
-    final ethereumWallet = wallet as EthereumWallet;
-    return ethereumWallet.erc20Currencies.any((element) => element.contractAddress.toLowerCase() == contractAddress.toLowerCase());
-  }
-
-  Future<PendingTransaction> createTokenApproval(WalletBase wallet, BigInt amount, String spender,
-          CryptoCurrency token, TransactionPriority priority) =>
-      (wallet as EVMChainWallet).createApprovalTransaction(
-          amount, spender, token, priority as EVMChainTransactionPriority);
-
-  // Integrations
-  @override
-  Future<BigInt> getDEuroSavingsBalance(WalletBase wallet) =>
-      DEuro(wallet as EthereumWallet).savingsBalance;
-
-  @override
-  Future<BigInt> getDEuroAccruedInterest(WalletBase wallet) =>
-      DEuro(wallet as EthereumWallet).accruedInterest;
-
-  @override
-  Future<BigInt> getDEuroInterestRate(WalletBase wallet) =>
-      DEuro(wallet as EthereumWallet).interestRate;
-
-  @override
-  Future<BigInt> getDEuroSavingsApproved(WalletBase wallet) =>
-      DEuro(wallet as EthereumWallet).approvedBalance;
-
-  @override
-  Future<PendingTransaction> addDEuroSaving(
-          WalletBase wallet, BigInt amount, TransactionPriority priority) =>
-      DEuro(wallet as EthereumWallet)
-          .depositSavings(amount, priority as EVMChainTransactionPriority);
-
-  @override
-  Future<PendingTransaction> removeDEuroSaving(
-          WalletBase wallet, BigInt amount, TransactionPriority priority) =>
-      DEuro(wallet as EthereumWallet)
-          .withdrawSavings(amount, priority as EVMChainTransactionPriority);
-
-  @override
-  Future<PendingTransaction> enableDEuroSaving(WalletBase wallet, TransactionPriority priority) =>
-      DEuro(wallet as EthereumWallet).enableSavings(priority as EVMChainTransactionPriority);
 }
diff --git a/lib/exchange/provider/chainflip_exchange_provider.dart b/lib/exchange/provider/chainflip_exchange_provider.dart
index c2e2f385c..a2c27b745 100644
--- a/lib/exchange/provider/chainflip_exchange_provider.dart
+++ b/lib/exchange/provider/chainflip_exchange_provider.dart
@@ -12,7 +12,7 @@ import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:hive/hive.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 
 class ChainflipExchangeProvider extends ExchangeProvider {
   ChainflipExchangeProvider({required this.tradesStore})
@@ -275,8 +275,7 @@ class ChainflipExchangeProvider extends ExchangeProvider {
   Future<Map<String, dynamic>> _getRequest(String path, Map<String, String> params) async {
     final uri = Uri.https(_baseURL, path, params);
 
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await http.get(uri);
 
     if ((response.statusCode != 200) || (response.body.contains('error'))) {
       throw Exception('Unexpected response: ${response.statusCode} / ${uri.toString()} / ${response.body}');
@@ -288,8 +287,7 @@ class ChainflipExchangeProvider extends ExchangeProvider {
   Future<Map<String, dynamic>?> _getStatus(Map<String, String> params) async {
     final uri = Uri.https(_baseURL, _txInfoPath, params);
 
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await http.get(uri);
 
     if (response.statusCode == 404) return null;
 
diff --git a/lib/exchange/provider/changenow_exchange_provider.dart b/lib/exchange/provider/changenow_exchange_provider.dart
index dbc4cc3ab..79f8d70d4 100644
--- a/lib/exchange/provider/changenow_exchange_provider.dart
+++ b/lib/exchange/provider/changenow_exchange_provider.dart
@@ -11,11 +11,12 @@ import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/distribution_info.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:http/http.dart';
 
 class ChangeNowExchangeProvider extends ExchangeProvider {
   ChangeNowExchangeProvider({required SettingsStore settingsStore})
@@ -29,7 +30,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
   ];
 
   static final apiKey =
-      isMoneroOnly ? secrets.changeNowMoneroApiKey : secrets.changeNowCakeWalletApiKey;
+      DeviceInfo.instance.isMobile ? secrets.changeNowApiKey : secrets.changeNowApiKeyDesktop;
   static const apiAuthority = 'api.changenow.io';
   static const createTradePath = '/v2/exchange';
   static const findTradeByIdPath = '/v2/exchange/by-id';
@@ -72,7 +73,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
       'flow': _getFlow(isFixedRateMode)
     };
     final uri = Uri.https(apiAuthority, rangePath, params);
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers);
+    final response = await get(uri, headers: headers);
 
     if (response.statusCode == 400) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
@@ -117,8 +118,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
         params['fromAmount'] = amount.toString();
 
       final uri = Uri.https(apiAuthority, estimatedAmountPath, params);
-      final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers);
-
+      final response = await get(uri, headers: headers);
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
       final fromAmount = double.parse(responseJSON['fromAmount'].toString());
       final toAmount = double.parse(responseJSON['toAmount'].toString());
@@ -177,11 +177,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
     }
 
     final uri = Uri.https(apiAuthority, createTradePath);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(body),
-    );
+    final response = await post(uri, headers: headers, body: json.encode(body));
 
     if (response.statusCode == 400) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
@@ -224,7 +220,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
     final headers = {apiHeaderKey: apiKey};
     final params = <String, String>{'id': id};
     final uri = Uri.https(apiAuthority, findTradeByIdPath, params);
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers);
+    final response = await get(uri, headers: headers);
 
     if (response.statusCode == 404) throw TradeNotFoundException(id, provider: description);
 
diff --git a/lib/exchange/provider/exolix_exchange_provider.dart b/lib/exchange/provider/exolix_exchange_provider.dart
index 0b7491bf5..43f63b8ca 100644
--- a/lib/exchange/provider/exolix_exchange_provider.dart
+++ b/lib/exchange/provider/exolix_exchange_provider.dart
@@ -9,15 +9,14 @@ import 'package:cake_wallet/exchange/trade_not_found_exception.dart';
 import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
-import 'package:cake_wallet/wallet_type_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:http/http.dart';
 
 class ExolixExchangeProvider extends ExchangeProvider {
   ExolixExchangeProvider() : super(pairList: supportedPairs(_notSupported));
 
-  static final apiKey = isMoneroOnly ? secrets.exolixMoneroApiKey : secrets.exolixCakeWalletApiKey;
+  static final apiKey = secrets.exolixApiKey;
   static const apiBaseUrl = 'exolix.com';
   static const transactionsPath = '/api/v2/transactions';
   static const ratePath = '/api/v2/rate';
@@ -87,9 +86,8 @@ class ExolixExchangeProvider extends ExchangeProvider {
     // Maximum of 2 attempts to fetch limits
     for (int i = 0; i < 2; i++) {
       final uri = Uri.https(apiBaseUrl, ratePath, params);
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
-      
+      final response = await get(uri);
+
       if (response.statusCode == 200) {
         final responseJSON = json.decode(response.body) as Map<String, dynamic>;
         final minAmount = responseJSON['minAmount'];
@@ -135,8 +133,7 @@ class ExolixExchangeProvider extends ExchangeProvider {
         params['amount'] = amount.toString();
 
       final uri = Uri.https(apiBaseUrl, ratePath, params);
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await get(uri);
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
 
       if (response.statusCode != 200) {
@@ -175,12 +172,7 @@ class ExolixExchangeProvider extends ExchangeProvider {
       body['amount'] = request.fromAmount;
 
     final uri = Uri.https(apiBaseUrl, transactionsPath);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(body),
-    );
-    
+    final response = await post(uri, headers: headers, body: json.encode(body));
 
     if (response.statusCode == 400) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
@@ -222,8 +214,8 @@ class ExolixExchangeProvider extends ExchangeProvider {
   Future<Trade> findTradeById({required String id}) async {
     final findTradeByIdPath = '$transactionsPath/$id';
     final uri = Uri.https(apiBaseUrl, findTradeByIdPath);
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await get(uri);
+
     if (response.statusCode == 404) throw TradeNotFoundException(id, provider: description);
 
     if (response.statusCode == 400) {
diff --git a/lib/exchange/provider/letsexchange_exchange_provider.dart b/lib/exchange/provider/letsexchange_exchange_provider.dart
index 1fe1e9e35..d07297fcf 100644
--- a/lib/exchange/provider/letsexchange_exchange_provider.dart
+++ b/lib/exchange/provider/letsexchange_exchange_provider.dart
@@ -10,9 +10,9 @@ import 'package:cake_wallet/exchange/trade_not_created_exception.dart';
 import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:http/http.dart' as http;
 
 class LetsExchangeExchangeProvider extends ExchangeProvider {
   LetsExchangeExchangeProvider() : super(pairList: supportedPairs(_notSupported));
@@ -152,11 +152,7 @@ class LetsExchangeExchangeProvider extends ExchangeProvider {
 
       final uri = Uri.https(_baseUrl,
           isFixedRateMode ? _createTransactionRevertPath : _createTransactionPath, tradeParams);
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        headers: headers,
-      );
-      
+      final response = await http.post(uri, headers: headers);
 
       if (response.statusCode != 200) {
         throw Exception('LetsExchange create trade failed: ${response.body}');
@@ -222,8 +218,7 @@ class LetsExchangeExchangeProvider extends ExchangeProvider {
     };
 
     final url = Uri.https(_baseUrl, '$_getTransactionPath/$id');
-    final response = await ProxyWrapper().get(clearnetUri: url, headers: headers);
-    
+    final response = await http.get(url, headers: headers);
 
     if (response.statusCode != 200) {
       throw Exception('LetsExchange fetch trade failed: ${response.body}');
@@ -271,11 +266,7 @@ class LetsExchangeExchangeProvider extends ExchangeProvider {
 
     try {
       final uri = Uri.https(_baseUrl, isFixedRateMode ? _infoRevertPath : _infoPath, params);
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        headers: headers,
-      );
-      
+      final response = await http.post(uri, headers: headers);
       if (response.statusCode != 200) {
         throw Exception('LetsExchange fetch info failed: ${response.body}');
       }
diff --git a/lib/exchange/provider/sideshift_exchange_provider.dart b/lib/exchange/provider/sideshift_exchange_provider.dart
index 3c9b2d951..12ec59100 100644
--- a/lib/exchange/provider/sideshift_exchange_provider.dart
+++ b/lib/exchange/provider/sideshift_exchange_provider.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:developer';
 
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
@@ -10,9 +11,9 @@ import 'package:cake_wallet/exchange/trade_not_found_exception.dart';
 import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:http/http.dart';
 
 class SideShiftExchangeProvider extends ExchangeProvider {
   SideShiftExchangeProvider() : super(pairList: supportedPairs(_notSupported));
@@ -59,8 +60,8 @@ class SideShiftExchangeProvider extends ExchangeProvider {
   Future<bool> checkIsAvailable() async {
     const url = apiBaseUrl + permissionPath;
     final uri = Uri.parse(url);
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await get(uri);
+
     if (response.statusCode == 500) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
       final error = responseJSON['error']['message'] as String;
@@ -89,8 +90,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
         "$apiBaseUrl$rangePath/${fromCurrency.title.toLowerCase()}-$fromNetwork/${toCurrency.title.toLowerCase()}-$toNetwork";
 
     final uri = Uri.parse(url);
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await get(uri);
 
     if (response.statusCode == 500) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
@@ -137,8 +137,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
           "$apiBaseUrl$rangePath/$fromCurrency-$depositNetwork/$toCurrency-$settleNetwork?amount=$amount";
 
       final uri = Uri.parse(url);
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await get(uri);
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
 
       if (response.statusCode == 500) {
@@ -187,12 +186,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
     final headers = {'Content-Type': 'application/json'};
 
     final uri = Uri.parse(url);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(body),
-    );
-    
+    final response = await post(uri, headers: headers, body: json.encode(body));
 
     if (response.statusCode != 201) {
       if (response.statusCode == 400) {
@@ -233,8 +227,8 @@ class SideShiftExchangeProvider extends ExchangeProvider {
   Future<Trade> findTradeById({required String id}) async {
     final url = apiBaseUrl + orderPath + '/' + id;
     final uri = Uri.parse(url);
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await get(uri);
+
     if (response.statusCode == 404) {
       throw TradeNotFoundException(id, provider: description);
     }
@@ -287,12 +281,7 @@ class SideShiftExchangeProvider extends ExchangeProvider {
       'depositNetwork': _networkFor(request.fromCurrency),
     };
     final uri = Uri.parse(url);
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(body),
-    );
-    
+    final response = await post(uri, headers: headers, body: json.encode(body));
 
     if (response.statusCode != 201) {
       if (response.statusCode == 400) {
diff --git a/lib/exchange/provider/simpleswap_exchange_provider.dart b/lib/exchange/provider/simpleswap_exchange_provider.dart
index cc02ac799..2a72ac793 100644
--- a/lib/exchange/provider/simpleswap_exchange_provider.dart
+++ b/lib/exchange/provider/simpleswap_exchange_provider.dart
@@ -11,8 +11,8 @@ import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
 import 'package:cake_wallet/utils/device_info.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
+import 'package:http/http.dart';
 
 class SimpleSwapExchangeProvider extends ExchangeProvider {
   SimpleSwapExchangeProvider() : super(pairList: supportedPairs(_notSupported));
@@ -34,10 +34,10 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
   String get title => 'SimpleSwap';
 
   @override
-  bool get isAvailable => false;
+  bool get isAvailable => true;
 
   @override
-  bool get isEnabled => false;
+  bool get isEnabled => true;
 
   @override
   bool get supportsFixedRate => false;
@@ -48,7 +48,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
   @override
   Future<bool> checkIsAvailable() async {
     final uri = Uri.https(apiAuthority, getEstimatePath, <String, String>{'api_key': apiKey});
-    final response = await ProxyWrapper().get(clearnetUri: uri);
+    final response = await get(uri);
 
     return !(response.statusCode == 403);
   }
@@ -66,8 +66,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
     };
     final uri = Uri.https(apiAuthority, rangePath, params);
 
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await get(uri);
 
     if (response.statusCode == 500) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
@@ -105,10 +104,10 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
         'fixed': isFixedRateMode.toString()
       };
       final uri = Uri.https(apiAuthority, getEstimatePath, params);
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await get(uri);
 
       if (response.body == "null") return 0.00;
+
       final data = json.decode(response.body) as String;
 
       return double.parse(data) / amount;
@@ -135,12 +134,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
     };
     final uri = Uri.https(apiAuthority, createExchangePath, params);
 
-    final response = await ProxyWrapper().post(
-      clearnetUri: uri,
-      headers: headers,
-      body: json.encode(body),
-    );
-    
+    final response = await post(uri, headers: headers, body: json.encode(body));
 
     if (response.statusCode != 200 && response.statusCode != 201) {
       if (response.statusCode == 400) {
@@ -182,9 +176,8 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
   Future<Trade> findTradeById({required String id}) async {
     final params = {'api_key': apiKey, 'id': id};
     final uri = Uri.https(apiAuthority, getExchangePath, params);
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
-    
+    final response = await get(uri);
+
     if (response.statusCode == 404) {
       throw TradeNotFoundException(id, provider: description);
     }
diff --git a/lib/exchange/provider/stealth_ex_exchange_provider.dart b/lib/exchange/provider/stealth_ex_exchange_provider.dart
index 8c7efae65..11b8d768a 100644
--- a/lib/exchange/provider/stealth_ex_exchange_provider.dart
+++ b/lib/exchange/provider/stealth_ex_exchange_provider.dart
@@ -10,8 +10,8 @@ import 'package:cake_wallet/exchange/trade_not_created_exception.dart';
 import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
+import 'package:http/http.dart' as http;
 
 class StealthExExchangeProvider extends ExchangeProvider {
   StealthExExchangeProvider() : super(pairList: supportedPairs(_notSupported));
@@ -63,12 +63,8 @@ class StealthExExchangeProvider extends ExchangeProvider {
     };
 
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: Uri.parse(_baseUrl + _rangePath),
-        headers: headers,
-        body: json.encode(body),
-      );
-      
+      final response = await http.post(Uri.parse(_baseUrl + _rangePath),
+          headers: headers, body: json.encode(body));
       if (response.statusCode != 200) {
         throw Exception('StealthEx fetch limits failed: ${response.body}');
       }
@@ -138,12 +134,8 @@ class StealthExExchangeProvider extends ExchangeProvider {
         'additional_fee_percent': _additionalFeePercent,
       };
 
-      final response = await ProxyWrapper().post(
-        clearnetUri: Uri.parse(_baseUrl + _exchangesPath),
-        headers: headers,
-        body: json.encode(body),
-      );
-      
+      final response = await http.post(Uri.parse(_baseUrl + _exchangesPath),
+          headers: headers, body: json.encode(body));
 
       if (response.statusCode != 201) {
         throw Exception('StealthEx create trade failed: ${response.body}');
@@ -210,9 +202,8 @@ class StealthExExchangeProvider extends ExchangeProvider {
     final headers = {'Authorization': apiKey, 'Content-Type': 'application/json'};
 
     final uri = Uri.parse('$_baseUrl$_exchangesPath/$id');
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers);
-    
-    
+    final response = await http.get(uri, headers: headers);
+
     if (response.statusCode != 200) {
       throw Exception('StealthEx fetch trade failed: ${response.body}');
     }
@@ -269,12 +260,8 @@ class StealthExExchangeProvider extends ExchangeProvider {
     };
 
     try {
-      final response = await ProxyWrapper().post(
-        clearnetUri: Uri.parse(_baseUrl + _amountPath),
-        headers: headers,
-        body: json.encode(body),
-      );
-      
+      final response = await http.post(Uri.parse(_baseUrl + _amountPath),
+          headers: headers, body: json.encode(body));
       if (response.statusCode != 200) return {};
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
       final rate = responseJSON['rate'] as Map<String, dynamic>?;
diff --git a/lib/exchange/provider/swaptrade_exchange_provider.dart b/lib/exchange/provider/swaptrade_exchange_provider.dart
index f6c8332db..d3f64b712 100644
--- a/lib/exchange/provider/swaptrade_exchange_provider.dart
+++ b/lib/exchange/provider/swaptrade_exchange_provider.dart
@@ -10,9 +10,9 @@ import 'package:cake_wallet/exchange/trade_not_found_exception.dart';
 import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:http/http.dart';
 
 class SwapTradeExchangeProvider extends ExchangeProvider {
   SwapTradeExchangeProvider() : super(pairList: supportedPairs(_notSupported));
@@ -69,8 +69,7 @@ class SwapTradeExchangeProvider extends ExchangeProvider {
   }) async {
     try {
       final uri = Uri.https(apiAuthority, getCoins);
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await get(uri);
 
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
 
@@ -117,12 +116,7 @@ class SwapTradeExchangeProvider extends ExchangeProvider {
       };
 
       final uri = Uri.https(apiAuthority, getRate, params);
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        body: json.encode(body),
-        headers: headers,
-      );
-      
+      final response = await post(uri, body: body, headers: headers);
       final responseBody = json.decode(response.body) as Map<String, dynamic>;
 
       if (response.statusCode != 200)
@@ -159,12 +153,7 @@ class SwapTradeExchangeProvider extends ExchangeProvider {
       };
 
       final uri = Uri.https(apiAuthority, createOrder, params);
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        body: json.encode(body),
-        headers: headers,
-      );
-      
+      final response = await post(uri, body: body, headers: headers);
       final responseBody = json.decode(response.body) as Map<String, dynamic>;
 
       if (response.statusCode == 400 || responseBody["success"] == false) {
@@ -207,12 +196,7 @@ class SwapTradeExchangeProvider extends ExchangeProvider {
       };
 
       final uri = Uri.https(apiAuthority, order, params);
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        body: json.encode(body),
-        headers: headers,
-      );
-      
+      final response = await post(uri, body: body, headers: headers);
       final responseBody = json.decode(response.body) as Map<String, dynamic>;
 
       if (response.statusCode == 400 || responseBody["success"] == false) {
diff --git a/lib/exchange/provider/thorchain_exchange.provider.dart b/lib/exchange/provider/thorchain_exchange.provider.dart
index 16246abac..aa7ab2d27 100644
--- a/lib/exchange/provider/thorchain_exchange.provider.dart
+++ b/lib/exchange/provider/thorchain_exchange.provider.dart
@@ -7,10 +7,10 @@ import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:hive/hive.dart';
+import 'package:http/http.dart' as http;
 
 class ThorChainExchangeProvider extends ExchangeProvider {
   ThorChainExchangeProvider({required this.tradesStore})
@@ -23,7 +23,6 @@ class ThorChainExchangeProvider extends ExchangeProvider {
               // CryptoCurrency.eth,
               CryptoCurrency.ltc,
               CryptoCurrency.bch,
-              CryptoCurrency.usdtbsc,
               // CryptoCurrency.aave,
               // CryptoCurrency.dai,
               // CryptoCurrency.gusd,
@@ -165,8 +164,7 @@ class ThorChainExchangeProvider extends ExchangeProvider {
     if (id.isEmpty) throw Exception('Trade id is empty');
     final formattedId = id.startsWith('0x') ? id.substring(2) : id;
     final uri = Uri.https(_baseNodeURL, '$_txInfoPath$formattedId');
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await http.get(uri);
 
     if (response.statusCode == 404) {
       throw Exception('Trade not found for id: $formattedId');
@@ -219,8 +217,8 @@ class ThorChainExchangeProvider extends ExchangeProvider {
 
   static Future<Map<String, String>?>? lookupAddressByName(String name) async {
     final uri = Uri.https(_baseURL, '$_nameLookUpPath$name');
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await http.get(uri);
+
     if (response.statusCode != 200) {
       return null;
     }
@@ -246,8 +244,8 @@ class ThorChainExchangeProvider extends ExchangeProvider {
   Future<Map<String, dynamic>> _getSwapQuote(Map<String, String> params) async {
     Uri uri = Uri.https(_baseNodeURL, _quotePath, params);
 
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await http.get(uri);
+
     if (response.statusCode != 200) {
       throw Exception('Unexpected HTTP status: ${response.statusCode}');
     }
@@ -260,7 +258,7 @@ class ThorChainExchangeProvider extends ExchangeProvider {
   }
 
   String _normalizeCurrency(CryptoCurrency currency) {
-    final networkTitle = currency.tag == 'ETH' ? 'ETH' : currency.tag ?? currency.title;
+    final networkTitle = currency.tag == 'ETH' ? 'ETH' : currency.title;
     return '$networkTitle.${currency.title}';
   }
 
diff --git a/lib/exchange/provider/trocador_exchange_provider.dart b/lib/exchange/provider/trocador_exchange_provider.dart
index cc8d8fa60..26a9b2e35 100644
--- a/lib/exchange/provider/trocador_exchange_provider.dart
+++ b/lib/exchange/provider/trocador_exchange_provider.dart
@@ -8,10 +8,9 @@ import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/exchange/trade_request.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
-import 'package:cake_wallet/wallet_type_utils.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:http/http.dart';
 
 class TrocadorExchangeProvider extends ExchangeProvider {
   TrocadorExchangeProvider({this.useTorOnly = false, this.providerStates = const {}})
@@ -52,10 +51,9 @@ class TrocadorExchangeProvider extends ExchangeProvider {
     CryptoCurrency.zaddr,
   ];
 
-  static final apiKey = isMoneroOnly ? secrets.trocadorMoneroApiKey : secrets.trocadorApiKey;
+  static const apiKey = secrets.trocadorApiKey;
+  static const onionApiAuthority = 'trocadorfyhlu27aefre5u7zri66gudtzdyelymftvr4yjwcxhfaqsid.onion';
   static const clearNetAuthority = 'api.trocador.app';
-  static const onionApiAuthority = clearNetAuthority;
-  // static const onionApiAuthority = 'trocadorfyhlu27aefre5u7zri66gudtzdyelymftvr4yjwcxhfaqsid.onion';
   static const markup = secrets.trocadorExchangeMarkup;
   static const newRatePath = '/new_rate';
   static const createTradePath = '/new_trade';
@@ -99,8 +97,7 @@ class TrocadorExchangeProvider extends ExchangeProvider {
     };
 
     final uri = await _getUri(coinPath, params);
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey});
-    
+    final response = await get(uri, headers: {'API-Key': apiKey});
 
     if (response.statusCode != 200)
       throw Exception('Unexpected http status: ${response.statusCode}');
@@ -141,10 +138,12 @@ class TrocadorExchangeProvider extends ExchangeProvider {
       };
 
       final uri = await _getUri(newRatePath, params);
-      final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey});
-      
+      final response = await get(uri, headers: {'API-Key': apiKey});
 
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+
+      if (responseJSON['error'] != null) throw Exception(responseJSON['error']);
+
       final fromAmount = double.parse(responseJSON['amount_from'].toString());
       final toAmount = double.parse(responseJSON['amount_to'].toString());
       final rateId = responseJSON['trade_id'] as String? ?? '';
@@ -207,9 +206,8 @@ class TrocadorExchangeProvider extends ExchangeProvider {
     params['provider'] = _provider.first as String;
 
     final uri = await _getUri(createTradePath, params);
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey});
-    
-    
+    final response = await get(uri, headers: {'API-Key': apiKey});
+
     if (response.statusCode == 400) {
       final responseJSON = json.decode(response.body) as Map<String, dynamic>;
       final error = responseJSON['error'] as String;
@@ -232,7 +230,6 @@ class TrocadorExchangeProvider extends ExchangeProvider {
     final providerName = responseJSON['provider'] as String;
     final amount = responseJSON['amount_from']?.toString();
     final receiveAmount = responseJSON['amount_to']?.toString();
-    final addressProviderMemo = responseJSON['address_provider_memo'] as String?;
 
     return Trade(
       id: id,
@@ -250,17 +247,15 @@ class TrocadorExchangeProvider extends ExchangeProvider {
       receiveAmount: receiveAmount ?? request.toAmount,
       payoutAddress: payoutAddress,
       isSendAll: isSendAll,
-      extraId: addressProviderMemo,
     );
   }
 
   @override
   Future<Trade> findTradeById({required String id}) async {
     final uri = await _getUri(tradePath, {'id': id});
-    return ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey}).then((response) async {
+    return get(uri, headers: {'API-Key': apiKey}).then((response) {
       if (response.statusCode != 200)
         throw Exception('Unexpected http status: ${response.statusCode}');
-      
 
       final responseListJson = json.decode(response.body) as List;
       final responseJSON = responseListJson.first;
@@ -295,8 +290,7 @@ class TrocadorExchangeProvider extends ExchangeProvider {
 
   Future<List<TrocadorPartners>> fetchProviders() async {
     final uri = await _getUri(providersListPath, {'api_key': apiKey});
-    final response = await ProxyWrapper().get(clearnetUri: uri);
-    
+    final response = await get(uri);
 
     if (response.statusCode != 200)
       throw Exception('Unexpected http status: ${response.statusCode}');
@@ -348,8 +342,6 @@ class TrocadorExchangeProvider extends ExchangeProvider {
         return 'TRC20';
       case 'LN':
         return 'Lightning';
-      case 'BSC':
-        return 'BEP20';
       default:
         return tag.toLowerCase();
     }
@@ -361,7 +353,7 @@ class TrocadorExchangeProvider extends ExchangeProvider {
     if (useTorOnly) return uri;
 
     try {
-      await ProxyWrapper().get(clearnetUri: uri);
+      await get(uri);
 
       return uri;
     } catch (e) {
diff --git a/lib/exchange/provider/xoswap_exchange_provider.dart b/lib/exchange/provider/xoswap_exchange_provider.dart
index e70eab568..0b3826aa9 100644
--- a/lib/exchange/provider/xoswap_exchange_provider.dart
+++ b/lib/exchange/provider/xoswap_exchange_provider.dart
@@ -10,7 +10,8 @@ import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
+
 class XOSwapExchangeProvider extends ExchangeProvider {
   XOSwapExchangeProvider() : super(pairList: supportedPairs(_notSupported));
 
@@ -71,8 +72,7 @@ class XOSwapExchangeProvider extends ExchangeProvider {
       final uri = Uri.https(_apiAuthority, _apiPath + _assets,
           {'networks': normalizedNetwork, 'query': currency.title});
 
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await http.get(uri, headers: _headers);
       if (response.statusCode != 200) {
         throw Exception('Failed to fetch assets for ${currency.title} on ${currency.tag}');
       }
@@ -102,8 +102,7 @@ class XOSwapExchangeProvider extends ExchangeProvider {
       if (curFrom == null || curTo == null) return [];
       final pairId = curFrom + '_' + curTo;
       final uri = Uri.https(_apiAuthority, '$_apiPath$_pairsPath/$pairId$_ratePath');
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await http.get(uri, headers: _headers);
       if (response.statusCode != 200) return [];
       return json.decode(response.body) as List<dynamic>;
     } catch (e) {
@@ -189,29 +188,15 @@ class XOSwapExchangeProvider extends ExchangeProvider {
     try {
       final uri = Uri.https(_apiAuthority, '$_apiPath$_orders');
 
-      final curFrom = await _getAssets(request.fromCurrency);
-      final curTo = await _getAssets(request.toCurrency);
-
-      if (curFrom == null || curTo == null) {
-        throw TradeNotCreatedException(description);
-      }
-
-      final pairId = curFrom + '_' + curTo;
-
       final payload = {
         'fromAmount': request.fromAmount,
         'fromAddress': request.refundAddress,
         'toAmount': request.toAmount,
         'toAddress': request.toAddress,
-        'pairId': pairId,
+        'pairId': '${request.fromCurrency.title}_${request.toCurrency.title}',
       };
 
-      final response = await ProxyWrapper().post(
-        clearnetUri: uri,
-        headers: _headers,
-        body: json.encode(payload),
-      );
-      
+      final response = await http.post(uri, headers: _headers, body: json.encode(payload));
       if (response.statusCode != 201) {
         final responseJSON = json.decode(response.body) as Map<String, dynamic>;
         final error = responseJSON['error'] ?? 'Unknown error';
@@ -260,8 +245,7 @@ class XOSwapExchangeProvider extends ExchangeProvider {
   Future<Trade> findTradeById({required String id}) async {
     try {
       final uri = Uri.https(_apiAuthority, '$_apiPath$_orders/$id');
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await http.get(uri, headers: _headers);
       if (response.statusCode != 200) {
         final responseJSON = json.decode(response.body) as Map<String, dynamic>;
         if (responseJSON.containsKey('code') && responseJSON['code'] == 'NOT_FOUND') {
diff --git a/lib/exchange/trade_state.dart b/lib/exchange/trade_state.dart
index d09751604..f63b41e5d 100644
--- a/lib/exchange/trade_state.dart
+++ b/lib/exchange/trade_state.dart
@@ -7,7 +7,6 @@ class TradeState extends EnumerableItem<String> with Serializable<String> {
   bool operator ==(Object other) => other is TradeState && other.raw == raw;
 
   static const pending = TradeState(raw: 'pending', title: 'Pending');
-  static const awaiting = TradeState(raw: 'awaiting', title: 'Awaiting');
   static const confirming = TradeState(raw: 'confirming', title: 'Confirming');
   static const trading = TradeState(raw: 'trading', title: 'Trading');
   static const traded = TradeState(raw: 'traded', title: 'Traded');
@@ -41,8 +40,8 @@ class TradeState extends EnumerableItem<String> with Serializable<String> {
   static const exchanging = TradeState(raw: 'exchanging', title: 'Exchanging');
   static const sending = TradeState(raw: 'sending', title: 'Sending');
   static const success = TradeState(raw: 'success', title: 'Success');
-
   static TradeState deserialize({required String raw}) {
+
     switch (raw) {
       case '1':
         return unpaid;
@@ -135,10 +134,8 @@ class TradeState extends EnumerableItem<String> with Serializable<String> {
         return success;
       case 'expired':
         return expired;
-      case 'awaiting':
-        return awaiting;
       default:
-        return TradeState(raw: raw, title: raw);
+        throw Exception('Unexpected token: $raw in TradeState deserialize');
     }
   }
 
diff --git a/lib/haven/cw_haven.dart b/lib/haven/cw_haven.dart
index b69e733c3..c54e47eb4 100644
--- a/lib/haven/cw_haven.dart
+++ b/lib/haven/cw_haven.dart
@@ -1,78 +1,348 @@
-import 'dart:io';
+part of 'haven.dart';
 
-import 'package:cw_core/balance.dart';
-import 'package:cw_core/pathForWallet.dart';
-import 'package:cw_core/transaction_history.dart';
-import 'package:cw_core/transaction_info.dart';
-import 'package:cw_core/wallet_base.dart';
-import 'package:cw_core/wallet_credentials.dart';
-import 'package:cw_core/wallet_info.dart';
-import 'package:cw_core/wallet_service.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:hive/hive.dart';
+class CWHavenAccountList extends HavenAccountList {
+  CWHavenAccountList(this._wallet);
 
-class HavenWalletService extends WalletService {
-  final Box<WalletInfo> walletInfoSource;
-
-  HavenWalletService(this.walletInfoSource);
+  final Object _wallet;
 
   @override
-  WalletType getType() => WalletType.haven;
-
-  @override
-  Future<void> remove(String wallet) async {
-    final path = await pathForWalletDir(name: wallet, type: WalletType.haven);
-
-    final file = Directory(path);
-    final isExist = file.existsSync();
-
-    if (isExist) {
-      await file.delete(recursive: true);
-    }
-
-    final walletInfo = walletInfoSource.values
-        .firstWhere((info) => info.id == WalletBase.idFor(wallet, getType()));
-    await walletInfoSource.delete(walletInfo.key);
+  @computed
+  ObservableList<Account> get accounts {
+    final havenWallet = _wallet as HavenWallet;
+    final accounts = havenWallet.walletAddresses.accountList.accounts
+        .map((acc) => Account(id: acc.id, label: acc.label))
+        .toList();
+    return ObservableList<Account>.of(accounts);
   }
 
   @override
-  Future<WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo>> create(
-      WalletCredentials credentials,
-      {bool? isTestnet}) {
-    throw UnimplementedError();
+  void update(Object wallet) {
+    final havenWallet = wallet as HavenWallet;
+    havenWallet.walletAddresses.accountList.update();
   }
 
   @override
-  Future<bool> isWalletExit(String name) {
-    throw UnimplementedError();
+  void refresh(Object wallet) {
+    final havenWallet = wallet as HavenWallet;
+    havenWallet.walletAddresses.accountList.refresh();
   }
 
   @override
-  Future<WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo>> openWallet(
-      String name, String password) {
-    throw UnimplementedError();
+  List<Account> getAll(Object wallet) {
+    final havenWallet = wallet as HavenWallet;
+    return havenWallet.walletAddresses.accountList
+        .getAll()
+        .map((acc) => Account(id: acc.id, label: acc.label))
+        .toList();
   }
 
   @override
-  Future<void> rename(String currentName, String password, String newName) {
-    throw UnimplementedError();
+  Future<void> addAccount(Object wallet, {required String label}) async {
+    final havenWallet = wallet as HavenWallet;
+    await havenWallet.walletAddresses.accountList.addAccount(label: label);
   }
 
   @override
-  Future<WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo>>
-      restoreFromHardwareWallet(WalletCredentials credentials) {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo>>
-      restoreFromKeys(WalletCredentials credentials, {bool? isTestnet}) {
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo>>
-      restoreFromSeed(WalletCredentials credentials, {bool? isTestnet}) {
-    throw UnimplementedError();
+  Future<void> setLabelAccount(Object wallet,
+      {required int accountIndex, required String label}) async {
+    final havenWallet = wallet as HavenWallet;
+    await havenWallet.walletAddresses.accountList
+        .setLabelAccount(accountIndex: accountIndex, label: label);
   }
 }
+
+class CWHavenSubaddressList extends MoneroSubaddressList {
+  CWHavenSubaddressList(this._wallet);
+
+  final Object _wallet;
+
+  @override
+  @computed
+  ObservableList<Subaddress> get subaddresses {
+    final havenWallet = _wallet as HavenWallet;
+    final subAddresses = havenWallet.walletAddresses.subaddressList.subaddresses
+        .map((sub) => Subaddress(id: sub.id, address: sub.address, label: sub.label))
+        .toList();
+    return ObservableList<Subaddress>.of(subAddresses);
+  }
+
+  @override
+  void update(Object wallet, {required int accountIndex}) {
+    final havenWallet = wallet as HavenWallet;
+    havenWallet.walletAddresses.subaddressList.update(accountIndex: accountIndex);
+  }
+
+  @override
+  void refresh(Object wallet, {required int accountIndex}) {
+    final havenWallet = wallet as HavenWallet;
+    havenWallet.walletAddresses.subaddressList.refresh(accountIndex: accountIndex);
+  }
+
+  @override
+  List<Subaddress> getAll(Object wallet) {
+    final havenWallet = wallet as HavenWallet;
+    return havenWallet.walletAddresses.subaddressList
+        .getAll()
+        .map((sub) => Subaddress(id: sub.id, label: sub.label, address: sub.address))
+        .toList();
+  }
+
+  @override
+  Future<void> addSubaddress(Object wallet,
+      {required int accountIndex, required String label}) async {
+    final havenWallet = wallet as HavenWallet;
+    await havenWallet.walletAddresses.subaddressList
+        .addSubaddress(accountIndex: accountIndex, label: label);
+  }
+
+  @override
+  Future<void> setLabelSubaddress(Object wallet,
+      {required int accountIndex, required int addressIndex, required String label}) async {
+    final havenWallet = wallet as HavenWallet;
+    await havenWallet.walletAddresses.subaddressList
+        .setLabelSubaddress(accountIndex: accountIndex, addressIndex: addressIndex, label: label);
+  }
+}
+
+class CWHavenWalletDetails extends HavenWalletDetails {
+  CWHavenWalletDetails(this._wallet);
+
+  final Object _wallet;
+
+  @computed
+  @override
+  Account get account {
+    final havenWallet = _wallet as HavenWallet;
+    final acc = havenWallet.walletAddresses.account as monero_account.Account;
+    return Account(id: acc.id, label: acc.label);
+  }
+
+  @computed
+  @override
+  HavenBalance get balance {
+    final havenWallet = _wallet as HavenWallet;
+    final balance = havenWallet.balance;
+    throw Exception('Unimplemented');
+    //return HavenBalance(
+    //	fullBalance: balance.fullBalance,
+    //	unlockedBalance: balance.unlockedBalance);
+  }
+}
+
+class CWHaven extends Haven {
+  @override
+  HavenAccountList getAccountList(Object wallet) {
+    return CWHavenAccountList(wallet);
+  }
+
+  @override
+  MoneroSubaddressList getSubaddressList(Object wallet) {
+    return CWHavenSubaddressList(wallet);
+  }
+
+  @override
+  TransactionHistoryBase getTransactionHistory(Object wallet) {
+    final havenWallet = wallet as HavenWallet;
+    return havenWallet.transactionHistory;
+  }
+
+  @override
+  HavenWalletDetails getMoneroWalletDetails(Object wallet) {
+    return CWHavenWalletDetails(wallet);
+  }
+
+  @override
+  int getHeightByDate({required DateTime date}) => getHavenHeightByDate(date: date);
+
+  @override
+  Future<int> getCurrentHeight() => getHavenCurrentHeight();
+
+  @override
+  TransactionPriority getDefaultTransactionPriority() {
+    return MoneroTransactionPriority.automatic;
+  }
+
+  @override
+  TransactionPriority deserializeMoneroTransactionPriority({required int raw}) {
+    return MoneroTransactionPriority.deserialize(raw: raw);
+  }
+
+  @override
+  List<TransactionPriority> getTransactionPriorities() {
+    return MoneroTransactionPriority.all;
+  }
+
+  @override
+  List<String> getMoneroWordList(String language) {
+    switch (language.toLowerCase()) {
+      case 'english':
+        return EnglishMnemonics.words;
+      case 'chinese (simplified)':
+        return ChineseSimplifiedMnemonics.words;
+      case 'dutch':
+        return DutchMnemonics.words;
+      case 'german':
+        return GermanMnemonics.words;
+      case 'japanese':
+        return JapaneseMnemonics.words;
+      case 'portuguese':
+        return PortugueseMnemonics.words;
+      case 'russian':
+        return RussianMnemonics.words;
+      case 'spanish':
+        return SpanishMnemonics.words;
+      case 'french':
+        return FrenchMnemonics.words;
+      case 'italian':
+        return ItalianMnemonics.words;
+      default:
+        return EnglishMnemonics.words;
+    }
+  }
+
+  @override
+  WalletCredentials createHavenRestoreWalletFromKeysCredentials(
+      {required String name,
+      required String spendKey,
+      required String viewKey,
+      required String address,
+      required String password,
+      required String language,
+      required int height}) {
+    return HavenRestoreWalletFromKeysCredentials(
+        name: name,
+        spendKey: spendKey,
+        viewKey: viewKey,
+        address: address,
+        password: password,
+        language: language,
+        height: height);
+  }
+
+  @override
+  WalletCredentials createHavenRestoreWalletFromSeedCredentials(
+      {required String name,
+      required String password,
+      required int height,
+      required String mnemonic}) {
+    return HavenRestoreWalletFromSeedCredentials(
+        name: name, password: password, height: height, mnemonic: mnemonic);
+  }
+
+  @override
+  WalletCredentials createHavenNewWalletCredentials(
+      {required String name, required String language, String? password}) {
+    return HavenNewWalletCredentials(name: name, password: password, language: language);
+  }
+
+  @override
+  Map<String, String> getKeys(Object wallet) {
+    final havenWallet = wallet as HavenWallet;
+    final keys = havenWallet.keys;
+    return <String, String>{
+      'privateSpendKey': keys.privateSpendKey,
+      'privateViewKey': keys.privateViewKey,
+      'publicSpendKey': keys.publicSpendKey,
+      'publicViewKey': keys.publicViewKey
+    };
+  }
+
+  @override
+  Object createHavenTransactionCreationCredentials(
+      {required List<Output> outputs,
+      required TransactionPriority priority,
+      required String assetType}) {
+    return HavenTransactionCreationCredentials(
+        outputs: outputs
+            .map((out) => OutputInfo(
+                fiatAmount: out.fiatAmount,
+                cryptoAmount: out.cryptoAmount,
+                address: out.address,
+                note: out.note,
+                sendAll: out.sendAll,
+                extractedAddress: out.extractedAddress,
+                isParsedAddress: out.isParsedAddress,
+                formattedCryptoAmount: out.formattedCryptoAmount))
+            .toList(),
+        priority: priority as MoneroTransactionPriority,
+        assetType: assetType);
+  }
+
+  @override
+  String formatterMoneroAmountToString({required int amount}) {
+    return moneroAmountToString(amount: amount);
+  }
+
+  @override
+  double formatterMoneroAmountToDouble({required int amount}) {
+    return moneroAmountToDouble(amount: amount);
+  }
+
+  @override
+  int formatterMoneroParseAmount({required String amount}) {
+    return moneroParseAmount(amount: amount);
+  }
+
+  @override
+  Account getCurrentAccount(Object wallet) {
+    final havenWallet = wallet as HavenWallet;
+    final acc = havenWallet.walletAddresses.account as monero_account.Account;
+    return Account(id: acc.id, label: acc.label);
+  }
+
+  @override
+  void setCurrentAccount(Object wallet, int id, String label) {
+    final havenWallet = wallet as HavenWallet;
+    havenWallet.walletAddresses.account = monero_account.Account(id: id, label: label);
+  }
+
+  @override
+  void onStartup() {
+    monero_wallet_api.onStartup();
+  }
+
+  @override
+  int getTransactionInfoAccountId(TransactionInfo tx) {
+    final havenTransactionInfo = tx as HavenTransactionInfo;
+    return havenTransactionInfo.accountIndex;
+  }
+
+  @override
+  Future<void> backupHavenSeeds(Box<HavenSeedStore> havenSeedStore) async {
+    final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
+    final wallets = walletInfoSource.values
+      .where((element) => element.type == WalletType.haven);
+    for (var w in wallets) {
+      final walletService = HavenWalletService(walletInfoSource);
+      final flutterSecureStorage = secureStorageShared;
+      final keyService = KeyService(flutterSecureStorage);
+      final password = await keyService.getWalletPassword(walletName: w.name);
+      final wallet = await walletService.openWallet(w.name, password);
+      await havenSeedStore.add(HavenSeedStore(id: wallet.id, seed: wallet.seed));
+      wallet.close();
+    }
+    await havenSeedStore.flush();
+  }
+
+  @override
+  WalletService createHavenWalletService(Box<WalletInfo> walletInfoSource) {
+    return HavenWalletService(walletInfoSource);
+  }
+
+  @override
+  String getTransactionAddress(Object wallet, int accountIndex, int addressIndex) {
+    final havenWallet = wallet as HavenWallet;
+    return havenWallet.getTransactionAddress(accountIndex, addressIndex);
+  }
+
+  @override
+  CryptoCurrency assetOfTransaction(TransactionInfo tx) {
+    final transaction = tx as HavenTransactionInfo;
+    final asset = CryptoCurrency.fromString(transaction.assetType);
+    return asset;
+  }
+
+  @override
+  List<AssetRate> getAssetRate() =>
+      getRate().map((rate) => AssetRate(rate.getAssetType(), rate.getRate())).toList();
+}
diff --git a/lib/main.dart b/lib/main.dart
index 709304939..7e5f24b60 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -25,12 +25,9 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/root/root.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/utils/theme_provider.dart';
-import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
-import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/view_model/link_view_model.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cw_core/address_info.dart';
@@ -38,11 +35,8 @@ import 'package:cw_core/cake_hive.dart';
 import 'package:cw_core/hive_type_ids.dart';
 import 'package:cw_core/mweb_utxo.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/payjoin_session.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/foundation.dart';
@@ -55,7 +49,6 @@ import 'package:cw_core/root_dir.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:cw_core/window_size.dart';
 import 'package:logging/logging.dart';
-import 'package:cake_wallet/core/trade_monitor.dart';
 
 final navigatorKey = GlobalKey<NavigatorState>();
 final rootKey = GlobalKey<RootState>();
@@ -92,9 +85,6 @@ Future<void> runAppWithZone({Key? topLevelKey}) async {
         ledgerFile.writeAsStringSync("$content\n${event.message}");
       });
     }
-    if (FeatureFlag.hasDevOptions) {
-      ProxyWrapper.logger = MemoryProxyLogger();
-    }
 
     runApp(App(key: topLevelKey));
     isAppRunning = true;
@@ -188,10 +178,6 @@ Future<void> initializeAppConfigs({bool loadWallet = true}) async {
     CakeHive.registerAdapter(MwebUtxoAdapter());
   }
 
-  if (!CakeHive.isAdapterRegistered(PayjoinSession.typeId)) {
-    CakeHive.registerAdapter(PayjoinSessionAdapter());
-  }
-
   final secureStorage = secureStorageShared;
   final transactionDescriptionsBoxKey =
       await getEncryptionKey(secureStorage: secureStorage, forKey: TransactionDescription.boxKey);
@@ -202,8 +188,8 @@ Future<void> initializeAppConfigs({bool loadWallet = true}) async {
   final powNodes =
       await CakeHive.openBox<Node>(Node.boxName + "pow"); // must be different from Node.boxName
   final transactionDescriptions = await CakeHive.openBox<TransactionDescription>(
-          TransactionDescription.boxName,
-          encryptionKey: transactionDescriptionsBoxKey);
+      TransactionDescription.boxName,
+      encryptionKey: transactionDescriptionsBoxKey);
   final trades = await CakeHive.openBox<Trade>(Trade.boxName, encryptionKey: tradesBoxKey);
   final orders = await CakeHive.openBox<Order>(Order.boxName, encryptionKey: ordersBoxKey);
   final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
@@ -211,11 +197,11 @@ Future<void> initializeAppConfigs({bool loadWallet = true}) async {
   final exchangeTemplates = await CakeHive.openBox<ExchangeTemplate>(ExchangeTemplate.boxName);
   final anonpayInvoiceInfo = await CakeHive.openBox<AnonpayInvoiceInfo>(AnonpayInvoiceInfo.boxName);
   final unspentCoinsInfoSource = await CakeHive.openBox<UnspentCoinsInfo>(UnspentCoinsInfo.boxName);
-  final payjoinSessionSource = await CakeHive.openBox<PayjoinSession>(PayjoinSession.boxName);
 
   final havenSeedStoreBoxKey =
       await getEncryptionKey(secureStorage: secureStorage, forKey: HavenSeedStore.boxKey);
-  final havenSeedStore = await CakeHive.openBox<HavenSeedStore>(HavenSeedStore.boxName,
+  final havenSeedStore = await CakeHive.openBox<HavenSeedStore>(
+      HavenSeedStore.boxName,
       encryptionKey: havenSeedStoreBoxKey);
 
   await initialSetup(
@@ -233,33 +219,30 @@ Future<void> initializeAppConfigs({bool loadWallet = true}) async {
     exchangeTemplates: exchangeTemplates,
     transactionDescriptions: transactionDescriptions,
     secureStorage: secureStorage,
-    payjoinSessionSource: payjoinSessionSource,
     anonpayInvoiceInfo: anonpayInvoiceInfo,
     havenSeedStore: havenSeedStore,
     initialMigrationVersion: 49,
   );
 }
 
-Future<void> initialSetup({
-  required bool loadWallet,
-  required SharedPreferences sharedPreferences,
-  required Box<Node> nodes,
-  required Box<Node> powNodes,
-  required Box<WalletInfo> walletInfoSource,
-  required Box<Contact> contactSource,
-  required Box<Trade> tradesSource,
-  required Box<Order> ordersSource,
-  // required FiatConvertationService fiatConvertationService,
-  required Box<Template> templates,
-  required Box<ExchangeTemplate> exchangeTemplates,
-  required Box<TransactionDescription> transactionDescriptions,
-  required SecureStorage secureStorage,
-  required Box<AnonpayInvoiceInfo> anonpayInvoiceInfo,
-  required Box<UnspentCoinsInfo> unspentCoinsInfoSource,
-  required Box<PayjoinSession> payjoinSessionSource,
-  required Box<HavenSeedStore> havenSeedStore,
-  int initialMigrationVersion = 15,
-}) async {
+Future<void> initialSetup(
+    {required bool loadWallet,
+    required SharedPreferences sharedPreferences,
+    required Box<Node> nodes,
+    required Box<Node> powNodes,
+    required Box<WalletInfo> walletInfoSource,
+    required Box<Contact> contactSource,
+    required Box<Trade> tradesSource,
+    required Box<Order> ordersSource,
+    // required FiatConvertationService fiatConvertationService,
+    required Box<Template> templates,
+    required Box<ExchangeTemplate> exchangeTemplates,
+    required Box<TransactionDescription> transactionDescriptions,
+    required SecureStorage secureStorage,
+    required Box<AnonpayInvoiceInfo> anonpayInvoiceInfo,
+    required Box<UnspentCoinsInfo> unspentCoinsInfoSource,
+    required Box<HavenSeedStore> havenSeedStore,
+    int initialMigrationVersion = 15, }) async {
   LanguageService.loadLocaleList();
   await defaultSettingsMigration(
       secureStorage: secureStorage,
@@ -283,15 +266,10 @@ Future<void> initialSetup({
     ordersSource: ordersSource,
     anonpayInvoiceInfoSource: anonpayInvoiceInfo,
     unspentCoinsInfoSource: unspentCoinsInfoSource,
-    payjoinSessionSource: payjoinSessionSource,
     navigatorKey: navigatorKey,
     secureStorage: secureStorage,
   );
-  await bootstrapOffline();
-  final settingsStore = getIt<SettingsStore>();
-  if (!settingsStore.currentBuiltinTor) {
-    bootstrapOnline(navigatorKey, loadWallet: loadWallet);
-  }
+  await bootstrap(navigatorKey, loadWallet: loadWallet);
 }
 
 class App extends StatefulWidget {
@@ -306,58 +284,46 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
   @override
   Widget build(BuildContext context) {
     return Observer(builder: (BuildContext context) {
-        final appStore = getIt.get<AppStore>();
-        final authService = getIt.get<AuthService>();
-        final linkViewModel = getIt.get<LinkViewModel>();
-        final tradeMonitor = getIt.get<TradeMonitor>();
-        final settingsStore = appStore.settingsStore;
-        final statusBarColor = Colors.transparent;
-        final authenticationStore = getIt.get<AuthenticationStore>();
-        final initialRoute = authenticationStore.state == AuthenticationState.uninitialized
-                  ? Routes.welcome
-            : settingsStore.currentBuiltinTor ? Routes.startTor : Routes.login;
-        final currentTheme = appStore.themeStore.currentTheme;
-        final statusBarBrightness = currentTheme.type == currentTheme.isDark
-            ? Brightness.light
-            : Brightness.dark;
-        final statusBarIconBrightness = currentTheme.type == currentTheme.isDark
-            ? Brightness.light
-            : Brightness.dark;
-        SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-            statusBarColor: statusBarColor,
-            statusBarBrightness: statusBarBrightness,
-            statusBarIconBrightness: statusBarIconBrightness));
+      final appStore = getIt.get<AppStore>();
+      final authService = getIt.get<AuthService>();
+      final linkViewModel = getIt.get<LinkViewModel>();
+      final settingsStore = appStore.settingsStore;
+      final statusBarColor = Colors.transparent;
+      final authenticationStore = getIt.get<AuthenticationStore>();
+      final initialRoute = authenticationStore.state == AuthenticationState.uninitialized
+          ? Routes.welcome
+          : Routes.login;
+      final currentTheme = settingsStore.currentTheme;
+      final statusBarBrightness =
+          currentTheme.type == ThemeType.dark ? Brightness.light : Brightness.dark;
+      final statusBarIconBrightness =
+          currentTheme.type == ThemeType.dark ? Brightness.light : Brightness.dark;
+      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+          statusBarColor: statusBarColor,
+          statusBarBrightness: statusBarBrightness,
+          statusBarIconBrightness: statusBarIconBrightness));
 
-        return Root(
+      return Root(
           key: widget.key ?? rootKey,
           appStore: appStore,
           authenticationStore: authenticationStore,
           navigatorKey: navigatorKey,
           authService: authService,
           linkViewModel: linkViewModel,
-          tradeMonitor: tradeMonitor,
-          child: ThemeProvider(
-            themeStore: appStore.themeStore,
-            materialAppBuilder: (context, theme, darkTheme, themeMode) =>
-                MaterialApp(
-              navigatorObservers: [routeObserver],
-              navigatorKey: navigatorKey,
-              debugShowCheckedModeBanner: false,
-              theme: theme,
-              darkTheme: darkTheme,
-              themeMode: themeMode,
-              localizationsDelegates: localizationDelegates,
-              supportedLocales: S.delegate.supportedLocales,
-              locale: Locale(appStore.settingsStore.languageCode),
-              onGenerateRoute: (settings) => Router.createRoute(settings),
-              initialRoute: initialRoute,
-              scrollBehavior: AppScrollBehavior(),
-              home: _Home(),
-            ),
-          ),
-        );
-      },
-    );
+          child: MaterialApp(
+            navigatorObservers: [routeObserver],
+            navigatorKey: navigatorKey,
+            debugShowCheckedModeBanner: false,
+            theme: settingsStore.theme,
+            localizationsDelegates: localizationDelegates,
+            supportedLocales: S.delegate.supportedLocales,
+            locale: Locale(settingsStore.languageCode),
+            onGenerateRoute: (settings) => Router.createRoute(settings),
+            initialRoute: initialRoute,
+            scrollBehavior: AppScrollBehavior(),
+            home: _Home(),
+          ));
+    });
   }
 }
 
@@ -382,10 +348,8 @@ class _HomeState extends State<_Home> {
         SystemChrome.setPreferredOrientations(
             [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
       } else {
-        SystemChrome.setPreferredOrientations([
-          DeviceOrientation.landscapeLeft,
-          DeviceOrientation.landscapeRight
-        ]);
+        SystemChrome.setPreferredOrientations(
+            [DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
       }
     }
   }
@@ -419,15 +383,11 @@ class TopLevelErrorWidget extends StatelessWidget {
               children: [
                 Text(
                   'Error:\n${error.toString()}',
-                  style: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                        fontSize: 22,
-                      ),
+                  style: TextStyle(fontSize: 22),
                 ),
                 Text(
                   'Stack trace:\n${stackTrace.toString()}',
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 16,
-                      ),
+                  style: TextStyle(fontSize: 16),
                 ),
               ],
             ),
diff --git a/lib/mastodon/mastodon_api.dart b/lib/mastodon/mastodon_api.dart
index 58767eea7..a2fdc97bd 100644
--- a/lib/mastodon/mastodon_api.dart
+++ b/lib/mastodon/mastodon_api.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:http/http.dart' as http;
 import 'package:cake_wallet/mastodon/mastodon_user.dart';
 
 class MastodonAPI {
@@ -20,8 +20,7 @@ class MastodonAPI {
         queryParameters: queryParams,
       );
 
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await http.get(uri);
 
       if (response.statusCode != 200) return null;
 
@@ -48,8 +47,7 @@ class MastodonAPI {
         queryParameters: queryParams,
       );
 
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await http.get(uri);
 
       if (response.statusCode != 200) {
         throw Exception('Unexpected HTTP status: ${response.statusCode}');
diff --git a/lib/monero/cw_monero.dart b/lib/monero/cw_monero.dart
index 257ff895e..aa6fafc6b 100644
--- a/lib/monero/cw_monero.dart
+++ b/lib/monero/cw_monero.dart
@@ -39,14 +39,14 @@ class CWMoneroAccountList extends MoneroAccountList {
   @override
   Future<void> addAccount(Object wallet, {required String label}) async {
     final moneroWallet = wallet as MoneroWallet;
-    moneroWallet.walletAddresses.accountList.addAccount(label: label);
+    await moneroWallet.walletAddresses.accountList.addAccount(label: label);
   }
 
   @override
   Future<void> setLabelAccount(Object wallet,
       {required int accountIndex, required String label}) async {
     final moneroWallet = wallet as MoneroWallet;
-    moneroWallet.walletAddresses.accountList
+    await moneroWallet.walletAddresses.accountList
         .setLabelAccount(accountIndex: accountIndex, label: label);
   }
 }
@@ -252,21 +252,11 @@ class CWMonero extends Monero {
   WalletCredentials createMoneroNewWalletCredentials({
     required String name,
     required String language,
-    required int seedType,
+    required bool isPolyseed,
     required String? passphrase,
-    String? password,
-    String? mnemonic,
-  }) =>
+    String? password}) =>
       MoneroNewWalletCredentials(
-        name: name,
-        password: password,
-        language: language,
-        seedType: seedType == 1
-            ? MoneroSeedType.polyseed
-            : (seedType == 3 ? MoneroSeedType.bip39 : MoneroSeedType.legacy),
-        passphrase: passphrase,
-        mnemonic: mnemonic,
-      );
+        name: name, password: password, language: language, isPolyseed: isPolyseed, passphrase: passphrase);
 
   @override
   Map<String, String> getKeys(Object wallet) {
@@ -365,7 +355,7 @@ class CWMonero extends Monero {
   @override
   Map<String, String> pendingTransactionInfo(Object transaction) {
     final ptx = transaction as PendingMoneroTransaction;
-    return {'id': ptx.id, 'hex': ptx.hex};
+    return {'id': ptx.id, 'hex': ptx.hex, 'key': ptx.txKey};
   }
 
   @override
@@ -421,7 +411,6 @@ class CWMonero extends Monero {
     moneroWallet.setLedgerConnection(connection);
   }
 
-  @override
   void resetLedgerConnection() {
     disableLedgerExchange();
   }
@@ -429,17 +418,10 @@ class CWMonero extends Monero {
   @override
   void setGlobalLedgerConnection(ledger.LedgerConnection connection) {
     gLedger = connection;
+    keepAlive(connection);
   }
 
-  @override
-  String? getLastLedgerCommand() => latestLedgerCommand;
-
   bool isViewOnly() {
-    return isViewOnlyBySpendKey(null);
-  }
-
-  @override
-  Map<String, List<int>> debugCallLength() {
-    return monero_wallet_api.debugCallLength();
+    return isViewOnlyBySpendKey();
   }
 }
diff --git a/lib/polygon/cw_polygon.dart b/lib/polygon/cw_polygon.dart
index 2e6e7dd13..ec98137c5 100644
--- a/lib/polygon/cw_polygon.dart
+++ b/lib/polygon/cw_polygon.dart
@@ -67,7 +67,8 @@ class CWPolygon extends Polygon {
   @override
   String getPublicKey(WalletBase wallet) {
     final privateKeyInUnitInt = (wallet as PolygonWallet).evmChainPrivateKey;
-    return privateKeyInUnitInt.address.hex;
+    final publicKey = privateKeyInUnitInt.address.hex;
+    return publicKey;
   }
 
   @override
@@ -136,27 +137,28 @@ class CWPolygon extends Polygon {
   }
 
   @override
-  List<Erc20Token> getERC20Currencies(WalletBase wallet) =>
-      (wallet as PolygonWallet).erc20Currencies;
+  List<Erc20Token> getERC20Currencies(WalletBase wallet) {
+    final polygonWallet = wallet as PolygonWallet;
+    return polygonWallet.erc20Currencies;
+  }
 
   @override
-  Future<void> addErc20Token(WalletBase wallet, CryptoCurrency token) =>
-      (wallet as PolygonWallet).addErc20Token(token as Erc20Token);
+  Future<void> addErc20Token(WalletBase wallet, CryptoCurrency token) async =>
+      await (wallet as PolygonWallet).addErc20Token(token as Erc20Token);
 
   @override
-  Future<void> deleteErc20Token(WalletBase wallet, CryptoCurrency token) =>
-      (wallet as PolygonWallet).deleteErc20Token(token as Erc20Token);
+  Future<void> deleteErc20Token(WalletBase wallet, CryptoCurrency token) async =>
+      await (wallet as PolygonWallet).deleteErc20Token(token as Erc20Token);
 
   @override
-  Future<void> removeTokenTransactionsInHistory(
-          WalletBase wallet, CryptoCurrency token) =>
-      (wallet as PolygonWallet)
-          .removeTokenTransactionsInHistory(token as Erc20Token);
+  Future<void> removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token) async =>
+      await (wallet as PolygonWallet).removeTokenTransactionsInHistory(token as Erc20Token);
 
   @override
-  Future<Erc20Token?> getErc20Token(
-          WalletBase wallet, String contractAddress) =>
-      (wallet as PolygonWallet).getErc20Token(contractAddress, 'polygon');
+  Future<Erc20Token?> getErc20Token(WalletBase wallet, String contractAddress) async {
+    final polygonWallet = wallet as PolygonWallet;
+    return await polygonWallet.getErc20Token(contractAddress, 'polygon');
+  }
 
   @override
   CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo transaction) {
@@ -174,29 +176,23 @@ class CWPolygon extends Polygon {
   }
 
   @override
-  void updatePolygonScanUsageState(WalletBase wallet, bool isEnabled) =>
-      (wallet as PolygonWallet).updateScanProviderUsageState(isEnabled);
+  void updatePolygonScanUsageState(WalletBase wallet, bool isEnabled) {
+    (wallet as PolygonWallet).updateScanProviderUsageState(isEnabled);
+  }
 
   @override
-  Web3Client? getWeb3Client(WalletBase wallet) =>
-      (wallet as PolygonWallet).getWeb3Client();
+  Web3Client? getWeb3Client(WalletBase wallet) {
+    return (wallet as PolygonWallet).getWeb3Client();
+  }
 
-  @override
-  String getTokenAddress(CryptoCurrency asset) =>
-      (asset as Erc20Token).contractAddress;
-
-  @override
-  Future<PendingTransaction> createTokenApproval(WalletBase wallet,
-          BigInt amount, String spender, CryptoCurrency token, TransactionPriority priority) =>
-      (wallet as EVMChainWallet)
-          .createApprovalTransaction(amount, spender, token, priority as EVMChainTransactionPriority);
+  String getTokenAddress(CryptoCurrency asset) => (asset as Erc20Token).contractAddress;
 
   @override
   void setLedgerConnection(
       WalletBase wallet, ledger.LedgerConnection connection) {
     ((wallet as EVMChainWallet).evmChainPrivateKey as EvmLedgerCredentials)
         .setLedgerConnection(
-            connection, wallet.walletInfo.derivationInfo?.derivationPath);
+        connection, wallet.walletInfo.derivationInfo?.derivationPath);
   }
 
   @override
@@ -210,16 +206,9 @@ class CWPolygon extends Polygon {
       throw err;
     }
   }
-
+  
   @override
-  List<String> getDefaultTokenContractAddresses() => DefaultPolygonErc20Tokens()
-      .initialPolygonErc20Tokens
-      .map((e) => e.contractAddress)
-      .toList();
-
-  @override
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) {
-    final polygonWallet = wallet as PolygonWallet;
-    return polygonWallet.erc20Currencies.any((element) => element.contractAddress.toLowerCase() == contractAddress.toLowerCase());
+  List<String> getDefaultTokenContractAddresses() {
+    return DefaultPolygonErc20Tokens().initialPolygonErc20Tokens.map((e) => e.contractAddress).toList();
   }
 }
diff --git a/lib/reactions/bip39_wallet_utils.dart b/lib/reactions/bip39_wallet_utils.dart
index a46adb6b1..0c58bc76f 100644
--- a/lib/reactions/bip39_wallet_utils.dart
+++ b/lib/reactions/bip39_wallet_utils.dart
@@ -11,8 +11,8 @@ bool isBIP39Wallet(WalletType walletType) {
     case WalletType.bitcoinCash:
     case WalletType.nano:
     case WalletType.banano:
-    case WalletType.monero:
       return true;
+    case WalletType.monero:
     case WalletType.wownero:
     case WalletType.haven:
     case WalletType.zano:
diff --git a/lib/reactions/bootstrap.dart b/lib/reactions/bootstrap.dart
index 6fb4c5ab2..e767433aa 100644
--- a/lib/reactions/bootstrap.dart
+++ b/lib/reactions/bootstrap.dart
@@ -15,29 +15,24 @@ import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 
-Future<void> bootstrapOffline() async {
+Future<void> bootstrap(GlobalKey<NavigatorState> navigatorKey, {required bool loadWallet}) async {
+  final appStore = getIt.get<AppStore>();
   final authenticationStore = getIt.get<AuthenticationStore>();
+  final settingsStore = getIt.get<SettingsStore>();
+  final fiatConversionStore = getIt.get<FiatConversionStore>();
 
   final currentWalletName =
       getIt.get<SharedPreferences>().getString(PreferencesKey.currentWalletName);
   if (currentWalletName != null) {
     authenticationStore.installed();
   }
-}
-
-void bootstrapOnline(GlobalKey<NavigatorState> navigatorKey, {required bool loadWallet}) {
-  final appStore = getIt.get<AppStore>();
-  final authenticationStore = getIt.get<AuthenticationStore>();
-  final settingsStore = getIt.get<SettingsStore>();
-  final fiatConversionStore = getIt.get<FiatConversionStore>();
 
   if (loadWallet) {
     startAuthenticationStateChange(authenticationStore, navigatorKey);
   }
-
   startCurrentWalletChangeReaction(appStore, settingsStore, fiatConversionStore);
   startCurrentFiatChangeReaction(appStore, settingsStore, fiatConversionStore);
   startCurrentFiatApiModeChangeReaction(appStore, settingsStore, fiatConversionStore);
   startOnCurrentNodeChangeReaction(appStore);
   startFiatRateUpdate(appStore, settingsStore, fiatConversionStore);
-}
\ No newline at end of file
+}
diff --git a/lib/reactions/check_connection.dart b/lib/reactions/check_connection.dart
index 4591bb9ae..1e8fa88fa 100644
--- a/lib/reactions/check_connection.dart
+++ b/lib/reactions/check_connection.dart
@@ -1,15 +1,11 @@
 import 'dart:async';
 
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/utils/tor.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/sync_status.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:flutter/material.dart';
-import 'package:get_it/get_it.dart';
 
 Timer? _checkConnectionTimer;
 
@@ -40,10 +36,6 @@ void startCheckConnectionReaction(WalletBase wallet, SettingsStore settingsStore
         final alive = await settingsStore.getCurrentNode(wallet.type).requestNode();
 
         if (alive) {
-          if (settingsStore.currentBuiltinTor) {
-            await ensureTorStarted(context: null);
-          }
-      
           await wallet.connectToNode(node: settingsStore.getCurrentNode(wallet.type));
         }
       }
diff --git a/lib/reactions/on_authentication_state_change.dart b/lib/reactions/on_authentication_state_change.dart
index 8cde67731..bce160b4a 100644
--- a/lib/reactions/on_authentication_state_change.dart
+++ b/lib/reactions/on_authentication_state_change.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/hardware_wallet/require_hardware_wallet_connection.dart';
 import 'package:cake_wallet/entities/load_current_wallet.dart';
@@ -7,9 +8,7 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/connect_device/connect_device_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
@@ -64,50 +63,15 @@ void startAuthenticationStateChange(
               monero!.setGlobalLedgerConnection(ledgerVM.connection);
               showPopUp<void>(
                 context: context,
-                builder: (context) => AlertWithOneAction(
-                  alertTitle: S.of(context).proceed_on_device,
-                  alertContent: S.of(context).proceed_on_device_description,
-                  buttonText: S.of(context).cancel,
-                  alertBarrierDismissible: false,
-                  buttonAction: () => Navigator.of(context).pop(),
-                ),
+                builder: (BuildContext context) => AlertWithOneAction(
+                    alertTitle: S.of(context).proceed_on_device,
+                    alertContent: S.of(context).proceed_on_device_description,
+                    buttonText: S.of(context).cancel,
+                    alertBarrierDismissible: false,
+                    buttonAction: () => Navigator.of(context).pop()),
               );
-              bool tryOpening = true;
-              while (tryOpening) {
-                try {
-                  await loadCurrentWallet();
-                  tryOpening = false;
-                } on Exception catch (e) {
-                  final errorCode = RegExp(r'0x\S*?(?= )').firstMatch(
-                      e.toString());
-
-                  final errorMessage = ledgerVM.interpretErrorCode(
-                      errorCode?.group(0).toString().replaceAll("0x", "") ??
-                          "");
-                  if (errorMessage != null) {
-                    await showPopUp<void>(
-                      context: context,
-                      builder: (context) => AlertWithTwoActions(
-                        alertTitle: "Ledger Error",
-                        alertContent: errorMessage,
-                        leftButtonText: S.of(context).try_again,
-                        alertBarrierDismissible: false,
-                        actionLeftButton: () => Navigator.of(context).pop(),
-                        rightButtonText: S.of(context).cancel,
-                        actionRightButton: () {
-                          tryOpening = false;
-                          Navigator.of(context).pop();
-                        },
-                      ),
-                    );
-                  } else {
-                    tryOpening = false;
-                    rethrow;
-                  }
-                }
-              }
-
-              getIt.get<BottomSheetService>().showNext();
+              await loadCurrentWallet();
+              getIt.get<BottomSheetService>().resetCurrentSheet();
               await navigatorKey.currentState!
                   .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
             },
diff --git a/lib/reactions/on_current_wallet_change.dart b/lib/reactions/on_current_wallet_change.dart
index 7b7199b14..b1786b743 100644
--- a/lib/reactions/on_current_wallet_change.dart
+++ b/lib/reactions/on_current_wallet_change.dart
@@ -1,4 +1,3 @@
-import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
@@ -7,7 +6,6 @@ import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/polygon/polygon.dart';
 import 'package:cake_wallet/solana/solana.dart';
 import 'package:cake_wallet/tron/tron.dart';
-import 'package:cake_wallet/utils/tor.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/transaction_history.dart';
 import 'package:cw_core/balance.dart';
@@ -66,7 +64,7 @@ void startCurrentWalletChangeReaction(
 
       final node = settingsStore.getCurrentNode(wallet.type);
 
-      startWalletSyncStatusChangeReaction(wallet, settingsStore);
+      startWalletSyncStatusChangeReaction(wallet, fiatConversionStore);
       startCheckConnectionReaction(wallet, settingsStore);
 
       await Future.delayed(Duration.zero);
@@ -80,14 +78,6 @@ void startCurrentWalletChangeReaction(
         _setAutoGenerateSubaddressStatus(wallet, settingsStore);
       }
 
-      if (wallet.type == WalletType.bitcoin) {
-        bitcoin!.updatePayjoinState(wallet, settingsStore.usePayjoin);
-      }
-
-      if (settingsStore.currentBuiltinTor) {
-        await ensureTorStarted(context: null);
-      }
-      
       await wallet.connectToNode(node: node);
       if (wallet.type == WalletType.nano || wallet.type == WalletType.banano) {
         final powNode = settingsStore.getCurrentPowNode(wallet.type);
diff --git a/lib/reactions/on_wallet_sync_status_change.dart b/lib/reactions/on_wallet_sync_status_change.dart
index bbf4f44fe..bf2e8ed0d 100644
--- a/lib/reactions/on_wallet_sync_status_change.dart
+++ b/lib/reactions/on_wallet_sync_status_change.dart
@@ -1,7 +1,5 @@
-import 'package:cake_wallet/bitcoin/bitcoin.dart';
-import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/transaction_history.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -14,7 +12,7 @@ ReactionDisposer? _onWalletSyncStatusChangeReaction;
 
 void startWalletSyncStatusChangeReaction(
     WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo> wallet,
-    SettingsStore settingsStore) {
+    FiatConversionStore fiatConversionStore) {
   _onWalletSyncStatusChangeReaction?.reaction.dispose();
   _onWalletSyncStatusChangeReaction = reaction((_) => wallet.syncStatus, (SyncStatus status) async {
     try {
@@ -27,12 +25,6 @@ void startWalletSyncStatusChangeReaction(
       if (status is SyncedSyncStatus || status is FailedSyncStatus) {
         await WakelockPlus.disable();
       }
-
-      if (status is SyncedSyncStatus &&
-          wallet.type == WalletType.bitcoin &&
-          settingsStore.usePayjoin) {
-        bitcoin!.resumePayjoinSessions(wallet);
-      }
     } catch (e) {
       printV(e.toString());
     }
diff --git a/lib/reactions/wallet_connect.dart b/lib/reactions/wallet_connect.dart
index 37a0b92ec..217664eaa 100644
--- a/lib/reactions/wallet_connect.dart
+++ b/lib/reactions/wallet_connect.dart
@@ -1,7 +1,5 @@
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/eth/evm_chain_id.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/eth/evm_supported_methods.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/solana/solana_chain_id.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/solana/solana_supported_methods.dart';
+import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_id.dart';
+import 'package:cake_wallet/core/wallet_connect/chain_service/solana/solana_chain_id.dart';
 import 'package:cw_core/wallet_type.dart';
 
 bool isEVMCompatibleChain(WalletType walletType) {
@@ -49,19 +47,6 @@ String getChainNameSpaceAndIdBasedOnWalletType(WalletType walletType) {
   }
 }
 
-List<String> getChainSupportedMethodsOnWalletType(WalletType walletType) {
-  switch (walletType) {
-    case WalletType.ethereum:
-      return EVMSupportedMethods.values.map((e) => e.name).toList();
-    case WalletType.polygon:
-      return EVMSupportedMethods.values.map((e) => e.name).toList();
-    case WalletType.solana:
-      return SolanaSupportedMethods.values.map((e) => e.name).toList();
-    default:
-      return [];
-  }
-}
-
 int getChainIdBasedOnWalletType(WalletType walletType) {
   switch (walletType) {
     case WalletType.polygon:
diff --git a/lib/router.dart b/lib/router.dart
index 00b0c5bb9..35177c0eb 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -1,15 +1,15 @@
-import 'dart:io';
-
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
 import 'package:cake_wallet/core/new_wallet_arguments.dart';
 import 'package:cake_wallet/buy/order.dart';
 import 'package:cake_wallet/core/new_wallet_type_arguments.dart';
 import 'package:cake_wallet/core/totp_request_details.dart';
+import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/entities/qr_view_data.dart';
 import 'package:cake_wallet/entities/wallet_edit_page_arguments.dart';
+import 'package:cake_wallet/entities/wallet_nft_response.dart';
 import 'package:cake_wallet/exchange/trade.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
@@ -37,11 +37,6 @@ import 'package:cake_wallet/src/screens/dashboard/pages/nft_details_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/pages/transactions_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/sign_page.dart';
 import 'package:cake_wallet/src/screens/dev/monero_background_sync.dart';
-import 'package:cake_wallet/src/screens/dev/moneroc_call_profiler.dart';
-import 'package:cake_wallet/src/screens/dev/network_requests.dart';
-import 'package:cake_wallet/src/screens/dev/secure_preferences_page.dart';
-import 'package:cake_wallet/src/screens/dev/shared_preferences_page.dart';
-import 'package:cake_wallet/src/screens/dev/background_sync_logs_page.dart';
 import 'package:cake_wallet/src/screens/disclaimer/disclaimer_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
@@ -49,7 +44,6 @@ import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dar
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_external_send_page.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
 import 'package:cake_wallet/src/screens/faq/faq_page.dart';
-import 'package:cake_wallet/src/screens/integrations/deuro/savings_page.dart';
 import 'package:cake_wallet/src/screens/monero_accounts/monero_account_edit_or_create_page.dart';
 import 'package:cake_wallet/src/screens/nano/nano_change_rep_page.dart';
 import 'package:cake_wallet/src/screens/nano_accounts/nano_account_edit_or_create_page.dart';
@@ -62,7 +56,6 @@ import 'package:cake_wallet/src/screens/new_wallet/wallet_group_existing_seed_de
 import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/nodes/pow_node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/order_details/order_details_page.dart';
-import 'package:cake_wallet/src/screens/payjoin_details/payjoin_details_page.dart';
 import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
 import 'package:cake_wallet/src/screens/receive/address_list_page.dart';
 import 'package:cake_wallet/src/screens/receive/anonpay_invoice_page.dart';
@@ -94,6 +87,7 @@ import 'package:cake_wallet/src/screens/settings/other_settings_page.dart';
 import 'package:cake_wallet/src/screens/settings/privacy_page.dart';
 import 'package:cake_wallet/src/screens/settings/security_backup_page.dart';
 import 'package:cake_wallet/src/screens/settings/silent_payments_settings.dart';
+import 'package:cake_wallet/src/screens/settings/tor_page.dart';
 import 'package:cake_wallet/src/screens/settings/trocador_providers_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart';
@@ -101,7 +95,6 @@ import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_info_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart';
 import 'package:cake_wallet/src/screens/setup_pin_code/setup_pin_code.dart';
-import 'package:cake_wallet/src/screens/start_tor/start_tor_page.dart';
 import 'package:cake_wallet/src/screens/subaddress/address_edit_or_create_page.dart';
 import 'package:cake_wallet/src/screens/support/support_page.dart';
 import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
@@ -113,7 +106,6 @@ import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
 import 'package:cake_wallet/src/screens/ur/animated_ur_page.dart';
 import 'package:cake_wallet/src/screens/wallet/wallet_edit_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/wc_connections_listing_view.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
 import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
@@ -147,62 +139,48 @@ import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:cake_wallet/src/screens/cake_pay/cake_pay.dart';
 import 'src/screens/buy/buy_sell_page.dart';
 import 'src/screens/dashboard/pages/nft_import_page.dart';
 
 late RouteSettings currentRouteSettings;
 
-Route<dynamic> handleRouteWithPlatformAwareness(
-  Widget Function(BuildContext) builder, {
-  bool fullscreenDialog = false,
-}) {
-  if (Platform.isIOS) {
-    return CupertinoPageRoute<void>(builder: builder, fullscreenDialog: fullscreenDialog);
-  } else {
-    return MaterialPageRoute<void>(builder: builder, fullscreenDialog: fullscreenDialog);
-  }
-}
-
 Route<dynamic> createRoute(RouteSettings settings) {
   currentRouteSettings = settings;
 
   switch (settings.name) {
     case Routes.welcome:
       return MaterialPageRoute<void>(
-        builder: (_) => CreatePinWelcomePage(
-          SettingsStoreBase.walletPasswordDirectInput,
-        ),
-      );
+          builder: (_) => CreatePinWelcomePage(SettingsStoreBase.walletPasswordDirectInput));
 
     case Routes.welcomeWallet:
       if (SettingsStoreBase.walletPasswordDirectInput) {
         return createRoute(RouteSettings(name: Routes.welcomePage));
       }
-      return handleRouteWithPlatformAwareness(
-        (_) => getIt.get<SetupPinCodePage>(
-          param1: (PinCodeState<PinCodeWidget> context, dynamic _) {
-            Navigator.of(context.context).pushNamed(Routes.welcomePage);
-          },
-        ),
-        fullscreenDialog: true,
-      );
+      return CupertinoPageRoute<void>(
+          builder: (_) =>
+              getIt.get<SetupPinCodePage>(param1: (PinCodeState<PinCodeWidget> context, dynamic _) {
+                Navigator.of(context.context).pushNamed(Routes.welcomePage);
+              }),
+          fullscreenDialog: true);
 
     case Routes.welcomePage:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<WelcomePage>());
 
     case Routes.newWalletFromWelcome:
-      if (isSingleCoin) {
-        return createRoute(
-          RouteSettings(
+        if (isSingleCoin) {
+          return createRoute(
+            RouteSettings(
               name: Routes.newWallet,
-              arguments: NewWalletArguments(type: availableWalletTypes.first)),
-        );
-      }
-      return createRoute(RouteSettings(name: Routes.newWalletType));
+              arguments: NewWalletArguments(type: availableWalletTypes.first)
+            ),
+          );
+        }
+        return createRoute(RouteSettings(name: Routes.newWalletType));
 
     case Routes.newWalletType:
-      return handleRouteWithPlatformAwareness(
-        (_) => getIt.get<NewWalletTypePage>(
+      return CupertinoPageRoute<void>(
+        builder: (_) => getIt.get<NewWalletTypePage>(
           param1: NewWalletTypeArguments(
             onTypeSelected: (BuildContext context, WalletType type) =>
                 Navigator.of(context).pushNamed(
@@ -219,11 +197,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
       final type = settings.arguments as WalletType;
       final walletGroupsDisplayVM = getIt.get<WalletGroupsDisplayViewModel>(param1: type);
 
-      return handleRouteWithPlatformAwareness(
-        (_) => WalletGroupsDisplayPage(
-          walletGroupsDisplayVM,
-        ),
-      );
+      return CupertinoPageRoute<void>(
+          builder: (_) => WalletGroupsDisplayPage(walletGroupsDisplayVM));
 
     case Routes.newWallet:
       final args = settings.arguments as NewWalletArguments;
@@ -231,8 +206,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
       final walletNewVM = getIt.get<WalletNewVM>(param1: args);
       final seedSettingsViewModel = getIt.get<SeedSettingsViewModel>();
 
-      return handleRouteWithPlatformAwareness(
-        (_) => NewWalletPage(
+      return CupertinoPageRoute<void>(
+        builder: (_) => NewWalletPage(
           walletNewVM,
           seedSettingsViewModel,
           isChildWallet: args.isChildWallet,
@@ -256,18 +231,16 @@ Route<dynamic> createRoute(RouteSettings settings) {
         callback = settings.arguments as Function(PinCodeState<PinCodeWidget>, String);
       }
 
-      return handleRouteWithPlatformAwareness(
-        (_) => getIt.get<SetupPinCodePage>(param1: callback),
-      );
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<SetupPinCodePage>(param1: callback));
 
     case Routes.restoreWalletType:
-      return handleRouteWithPlatformAwareness(
-        (_) => getIt.get<NewWalletTypePage>(
+      return CupertinoPageRoute<void>(
+        builder: (_) => getIt.get<NewWalletTypePage>(
           param1: NewWalletTypeArguments(
             onTypeSelected: (BuildContext context, WalletType type) {
               final arg = {'walletType': type};
-              Navigator.of(context).pushNamed(Routes.restoreWallet, arguments: arg);
-            },
+                Navigator.of(context).pushNamed(Routes.restoreWallet, arguments: arg);},
             isCreate: false,
             isHardwareWallet: false,
           ),
@@ -280,62 +253,57 @@ Route<dynamic> createRoute(RouteSettings settings) {
       }
 
       final isNewInstall = settings.arguments as bool;
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<RestoreOptionsPage>(param1: isNewInstall),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true,
+          builder: (_) => getIt.get<RestoreOptionsPage>(param1: isNewInstall));
 
     case Routes.restoreWalletFromSeedKeys:
       if (isSingleCoin) {
-        return handleRouteWithPlatformAwareness(
-          (context) => getIt.get<WalletRestorePage>(param1: availableWalletTypes.first),
-        );
+        return CupertinoPageRoute<void>(
+            builder: (_) => getIt.get<WalletRestorePage>(param1: availableWalletTypes.first));
       }
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<NewWalletTypePage>(
-          param1: NewWalletTypeArguments(
-            onTypeSelected: (BuildContext context, WalletType type) {
-              final arg = {'walletType': type};
-              Navigator.of(context).pushNamed(Routes.restoreWallet, arguments: arg);
-            },
-            isCreate: false,
-            isHardwareWallet: false,
+        return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<NewWalletTypePage>(
+            param1: NewWalletTypeArguments(
+              onTypeSelected: (BuildContext context, WalletType type) {
+                final arg = {'walletType': type};
+                Navigator.of(context).pushNamed(Routes.restoreWallet, arguments: arg);},
+              isCreate: false,
+              isHardwareWallet: false,
+            ),
           ),
-        ),
-      );
+        );
 
     case Routes.restoreWalletFromHardwareWallet:
       if (isSingleCoin) {
         return MaterialPageRoute<void>(
-          builder: (_) => ConnectDevicePage(
-            ConnectDevicePageParams(
-              walletType: availableWalletTypes.first,
-              onConnectDevice: (BuildContext context, _) => Navigator.of(context).pushNamed(
-                  Routes.chooseHardwareWalletAccount,
-                  arguments: [availableWalletTypes.first]),
-              isReconnect: false,
+            builder: (_) => ConnectDevicePage(
+                  ConnectDevicePageParams(
+                    walletType: availableWalletTypes.first,
+                    onConnectDevice: (BuildContext context, _) => Navigator.of(context).pushNamed(
+                        Routes.chooseHardwareWalletAccount,
+                        arguments: [availableWalletTypes.first]),
+                  ),
+                  getIt.get<LedgerViewModel>(),
+                ));
+      }
+        return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<NewWalletTypePage>(
+            param1: NewWalletTypeArguments(
+              onTypeSelected: (BuildContext context, WalletType type) {
+                final arguments = ConnectDevicePageParams(
+                  walletType: type,
+                  onConnectDevice: (BuildContext context, _) => Navigator.of(context)
+                      .pushNamed(Routes.chooseHardwareWalletAccount, arguments: [type]),
+                );
+
+                Navigator.of(context).pushNamed(Routes.connectDevices, arguments: arguments);
+              },
+              isCreate: false,
+              isHardwareWallet: true,
             ),
-            getIt.get<LedgerViewModel>(),
           ),
         );
-      }
-      return CupertinoPageRoute<void>(
-        builder: (_) => getIt.get<NewWalletTypePage>(
-          param1: NewWalletTypeArguments(
-            onTypeSelected: (BuildContext context, WalletType type) {
-              final arguments = ConnectDevicePageParams(
-                walletType: type,
-                onConnectDevice: (BuildContext context, _) => Navigator.of(context)
-                    .pushNamed(Routes.chooseHardwareWalletAccount, arguments: [type]),
-                isReconnect: false,
-              );
-
-              Navigator.of(context).pushNamed(Routes.connectDevices, arguments: arguments);
-            },
-            isCreate: false,
-            isHardwareWallet: true,
-          ),
-        ),
-      );
 
     case Routes.restoreWalletTypeFromQR:
       return CupertinoPageRoute<void>(
@@ -350,9 +318,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
       );
 
     case Routes.seed:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<WalletSeedPage>(param1: settings.arguments as bool),
-      );
+      return MaterialPageRoute<void>(
+          fullscreenDialog: true,
+          builder: (_) => getIt.get<WalletSeedPage>(param1: settings.arguments as bool));
 
     case Routes.restoreWallet:
       final args = settings.arguments as Map<String, dynamic>?;
@@ -378,8 +346,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
       final initialPaymentRequest = args?['paymentRequest'] as PaymentRequest?;
       final coinTypeToSpendFrom = args?['coinTypeToSpendFrom'] as UnspentCoinType?;
 
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<SendPage>(
+      return CupertinoPageRoute<void>(
+        fullscreenDialog: true,
+        builder: (_) => getIt.get<SendPage>(
           param1: initialPaymentRequest,
           param2: coinTypeToSpendFrom,
         ),
@@ -390,12 +359,11 @@ Route<dynamic> createRoute(RouteSettings settings) {
           fullscreenDialog: true, builder: (_) => getIt.get<SendTemplatePage>());
 
     case Routes.receive:
-      return CupertinoPageRoute<void>(builder: (context) => getIt.get<ReceivePage>());
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<ReceivePage>());
 
     case Routes.addressPage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<AddressPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<AddressPage>());
 
     case Routes.transactionDetails:
       return CupertinoPageRoute<void>(
@@ -481,39 +449,32 @@ Route<dynamic> createRoute(RouteSettings settings) {
                   onWillPop: () async => false));
 
     case Routes.silentPaymentsSettings:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<SilentPaymentsSettingsPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<SilentPaymentsSettingsPage>());
 
     case Routes.mwebSettings:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<MwebSettingsPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<MwebSettingsPage>());
 
     case Routes.mwebLogs:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<MwebLogsPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<MwebLogsPage>());
 
     case Routes.mwebNode:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<MwebNodePage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<MwebNodePage>());
 
     case Routes.connectionSync:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<ConnectionSyncPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<ConnectionSyncPage>());
 
     case Routes.securityBackupPage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<SecurityBackupPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<SecurityBackupPage>());
 
     case Routes.privacyPage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<PrivacyPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<PrivacyPage>());
 
     case Routes.trocadorProvidersPage:
       return CupertinoPageRoute<void>(
@@ -524,14 +485,12 @@ Route<dynamic> createRoute(RouteSettings settings) {
           fullscreenDialog: true, builder: (_) => getIt.get<DomainLookupsPage>());
 
     case Routes.displaySettingsPage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<DisplaySettingsPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<DisplaySettingsPage>());
 
     case Routes.otherSettingsPage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<OtherSettingsPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<OtherSettingsPage>());
 
     case Routes.newNode:
       final args = settings.arguments as Map<String, dynamic>?;
@@ -568,9 +527,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
               getIt.get<NanoAccountEditOrCreatePage>(param1: settings.arguments as NanoAccount?));
 
     case Routes.addressBook:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<ContactListPage>(),
-      );
+      return MaterialPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<ContactListPage>());
 
     case Routes.pickerAddressBook:
       final selectedCurrency = settings.arguments as CryptoCurrency?;
@@ -581,14 +539,12 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return MaterialPageRoute<void>(builder: (_) => getIt.get<AddressListPage>());
 
     case Routes.addressBookAddContact:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<ContactPage>(param1: settings.arguments as ContactRecord?),
-      );
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<ContactPage>(param1: settings.arguments as ContactRecord?));
 
     case Routes.showKeys:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<WalletKeysPage>(),
-      );
+      return MaterialPageRoute<void>(
+          builder: (_) => getIt.get<WalletKeysPage>(), fullscreenDialog: true);
 
     case Routes.exchangeTrade:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<ExchangeTradePage>());
@@ -607,9 +563,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.buySellPage:
       final args = settings.arguments as bool;
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<BuySellPage>(param1: args),
-      );
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<BuySellPage>(param1: args));
 
     case Routes.buyOptionsPage:
       final args = settings.arguments as List;
@@ -617,8 +571,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.paymentMethodOptionsPage:
       final args = settings.arguments as List;
-      return MaterialPageRoute<void>(
-          builder: (_) => getIt.get<PaymentMethodOptionsPage>(param1: args));
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<PaymentMethodOptionsPage>(param1: args));
 
     case Routes.buyWebView:
       final args = settings.arguments as List;
@@ -627,8 +580,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
           fullscreenDialog: true, builder: (_) => getIt.get<BuyWebViewPage>(param1: args));
 
     case Routes.exchange:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<ExchangePage>(param1: settings.arguments as PaymentRequest?),
+      return CupertinoPageRoute<void>(
+        fullscreenDialog: true,
+        builder: (_) => getIt.get<ExchangePage>(param1: settings.arguments as PaymentRequest?),
       );
 
     case Routes.exchangeTemplate:
@@ -641,19 +595,21 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return MaterialPageRoute<void>(builder: (_) => getIt.get<FaqPage>());
 
     case Routes.preSeedPage:
-      return MaterialPageRoute<void>(builder: (_) => getIt.get<PreSeedPage>());
+      return MaterialPageRoute<void>(
+          builder: (_) => getIt.get<PreSeedPage>(param1: settings.arguments as int));
 
     case Routes.walletGroupExistingSeedDescriptionPage:
-      return MaterialPageRoute<void>(builder: (_) => WalletGroupExistingSeedDescriptionPage());
+      return MaterialPageRoute<void>(
+          builder: (_) => WalletGroupExistingSeedDescriptionPage(
+              seedPhraseWordsLength: settings.arguments as int));
 
     case Routes.transactionSuccessPage:
       return MaterialPageRoute<void>(
           builder: (_) => getIt.get<TransactionSuccessPage>(param1: settings.arguments as String));
 
     case Routes.backup:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<BackupPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<BackupPage>());
 
     case Routes.editBackupPassword:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<EditBackupPasswordPage>());
@@ -663,23 +619,20 @@ Route<dynamic> createRoute(RouteSettings settings) {
           fullscreenDialog: true, builder: (_) => getIt.get<RestoreFromBackupPage>());
 
     case Routes.support:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<SupportPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<SupportPage>());
 
     case Routes.supportLiveChat:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<SupportChatPage>());
 
     case Routes.supportOtherLinks:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<SupportOtherLinksPage>(),
-      );
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<SupportOtherLinksPage>());
 
     case Routes.unspentCoinsList:
       final coinTypeToSpendFrom = settings.arguments as UnspentCoinType?;
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<UnspentCoinsListPage>(param1: coinTypeToSpendFrom),
-      );
+      return MaterialPageRoute<void>(
+          builder: (_) => getIt.get<UnspentCoinsListPage>(param1: coinTypeToSpendFrom));
 
     case Routes.unspentCoinsDetails:
       final args = settings.arguments as List;
@@ -694,37 +647,29 @@ Route<dynamic> createRoute(RouteSettings settings) {
               ));
 
     case Routes.cakePayCardsPage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<CakePayCardsPage>(),
-      );
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<CakePayCardsPage>());
 
     case Routes.cakePayBuyCardPage:
       final args = settings.arguments as List;
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<CakePayBuyCardPage>(param1: args),
-      );
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<CakePayBuyCardPage>(param1: args));
 
     case Routes.cakePayBuyCardDetailPage:
       final args = settings.arguments as List;
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<CakePayBuyCardDetailPage>(param1: args),
-      );
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<CakePayBuyCardDetailPage>(param1: args));
 
     case Routes.cakePayWelcomePage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<CakePayWelcomePage>(),
+      return CupertinoPageRoute<void>(
+        builder: (_) => getIt.get<CakePayWelcomePage>(),
       );
 
     case Routes.cakePayVerifyOtpPage:
       final args = settings.arguments as List;
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<CakePayVerifyOtpPage>(param1: args),
-      );
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<CakePayVerifyOtpPage>(param1: args));
 
     case Routes.cakePayAccountPage:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<CakePayAccountPage>(),
-      );
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<CakePayAccountPage>());
 
     case Routes.webViewPage:
       final args = settings.arguments as List;
@@ -742,18 +687,17 @@ Route<dynamic> createRoute(RouteSettings settings) {
       final toggleTestnet = args['toggleTestnet'] as Function(bool? val);
       final restoredWallet = args['restoredWallet'] as RestoredWallet?;
 
-      return handleRouteWithPlatformAwareness(
-        (context) => AdvancedPrivacySettingsPage(
-          isFromRestore: isFromRestore,
-          isChildWallet: isChildWallet,
-          useTestnet: useTestnet,
-          toggleUseTestnet: toggleTestnet,
-          advancedPrivacySettingsViewModel:
-              getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
-          nodeViewModel: getIt.get<NodeCreateOrEditViewModel>(param1: type, param2: false),
-          seedSettingsViewModel: getIt.get<SeedSettingsViewModel>(),
-        ),
-      );
+      return CupertinoPageRoute<void>(
+          builder: (_) => AdvancedPrivacySettingsPage(
+                isFromRestore: isFromRestore,
+                isChildWallet: isChildWallet,
+                useTestnet: useTestnet,
+                toggleUseTestnet: toggleTestnet,
+                advancedPrivacySettingsViewModel:
+                    getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
+                nodeViewModel: getIt.get<NodeCreateOrEditViewModel>(param1: type, param2: false),
+                seedSettingsViewModel: getIt.get<SeedSettingsViewModel>(),
+              ));
 
     case Routes.anonPayInvoicePage:
       final args = settings.arguments as List;
@@ -769,14 +713,6 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return CupertinoPageRoute<void>(
           builder: (_) => getIt.get<AnonpayDetailsPage>(param1: anonInvoiceViewData));
 
-    case Routes.payjoinDetails:
-      final arguments = settings.arguments as List;
-      final sessionId = arguments.first as String;
-      final transactionInfo = arguments[1] as TransactionInfo?;
-      return CupertinoPageRoute<void>(
-          builder: (_) =>
-              getIt.get<PayjoinDetailsPage>(param1: sessionId, param2: transactionInfo));
-
     case Routes.desktop_actions:
       return PageRouteBuilder(
         opaque: false,
@@ -808,8 +744,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return MaterialPageRoute<void>(builder: (_) => getIt.get<Setup2FAInfoPage>());
 
     case Routes.urqrAnimatedPage:
-      return MaterialPageRoute<void>(
-          builder: (_) => getIt.get<AnimatedURPage>(param1: settings.arguments));
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<AnimatedURPage>(param1: settings.arguments));
 
     case Routes.homeSettings:
       return CupertinoPageRoute<void>(
@@ -839,7 +774,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.walletConnectConnectionsListing:
       return MaterialPageRoute<void>(
           builder: (_) => WalletConnectConnectionsView(
-                walletKitService: getIt.get<WalletKitService>(),
+                web3walletService: getIt.get<Web3WalletService>(),
                 launchUri: settings.arguments as Uri?,
               ));
 
@@ -858,6 +793,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
         ),
       );
 
+    case Routes.torPage:
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<TorPage>());
+
     case Routes.signPage:
       return MaterialPageRoute<void>(
         builder: (_) => SignPage(
@@ -886,53 +824,15 @@ Route<dynamic> createRoute(RouteSettings settings) {
       );
 
     case Routes.exchangeTradeExternalSendPage:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<ExchangeTradeExternalSendPage>(),
-      );
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<ExchangeTradeExternalSendPage>(),);
 
     case Routes.backgroundSync:
-      return handleRouteWithPlatformAwareness(
-        (context) => getIt.get<BackgroundSyncPage>(),
-      );
-
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true, builder: (_) => getIt.get<BackgroundSyncPage>());
     case Routes.devMoneroBackgroundSync:
       return MaterialPageRoute<void>(
         builder: (_) => getIt.get<DevMoneroBackgroundSyncPage>(),
       );
-    case Routes.devSharedPreferences:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<DevSharedPreferencesPage>(),
-      );
-
-    case Routes.devBackgroundSyncLogs:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<DevBackgroundSyncLogsPage>(),
-      );
-    
-    case Routes.devNetworkRequests:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<DevNetworkRequests>(),
-      );
-    
-    case Routes.devMoneroCallProfiler:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<DevMoneroCallProfilerPage>(),
-      );
-
-    case Routes.devSecurePreferences:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<DevSecurePreferencesPage>(),
-      );
-    
-    case Routes.startTor:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<StartTorPage>(),
-      );
-
-    case Routes.dEuroSavings:
-      return MaterialPageRoute<void>(
-        builder: (_) => getIt.get<DEuroSavingsPage>(),
-      );
 
     default:
       return MaterialPageRoute<void>(
diff --git a/lib/routes.dart b/lib/routes.dart
index 6ff083bda..be5e9f05d 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -15,7 +15,6 @@ class Routes {
   static const dashboard = '/dashboard';
   static const send = '/send';
   static const transactionDetails = '/transaction_info';
-  static const payjoinDetails = '/transaction_info/payjoin';
   static const bumpFeePage = '/bump_fee_page';
   static const receive = '/receive';
   static const newSubaddress = '/new_subaddress';
@@ -110,16 +109,9 @@ class Routes {
   static const walletConnectConnectionsListing = '/wallet-connect-connections-listing';
   static const nftDetailsPage = '/nft_details_page';
   static const importNFTPage = '/import_nft_page';
+  static const torPage = '/tor_page';
   static const backgroundSync = '/background_sync';
-  static const startTor = '/start_tor';
-
   static const devMoneroBackgroundSync = '/dev/monero_background_sync';
-  static const devMoneroCallProfiler = '/dev/monero_call_profiler';
-
-  static const devSharedPreferences = '/dev/shared_preferences';
-  static const devSecurePreferences = '/dev/secure_preferences';
-  static const devBackgroundSyncLogs = '/dev/background_sync_logs';
-  static const devNetworkRequests = '/dev/network_requests';
 
   static const signPage = '/sign_page';
   static const connectDevices = '/device/connect';
@@ -129,6 +121,4 @@ class Routes {
   static const walletGroupExistingSeedDescriptionPage = '/wallet_group_existing_seed_description_page';
   static const walletSeedVerificationPage = '/wallet_seed_verification_page';
   static const exchangeTradeExternalSendPage = '/exchange_trade_external_send_page';
-
-  static const dEuroSavings = '/integration/dEuro/savings';
 }
diff --git a/lib/solana/cw_solana.dart b/lib/solana/cw_solana.dart
index ca001bb3b..937b5b3bf 100644
--- a/lib/solana/cw_solana.dart
+++ b/lib/solana/cw_solana.dart
@@ -99,7 +99,6 @@ class CWSolana extends Solana {
       mint: token.name.toUpperCase(),
       enabled: token.enabled,
       iconPath: token.iconPath,
-      isPotentialScam: token.isPotentialScam,
     );
 
     await (wallet as SolanaWallet).addSPLToken(splToken);
@@ -155,10 +154,4 @@ class CWSolana extends Solana {
   List<String> getDefaultTokenContractAddresses() {
     return DefaultSPLTokens().initialSPLTokens.map((e) => e.mintAddress).toList();
   }
-
-  @override
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) {
-    final solanaWallet = wallet as SolanaWallet;
-    return solanaWallet.splTokenCurrencies.any((element) => element.mintAddress == contractAddress);
-  }
 }
diff --git a/lib/src/screens/Info_page.dart b/lib/src/screens/Info_page.dart
index 07345606b..84b9e8632 100644
--- a/lib/src/screens/Info_page.dart
+++ b/lib/src/screens/Info_page.dart
@@ -1,7 +1,7 @@
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 
@@ -14,6 +14,9 @@ abstract class InfoPage extends BasePage {
   final String imageLightPath;
   final String imageDarkPath;
 
+  Image get imageLight => Image.asset(imageLightPath);
+  Image get imageDark => Image.asset(imageDarkPath);
+
   bool get onWillPop => true;
   String get pageTitle;
   String get pageDescription;
@@ -21,13 +24,6 @@ abstract class InfoPage extends BasePage {
   Key? get buttonKey;
   void Function(BuildContext) get onPressed;
 
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-          (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
-
   @override
   Widget? leading(BuildContext context) => null;
 
@@ -36,10 +32,10 @@ abstract class InfoPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final image = currentTheme.isDark ? imageDarkPath : imageLightPath;
+    final image = currentTheme.type == ThemeType.dark ? imageDark : imageLight;
 
-    return PopScope(
-      canPop: onWillPop,
+    return WillPopScope(
+      onWillPop: () async => onWillPop,
       child: Container(
         alignment: Alignment.center,
         padding: EdgeInsets.all(24),
@@ -51,13 +47,8 @@ abstract class InfoPage extends BasePage {
             children: <Widget>[
               Expanded(
                 child: ConstrainedBox(
-                  constraints: BoxConstraints(
-                    maxHeight: MediaQuery.of(context).size.height * 0.3,
-                  ),
-                  child: AspectRatio(
-                    aspectRatio: 0.9,
-                    child: CakeImageWidget(imageUrl: image),
-                  ),
+                  constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.3),
+                  child: AspectRatio(aspectRatio: 1, child: image),
                 ),
               ),
               Expanded(
@@ -66,7 +57,12 @@ abstract class InfoPage extends BasePage {
                   child: Text(
                     pageDescription,
                     textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(height: 1.6),
+                    style: TextStyle(
+                      height: 1.7,
+                      fontSize: 14,
+                      fontWeight: FontWeight.normal,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                    ),
                   ),
                 ),
               ),
@@ -74,8 +70,8 @@ abstract class InfoPage extends BasePage {
                 key: buttonKey,
                 onPressed: () => onPressed(context),
                 text: buttonText,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
+                color: Theme.of(context).primaryColor,
+                textColor: Colors.white,
               ),
             ],
           ),
diff --git a/lib/src/screens/anonpay_details/anonpay_details_page.dart b/lib/src/screens/anonpay_details/anonpay_details_page.dart
index c07e1dd2c..fc03617fa 100644
--- a/lib/src/screens/anonpay_details/anonpay_details_page.dart
+++ b/lib/src/screens/anonpay_details/anonpay_details_page.dart
@@ -56,7 +56,7 @@ class _AnonpayDetailsPageBodyState extends State<AnonpayDetailsPageBody> {
               id: item.id,
               create: item.createdAt,
               pair: item.pair,
-              currentTheme: widget.anonpayDetailsViewModel.themeStore.currentTheme.type,
+              currentTheme: widget.anonpayDetailsViewModel.settingsStore.currentTheme.type,
               onTap: item.onTap,
             );
           }
diff --git a/lib/src/screens/auth/auth_page.dart b/lib/src/screens/auth/auth_page.dart
index 79130b89d..e2bc1f075 100644
--- a/lib/src/screens/auth/auth_page.dart
+++ b/lib/src/screens/auth/auth_page.dart
@@ -22,7 +22,9 @@ abstract class AuthPageState<T extends StatefulWidget> extends State<T> {
 }
 
 class AuthPage extends StatefulWidget {
-  AuthPage(this.authViewModel, {required this.onAuthenticationFinished, this.closable = true});
+  AuthPage(this.authViewModel,
+      {required this.onAuthenticationFinished,
+        this.closable = true});
 
   final AuthViewModel authViewModel;
   final OnAuthenticationFinished onAuthenticationFinished;
@@ -35,14 +37,16 @@ class AuthPage extends StatefulWidget {
 class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
   final _key = GlobalKey<ScaffoldState>();
   final _pinCodeKey = GlobalKey<PinCodeState>();
-  final _backArrowImageDarkTheme = Image.asset('assets/images/close_button.png');
+  final _backArrowImageDarkTheme =
+      Image.asset('assets/images/close_button.png');
   ReactionDisposer? _reaction;
   Flushbar<void>? _authBar;
   Flushbar<void>? _progressBar;
 
   @override
   void initState() {
-    _reaction ??= reaction((_) => widget.authViewModel.state, (ExecutionState state) {
+    _reaction ??=
+        reaction((_) => widget.authViewModel.state, (ExecutionState state) {
       if (state is ExecutedSuccessfullyState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           widget.onAuthenticationFinished(true, this);
@@ -51,20 +55,20 @@ class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
       }
 
       if (state is IsExecutingState) {
-        WidgetsBinding.instance.addPostFrameCallback(
-          (_) {
-            // null duration to make it indefinite until its disposed
-            _authBar = createBar<void>(S.of(context).authentication, context, duration: null)
-              ..show(context);
-          },
-        );
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          // null duration to make it indefinite until its disposed
+          _authBar =
+              createBar<void>(S.of(context).authentication, duration: null)
+                ..show(context);
+        });
       }
 
       if (state is FailureState) {
         WidgetsBinding.instance.addPostFrameCallback((_) async {
           _pinCodeKey.currentState?.clear();
           dismissFlushBar(_authBar);
-          showBar<void>(context, S.of(context).failed_authentication(state.error));
+          showBar<void>(
+              context, S.of(context).failed_authentication(state.error));
           widget.onAuthenticationFinished(false, this);
         });
       }
@@ -73,12 +77,14 @@ class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
         WidgetsBinding.instance.addPostFrameCallback((_) async {
           _pinCodeKey.currentState?.clear();
           dismissFlushBar(_authBar);
-          showBar<void>(context, S.of(context).failed_authentication(state.error));
+          showBar<void>(
+              context, S.of(context).failed_authentication(state.error));
           widget.onAuthenticationFinished(false, this);
         });
       }
     });
 
+
     if (widget.authViewModel.isBiometricalAuthenticationAllowed) {
       WidgetsBinding.instance.addPostFrameCallback((_) async {
         await Future<void>.delayed(Duration(milliseconds: 100));
@@ -89,8 +95,8 @@ class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
     super.initState();
   }
 
-  Future<void> _showSeedsPopup(BuildContext context, String message) async {
-    await showPopUp<void>(
+   Future<void> _showSeedsPopup(BuildContext context, String message) async {
+      await showPopUp<void>(
         context: context,
         builder: (BuildContext context) {
           return AlertWithTwoActions(
@@ -103,8 +109,8 @@ class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
             },
             actionRightButton: () => Navigator.of(context).pop(),
           );
-        });
-  }
+      });
+    }
 
   @override
   void dispose() {
@@ -115,7 +121,8 @@ class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
   @override
   void changeProcessText(String text) {
     dismissFlushBar(_authBar);
-    _progressBar = createBar<void>(text,context, duration: null)..show(_key.currentContext!);
+    _progressBar = createBar<void>(text, duration: null)
+      ..show(_key.currentContext!);
   }
 
   @override
@@ -156,15 +163,15 @@ class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
                       width: 37,
                       child: InkWell(
                         onTap: () => Navigator.of(context).pop(),
-                        child: _backArrowImageDarkTheme,
+                        child:  _backArrowImageDarkTheme,
                       ),
                     ))
                 : Container(),
-            backgroundColor: Theme.of(context).colorScheme.surface,
+            backgroundColor: Theme.of(context).colorScheme.background,
             border: null),
         resizeToAvoidBottomInset: false,
-        body: PinCode((pin, _) => widget.authViewModel.auth(password: pin), (_) => null,
-            widget.authViewModel.pinLength, false, _pinCodeKey));
+        body: PinCode((pin, _) => widget.authViewModel.auth(password: pin),
+            (_) => null, widget.authViewModel.pinLength, false, _pinCodeKey));
   }
 
   void dismissFlushBar(Flushbar<dynamic>? bar) {
diff --git a/lib/src/screens/backup/backup_page.dart b/lib/src/screens/backup/backup_page.dart
index b4889e7b0..8f520b15f 100644
--- a/lib/src/screens/backup/backup_page.dart
+++ b/lib/src/screens/backup/backup_page.dart
@@ -3,7 +3,9 @@ import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/src/widgets/trail_button.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/utils/clipboard_util.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
@@ -30,72 +32,63 @@ class BackupPage extends BasePage {
       fit: StackFit.expand,
       children: [
         Center(
-          child: Container(
-            padding: EdgeInsets.only(left: 24, right: 24),
-            height: 300,
-            child: Column(
-              children: [
-                Text(
-                  S.of(context).backup_password + ':',
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.headlineMedium,
-                ),
-                Padding(
-                  padding: EdgeInsets.only(top: 20, bottom: 10),
-                  child: Observer(
-                    builder: (_) => GestureDetector(
-                      onTap: () {
-                        ClipboardUtil.setSensitiveDataToClipboard(
-                          ClipboardData(text: backupViewModelBase.backupPassword),
-                        );
-                        showBar<void>(
-                          context,
-                          S.of(context).transaction_details_copied(S.of(context).backup_password),
-                        );
-                      },
-                      child: Text(
-                        backupViewModelBase.backupPassword,
-                        style: Theme.of(context).textTheme.titleLarge,
-                        textAlign: TextAlign.center,
-                      ),
-                    ),
-                  ),
-                ),
-                Padding(
-                  padding: EdgeInsets.all(20),
-                  child: Text(
-                    S.of(context).write_down_backup_password,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
+            child: Container(
+                padding: EdgeInsets.only(left: 24, right: 24),
+                height: 300,
+                child: Column(children: [
+                  Text(
+                    S.of(context).backup_password + ':',
                     textAlign: TextAlign.center,
+                    style: TextStyle(fontSize: 30),
                   ),
-                )
-              ],
-            ),
-          ),
-        ),
+                  Padding(
+                      padding: EdgeInsets.only(top: 20, bottom: 10),
+                      child: Observer(
+                          builder: (_) => GestureDetector(
+                                onTap: () {
+                                  ClipboardUtil.setSensitiveDataToClipboard(
+                                      ClipboardData(
+                                          text: backupViewModelBase
+                                              .backupPassword));
+                                  showBar<void>(
+                                      context,
+                                      S.of(context).transaction_details_copied(
+                                          S.of(context).backup_password));
+                                },
+                                child: Text(
+                                  backupViewModelBase.backupPassword,
+                                  style: TextStyle(fontSize: 26),
+                                  textAlign: TextAlign.center,
+                                ),
+                              ))),
+                  Padding(
+                      padding: EdgeInsets.all(20),
+                      child: Text(
+                        S.of(context).write_down_backup_password,
+                        style: TextStyle(fontSize: 14, color: Colors.grey),
+                        textAlign: TextAlign.center,
+                      ))
+                ]))),
         Positioned(
-          child: Column(
-            children: [
-              PrimaryButton(
-                onPressed: () => Navigator.of(context).pushNamed(Routes.editBackupPassword),
-                text: S.of(context).change_password,
-                color: Theme.of(context).colorScheme.surfaceContainer,
-                textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+          child: Column(children: [
+            PrimaryButton(
+              onPressed: () =>
+                  Navigator.of(context).pushNamed(Routes.editBackupPassword),
+              text: S.of(context).change_password,
+              color: Theme.of(context).cardColor,
+              textColor: Colors.white,
+            ),
+            SizedBox(height: 10),
+            Observer(
+              builder: (_) => LoadingPrimaryButton(
+                isLoading: backupViewModelBase.state is IsExecutingState,
+                onPressed: () => onExportBackup(context),
+                text: S.of(context).export_backup,
+                color: Theme.of(context).primaryColor,
+                textColor: Colors.white,
               ),
-              const SizedBox(height: 10),
-              Observer(
-                builder: (_) => LoadingPrimaryButton(
-                  isLoading: backupViewModelBase.state is IsExecutingState,
-                  onPressed: () => onExportBackup(context),
-                  text: S.of(context).export_backup,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
-                ),
-              ),
-            ],
-          ),
+            ),
+          ]),
           bottom: 24,
           left: 24,
           right: 24,
@@ -106,33 +99,31 @@ class BackupPage extends BasePage {
 
   void onExportBackup(BuildContext context) {
     showPopUp<void>(
-      context: context,
-      builder: (dialogContext) {
-        return AlertWithTwoActions(
-          alertTitle: S.of(context).export_backup,
-          alertContent: S.of(context).save_backup_password,
-          rightButtonText: S.of(context).seed_alert_yes,
-          leftButtonText: S.of(context).seed_alert_back,
-          actionRightButton: () async {
-            Navigator.of(dialogContext).pop();
-            final backup = await backupViewModelBase.exportBackup();
+        context: context,
+        builder: (dialogContext) {
+          return AlertWithTwoActions(
+              alertTitle: S.of(context).export_backup,
+              alertContent: S.of(context).save_backup_password,
+              rightButtonText: S.of(context).seed_alert_yes,
+              leftButtonText: S.of(context).seed_alert_back,
+              actionRightButton: () async {
+                Navigator.of(dialogContext).pop();
+                final backup = await backupViewModelBase.exportBackup();
 
-            if (backup == null) {
-              return;
-            }
+                if (backup == null) {
+                  return;
+                }
 
-            if (Platform.isAndroid) {
-              onExportAndroid(context, backup);
-            } else if (Platform.isIOS) {
-              await share(backup, context);
-            } else {
-              await _saveFile(backup);
-            }
-          },
-          actionLeftButton: () => Navigator.of(dialogContext).pop(),
-        );
-      },
-    );
+                if (Platform.isAndroid) {
+                  onExportAndroid(context, backup);
+                } else if (Platform.isIOS) {
+                  await share(backup, context);
+                } else {
+                  await _saveFile(backup);
+                }
+              },
+              actionLeftButton: () => Navigator.of(dialogContext).pop());
+        });
   }
 
   void onExportAndroid(BuildContext context, BackupExportFile backup) {
@@ -145,9 +136,9 @@ class BackupPage extends BasePage {
               rightButtonText: S.of(context).save_to_downloads,
               leftButtonText: S.of(context).share,
               actionRightButton: () async {
-                await backupViewModelBase.saveToDownload(backup.name, backup.file);
+                await backupViewModelBase.saveToDownload(
+                    backup.name, backup.file);
                 Navigator.of(dialogContext).pop();
-                await showBar<void>(context, S.of(context).file_saved);
               },
               actionLeftButton: () async {
                 Navigator.of(dialogContext).pop();
@@ -158,13 +149,15 @@ class BackupPage extends BasePage {
 
   Future<void> share(BackupExportFile backup, BuildContext context) async {
     final path = await backupViewModelBase.saveBackupFileLocally(backup);
-    await ShareUtil.shareFile(filePath: path, fileName: backup.name, context: context);
+    await ShareUtil.shareFile(
+        filePath: path, fileName: backup.name, context: context);
     await backupViewModelBase.removeBackupFileLocally(backup);
   }
 
   Future<void> _saveFile(BackupExportFile backup) async {
-    String? outputFile = await FilePicker.platform
-        .saveFile(dialogTitle: 'Save Your File to desired location', fileName: backup.name);
+    String? outputFile = await FilePicker.platform.saveFile(
+        dialogTitle: 'Save Your File to desired location',
+        fileName: backup.name);
 
     try {
       await backup.file.copy(outputFile!);
diff --git a/lib/src/screens/backup/edit_backup_password_page.dart b/lib/src/screens/backup/edit_backup_password_page.dart
index 30ce91a22..93207c191 100644
--- a/lib/src/screens/backup/edit_backup_password_page.dart
+++ b/lib/src/screens/backup/edit_backup_password_page.dart
@@ -1,5 +1,5 @@
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -7,13 +7,14 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/view_model/edit_backup_password_view_model.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class EditBackupPasswordPage extends BasePage {
   EditBackupPasswordPage(this.editBackupPasswordViewModel)
       : textEditingController = TextEditingController() {
     textEditingController.text = editBackupPasswordViewModel.backupPassword;
-    textEditingController
-        .addListener(() => editBackupPasswordViewModel.backupPassword = textEditingController.text);
+    textEditingController.addListener(() => editBackupPasswordViewModel
+        .backupPassword = textEditingController.text);
   }
 
   final EditBackupPasswordViewModel editBackupPasswordViewModel;
@@ -25,41 +26,34 @@ class EditBackupPasswordPage extends BasePage {
   @override
   Widget body(BuildContext context) {
     return Padding(
-      padding: EdgeInsets.only(left: 24, right: 24),
-      child: Stack(
-        fit: StackFit.expand,
-        children: [
-          Center(
-            child: Observer(
-              builder: (_) => BaseTextFormField(
-                autofocus: true,
-                enableSuggestions: false,
-                autocorrect: false,
-                keyboardType: TextInputType.visiblePassword,
-                controller: textEditingController,
-                textStyle: Theme.of(context).textTheme.titleLarge?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurface,
-                    ),
-              ),
-            ),
-          ),
-          Positioned(
-            child: Observer(
-              builder: (_) => PrimaryButton(
-                onPressed: () => onSave(context),
-                text: S.of(context).save,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
-                isDisabled: !editBackupPasswordViewModel.canSave,
-              ),
-            ),
-            bottom: 24,
-            left: 0,
-            right: 0,
-          )
-        ],
-      ),
-    );
+        padding: EdgeInsets.only(left: 24, right: 24),
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            Center(
+                child: Observer(
+                    builder: (_) => TextFormField(
+                        autofocus: true,
+                        enableSuggestions: false,
+                        autocorrect: false,
+                        keyboardType: TextInputType.visiblePassword,
+                        controller: textEditingController,
+                        style: TextStyle(
+                            fontSize: 26,
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)))),
+            Positioned(
+                child: Observer(
+                    builder: (_) => PrimaryButton(
+                        onPressed: () => onSave(context),
+                        text: S.of(context).save,
+                        color: Theme.of(context).primaryColor,
+                        textColor: Colors.white,
+                        isDisabled: !editBackupPasswordViewModel.canSave)),
+                bottom: 24,
+                left: 0,
+                right: 0)
+          ],
+        ));
   }
 
   void onSave(BuildContext context) {
@@ -74,9 +68,7 @@ class EditBackupPasswordPage extends BasePage {
               actionRightButton: () async {
                 await editBackupPasswordViewModel.save();
                 Navigator.of(dialogContext).pop();
-                if (context.mounted) {
-                  Navigator.of(context).pop();
-                }
+                Navigator.of(context).pop();
               },
               actionLeftButton: () => Navigator.of(dialogContext).pop());
         });
diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
index 24bd8c48a..fbf4bb1fa 100644
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@@ -1,9 +1,9 @@
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/route_aware.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/src/widgets/nav_bar.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
@@ -14,7 +14,8 @@ abstract class BasePage extends StatelessWidget {
   final GlobalKey<ScaffoldState> _scaffoldKey;
 
   final Image closeButtonImage = Image.asset('assets/images/close_button.png');
-  final Image closeButtonImageDarkTheme = Image.asset('assets/images/close_button_dark_theme.png');
+  final Image closeButtonImageDarkTheme =
+      Image.asset('assets/images/close_button_dark_theme.png');
 
   String? get title => null;
 
@@ -44,22 +45,30 @@ abstract class BasePage extends StatelessWidget {
 
   Widget Function(BuildContext, Widget)? get rootWrapper => null;
 
-  MaterialThemeBase get currentTheme => getIt.get<ThemeStore>().currentTheme;
+  ThemeBase get currentTheme => getIt.get<SettingsStore>().currentTheme;
 
   void onOpenEndDrawer() => _scaffoldKey.currentState!.openEndDrawer();
 
   void onClose(BuildContext context) => Navigator.of(context).pop();
 
   Color pageBackgroundColor(BuildContext context) =>
-      (currentTheme.isDark ? backgroundDarkColor : backgroundLightColor) ??
-      (gradientBackground ? Colors.transparent : Theme.of(context).colorScheme.surface);
+      (currentTheme.type == ThemeType.dark
+          ? backgroundDarkColor
+          : backgroundLightColor) ??
+      (gradientBackground && currentTheme.type == ThemeType.bright
+          ? Colors.transparent
+          : Theme.of(context).colorScheme.background);
 
-  Color titleColor(BuildContext context) => Theme.of(context).colorScheme.onSurface;
+  Color titleColor(BuildContext context) =>
+      (gradientBackground && currentTheme.type == ThemeType.bright) ||
+              (gradientAll && currentTheme.brightness == Brightness.light)
+          ? Colors.white
+          : Theme.of(context).appBarTheme.titleTextStyle!.color!;
 
   Color? pageIconColor(BuildContext context) => titleColor(context);
 
   Widget closeButton(BuildContext context) => Image.asset(
-        currentTheme.isDark
+        currentTheme.type == ThemeType.dark
             ? 'assets/images/close_button_dark_theme.png'
             : 'assets/images/close_button.png',
         color: pageIconColor(context),
@@ -86,9 +95,9 @@ abstract class BasePage extends StatelessWidget {
           child: Semantics(
             label: S.of(context).seed_alert_back,
             child: TextButton(
-              style: TextButton.styleFrom(
-                foregroundColor: Theme.of(context).colorScheme.onSurface,
-                overlayColor: WidgetStateColor.resolveWith((states) => Colors.transparent),
+              style: ButtonStyle(
+                overlayColor: MaterialStateColor.resolveWith(
+                    (states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
               child: backButton(context),
@@ -104,11 +113,11 @@ abstract class BasePage extends StatelessWidget {
         ? null
         : Text(
             title!,
-            style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                  fontSize: 18.0,
-                  fontWeight: FontWeight.w600,
-                  color: titleColor(context),
-                ),
+            style: TextStyle(
+                fontSize: 18.0,
+                fontWeight: FontWeight.bold,
+                fontFamily: 'Lato',
+                color: titleColor(context)),
           );
   }
 
diff --git a/lib/src/screens/buy/buy_sell_page.dart b/lib/src/screens/buy/buy_sell_page.dart
index c14df4d50..9d0f17ee3 100644
--- a/lib/src/screens/buy/buy_sell_page.dart
+++ b/lib/src/screens/buy/buy_sell_page.dart
@@ -14,6 +14,12 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/provider_optoin_tile.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/trail_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/src/screens/send/widgets/extract_address_from_parsed.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/view_model/buy/buy_sell_view_model.dart';
@@ -37,6 +43,17 @@ class BuySellPage extends BasePage {
   final _cryptoAddressFocus = FocusNode();
   var _isReactionsSet = false;
 
+  final arrowBottomPurple = Image.asset(
+    'assets/images/arrow_bottom_purple_icon.png',
+    color: Colors.white,
+    height: 8,
+  );
+  final arrowBottomCakeGreen = Image.asset(
+    'assets/images/arrow_bottom_cake_green.png',
+    color: Colors.white,
+    height: 8,
+  );
+
   late final String? depositWalletName;
   late final String? receiveWalletName;
 
@@ -78,11 +95,11 @@ class BuySellPage extends BasePage {
   Widget? leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).colorScheme.onSurface,
+      color: titleColor(context),
       size: 16,
     );
     final _closeButton =
-        buySellViewModel.isDarkTheme ? closeButtonImageDarkTheme : closeButtonImage;
+        currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
     bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
 
@@ -96,7 +113,7 @@ class BuySellPage extends BasePage {
             label: !isMobileView ? S.of(context).close : S.of(context).seed_alert_back,
             child: TextButton(
               style: ButtonStyle(
-                overlayColor: WidgetStateColor.resolveWith((states) => Colors.transparent),
+                overlayColor: MaterialStateColor.resolveWith((states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
               child: !isMobileView ? _closeButton : _backButton,
@@ -112,94 +129,53 @@ class BuySellPage extends BasePage {
     WidgetsBinding.instance.addPostFrameCallback((_) => _setReactions(context, buySellViewModel));
 
     return KeyboardActions(
-      disableScroll: true,
-      config: KeyboardActionsConfig(
-          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).colorScheme.surface,
-          nextFocus: false,
-          actions: [
-            KeyboardActionsItem(
-                focusNode: _fiatAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]),
-            KeyboardActionsItem(
-                focusNode: _cryptoAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()])
-          ]),
-      child: Container(
-        color: Theme.of(context).colorScheme.surface,
-        child: Form(
-          key: _formKey,
-          child: ScrollableWithBottomSection(
-            contentPadding: EdgeInsets.only(bottom: 24),
-            content: Observer(
-              builder: (_) => Column(
-                children: [
-                  _exchangeCardsSection(context),
-                  Padding(
-                    padding: EdgeInsets.symmetric(horizontal: 24),
-                    child: Column(
-                      children: [
-                        SizedBox(height: 12),
-                        _buildPaymentMethodTile(context),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-            bottomSection: Observer(
-              builder: (_) => Column(
-                children: [
-                  if (buySellViewModel.isBuySellQuotFailed)
-                    Padding(
-                      padding: EdgeInsets.only(bottom: 15),
-                      child: Row(
-                        children: [
-                          Expanded(
-                            child: Container(
-                              alignment: Alignment.centerRight,
-                              child: Icon(
-                                Icons.warning_amber_rounded,
-                                color: Theme.of(context).colorScheme.error,
-                                size: 26,
-                              ),
+        disableScroll: true,
+        config: KeyboardActionsConfig(
+            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
+            nextFocus: false,
+            actions: [
+              KeyboardActionsItem(
+                  focusNode: _fiatAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]),
+              KeyboardActionsItem(
+                  focusNode: _cryptoAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()])
+            ]),
+        child: Container(
+          color: Theme.of(context).colorScheme.background,
+          child: Form(
+              key: _formKey,
+              child: ScrollableWithBottomSection(
+                contentPadding: EdgeInsets.only(bottom: 24),
+                content: Observer(
+                    builder: (_) => Column(children: [
+                          _exchangeCardsSection(context),
+                          Padding(
+                            padding: EdgeInsets.symmetric(horizontal: 24),
+                            child: Column(
+                              children: [
+                                SizedBox(height: 12),
+                                _buildPaymentMethodTile(context),
+                              ],
                             ),
                           ),
-                          Expanded(
-                            flex: 8,
-                            child: Text(
-                              S.of(context).buy_sell_pair_is_not_supported_warning,
-                              textAlign: TextAlign.center,
-                              softWrap: true,
-                              overflow: TextOverflow.ellipsis,
-                              maxLines: 3,
-                              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    color: Theme.of(context).colorScheme.error,
-                                    fontWeight: FontWeight.w500,
-                                  ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  LoadingPrimaryButton(
-                    text: S.current.choose_a_provider,
-                    onPressed: () async {
-                      if (!_formKey.currentState!.validate()) return;
-                      buySellViewModel.onTapChoseProvider(context);
-                    },
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
-                    isDisabled: buySellViewModel.isBuySellQuotFailed,
-                    isLoading:
-                        !buySellViewModel.isReadyToTrade && !buySellViewModel.isBuySellQuotFailed,
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
+                        ])),
+                bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+                bottomSection: Column(children: [
+                  Observer(
+                      builder: (_) => LoadingPrimaryButton(
+                          text: S.current.choose_a_provider,
+                          onPressed: () async {
+                            if(!_formKey.currentState!.validate()) return;
+                            buySellViewModel.onTapChoseProvider(context);
+                          },
+                          color: Theme.of(context).primaryColor,
+                          textColor: Colors.white,
+                          isDisabled: buySellViewModel.isBuySellQuotFailed,
+                          isLoading: !buySellViewModel.isReadyToTrade &&
+                              !buySellViewModel.isBuySellQuotFailed)),
+                ]),
+              )),
+        ));
   }
 
   Widget _buildPaymentMethodTile(BuildContext context) {
@@ -218,21 +194,21 @@ class BuySellPage extends BasePage {
     }
     if (buySellViewModel.paymentMethodState is PaymentMethodLoaded &&
         buySellViewModel.selectedPaymentMethod != null) {
-      final selectedPaymentMethod = buySellViewModel.selectedPaymentMethod!;
-      return ProviderOptionTile(
-        lightImagePath: selectedPaymentMethod.lightIconPath,
-        darkImagePath: selectedPaymentMethod.darkIconPath,
-        title: selectedPaymentMethod.title,
-        onPressed: () => _pickPaymentMethod(context),
-        leadingIcon: Icons.arrow_forward_ios,
-        isLightMode: !buySellViewModel.isDarkTheme,
-        borderRadius: 30,
-        padding: EdgeInsets.symmetric(horizontal: 24, vertical: 8),
-        titleTextStyle: Theme.of(context).textTheme.titleMedium?.copyWith(
-              color: Theme.of(context).colorScheme.onSurface,
-              fontWeight: FontWeight.w600,
-            ),
-      );
+      return Observer(builder: (_) {
+        final selectedPaymentMethod = buySellViewModel.selectedPaymentMethod!;
+        return ProviderOptionTile(
+          lightImagePath: selectedPaymentMethod.lightIconPath,
+          darkImagePath: selectedPaymentMethod.darkIconPath,
+          title: selectedPaymentMethod.title,
+          onPressed: () => _pickPaymentMethod(context),
+          leadingIcon: Icons.arrow_forward_ios,
+          isLightMode: !buySellViewModel.isDarkTheme,
+          borderRadius: 30,
+          padding: EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+          titleTextStyle:
+          textLargeBold(color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+        );
+      });
     }
     return OptionTilePlaceholder(errorText: 'No payment methods available', borderRadius: 30);
   }
@@ -268,17 +244,19 @@ class BuySellPage extends BasePage {
     _onCurrencyChange(buySellViewModel.fiatCurrency, buySellViewModel, fiatCurrencyKey);
 
     reaction(
-        (_) => buySellViewModel.wallet.name,
-        (String _) => _onWalletNameChange(
-            buySellViewModel, buySellViewModel.cryptoCurrency, cryptoCurrencyKey));
+            (_) => buySellViewModel.wallet.name,
+            (String _) =>
+            _onWalletNameChange(buySellViewModel, buySellViewModel.cryptoCurrency, cryptoCurrencyKey));
 
     reaction(
         (_) => buySellViewModel.cryptoCurrency,
         (CryptoCurrency currency) =>
             _onCurrencyChange(currency, buySellViewModel, cryptoCurrencyKey));
 
-    reaction((_) => buySellViewModel.fiatCurrency,
-        (FiatCurrency currency) => _onCurrencyChange(currency, buySellViewModel, fiatCurrencyKey));
+    reaction(
+        (_) => buySellViewModel.fiatCurrency,
+        (FiatCurrency currency) =>
+            _onCurrencyChange(currency, buySellViewModel, fiatCurrencyKey));
 
     reaction((_) => buySellViewModel.fiatAmount, (String amount) {
       if (fiatCurrencyKey.currentState!.amountController.text != amount) {
@@ -304,13 +282,13 @@ class BuySellPage extends BasePage {
 
     fiatAmountController.addListener(() {
       if (fiatAmountController.text != buySellViewModel.fiatAmount) {
-        buySellViewModel.changeFiatAmount(amount: fiatAmountController.text);
+          buySellViewModel.changeFiatAmount(amount: fiatAmountController.text);
       }
     });
 
     cryptoAmountController.addListener(() {
       if (cryptoAmountController.text != buySellViewModel.cryptoAmount) {
-        buySellViewModel.changeCryptoAmount(amount: cryptoAmountController.text);
+          buySellViewModel.changeCryptoAmount(amount: cryptoAmountController.text);
       }
     });
 
@@ -322,7 +300,7 @@ class BuySellPage extends BasePage {
       if (!_cryptoAddressFocus.hasFocus && cryptoAddressController.text.isNotEmpty) {
         final domain = cryptoAddressController.text;
         buySellViewModel.cryptoCurrencyAddress =
-            await fetchParsedAddress(context, domain, buySellViewModel.cryptoCurrency);
+        await fetchParsedAddress(context, domain, buySellViewModel.cryptoCurrency);
       }
     });
 
@@ -351,16 +329,15 @@ class BuySellPage extends BasePage {
     _isReactionsSet = true;
   }
 
-  void _onCurrencyChange(
-      Currency currency, BuySellViewModel buySellViewModel, GlobalKey<ExchangeCardState> key) {
+  void _onCurrencyChange(Currency currency, BuySellViewModel buySellViewModel,
+      GlobalKey<ExchangeCardState> key) {
     final isCurrentTypeWallet = currency == buySellViewModel.wallet.currency;
 
     key.currentState!.changeSelectedCurrency(currency);
     key.currentState!.changeWalletName(isCurrentTypeWallet ? buySellViewModel.wallet.name : '');
 
     key.currentState!.changeAddress(
-        address:
-            isCurrentTypeWallet ? buySellViewModel.wallet.walletAddresses.addressForExchange : '');
+        address: isCurrentTypeWallet ? buySellViewModel.wallet.walletAddresses.addressForExchange : '');
 
     key.currentState!.changeAmount(amount: '');
   }
@@ -371,8 +348,7 @@ class BuySellPage extends BasePage {
 
     if (isCurrentTypeWallet) {
       key.currentState!.changeWalletName(buySellViewModel.wallet.name);
-      key.currentState!.addressController.text =
-          buySellViewModel.wallet.walletAddresses.addressForExchange;
+      key.currentState!.addressController.text = buySellViewModel.wallet.walletAddresses.addressForExchange;
     } else if (key.currentState!.addressController.text ==
         buySellViewModel.wallet.walletAddresses.addressForExchange) {
       key.currentState!.changeWalletName('');
@@ -384,77 +360,67 @@ class BuySellPage extends BasePage {
 
   Widget _exchangeCardsSection(BuildContext context) {
     final fiatExchangeCard = Observer(
-      builder: (_) => ExchangeCard(
-        cardInstanceName: 'fiat_currency_trade_card',
-        onDispose: disposeBestRateSync,
-        amountFocusNode: _fiatAmountFocus,
-        key: fiatCurrencyKey,
-        title: 'FIAT ${S.of(context).amount}',
-        initialCurrency: buySellViewModel.fiatCurrency,
-        initialWalletName: '',
-        initialAddress: '',
-        initialIsAmountEditable: true,
-        isAmountEstimated: false,
-        currencyRowPadding: EdgeInsets.zero,
-        addressRowPadding: EdgeInsets.zero,
-        isMoneroWallet: buySellViewModel.wallet == WalletType.monero,
-        showAddressField: false,
-        showLimitsField: false,
-        currencies: buySellViewModel.fiatCurrencies,
-        onCurrencySelected: (currency) => buySellViewModel.changeFiatCurrency(currency: currency),
-        imageArrow: Image.asset(
-          'assets/images/arrow_bottom_purple_icon.png',
-          color: Theme.of(context).colorScheme.onSurface,
-          height: 8,
-        ),
-        currencyButtonColor: Colors.transparent,
-        addressButtonsColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-        borderColor: Theme.of(context).colorScheme.outlineVariant,
-        onPushPasteButton: (context) async {},
-        onPushAddressBookButton: (context) async {},
-        fillColor: buySellViewModel.isBuyAction
-            ? Theme.of(context).colorScheme.surfaceContainer
-            : Theme.of(context).colorScheme.surfaceContainerLow,
-      ),
-    );
+        builder: (_) => ExchangeCard(
+              cardInstanceName: 'fiat_currency_trade_card',
+              onDispose: disposeBestRateSync,
+              amountFocusNode: _fiatAmountFocus,
+              key: fiatCurrencyKey,
+              title: 'FIAT ${S.of(context).amount}',
+              initialCurrency: buySellViewModel.fiatCurrency,
+              initialWalletName: '',
+              initialAddress: '',
+              initialIsAmountEditable: true,
+              isAmountEstimated: false,
+              currencyRowPadding: EdgeInsets.zero,
+              addressRowPadding: EdgeInsets.zero,
+              isMoneroWallet: buySellViewModel.wallet == WalletType.monero,
+              showAddressField: false,
+              showLimitsField: false,
+              currencies: buySellViewModel.fiatCurrencies,
+              onCurrencySelected: (currency) =>
+                  buySellViewModel.changeFiatCurrency(currency: currency),
+              imageArrow: arrowBottomPurple,
+              currencyButtonColor: Colors.transparent,
+              addressButtonsColor:
+                  Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
+              borderColor:
+                  Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
+              onPushPasteButton: (context) async {},
+              onPushAddressBookButton: (context) async {},
+            ));
 
     final cryptoExchangeCard = Observer(
-      builder: (_) => ExchangeCard(
-        cardInstanceName: 'crypto_currency_trade_card',
-        onDispose: disposeBestRateSync,
-        amountFocusNode: _cryptoAmountFocus,
-        addressFocusNode: _cryptoAddressFocus,
-        key: cryptoCurrencyKey,
-        title: 'Crypto ${S.of(context).amount}',
-        initialCurrency: buySellViewModel.cryptoCurrency,
-        initialWalletName: '',
-        initialAddress: buySellViewModel.cryptoCurrency == buySellViewModel.wallet.currency
-            ? buySellViewModel.wallet.walletAddresses.addressForExchange
-            : buySellViewModel.cryptoCurrencyAddress,
-        initialIsAmountEditable: true,
-        isAmountEstimated: true,
-        showLimitsField: false,
-        currencyRowPadding: EdgeInsets.zero,
-        addressRowPadding: EdgeInsets.zero,
-        isMoneroWallet: buySellViewModel.wallet == WalletType.monero,
-        currencies: buySellViewModel.cryptoCurrencies,
-        onCurrencySelected: (currency) => buySellViewModel.changeCryptoCurrency(currency: currency),
-        imageArrow: Image.asset(
-          'assets/images/arrow_bottom_cake_green.png',
-          color: Theme.of(context).colorScheme.onSurface,
-          height: 8,
-        ),
-        currencyButtonColor: Colors.transparent,
-        addressButtonsColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-        borderColor: Theme.of(context).colorScheme.outlineVariant,
-        addressTextFieldValidator: AddressValidator(type: buySellViewModel.cryptoCurrency),
-        onPushPasteButton: (context) async {},
-        onPushAddressBookButton: (context) async {},
-        fillColor: buySellViewModel.isBuyAction
-            ? Theme.of(context).colorScheme.surfaceContainerLow
-            : Theme.of(context).colorScheme.surfaceContainer,
-      ),
-    );
+        builder: (_) => ExchangeCard(
+              cardInstanceName: 'crypto_currency_trade_card',
+              onDispose: disposeBestRateSync,
+              amountFocusNode: _cryptoAmountFocus,
+              addressFocusNode: _cryptoAddressFocus,
+              key: cryptoCurrencyKey,
+              title: 'Crypto ${S.of(context).amount}',
+              initialCurrency: buySellViewModel.cryptoCurrency,
+              initialWalletName: '',
+              initialAddress: buySellViewModel.cryptoCurrency == buySellViewModel.wallet.currency
+                  ? buySellViewModel.wallet.walletAddresses.addressForExchange
+                  : buySellViewModel.cryptoCurrencyAddress,
+              initialIsAmountEditable: true,
+              isAmountEstimated: true,
+              showLimitsField: false,
+              currencyRowPadding: EdgeInsets.zero,
+              addressRowPadding: EdgeInsets.zero,
+              isMoneroWallet: buySellViewModel.wallet == WalletType.monero,
+              currencies: buySellViewModel.cryptoCurrencies,
+              onCurrencySelected: (currency) =>
+                  buySellViewModel.changeCryptoCurrency(currency: currency),
+              imageArrow: arrowBottomCakeGreen,
+              currencyButtonColor: Colors.transparent,
+              addressButtonsColor:
+                  Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
+              borderColor:
+                  Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderBottomPanelColor,
+              addressTextFieldValidator: AddressValidator(type: buySellViewModel.cryptoCurrency),
+              onPushPasteButton: (context) async {},
+              onPushAddressBookButton: (context) async {},
+            ));
 
     if (responsiveLayoutUtil.shouldRenderMobileUI) {
       return Observer(
@@ -488,19 +454,11 @@ class BuySellPage extends BasePage {
           return DesktopExchangeCardsSection(
             firstExchangeCard: fiatExchangeCard,
             secondExchangeCard: cryptoExchangeCard,
-            onBuyTap: () => null,
-            onSellTap: () =>
-                buySellViewModel.isBuyAction ? buySellViewModel.changeBuySellAction() : null,
-            isBuySellOption: true,
           );
         } else {
           return DesktopExchangeCardsSection(
             firstExchangeCard: cryptoExchangeCard,
             secondExchangeCard: fiatExchangeCard,
-            onBuyTap: () =>
-                !buySellViewModel.isBuyAction ? buySellViewModel.changeBuySellAction() : null,
-            onSellTap: () => null,
-            isBuySellOption: true,
           );
         }
       },
diff --git a/lib/src/screens/buy/buy_webview_page.dart b/lib/src/screens/buy/buy_webview_page.dart
index 488408d5c..5bca7a2ed 100644
--- a/lib/src/screens/buy/buy_webview_page.dart
+++ b/lib/src/screens/buy/buy_webview_page.dart
@@ -19,6 +19,9 @@ class BuyWebViewPage extends BasePage {
   @override
   String get title => S.current.buy;
 
+  @override
+  Color get backgroundDarkColor => Colors.white;
+
   @override
   Widget body(BuildContext context) =>
       BuyWebViewPageBody(buyViewModel, ordersStore: ordersStore, url: url);
diff --git a/lib/src/screens/buy/widgets/buy_list_item.dart b/lib/src/screens/buy/widgets/buy_list_item.dart
new file mode 100644
index 000000000..d41325ce8
--- /dev/null
+++ b/lib/src/screens/buy/widgets/buy_list_item.dart
@@ -0,0 +1,148 @@
+import 'package:cake_wallet/buy/buy_provider.dart';
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class BuyListItem extends StatelessWidget {
+  BuyListItem({
+    required this.selectedProvider,
+    required this.provider,
+    required this.sourceAmount,
+    required this.sourceCurrency,
+    required this.destAmount,
+    required this.destCurrency,
+    required this.achSourceAmount,
+    this.onTap
+  });
+
+  final BuyProvider? selectedProvider;
+  final BuyProvider provider;
+  final double sourceAmount;
+  final FiatCurrency sourceCurrency;
+  final double destAmount;
+  final CryptoCurrency destCurrency;
+  final double achSourceAmount;
+  final VoidCallback? onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final isSelected = selectedProvider?.providerDescription == provider.providerDescription;
+    final iconColor = isSelected ? Colors.white : Colors.black;
+
+    final providerIcon =  Image.asset('assets/images/wyre-icon.png', width: 36, height: 36);
+
+    final backgroundColor = isSelected
+          ? Palette.greyBlueCraiola
+          : Palette.shadowWhite;
+
+    final primaryTextColor = isSelected
+          ? Colors.white
+          : Palette.darkGray;
+
+    final secondaryTextColor = isSelected
+          ? Colors.white
+          : Palette.darkBlueCraiola;
+
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        padding: EdgeInsets.only(
+          left: 20,
+          top: 28,
+          bottom: 28,
+          right: 20
+        ),
+        decoration: BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(25)),
+            color: backgroundColor
+        ),
+        child: Column(
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              mainAxisSize: MainAxisSize.max,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (providerIcon != null)
+                      Padding(
+                          padding: EdgeInsets.only(right: 10),
+                          child: providerIcon),
+                    Text(
+                      provider.title,
+                      style: TextStyle(
+                          color: secondaryTextColor,
+                          fontSize: 20,
+                          fontWeight: FontWeight.bold),
+                    )
+                  ],
+                ),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    if(achSourceAmount != null)...[
+                    Text(
+                      '${destAmount?.toString()} ${destCurrency.title}',
+                      style: TextStyle(
+                          color: secondaryTextColor,
+                          fontSize: 20,
+                          fontWeight: FontWeight.bold),
+                    ),
+                    Row(
+                      children: [
+                        Icon(
+                          Icons.account_balance_outlined, 
+                          size: 12, 
+                          color: primaryTextColor,
+                        ),
+                        SizedBox(width: 5),
+                        Text(
+                          '${achSourceAmount?.toString()} ${sourceCurrency.title}',
+                          style: TextStyle(
+                              color: primaryTextColor,
+                              fontSize: 16,
+                              fontWeight: FontWeight.bold),
+                        ),
+                      ],
+                    ),
+                    SizedBox(height: 10),
+                    ],
+                    Text(
+                      '${destAmount?.toString()} ${destCurrency.title}',
+                      style: TextStyle(
+                          color: secondaryTextColor,
+                          fontSize: 20,
+                          fontWeight: FontWeight.bold),
+                    ),
+                    Row(
+                      children: [
+                        Icon(
+                          CupertinoIcons.creditcard, 
+                          size: 12, 
+                          color: primaryTextColor,
+                        ), 
+                        SizedBox(width: 5),
+                        Text(
+                          '${sourceAmount?.toString()} ${sourceCurrency.title}',
+                          style: TextStyle(
+                              color: primaryTextColor,
+                              fontSize: 16,
+                              fontWeight: FontWeight.bold),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ],
+        ),
+      )
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/src/screens/cake_pay/auth/cake_pay_account_page.dart b/lib/src/screens/cake_pay/auth/cake_pay_account_page.dart
index 68914402e..4a958a661 100644
--- a/lib/src/screens/cake_pay/auth/cake_pay_account_page.dart
+++ b/lib/src/screens/cake_pay/auth/cake_pay_account_page.dart
@@ -1,9 +1,11 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/cake_pay/widgets/cake_pay_tile.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/view_model/cake_pay/cake_pay_account_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -13,6 +15,8 @@ class CakePayAccountPage extends BasePage {
 
   final CakePayAccountViewModel cakePayAccountViewModel;
 
+
+
   @override
   Widget leading(BuildContext context) {
     return MergeSemantics(
@@ -25,7 +29,7 @@ class CakePayAccountPage extends BasePage {
             label: S.of(context).seed_alert_back,
             child: TextButton(
               style: ButtonStyle(
-                overlayColor: WidgetStateColor.resolveWith(
+                overlayColor: MaterialStateColor.resolveWith(
                         (states) => Colors.transparent),
               ),
               onPressed: () => Navigator.pop(context),
@@ -41,9 +45,8 @@ class CakePayAccountPage extends BasePage {
   Widget middle(BuildContext context) {
     return Text(
       S.current.account,
-      style:  Theme.of(context).textTheme.titleMedium?.copyWith(
-        color: Theme.of(context).colorScheme.onSurface,
-        fontWeight: FontWeight.w600,
+      style: textMediumSemiBold(
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
@@ -56,20 +59,15 @@ class CakePayAccountPage extends BasePage {
         children: [
           SizedBox(height: 20),
           Observer(
-            builder: (_) => Container(
-              decoration: BoxDecoration(
-                border: Border(
-                  bottom: BorderSide(
+            builder: (_) => Container(decoration: BoxDecoration(
+              border: Border(
+                bottom: BorderSide(
                     width: 1.0,
-                    color: Theme.of(context).colorScheme.outlineVariant,
-                  ),
-                ),
-              ),
-              child: CakePayTile(
-                title: S.of(context).email_address, 
-                subTitle: cakePayAccountViewModel.email
+                    color:
+                    Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
               ),
             ),
+                child: CakePayTile(title: S.of(context).email_address, subTitle: cakePayAccountViewModel.email)),
           ),
         ],
       ),
@@ -77,8 +75,8 @@ class CakePayAccountPage extends BasePage {
       bottomSection: Column(
         children: [
           PrimaryButton(
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
+            color: Theme.of(context).primaryColor,
+            textColor: Colors.white,
             text: S.of(context).logout,
             onPressed: () {
               cakePayAccountViewModel.logout();
diff --git a/lib/src/screens/cake_pay/auth/cake_pay_verify_otp_page.dart b/lib/src/screens/cake_pay/auth/cake_pay_verify_otp_page.dart
index 15a20b80a..34b02db93 100644
--- a/lib/src/screens/cake_pay/auth/cake_pay_verify_otp_page.dart
+++ b/lib/src/screens/cake_pay/auth/cake_pay_verify_otp_page.dart
@@ -1,11 +1,14 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/cake_pay/cake_pay_states.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/cake_pay/cake_pay_auth_view_model.dart';
@@ -39,7 +42,7 @@ class CakePayVerifyOtpPage extends BasePage {
     return Text(
       S.current.verification,
       style: textMediumSemiBold(
-        color: Theme.of(context).colorScheme.onSurface,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
@@ -60,7 +63,7 @@ class CakePayVerifyOtpPage extends BasePage {
     return KeyboardActions(
       config: KeyboardActionsConfig(
           keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).colorScheme.surface,
+          keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
           nextFocus: false,
           actions: [
             KeyboardActionsItem(
@@ -70,7 +73,7 @@ class CakePayVerifyOtpPage extends BasePage {
           ]),
       child: Container(
         height: 0,
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).colorScheme.background,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.all(24),
           content: Column(
@@ -85,9 +88,7 @@ class CakePayVerifyOtpPage extends BasePage {
               SizedBox(height: 14),
               Text(
                 S.of(context).fill_code,
-                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(color: Color(0xff7A93BA), fontSize: 12),
               ),
               SizedBox(height: 34),
               Row(
@@ -99,9 +100,7 @@ class CakePayVerifyOtpPage extends BasePage {
                     onTap: () => _authViewModel.logIn(_email),
                     child: Text(
                       S.of(context).resend_code,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            color: Theme.of(context).colorScheme.primary,
-                          ),
+                      style: textSmallSemiBold(color: Palette.blueCraiola),
                     ),
                   ),
                 ],
@@ -120,8 +119,8 @@ class CakePayVerifyOtpPage extends BasePage {
                       onPressed: _verify,
                       isDisabled: _authViewModel.otpState is CakePayOtpSendDisabled,
                       isLoading: _authViewModel.otpState is CakePayOtpValidating,
-                      color: Theme.of(context).colorScheme.primary,
-                      textColor: Theme.of(context).colorScheme.onPrimary,
+                      color: Theme.of(context).primaryColor,
+                      textColor: Colors.white,
                     ),
                   ),
                   SizedBox(height: 20),
@@ -146,7 +145,8 @@ class CakePayVerifyOtpPage extends BasePage {
         });
   }
 
-  void _onOtpSuccessful(BuildContext context) => Navigator.pop(context);
+  void _onOtpSuccessful(BuildContext context) =>
+      Navigator.pop(context);
 
   void _verify() async => await _authViewModel.verifyEmail(_codeController.text);
 }
diff --git a/lib/src/screens/cake_pay/auth/cake_pay_welcome_page.dart b/lib/src/screens/cake_pay/auth/cake_pay_welcome_page.dart
index a445371f3..cd893daf4 100644
--- a/lib/src/screens/cake_pay/auth/cake_pay_welcome_page.dart
+++ b/lib/src/screens/cake_pay/auth/cake_pay_welcome_page.dart
@@ -7,6 +7,7 @@ import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/cake_pay/cake_pay_auth_view_model.dart';
@@ -33,7 +34,7 @@ class CakePayWelcomePage extends BasePage {
     return Text(
       S.current.welcome_to_cakepay,
       style: textMediumSemiBold(
-        color: Theme.of(context).colorScheme.onSurface,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       ),
     );
   }
@@ -67,12 +68,12 @@ class CakePayWelcomePage extends BasePage {
           Text(
             S.of(context).about_cake_pay,
             style: textLarge(
-              color: Theme.of(context).colorScheme.onSurface,
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
             ),
           ),
           SizedBox(height: 20),
           Text(S.of(context).cake_pay_account_note,
-              style: textLarge(color: Theme.of(context).colorScheme.onSurface)),
+              style: textLarge(color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
         ],
       ),
       bottomSectionPadding: EdgeInsets.symmetric(vertical: 36, horizontal: 24),
@@ -87,8 +88,8 @@ class CakePayWelcomePage extends BasePage {
                   onPressed: _login,
                   isLoading:
                       _authViewModel.userVerificationState is CakePayUserVerificationStateLoading,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
+                  color: Theme.of(context).primaryColor,
+                  textColor: Colors.white,
                 ),
               ),
               SizedBox(
diff --git a/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart b/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart
index 99ecd63f8..bd1840974 100644
--- a/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart
+++ b/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart
@@ -15,6 +15,9 @@ import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/number_text_fild_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -57,10 +60,11 @@ class CakePayBuyCardPage extends BasePage {
       title,
       textAlign: TextAlign.center,
       maxLines: 2,
-      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-            color: Theme.of(context).colorScheme.onSurface,
-            fontWeight: FontWeight.w600,
-          ),
+      style: TextStyle(
+          fontSize: 18.0,
+          fontWeight: FontWeight.bold,
+          fontFamily: 'Lato',
+          color: titleColor(context)),
     );
   }
 
@@ -78,7 +82,7 @@ class CakePayBuyCardPage extends BasePage {
       disableScroll: true,
       config: KeyboardActionsConfig(
           keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).colorScheme.surface,
+          keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
           nextFocus: false,
           actions: [
             KeyboardActionsItem(
@@ -87,7 +91,7 @@ class CakePayBuyCardPage extends BasePage {
             ),
           ]),
       child: Container(
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).colorScheme.background,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.zero,
           content: Column(
@@ -99,8 +103,8 @@ class CakePayBuyCardPage extends BasePage {
                     decoration: BoxDecoration(
                       gradient: LinearGradient(
                         colors: [
-                          Theme.of(context).colorScheme.primary,
-                          Theme.of(context).colorScheme.secondary,
+                          Theme.of(context).extension<SendPageTheme>()!.firstGradientColor,
+                          Theme.of(context).extension<SendPageTheme>()!.secondGradientColor,
                         ],
                         begin: Alignment.topLeft,
                         end: Alignment.bottomRight,
@@ -141,13 +145,12 @@ class CakePayBuyCardPage extends BasePage {
                     children: [
                       SizedBox(height: 24),
                       Expanded(
-                        child: Text(
-                          S.of(context).enter_amount,
-                          style: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                                fontSize: 24,
-                                fontWeight: FontWeight.w600,
-                              ),
-                        ),
+                        child: Text(S.of(context).enter_amount,
+                            style: TextStyle(
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              fontSize: 24,
+                              fontWeight: FontWeight.w600,
+                            )),
                       ),
                       card.denominations.isNotEmpty
                           ? Expanded(
@@ -184,22 +187,16 @@ class CakePayBuyCardPage extends BasePage {
                                 padding: const EdgeInsets.only(bottom: 8.0),
                                 child: Container(
                                   decoration: BoxDecoration(
-                                    color: Theme.of(context).colorScheme.primary,
+                                    color: Theme.of(context).primaryColor,
                                     borderRadius: BorderRadius.circular(10),
-                                    border: Border.all(
-                                      color:
-                                          Theme.of(context).colorScheme.onPrimary.withOpacity(0.20),
-                                    ),
+                                    border: Border.all(color: Colors.white.withOpacity(0.20)),
                                   ),
                                   child: Padding(
                                     padding: const EdgeInsets.all(8.0),
                                     child: Text(
                                       vendor.cakeWarnings!,
                                       textAlign: TextAlign.center,
-                                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                            color: Theme.of(context).colorScheme.onPrimary,
-                                            fontWeight: FontWeight.w600,
-                                          ),
+                                      style: textSmallSemiBold(color: Colors.white),
                                     ),
                                   ),
                                 ),
@@ -208,10 +205,13 @@ class CakePayBuyCardPage extends BasePage {
                               child: SingleChildScrollView(
                                 child: ClickableLinksText(
                                   text: card.description ?? '',
-                                  textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                        fontSize: 18,
-                                      ),
+                                  textStyle: TextStyle(
+                                    color: Theme.of(context)
+                                        .extension<CakeTextTheme>()!
+                                        .secondaryTextColor,
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.w400,
+                                  ),
                                 ),
                               ),
                             ),
@@ -235,8 +235,8 @@ class CakePayBuyCardPage extends BasePage {
                         : navigateToCakePayBuyCardDetailPage(context, card),
                     text: S.of(context).buy_now,
                     isDisabled: !cakePayBuyCardViewModel.isEnablePurchase,
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
+                    color: Theme.of(context).primaryColor,
+                    textColor: Colors.white,
                   ),
                 );
               }),
@@ -358,7 +358,8 @@ class _DenominationsAmountWidget extends StatelessWidget {
                   items: denominations,
                   itemPrefix: fiatCurrency,
                   selectedItem: denominations.first,
-                  textStyle: textMediumSemiBold(color: Theme.of(context).colorScheme.onSurface),
+                  textStyle: textMediumSemiBold(
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                   onItemSelected: (value) {
                     amountController.text = value;
                     onAmountChanged(value);
@@ -373,12 +374,14 @@ class _DenominationsAmountWidget extends StatelessWidget {
                   decoration: BoxDecoration(
                     border: Border(
                       top: BorderSide(
-                          width: 1.0, color: Theme.of(context).colorScheme.onSurfaceVariant),
+                          width: 1.0,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
                     ),
                   ),
                   child: Text(S.of(context).choose_card_value + ':',
                       maxLines: 2,
-                      style: textSmall(color: Theme.of(context).colorScheme.onSurfaceVariant)),
+                      style: textSmall(
+                          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor)),
                 ),
               ),
             ],
@@ -405,12 +408,14 @@ class _DenominationsAmountWidget extends StatelessWidget {
                   decoration: BoxDecoration(
                     border: Border(
                       top: BorderSide(
-                          width: 1.0, color: Theme.of(context).colorScheme.onSurfaceVariant),
+                          width: 1.0,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
                     ),
                   ),
                   child: Text(S.of(context).quantity + ':',
                       maxLines: 1,
-                      style: textSmall(color: Theme.of(context).colorScheme.onSurfaceVariant)),
+                      style: textSmall(
+                          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor)),
                 ),
               ),
             ],
@@ -429,7 +434,8 @@ class _DenominationsAmountWidget extends StatelessWidget {
                               '$fiatCurrency ${cakePayBuyCardViewModel.totalAmount}',
                               maxLines: 1,
                               style: textMediumSemiBold(
-                                  color: Theme.of(context).colorScheme.onSurface)))),
+                                  color:
+                                      Theme.of(context).extension<CakeTextTheme>()!.titleColor)))),
                 ),
                 const SizedBox(height: 4),
                 Expanded(
@@ -438,12 +444,16 @@ class _DenominationsAmountWidget extends StatelessWidget {
                     decoration: BoxDecoration(
                       border: Border(
                         top: BorderSide(
-                            width: 1.0, color: Theme.of(context).colorScheme.onSurfaceVariant),
+                            width: 1.0,
+                            color:
+                                Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
                       ),
                     ),
                     child: Text(S.of(context).total + ':',
                         maxLines: 1,
-                        style: textSmall(color: Theme.of(context).colorScheme.onSurfaceVariant)),
+                        style: textSmall(
+                            color:
+                                Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor)),
                   ),
                 ),
               ],
@@ -477,7 +487,9 @@ class _EnterAmountWidget extends StatelessWidget {
         Container(
           decoration: BoxDecoration(
             border: Border(
-              bottom: BorderSide(width: 1.0, color: Theme.of(context).colorScheme.onSurfaceVariant),
+              bottom: BorderSide(
+                  width: 1.0,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
             ),
           ),
           child: BaseTextFormField(
@@ -485,16 +497,19 @@ class _EnterAmountWidget extends StatelessWidget {
             keyboardType: TextInputType.numberWithOptions(signed: false, decimal: true),
             hintText: '0.00',
             maxLines: null,
+            borderColor: Colors.transparent,
             prefixIcon: Padding(
               padding: const EdgeInsets.only(top: 12),
               child: Text(
                 '$fiatCurrency: ',
-                style: textMediumSemiBold(color: Theme.of(context).colorScheme.onSurface),
+                style: textMediumSemiBold(
+                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
               ),
             ),
-            textStyle: textMediumSemiBold(color: Theme.of(context).colorScheme.onSurface),
-            placeholderTextStyle:
-                textMediumSemiBold(color: Theme.of(context).colorScheme.onSurfaceVariant),
+            textStyle:
+                textMediumSemiBold(color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+            placeholderTextStyle: textMediumSemiBold(
+                color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
             inputFormatters: [
               FilteringTextInputFormatter.deny(RegExp('[\-|\ ]')),
               FilteringTextInputFormatter.allow(
@@ -508,9 +523,11 @@ class _EnterAmountWidget extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text(S.of(context).min_amount(minValue) + ' $fiatCurrency',
-                style: textSmall(color: Theme.of(context).colorScheme.onSurfaceVariant)),
+                style: textSmall(
+                    color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor)),
             Text(S.of(context).max_amount(maxValue) + ' $fiatCurrency',
-                style: textSmall(color: Theme.of(context).colorScheme.onSurfaceVariant)),
+                style: textSmall(
+                    color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor)),
           ],
         ),
       ],
diff --git a/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart b/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
index cf75cfdb0..450fa5281 100644
--- a/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
+++ b/lib/src/screens/cake_pay/cards/cake_pay_cards_page.dart
@@ -7,10 +7,14 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/cake_pay/widgets/card_item.dart';
 import 'package:cake_wallet/src/screens/cake_pay/widgets/card_menu.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/filter_widget.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/cake_scrollbar.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/debounce.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -56,7 +60,7 @@ class CakePayCardsPage extends BasePage {
     return Text(
       'Cake Pay',
       style: textMediumSemiBold(
-        color: Theme.of(context).colorScheme.onSurface,
+        color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
       ),
     );
   }
@@ -64,70 +68,66 @@ class CakePayCardsPage extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     return _TrailingIcon(
-      asset: 'assets/images/profile.png',
-      iconColor: Theme.of(context).colorScheme.onSurface,
-      onPressed: () {
-        _cardsListViewModel.isCakePayUserAuthenticated().then(
-          (value) {
+        asset: 'assets/images/profile.png',
+        iconColor: pageIconColor(context) ?? Colors.white,
+        onPressed: () {
+          _cardsListViewModel.isCakePayUserAuthenticated().then((value) {
             if (value) {
               Navigator.pushNamed(context, Routes.cakePayAccountPage);
               return;
             }
             Navigator.pushNamed(context, Routes.cakePayWelcomePage);
-          },
-        );
-      },
-    );
+          });
+        });
   }
 
   @override
   Widget body(BuildContext context) {
-    if (_cardsListViewModel.settingsStore.selectedCakePayCountry == null) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        reaction((_) => _cardsListViewModel.shouldShowCountryPicker,
-            (bool shouldShowCountryPicker) async {
-          if (shouldShowCountryPicker) {
-            _cardsListViewModel.storeInitialFilterStates();
-            await showCountryPicker(context, _cardsListViewModel);
-            if (_cardsListViewModel.hasFiltersChanged) {
-              _cardsListViewModel.resetLoadingNextPageState();
-              _cardsListViewModel.getVendors();
-            }
 
-            _cardsListViewModel.settingsStore.selectedCakePayCountry =
-                _cardsListViewModel.selectedCountry;
+    if (_cardsListViewModel.settingsStore.selectedCakePayCountry == null) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      reaction((_) => _cardsListViewModel.shouldShowCountryPicker, (bool shouldShowCountryPicker) async {
+        if (shouldShowCountryPicker) {
+          _cardsListViewModel.storeInitialFilterStates();
+          await showCountryPicker(context, _cardsListViewModel);
+          if (_cardsListViewModel.hasFiltersChanged) {
+            _cardsListViewModel.resetLoadingNextPageState();
+            _cardsListViewModel.getVendors();
           }
-        });
+
+          _cardsListViewModel.settingsStore.selectedCakePayCountry =
+              _cardsListViewModel.selectedCountry;
+
+        }
       });
+    });
     }
 
     final filterButton = Semantics(
       label: S.of(context).filter_by,
       child: GestureDetector(
-        onTap: () async {
-          _cardsListViewModel.storeInitialFilterStates();
-          await showFilterWidget(context);
-          if (_cardsListViewModel.hasFiltersChanged) {
-            _cardsListViewModel.resetLoadingNextPageState();
-            _cardsListViewModel.getVendors();
-          }
-        },
-        child: Container(
-          width: 32,
-          padding: EdgeInsets.only(top: 7, bottom: 7),
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.surface,
-            border: Border.all(
-              color: Colors.transparent,
-            ),
-            borderRadius: BorderRadius.circular(10),
-          ),
-          child: Image.asset(
-            'assets/images/filter_icon.png',
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-          ),
-        ),
-      ),
+          onTap: () async {
+            _cardsListViewModel.storeInitialFilterStates();
+            await showFilterWidget(context);
+            if (_cardsListViewModel.hasFiltersChanged) {
+              _cardsListViewModel.resetLoadingNextPageState();
+              _cardsListViewModel.getVendors();
+            }
+          },
+          child: Container(
+              width: 32,
+              padding: EdgeInsets.only(top: 7, bottom: 7),
+              decoration: BoxDecoration(
+                color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+                border: Border.all(
+                  color: Colors.transparent,
+                ),
+                borderRadius: BorderRadius.circular(10),
+              ),
+              child: Image.asset(
+                'assets/images/filter_icon.png',
+                color: Theme.of(context).extension<FilterTheme>()!.iconColor,
+              ))),
     );
     final _countryPicker = Semantics(
       label: S.of(context).filter_by,
@@ -143,7 +143,7 @@ class CakePayCardsPage extends BasePage {
         child: Container(
           padding: EdgeInsets.symmetric(horizontal: 8),
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.surface,
+            color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
             border: Border.all(color: Colors.transparent),
             borderRadius: BorderRadius.circular(10),
           ),
@@ -163,10 +163,11 @@ class CakePayCardsPage extends BasePage {
                 SizedBox(width: 6),
                 Text(
                   _cardsListViewModel.selectedCountry.countryCode,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w700,
-                      ),
+                  style: TextStyle(
+                    color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                    fontSize: 16,
+                    fontWeight: FontWeight.w700,
+                  ),
                 ),
               ],
             ),
@@ -176,32 +177,25 @@ class CakePayCardsPage extends BasePage {
     );
 
     return Padding(
-      padding: const EdgeInsets.all(14.0),
-      child: Column(
-        children: [
+        padding: const EdgeInsets.all(14.0),
+        child: Column(children: [
           Container(
-            padding: EdgeInsets.only(left: 2, right: 22),
-            height: 32,
-            child: Row(
-              children: [
+              padding: EdgeInsets.only(left: 2, right: 22),
+              height: 32,
+              child: Row(children: [
                 Expanded(
-                  child: _SearchWidget(
-                    controller: _searchController,
-                    focusNode: searchFocusNode,
-                  ),
-                ),
+                    child: _SearchWidget(
+                  controller: _searchController,
+                  focusNode: searchFocusNode,
+                )),
                 SizedBox(width: 5),
                 filterButton,
                 SizedBox(width: 5),
                 _countryPicker
-              ],
-            ),
-          ),
+              ])),
           SizedBox(height: 8),
           Expanded(child: CakePayCardsPageBody(cardsListViewModel: _cardsListViewModel))
-        ],
-      ),
-    );
+        ]));
   }
 
   Future<void> showFilterWidget(BuildContext context) async {
@@ -214,25 +208,26 @@ class CakePayCardsPage extends BasePage {
   }
 }
 
-Future<void> showCountryPicker(
-    BuildContext context, CakePayCardsListViewModel cardsListViewModel) async {
+
+Future<void> showCountryPicker(BuildContext context, CakePayCardsListViewModel cardsListViewModel) async {
   await showPopUp<void>(
       context: context,
       builder: (_) => Picker(
-          title: S.of(context).select_your_country,
+        title: S.of(context).select_your_country,
           items: cardsListViewModel.availableCountries,
           images: cardsListViewModel.availableCountries
               .map((e) => Image.asset(
-                    e.iconPath,
-                    errorBuilder: (context, error, stackTrace) => Container(
-                      width: 58,
-                      height: 58,
-                    ),
-                  ))
+            e.iconPath,
+            errorBuilder: (context, error, stackTrace) => Container(
+              width: 58,
+              height: 58,
+            ),
+          ))
               .toList(),
-          selectedAtIndex:
-              cardsListViewModel.availableCountries.indexOf(cardsListViewModel.selectedCountry),
-          onItemSelected: (Country country) => cardsListViewModel.setSelectedCountry(country),
+          selectedAtIndex: cardsListViewModel.availableCountries
+              .indexOf(cardsListViewModel.selectedCountry),
+          onItemSelected: (Country country) =>
+              cardsListViewModel.setSelectedCountry(country),
           isSeparated: false,
           hintText: S.of(context).search,
           matchingCriteria: (Country country, String searchText) =>
@@ -315,9 +310,10 @@ class _CakePayCardsPageBodyState extends State<CakePayCardsPageBody> {
                 },
                 title: vendor.name,
                 subTitle: vendor.card?.description ?? '',
-                backgroundColor: Theme.of(context).colorScheme.surface,
-                titleColor: Theme.of(context).colorScheme.onSurface,
-                subtitleColor: Theme.of(context).colorScheme.onSecondary,
+                backgroundColor:
+                    Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+                titleColor: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                subtitleColor: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
                 discount: 0.0,
               );
             },
@@ -328,8 +324,10 @@ class _CakePayCardsPageBodyState extends State<CakePayCardsPageBody> {
                   thumbHeight: thumbHeight,
                   rightOffset: 1,
                   width: 3,
-                  backgroundColor: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.05),
-                  thumbColor: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.5),
+                  backgroundColor:
+                      Theme.of(context).extension<FilterTheme>()!.iconColor.withOpacity(0.05),
+                  thumbColor:
+                      Theme.of(context).extension<FilterTheme>()!.iconColor.withOpacity(0.5),
                   fromTop: widget.cardsListViewModel.scrollOffsetFromTop,
                 )
               : Offstage()
@@ -345,8 +343,9 @@ class _VendorLoadedIndicator extends StatelessWidget {
   Widget build(BuildContext context) {
     return Center(
       child: CircularProgressIndicator(
-        backgroundColor: Theme.of(context).colorScheme.onSurface,
-        valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).colorScheme.primary),
+        backgroundColor: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+        valueColor: AlwaysStoppedAnimation<Color>(
+            Theme.of(context).extension<ExchangePageTheme>()!.firstGradientBottomPanelColor),
       ),
     );
   }
@@ -363,23 +362,41 @@ class _SearchWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BaseTextFormField(
-      focusNode: focusNode,
-      textStyle: Theme.of(context).textTheme.bodyMedium,
-      controller: controller,
-      contentPadding: EdgeInsets.only(top: 8, left: 8),
-      hintText: S.of(context).search,
-      placeholderTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            color: Theme.of(context).colorScheme.onSurface,
-          ),
-      alignLabelWithHint: true,
-      floatingLabelBehavior: FloatingLabelBehavior.never,
-      suffixIcon: ExcludeSemantics(
-        child: Icon(
-          Icons.search,
-          color: Theme.of(context).colorScheme.primary,
+    final searchIcon = ExcludeSemantics(
+        child: Icon( Icons.search,
+          color: Theme.of(context).extension<FilterTheme>()!.iconColor,
+          //size: 24
         ),
-      ),
+    );
+
+    return TextField(
+      focusNode: focusNode,
+      style: TextStyle(color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
+      controller: controller,
+      decoration: InputDecoration(
+          filled: true,
+          contentPadding: EdgeInsets.only(
+            top: 8,
+            left: 8,
+          ),
+          fillColor: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+          hintText: S.of(context).search,
+          hintStyle: TextStyle(
+            color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+          ),
+          alignLabelWithHint: true,
+          floatingLabelBehavior: FloatingLabelBehavior.never,
+          suffixIcon: searchIcon,
+          enabledBorder: OutlineInputBorder(
+            borderSide: BorderSide(
+              color: Colors.transparent,
+            ),
+            borderRadius: BorderRadius.circular(10),
+          ),
+          focusedBorder: OutlineInputBorder(
+            borderSide: BorderSide(color: Colors.white.withOpacity(0.2)),
+            borderRadius: BorderRadius.circular(10),
+          )),
     );
   }
 }
diff --git a/lib/src/screens/cake_pay/cards/cake_pay_confirm_purchase_card_page.dart b/lib/src/screens/cake_pay/cards/cake_pay_confirm_purchase_card_page.dart
index bf37dfa18..9ae2acf8e 100644
--- a/lib/src/screens/cake_pay/cards/cake_pay_confirm_purchase_card_page.dart
+++ b/lib/src/screens/cake_pay/cards/cake_pay_confirm_purchase_card_page.dart
@@ -1,6 +1,6 @@
-import 'package:cake_wallet/cake_pay/cake_pay_card.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/cake_pay/cake_pay_card.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/cake_pay/widgets/cake_pay_alert_modal.dart';
@@ -15,6 +15,10 @@ import 'package:cake_wallet/src/widgets/bottom_sheet/info_bottom_sheet_widget.da
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/cake_pay/cake_pay_purchase_view_model.dart';
 import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
@@ -38,10 +42,11 @@ class CakePayBuyCardDetailPage extends BasePage {
       title,
       textAlign: TextAlign.center,
       maxLines: 2,
-      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-            color: Theme.of(context).colorScheme.onSurface,
-            fontWeight: FontWeight.bold,
-          ),
+      style: TextStyle(
+          fontSize: 18.0,
+          fontWeight: FontWeight.bold,
+          fontFamily: 'Lato',
+          color: titleColor(context)),
     );
   }
 
@@ -67,11 +72,9 @@ class CakePayBuyCardDetailPage extends BasePage {
                   BorderRadius.horizontal(left: Radius.circular(20), right: Radius.circular(20)),
               child: Container(
                 decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.surfaceContainerLowest,
+                  color: Theme.of(context).extension<PickerTheme>()!.searchBackgroundFillColor,
                   borderRadius: BorderRadius.circular(20),
-                  border: Border.all(
-                    color: Theme.of(context).colorScheme.outline.withOpacity(0.20),
-                  ),
+                  border: Border.all(color: Colors.white.withOpacity(0.20)),
                 ),
                 child: Row(
                   children: [
@@ -101,16 +104,16 @@ class CakePayBuyCardDetailPage extends BasePage {
                             children: [
                               Text(
                                 S.of(context).value + ':',
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                    ),
+                                style: textLarge(
+                                    color:
+                                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                               SizedBox(width: 8),
                               Text(
                                 '${cakePayPurchaseViewModel.amount.toStringAsFixed(2)} ${cakePayPurchaseViewModel.fiatCurrency}',
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                    ),
+                                style: textLarge(
+                                    color:
+                                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             ],
                           ),
@@ -119,16 +122,16 @@ class CakePayBuyCardDetailPage extends BasePage {
                             children: [
                               Text(
                                 S.of(context).quantity + ':',
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                    ),
+                                style: textLarge(
+                                    color:
+                                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                               SizedBox(width: 8),
                               Text(
                                 '${cakePayPurchaseViewModel.quantity}',
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                    ),
+                                style: textLarge(
+                                    color:
+                                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             ],
                           ),
@@ -137,16 +140,16 @@ class CakePayBuyCardDetailPage extends BasePage {
                             children: [
                               Text(
                                 S.of(context).total + ':',
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                    ),
+                                style: textLarge(
+                                    color:
+                                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                               SizedBox(width: 8),
                               Text(
                                 '${cakePayPurchaseViewModel.totalAmount.toStringAsFixed(2)} ${cakePayPurchaseViewModel.fiatCurrency}',
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                    ),
+                                style: textLarge(
+                                    color:
+                                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             ],
                           ),
@@ -173,17 +176,15 @@ class CakePayBuyCardDetailPage extends BasePage {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Text(S.of(context).expiry_and_validity + ':',
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                              color: Theme.of(context).colorScheme.onSurface,
-                              fontWeight: FontWeight.w600,
-                            )),
+                        style: textMediumSemiBold(
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
                     SizedBox(height: 10),
                     Container(
                       width: double.infinity,
                       decoration: BoxDecoration(
                         border: Border(
                           bottom: BorderSide(
-                            color: Theme.of(context).colorScheme.outline.withOpacity(0.20),
+                            color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
                             width: 1,
                           ),
                         ),
@@ -192,9 +193,9 @@ class CakePayBuyCardDetailPage extends BasePage {
                         padding: const EdgeInsets.only(bottom: 8.0),
                         child: Text(
                           card.expiryAndValidity ?? '',
-                          style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
+                          style: textMedium(
+                            color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                          ),
                         ),
                       ),
                     ),
@@ -215,21 +216,18 @@ class CakePayBuyCardDetailPage extends BasePage {
                     cakePayPurchaseViewModel.sendViewModel.state is IsExecutingState,
                 onPressed: () => confirmPurchaseFirst(context),
                 text: S.of(context).purchase_gift_card,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
+                color: Theme.of(context).primaryColor,
+                textColor: Colors.white,
               );
             }),
           ),
           SizedBox(height: 8),
           InkWell(
             onTap: () => _showTermsAndCondition(context, card.termsAndConditions),
-            child: Text(
-              S.of(context).settings_terms_and_conditions,
-              style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                    color: Theme.of(context).colorScheme.primary,
-                    fontWeight: FontWeight.w600,
-                  ),
-            ),
+            child: Text(S.of(context).settings_terms_and_conditions,
+                style: textMediumSemiBold(
+                  color: Theme.of(context).primaryColor,
+                ).copyWith(fontSize: 12)),
           ),
           SizedBox(height: 16)
         ],
@@ -247,14 +245,11 @@ class CakePayBuyCardDetailPage extends BasePage {
               alignment: Alignment.bottomLeft,
               child: ClickableLinksText(
                 text: termsAndConditions ?? '',
-                textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          fontSize: 18,
-                        ) ??
-                    Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          fontSize: 18,
-                        ),
+                textStyle: TextStyle(
+                  color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                  fontSize: 18,
+                  fontWeight: FontWeight.w400,
+                ),
               ),
             ),
             actionTitle: S.of(context).agree,
@@ -316,8 +311,9 @@ class CakePayBuyCardDetailPage extends BasePage {
       } catch (_) {
         await cakePayPurchaseViewModel.cakePayService.logout();
       }
-    }
-    cakePayPurchaseViewModel.isPurchasing = false;
+
+   }
+   cakePayPurchaseViewModel.isPurchasing = false;
   }
 
   void _showHowToUseCard(
@@ -334,27 +330,23 @@ class CakePayBuyCardDetailPage extends BasePage {
                   padding: EdgeInsets.all(10),
                   child: Text(
                     card.name,
-                    style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontWeight: FontWeight.w600,
-                        ),
+                    style: textLargeSemiBold(
+                      color: Theme.of(context).extension<ReceivePageTheme>()!.tilesTextColor,
+                    ),
                   )),
               ClickableLinksText(
                 text: card.howToUse ?? '',
-                textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ) ??
-                    Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
-                linkStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontStyle: FontStyle.italic,
-                        ) ??
-                    Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontStyle: FontStyle.italic,
-                        ),
+                textStyle: TextStyle(
+                  color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                  fontSize: 18,
+                  fontWeight: FontWeight.w400,
+                ),
+                linkStyle: TextStyle(
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                  fontSize: 18,
+                  fontStyle: FontStyle.italic,
+                  fontWeight: FontWeight.w400,
+                ),
               ),
             ]),
             actionTitle: S.current.got_it,
@@ -389,7 +381,6 @@ class CakePayBuyCardDetailPage extends BasePage {
         return ConfirmSendingBottomSheet(
           key: ValueKey('send_page_confirm_sending_dialog_key'),
           currentTheme: currentTheme,
-          walletType: cakePayPurchaseViewModel.sendViewModel.walletType,
           paymentId: S.of(popupContext).payment_id,
           paymentIdValue: order?.orderId,
           expirationTime: cakePayPurchaseViewModel.formattedRemainingTime,
@@ -398,12 +389,10 @@ class CakePayBuyCardDetailPage extends BasePage {
           currency: cakePayPurchaseViewModel.sendViewModel.selectedCryptoCurrency,
           amount: S.of(popupContext).send_amount,
           amountValue: cakePayPurchaseViewModel.sendViewModel.pendingTransaction!.amountFormatted,
-          fiatAmountValue:
-              cakePayPurchaseViewModel.sendViewModel.pendingTransactionFiatAmountFormatted,
+          fiatAmountValue: cakePayPurchaseViewModel.sendViewModel.pendingTransactionFiatAmountFormatted,
           fee: S.of(popupContext).send_fee,
           feeValue: cakePayPurchaseViewModel.sendViewModel.pendingTransaction!.feeFormatted,
-          feeFiatAmount:
-              cakePayPurchaseViewModel.sendViewModel.pendingTransactionFeeFiatAmountFormatted,
+          feeFiatAmount: cakePayPurchaseViewModel.sendViewModel.pendingTransactionFeeFiatAmountFormatted,
           outputs: cakePayPurchaseViewModel.sendViewModel.outputs,
           onSlideComplete: () async {
             Navigator.of(popupContext).pop();
@@ -542,15 +531,19 @@ class ThreeCheckboxAlert extends BaseAlertDialog {
 
   @override
   String get titleText => alertTitle;
+
   @override
   bool get isDividerExists => true;
 
   @override
   String get leftActionButtonText => leftButtonText;
+
   @override
   String get rightActionButtonText => rightButtonText;
+
   @override
   VoidCallback get actionLeft => actionLeftButton;
+
   @override
   VoidCallback get actionRight => () {
         actionRightButton(checkbox1, checkbox2, checkbox3);
@@ -668,19 +661,21 @@ class _ThreeCheckboxAlertContentState extends State<ThreeCheckboxAlertContent> {
           GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () => launchUrl(
-              Uri.parse("https://www.cakepay.com/terms/"),
+              Uri.parse("https://cakepay.com/cakepay-web-terms.txt"),
               mode: LaunchMode.externalApplication,
             ),
             child: Padding(
               padding: const EdgeInsets.only(top: 8.0),
               child: Text(
                 S.of(context).settings_terms_and_conditions,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      fontSize: 16,
-                      color: Theme.of(context).colorScheme.primary,
-                      decoration: TextDecoration.none,
-                      height: 1,
-                    ),
+                style: TextStyle(
+                  fontSize: 16,
+                  fontFamily: 'Lato',
+                  fontWeight: FontWeight.w400,
+                  color: Theme.of(context).primaryColor,
+                  decoration: TextDecoration.none,
+                  height: 1,
+                ),
                 softWrap: true,
               ),
             ),
@@ -690,10 +685,13 @@ class _ThreeCheckboxAlertContentState extends State<ThreeCheckboxAlertContent> {
               padding: const EdgeInsets.only(top: 8.0),
               child: Text(
                 'Please confirm all checkboxes',
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      color: Theme.of(context).colorScheme.errorContainer,
-                      decoration: TextDecoration.none,
-                    ),
+                style: TextStyle(
+                  color: Colors.red,
+                  fontSize: 14,
+                  fontFamily: 'Lato',
+                  fontWeight: FontWeight.w400,
+                  decoration: TextDecoration.none,
+                ),
               ),
             ),
         ],
diff --git a/lib/src/screens/cake_pay/widgets/cake_pay_alert_modal.dart b/lib/src/screens/cake_pay/widgets/cake_pay_alert_modal.dart
index bd6cb7cdb..742ba1486 100644
--- a/lib/src/screens/cake_pay/widgets/cake_pay_alert_modal.dart
+++ b/lib/src/screens/cake_pay/widgets/cake_pay_alert_modal.dart
@@ -1,5 +1,8 @@
 import 'package:cake_wallet/src/widgets/alert_background.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:flutter/material.dart';
 
 class CakePayAlertModal extends StatelessWidget {
@@ -31,7 +34,7 @@ class CakePayAlertModal extends StatelessWidget {
               padding: EdgeInsets.only(top: 24, left: 24, right: 24),
               margin: EdgeInsets.all(24),
               decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.surface,
+                color: Theme.of(context).colorScheme.background,
                 borderRadius: BorderRadius.circular(30),
               ),
               child: Column(
@@ -39,9 +42,8 @@ class CakePayAlertModal extends StatelessWidget {
                   if (title.isNotEmpty)
                     Text(
                       title,
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        color: Theme.of(context).colorScheme.onSurface,
-                        fontWeight: FontWeight.bold,
+                      style: textLargeSemiBold(
+                        color: Theme.of(context).extension<CakeScrollbarTheme>()!.thumbColor,
                       ),
                     ),
                   Container(
@@ -56,8 +58,9 @@ class CakePayAlertModal extends StatelessWidget {
                   PrimaryButton(
                     onPressed: () => Navigator.pop(context),
                     text: actionTitle,
-                    color: Theme.of(context).colorScheme.surfaceContainer,
-                    textColor: Theme.of(context).colorScheme.primary,
+                    color: Theme.of(context).cardColor,
+                    textColor:
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   ),
                   SizedBox(height: 21),
                 ],
@@ -72,9 +75,9 @@ class CakePayAlertModal extends StatelessWidget {
                 child: CircleAvatar(
                   child: Icon(
                     Icons.close,
-                    color: Theme.of(context).colorScheme.onSurface,
+                    color: Colors.black,
                   ),
-                  backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
+                  backgroundColor: Colors.white,
                 ),
               ),
             )
diff --git a/lib/src/screens/cake_pay/widgets/cake_pay_tile.dart b/lib/src/screens/cake_pay/widgets/cake_pay_tile.dart
index 31f6fda70..a26786ab2 100644
--- a/lib/src/screens/cake_pay/widgets/cake_pay_tile.dart
+++ b/lib/src/screens/cake_pay/widgets/cake_pay_tile.dart
@@ -1,4 +1,7 @@
+import 'package:cake_wallet/typography.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class CakePayTile extends StatelessWidget {
   const CakePayTile({
@@ -14,34 +17,30 @@ class CakePayTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    
     return GestureDetector(
       onTap: onTap,
       child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                title,
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  color: colorScheme.onSurfaceVariant,
-                ),
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              title,
+              style: textXSmall(
+                color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
               ),
-              SizedBox(height: 8),
-              Text(
-                subTitle,
-                style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                  color: colorScheme.onSurface,
-                  fontWeight: FontWeight.w600,
-                ),
+            ),
+            SizedBox(height: 8),
+            Text(
+              subTitle,
+              style: textMediumBold(
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
               ),
-            ],
-          )
-        ],
-      ),
-    );
+            ),
+          ],
+        )
+      ],
+    ));
   }
 }
diff --git a/lib/src/screens/cake_pay/widgets/card_item.dart b/lib/src/screens/cake_pay/widgets/card_item.dart
index 2794369c5..1234c0a1f 100644
--- a/lib/src/screens/cake_pay/widgets/card_item.dart
+++ b/lib/src/screens/cake_pay/widgets/card_item.dart
@@ -44,9 +44,7 @@ class CardItem extends StatelessWidget {
             borderRadius: BorderRadius.circular(10),
             border: hideBorder
                 ? Border.all(color: Colors.transparent)
-                : Border.all(
-                    color: Theme.of(context).colorScheme.outlineVariant.withOpacity(0.20),
-                  ),
+                : Border.all(color: Colors.white.withOpacity(0.20)),
           ),
           child: Row(
             children: [
@@ -77,7 +75,7 @@ class CardItem extends StatelessWidget {
                         title,
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                        style: TextStyle(
                           color: titleColor,
                           fontSize: 18,
                           fontWeight: FontWeight.w700,
@@ -87,7 +85,7 @@ class CardItem extends StatelessWidget {
                         subTitle,
                         maxLines: 2,
                         overflow: TextOverflow.ellipsis,
-                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                        style: TextStyle(
                           color: titleColor,
                           fontSize: 10,
                           fontWeight: FontWeight.w700,
diff --git a/lib/src/screens/cake_pay/widgets/image_placeholder.dart b/lib/src/screens/cake_pay/widgets/image_placeholder.dart
index 3643a2e86..e389bab07 100644
--- a/lib/src/screens/cake_pay/widgets/image_placeholder.dart
+++ b/lib/src/screens/cake_pay/widgets/image_placeholder.dart
@@ -13,14 +13,15 @@ class CakePayCardImagePlaceholder extends StatelessWidget {
         child: Center(
           child: Text(
             text ?? 'Image not found!',
-            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurface,
-                  fontWeight: FontWeight.w900,
-                ),
+            style: TextStyle(
+              color: Colors.black,
+              fontSize: 12,
+              fontWeight: FontWeight.w900,
+            ),
           ),
         ),
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
+          color: Colors.white,
         ),
       ),
     );
diff --git a/lib/src/screens/cake_pay/widgets/link_extractor.dart b/lib/src/screens/cake_pay/widgets/link_extractor.dart
index d81dc492c..43b4a3e52 100644
--- a/lib/src/screens/cake_pay/widgets/link_extractor.dart
+++ b/lib/src/screens/cake_pay/widgets/link_extractor.dart
@@ -29,10 +29,11 @@ class ClickableLinksText extends StatelessWidget {
         spans.add(
           TextSpan(
             text: url,
-            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  color: Theme.of(context).colorScheme.primary,
-                   fontSize: 18,
-                ),
+            style: TextStyle(
+              color: Colors.blue,
+              fontSize: 18,
+              fontWeight: FontWeight.w400,
+            ),
             recognizer: TapGestureRecognizer()
               ..onTap = () async {
                 if (await canLaunchUrl(Uri.parse(url))) {
diff --git a/lib/src/screens/cake_pay/widgets/rounded_checkbox.dart b/lib/src/screens/cake_pay/widgets/rounded_checkbox.dart
index 8cd24e602..509708dc2 100644
--- a/lib/src/screens/cake_pay/widgets/rounded_checkbox.dart
+++ b/lib/src/screens/cake_pay/widgets/rounded_checkbox.dart
@@ -15,11 +15,11 @@ class RoundedCheckbox extends StatelessWidget {
               width: 20.0,
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.all(Radius.circular(50.0)),
-                color: Theme.of(context).colorScheme.primary,
+                color: Theme.of(context).primaryColor,
               ),
               child: Icon(
                 Icons.check,
-                color: Theme.of(context).colorScheme.surface,
+                color: Theme.of(context).colorScheme.background,
                 size: 14.0,
               ))
           : Offstage();
diff --git a/lib/src/screens/cake_pay/widgets/text_icon_button.dart b/lib/src/screens/cake_pay/widgets/text_icon_button.dart
index dac0088cb..937df3a36 100644
--- a/lib/src/screens/cake_pay/widgets/text_icon_button.dart
+++ b/lib/src/screens/cake_pay/widgets/text_icon_button.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/typography.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class TextIconButton extends StatelessWidget {
@@ -12,24 +14,24 @@ class TextIconButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            label,
-            style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurface,
-                  fontWeight: FontWeight.w600,
-                ),
-          ),
-          Icon(
-            Icons.chevron_right_rounded,
-            color: Theme.of(context).colorScheme.onSurface,
-          ),
-        ],
-      ),
+    return 
+       InkWell(
+        onTap: onTap,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text(
+              label,
+              style: textMediumSemiBold(
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              ),
+            ),
+            Icon(
+              Icons.chevron_right_rounded,
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+            ),
+          ],
+        ),
     );
   }
 }
diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart
index 9e332369e..5e52b887c 100644
--- a/lib/src/screens/connect_device/connect_device_page.dart
+++ b/lib/src/screens/connect_device/connect_device_page.dart
@@ -5,9 +5,9 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/connect_device/widgets/device_tile.dart';
-import 'package:cake_wallet/src/widgets/bottom_sheet/info_steps_bottom_sheet_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
 import 'package:cw_core/utils/print_verbose.dart';
@@ -28,7 +28,7 @@ class ConnectDevicePageParams {
     required this.walletType,
     required this.onConnectDevice,
     this.allowChangeWallet = false,
-    this.isReconnect = true,
+    this.isReconnect = false,
   });
 }
 
@@ -62,7 +62,6 @@ class ConnectDevicePage extends BasePage {
         onConnectDevice,
         allowChangeWallet,
         ledgerVM,
-        currentTheme,
       ));
 }
 
@@ -71,14 +70,12 @@ class ConnectDevicePageBody extends StatefulWidget {
   final OnConnectDevice onConnectDevice;
   final bool allowChangeWallet;
   final LedgerViewModel ledgerVM;
-  final MaterialThemeBase currentTheme;
 
   const ConnectDevicePageBody(
     this.walletType,
     this.onConnectDevice,
     this.allowChangeWallet,
     this.ledgerVM,
-    this.currentTheme,
   );
 
   @override
@@ -165,9 +162,8 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
   }
 
   Future<void> _connectToDevice(LedgerDevice device) async {
-    final isConnected =
-        await widget.ledgerVM.connectLedger(device, widget.walletType);
-    if (isConnected) widget.onConnectDevice(context, widget.ledgerVM);
+    await widget.ledgerVM.connectLedger(device, widget.walletType);
+    widget.onConnectDevice(context, widget.ledgerVM);
   }
 
   String _getDeviceTileLeading(LedgerDeviceType deviceInfo) {
@@ -185,126 +181,140 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      width: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint,
-      padding: EdgeInsets.symmetric(vertical: 24, horizontal: 24),
-      child: Column(
-        children: [
-          Expanded(
-            child: SingleChildScrollView(
-              child: Column(
-                children: [
-                  Padding(
+    return Center(
+      child: Container(
+        width: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint,
+        height: double.infinity,
+        padding: EdgeInsets.symmetric(vertical: 24, horizontal: 24),
+        child: SingleChildScrollView(
+          child: Column(
+            children: [
+              Padding(
+                padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
+                child: Text(
+                  Platform.isIOS
+                      ? S.of(context).connect_your_hardware_wallet_ios
+                      : S.of(context).connect_your_hardware_wallet,
+                  style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context)
+                          .extension<CakeTextTheme>()!
+                          .titleColor),
+                  textAlign: TextAlign.center,
+                ),
+              ),
+              Offstage(
+                offstage: !longWait,
+                child: Padding(
+                  padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
+                  child: Text(
+                    S.of(context).if_you_dont_see_your_device,
+                    style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .titleColor),
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+              ),
+              Observer(
+                builder: (_) => Offstage(
+                  offstage: widget.ledgerVM.bleIsEnabled,
+                  child: Padding(
                     padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
                     child: Text(
-                      Platform.isIOS
-                          ? S.of(context).connect_your_hardware_wallet_ios
-                          : S.of(context).connect_your_hardware_wallet,
-                      style:  Theme.of(context)
-                              .textTheme.titleMedium,
+                      S.of(context).ledger_please_enable_bluetooth,
+                      style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context)
+                              .extension<CakeTextTheme>()!
+                              .titleColor),
                       textAlign: TextAlign.center,
                     ),
                   ),
-                  Offstage(
-                    offstage: !longWait,
-                    child: Padding(
-                      padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
-                      child: Text(
-                        S.of(context).if_you_dont_see_your_device,
-                        style:  Theme.of(context)
-                                .textTheme.titleMedium,
-                        textAlign: TextAlign.center,
-                      ),
-                    ),
-                  ),
-                  Observer(
-                    builder: (_) => Offstage(
-                      offstage: widget.ledgerVM.bleIsEnabled,
-                      child: Padding(
-                        padding:
-                            EdgeInsets.only(left: 20, right: 20, bottom: 20),
-                        child: Text(
-                          S.of(context).ledger_please_enable_bluetooth,
-                          style:  Theme.of(context)
-                                  .textTheme.titleMedium,
-                          textAlign: TextAlign.center,
-                        ),
-                      ),
-                    ),
-                  ),
-                  if (bleDevices.length > 0) ...[
-                    Padding(
-                      padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
-                      child: Container(
-                        width: double.infinity,
-                        child: Text(
-                          S.of(context).bluetooth,
-                          style:  Theme.of(context)
-                                .textTheme.bodyMedium,
-                        ),
-                      ),
-                    ),
-                    ...bleDevices
-                        .map(
-                          (device) => Padding(
-                            padding: EdgeInsets.only(bottom: 20),
-                            child: DeviceTile(
-                              onPressed: () => _connectToDevice(device),
-                              title: device.name,
-                              leading: _getDeviceTileLeading(device.deviceInfo),
-                              connectionType: device.connectionType,
-                            ),
-                          ),
-                        )
-                        .toList()
-                  ],
-                  if (usbDevices.length > 0) ...[
-                    Padding(
-                      padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
-                      child: Container(
-                        width: double.infinity,
-                        child: Text(
-                          S.of(context).usb,
-                          style:  Theme.of(context)
-                                .textTheme.bodyMedium,
-                        ),
-                      ),
-                    ),
-                    ...usbDevices
-                        .map(
-                          (device) => Padding(
-                            padding: EdgeInsets.only(bottom: 20),
-                            child: DeviceTile(
-                              onPressed: () => _connectToDevice(device),
-                              title: device.name,
-                              leading: _getDeviceTileLeading(device.deviceInfo),
-                              connectionType: device.connectionType,
-                            ),
-                          ),
-                        )
-                        .toList(),
-                  ],
-                  if (widget.allowChangeWallet) ...[
-                    PrimaryButton(
-                      text: S.of(context).wallets,
-                      color: Theme.of(context)
-                          .colorScheme.primary,
-                      textColor: Theme.of(context)
-                          .colorScheme.onPrimary,
-                      onPressed: _onChangeWallet,
-                    )
-                  ],
-                ],
+                ),
               ),
-            ),
+              if (bleDevices.length > 0) ...[
+                Padding(
+                  padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
+                  child: Container(
+                    width: double.infinity,
+                    child: Text(
+                      S.of(context).bluetooth,
+                      style: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.w400,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .titleColor,
+                      ),
+                    ),
+                  ),
+                ),
+                ...bleDevices
+                    .map(
+                      (device) => Padding(
+                        padding: EdgeInsets.only(bottom: 20),
+                        child: DeviceTile(
+                          onPressed: () => _connectToDevice(device),
+                          title: device.name,
+                          leading: _getDeviceTileLeading(device.deviceInfo),
+                          connectionType: device.connectionType,
+                        ),
+                      ),
+                    )
+                    .toList()
+              ],
+              if (usbDevices.length > 0) ...[
+                Padding(
+                  padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
+                  child: Container(
+                    width: double.infinity,
+                    child: Text(
+                      S.of(context).usb,
+                      style: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.w400,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .titleColor,
+                      ),
+                    ),
+                  ),
+                ),
+                ...usbDevices
+                    .map(
+                      (device) => Padding(
+                        padding: EdgeInsets.only(bottom: 20),
+                        child: DeviceTile(
+                          onPressed: () => _connectToDevice(device),
+                          title: device.name,
+                          leading: _getDeviceTileLeading(device.deviceInfo),
+                          connectionType: device.connectionType,
+                        ),
+                      ),
+                    )
+                    .toList(),
+              ],
+              if (widget.allowChangeWallet) ...[
+                PrimaryButton(
+                  text: S.of(context).wallets,
+                  color: Theme.of(context)
+                      .extension<WalletListTheme>()!
+                      .createNewWalletButtonBackgroundColor,
+                  textColor: Theme.of(context)
+                      .extension<WalletListTheme>()!
+                      .restoreWalletButtonTextColor,
+                  onPressed: _onChangeWallet,
+                )
+              ],
+            ],
           ),
-          PrimaryButton(
-            text: S.of(context).how_to_connect,
-            color: Theme.of(context).colorScheme.surfaceContainer,
-            textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-            onPressed: () => _onHowToConnect(context),
-          )
-        ],
+        ),
       ),
     );
   }
@@ -316,21 +326,4 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
           .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false),
     );
   }
-
-  void _onHowToConnect(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      builder: (BuildContext bottomSheetContext) => InfoStepsBottomSheet(
-        titleText: S.of(context).how_to_connect,
-        currentTheme: widget.currentTheme,
-        steps: [
-          InfoStep('${S.of(context).step} 1', S.of(context).connect_hw_info_step_1),
-          InfoStep('${S.of(context).step} 2', S.of(context).connect_hw_info_step_2),
-          InfoStep('${S.of(context).step} 3', S.of(context).connect_hw_info_step_3),
-          InfoStep('${S.of(context).step} 4', S.of(context).connect_hw_info_step_4),
-        ],
-      ),
-    );
-  }
 }
diff --git a/lib/src/screens/connect_device/debug_device_page.dart b/lib/src/screens/connect_device/debug_device_page.dart
index bad20a96c..d5af9f2f6 100644
--- a/lib/src/screens/connect_device/debug_device_page.dart
+++ b/lib/src/screens/connect_device/debug_device_page.dart
@@ -127,8 +127,8 @@
 //                     child: PrimaryButton(
 //                         text: "Disconnect",
 //                         onPressed: () => disconnectCurrentDevice(),
-//                         color: Theme.of(context).colorScheme.primary,
-//                         textColor: Theme.of(context).colorScheme.onPrimary),
+//                         color: Theme.of(context).primaryColor,
+//                         textColor: Colors.white),
 //                   ),
 //                 ],
 //                 if (selectedDevice == null) ...[
@@ -156,8 +156,8 @@
 //                               devices.add(device);
 //                             }));
 //                       },
-//                       color: Theme.of(context).colorScheme.primary,
-//                       textColor: Theme.of(context).colorScheme.onPrimary),
+//                       color: Theme.of(context).primaryColor,
+//                       textColor: Colors.white),
 //                   Padding(
 //                     padding: EdgeInsets.only(top: 20),
 //                     child: PrimaryButton(
@@ -166,8 +166,8 @@
 //                           final dev = await ledger.listUsbDevices();
 //                           setState(() => devices = dev);
 //                         },
-//                         color: Theme.of(context).colorScheme.primary,
-//                         textColor: Theme.of(context).colorScheme.onPrimary),
+//                         color: Theme.of(context).primaryColor,
+//                         textColor: Colors.white),
 //                   ),
 //                 ],
 //               ],
@@ -229,8 +229,8 @@
 //               printV("${ex.errorCode.toRadixString(16)} ${ex.message}");
 //             }
 //           },
-//           color: Theme.of(context).colorScheme.primary,
-//           textColor: Theme.of(context).colorScheme.onPrimary),
+//           color: Theme.of(context).primaryColor,
+//           textColor: Colors.white),
 //     );
 //   }
 // }
diff --git a/lib/src/screens/connect_device/monero_hardware_wallet_options_page.dart b/lib/src/screens/connect_device/monero_hardware_wallet_options_page.dart
index d73d910f2..ab9ea5cef 100644
--- a/lib/src/screens/connect_device/monero_hardware_wallet_options_page.dart
+++ b/lib/src/screens/connect_device/monero_hardware_wallet_options_page.dart
@@ -3,10 +3,12 @@ import 'package:cake_wallet/entities/generate_name.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/wallet_hardware_restore_view_model.dart';
@@ -24,7 +26,8 @@ class MoneroHardwareWalletOptionsPage extends BasePage {
   String get title => S.current.restore_title_from_hardware_wallet;
 
   @override
-  Widget body(BuildContext context) => _MoneroHardwareWalletOptionsForm(_walletHardwareRestoreVM);
+  Widget body(BuildContext context) =>
+      _MoneroHardwareWalletOptionsForm(_walletHardwareRestoreVM);
 }
 
 class _MoneroHardwareWalletOptionsForm extends StatefulWidget {
@@ -37,7 +40,8 @@ class _MoneroHardwareWalletOptionsForm extends StatefulWidget {
       _MoneroHardwareWalletOptionsFormState(_walletHardwareRestoreVM);
 }
 
-class _MoneroHardwareWalletOptionsFormState extends State<_MoneroHardwareWalletOptionsForm> {
+class _MoneroHardwareWalletOptionsFormState
+    extends State<_MoneroHardwareWalletOptionsForm> {
   _MoneroHardwareWalletOptionsFormState(this._walletHardwareRestoreVM)
       : _formKey = GlobalKey<FormState>(),
         _blockchainHeightKey = GlobalKey<BlockchainHeightState>(),
@@ -64,8 +68,8 @@ class _MoneroHardwareWalletOptionsFormState extends State<_MoneroHardwareWalletO
         contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
         content: Center(
           child: ConstrainedBox(
-            constraints:
-                BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            constraints: BoxConstraints(
+                maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
@@ -76,34 +80,60 @@ class _MoneroHardwareWalletOptionsFormState extends State<_MoneroHardwareWalletO
                     child: Stack(
                       alignment: Alignment.centerRight,
                       children: [
-                        BaseTextFormField(
-                          onChanged: (value) => _walletHardwareRestoreVM.name = value,
+                        TextFormField(
+                          onChanged: (value) =>
+                              _walletHardwareRestoreVM.name = value,
                           controller: _controller,
-                          textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 20.0,
-                                fontWeight: FontWeight.w600,
+                          style: TextStyle(
+                            fontSize: 20.0,
+                            fontWeight: FontWeight.w600,
+                            color: Theme.of(context)
+                                .extension<CakeTextTheme>()!
+                                .titleColor,
+                          ),
+                          decoration: InputDecoration(
+                            hintStyle: TextStyle(
+                              fontSize: 18.0,
+                              fontWeight: FontWeight.w500,
+                              color: Theme.of(context)
+                                  .extension<NewWalletTheme>()!
+                                  .hintTextColor,
+                            ),
+                            hintText: S.of(context).wallet_name,
+                            focusedBorder: UnderlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Theme.of(context)
+                                    .extension<NewWalletTheme>()!
+                                    .underlineColor,
+                                width: 1.0,
                               ),
-                          placeholderTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 18.0,
-                                fontWeight: FontWeight.w500,
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
+                            ),
+                            enabledBorder: UnderlineInputBorder(
+                              borderSide: BorderSide(
+                                color: Theme.of(context)
+                                    .extension<NewWalletTheme>()!
+                                    .underlineColor,
+                                width: 1.0,
                               ),
-                          hintText: S.of(context).wallet_name,
-                          suffixIcon: Semantics(
-                            label: S.of(context).generate_name,
-                            child: IconButton(
-                              onPressed: _onGenerateName,
-                              icon: Container(
-                                padding: const EdgeInsets.all(8),
-                                decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(6.0),
-                                  color: Theme.of(context).colorScheme.surfaceContainerHighest,
-                                ),
-                                width: 34,
-                                height: 34,
-                                child: Image.asset(
-                                  'assets/images/refresh_icon.png',
-                                  color: Theme.of(context).colorScheme.primary,
+                            ),
+                            suffixIcon: Semantics(
+                              label: S.of(context).generate_name,
+                              child: IconButton(
+                                onPressed: _onGenerateName,
+                                icon: Container(
+                                  padding: const EdgeInsets.all(8),
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(6.0),
+                                    color: Theme.of(context).hintColor,
+                                  ),
+                                  width: 34,
+                                  height: 34,
+                                  child: Image.asset(
+                                    'assets/images/refresh_icon.png',
+                                    color: Theme.of(context)
+                                        .extension<SendPageTheme>()!
+                                        .textFieldButtonIconColor,
+                                  ),
                                 ),
                               ),
                             ),
@@ -132,8 +162,8 @@ class _MoneroHardwareWalletOptionsFormState extends State<_MoneroHardwareWalletO
           builder: (context) => LoadingPrimaryButton(
             onPressed: _confirmForm,
             text: S.of(context).seed_language_next,
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
+            color: Colors.green,
+            textColor: Colors.white,
             isDisabled: _walletHardwareRestoreVM.name.isEmpty,
           ),
         ),
@@ -148,8 +178,8 @@ class _MoneroHardwareWalletOptionsFormState extends State<_MoneroHardwareWalletO
     setState(() {
       _controller.text = rName;
       _walletHardwareRestoreVM.name = rName;
-      _controller.selection =
-          TextSelection.fromPosition(TextPosition(offset: _controller.text.length));
+      _controller.selection = TextSelection.fromPosition(
+          TextPosition(offset: _controller.text.length));
     });
   }
 
@@ -176,7 +206,8 @@ class _MoneroHardwareWalletOptionsFormState extends State<_MoneroHardwareWalletO
 
     reaction((_) => _walletHardwareRestoreVM.error, (String? error) {
       if (error != null) {
-        if (error == S.current.ledger_connection_error) Navigator.of(context).pop();
+        if (error == S.current.ledger_connection_error)
+          Navigator.of(context).pop();
 
         WidgetsBinding.instance.addPostFrameCallback((_) {
           showPopUp<void>(
diff --git a/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart b/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart
index d4c40d953..11a126be6 100644
--- a/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart
+++ b/lib/src/screens/connect_device/select_hardware_wallet_account_page.dart
@@ -4,9 +4,11 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/wallet_hardware_restore_view_model.dart';
@@ -73,50 +75,63 @@ class _SelectHardwareWalletAccountFormState extends State<SelectHardwareWalletAc
                     child: Stack(
                       alignment: Alignment.centerRight,
                       children: [
-                        BaseTextFormField(
+                        TextFormField(
                           onChanged: (value) => _walletHardwareRestoreVM.name = value,
                           controller: _controller,
-                          textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 20.0,
-                                fontWeight: FontWeight.w600,
+                          style: TextStyle(
+                            fontSize: 20.0,
+                            fontWeight: FontWeight.w600,
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                          ),
+                          decoration: InputDecoration(
+                            hintStyle: TextStyle(
+                              fontSize: 18.0,
+                              fontWeight: FontWeight.w500,
+                              color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                            ),
+                            hintText: S.of(context).wallet_name,
+                            focusedBorder: UnderlineInputBorder(
+                              borderSide: BorderSide(
+                                color:
+                                    Theme.of(context).extension<NewWalletTheme>()!.underlineColor,
+                                width: 1.0,
                               ),
-                          placeholderTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 18.0,
-                                fontWeight: FontWeight.w500,
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
+                            ),
+                            enabledBorder: UnderlineInputBorder(
+                              borderSide: BorderSide(
+                                color:
+                                    Theme.of(context).extension<NewWalletTheme>()!.underlineColor,
+                                width: 1.0,
                               ),
-                          hintText: S.of(context).wallet_name,
-                          // enabledBorder: UnderlineInputBorder(
-                          //   borderSide: BorderSide(
-                          //     color: Theme.of(context).colorScheme.outline,
-                          //     width: 100,
-                          //   ),
-                          // ),
-                          suffixIcon: Semantics(
-                            label: S.of(context).generate_name,
-                            child: IconButton(
-                              onPressed: () async {
-                                final rName = await generateName();
-                                FocusManager.instance.primaryFocus?.unfocus();
+                            ),
+                            suffixIcon: Semantics(
+                              label: S.of(context).generate_name,
+                              child: IconButton(
+                                onPressed: () async {
+                                  final rName = await generateName();
+                                  FocusManager.instance.primaryFocus?.unfocus();
 
-                                setState(() {
-                                  _controller.text = rName;
-                                  _walletHardwareRestoreVM.name = rName;
-                                  _controller.selection = TextSelection.fromPosition(
-                                      TextPosition(offset: _controller.text.length));
-                                });
-                              },
-                              icon: Container(
-                                padding: const EdgeInsets.all(8),
-                                decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(6.0),
-                                  color: Theme.of(context).colorScheme.surfaceContainerHighest,
-                                ),
-                                width: 34,
-                                height: 34,
-                                child: Image.asset(
-                                  'assets/images/refresh_icon.png',
-                                  color: Theme.of(context).colorScheme.primary,
+                                  setState(() {
+                                    _controller.text = rName;
+                                    _walletHardwareRestoreVM.name = rName;
+                                    _controller.selection = TextSelection.fromPosition(
+                                        TextPosition(offset: _controller.text.length));
+                                  });
+                                },
+                                icon: Container(
+                                  padding: const EdgeInsets.all(8),
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(6.0),
+                                    color: Theme.of(context).hintColor,
+                                  ),
+                                  width: 34,
+                                  height: 34,
+                                  child: Image.asset(
+                                    'assets/images/refresh_icon.png',
+                                    color: Theme.of(context)
+                                        .extension<SendPageTheme>()!
+                                        .textFieldButtonIconColor,
+                                  ),
                                 ),
                               ),
                             ),
@@ -133,16 +148,18 @@ class _SelectHardwareWalletAccountFormState extends State<SelectHardwareWalletAc
                     width: double.infinity,
                     child: Text(
                       S.of(context).select_hw_account_below,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w500,
-                          ),
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      ),
                     ),
                   ),
                 ),
                 Observer(
                   builder: (context) => Column(
                     children: _walletHardwareRestoreVM.availableAccounts.map((acc) {
+
                       final address = acc.address;
                       return Padding(
                         padding: EdgeInsets.only(top: 10),
@@ -154,7 +171,7 @@ class _SelectHardwareWalletAccountFormState extends State<SelectHardwareWalletAc
                             width: 24,
                           ),
                           text:
-                              "${acc.accountIndex} - ${address.substring(0, 6)}...${address.substring(address.length - 6)}",
+                          "${acc.accountIndex} - ${address.substring(0, 6)}...${address.substring(address.length - 6)}",
                           showTrailingIcon: false,
                           height: 54,
                           isSelected: _walletHardwareRestoreVM.selectedAccount == acc,
@@ -167,17 +184,15 @@ class _SelectHardwareWalletAccountFormState extends State<SelectHardwareWalletAc
                 ),
                 Padding(
                   padding: EdgeInsets.only(top: 10),
-                  child: Observer(
-                    builder: (context) {
-                      return LoadingPrimaryButton(
-                        onPressed: _loadMoreAccounts,
-                        text: S.of(context).load_more,
-                        color: Theme.of(context).colorScheme.surfaceContainer,
-                        textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-                        isLoading: _walletHardwareRestoreVM.isLoadingMoreAccounts,
-                      );
-                    },
-                  ),
+                  child: Observer(builder: (context) {
+                    return LoadingPrimaryButton(
+                      onPressed: _loadMoreAccounts,
+                      text: S.of(context).load_more,
+                      color: Theme.of(context).primaryColor,
+                      textColor: Colors.white,
+                      isLoading: _walletHardwareRestoreVM.isLoadingMoreAccounts,
+                    );
+                  }),
                 ),
               ],
             ),
@@ -189,8 +204,8 @@ class _SelectHardwareWalletAccountFormState extends State<SelectHardwareWalletAc
             return LoadingPrimaryButton(
               onPressed: _confirmForm,
               text: S.of(context).seed_language_next,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
+              color: Colors.green,
+              textColor: Colors.white,
               isDisabled: _walletHardwareRestoreVM.name.isEmpty,
             );
           },
@@ -214,8 +229,11 @@ class _SelectHardwareWalletAccountFormState extends State<SelectHardwareWalletAc
     if (_effectsInstalled) return;
 
     reaction((_) => _walletHardwareRestoreVM.error, (String? error) {
+
       if (error != null) {
-        if (error == S.current.ledger_connection_error) Navigator.of(context).pop();
+
+        if (error == S.current.ledger_connection_error)
+          Navigator.of(context).pop();
 
         WidgetsBinding.instance.addPostFrameCallback((_) {
           showPopUp<void>(
diff --git a/lib/src/screens/connect_device/widgets/device_tile.dart b/lib/src/screens/connect_device/widgets/device_tile.dart
index 7808570d2..58f65c5de 100644
--- a/lib/src/screens/connect_device/widgets/device_tile.dart
+++ b/lib/src/screens/connect_device/widgets/device_tile.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:ledger_flutter_plus/ledger_flutter_plus.dart';
 
@@ -35,7 +36,7 @@ class DeviceTile extends StatelessWidget {
         alignment: Alignment.center,
         decoration: BoxDecoration(
           borderRadius: BorderRadius.all(Radius.circular(12)),
-          color: Theme.of(context).colorScheme.surfaceContainer,
+          color: Theme.of(context).cardColor,
         ),
         child: Row(
           mainAxisSize: MainAxisSize.max,
@@ -46,16 +47,17 @@ class DeviceTile extends StatelessWidget {
               Image.asset(
                 leading!,
                 height: 30,
-                color: Theme.of(context).colorScheme.onSurface,
+                color: Theme.of(context).extension<OptionTileTheme>()!.titleColor,
               ),
             Expanded(
               child: Padding(
                 padding: EdgeInsets.only(left: 16),
                 child: Text(
                   title,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.w500,
+                    color: Theme.of(context).extension<OptionTileTheme>()!.titleColor,
                   ),
                 ),
               ),
@@ -65,7 +67,7 @@ class DeviceTile extends StatelessWidget {
                 child: Image.asset(
                   connectionTypeIcon!,
                   height: 25,
-                  color: Theme.of(context).colorScheme.onSurface,
+                  color: Theme.of(context).extension<OptionTileTheme>()!.titleColor,
                 ),
               )
           ],
diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart
index cf4486ab7..ee1dcd112 100644
--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/core/auth_service.dart';
+import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/entities/contact_base.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/entities/wallet_list_order_types.dart';
@@ -9,11 +10,11 @@ import 'package:cake_wallet/src/screens/dashboard/widgets/filter_list_widget.dar
 import 'package:cake_wallet/src/screens/wallet_list/filtered_list.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
-import 'package:cake_wallet/utils/address_formatter.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -35,9 +36,8 @@ class ContactListPage extends BasePage {
         width: 32.0,
         height: 32.0,
         decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          color: Theme.of(context).colorScheme.surfaceContainerHighest,
-        ),
+            shape: BoxShape.circle,
+            color: Theme.of(context).extension<ExchangePageTheme>()!.buttonBackgroundColor),
         child: Semantics(
           label: S.of(context).add_contact,
           button: true,
@@ -46,29 +46,28 @@ class ContactListPage extends BasePage {
             children: <Widget>[
               Icon(
                 Icons.add,
-                color: Theme.of(context).colorScheme.onSurface,
+                color: Theme.of(context).appBarTheme.titleTextStyle!.color,
                 size: 22.0,
               ),
               ButtonTheme(
                 minWidth: 32.0,
                 height: 32.0,
                 child: TextButton(
-                  // FIX-ME: Style
-                  //shape: CircleBorder(),
-                  onPressed: () async {
-                    if (contactListViewModel.shouldRequireTOTP2FAForAddingContacts) {
-                      authService.authenticateAction(
-                        context,
-                        route: Routes.addressBookAddContact,
-                        conditionToDetermineIfToUse2FA:
-                            contactListViewModel.shouldRequireTOTP2FAForAddingContacts,
-                      );
-                    } else {
-                      await Navigator.of(context).pushNamed(Routes.addressBookAddContact);
-                    }
-                  },
-                  child: Offstage(),
-                ),
+                    // FIX-ME: Style
+                    //shape: CircleBorder(),
+                    onPressed: () async {
+                      if (contactListViewModel.shouldRequireTOTP2FAForAddingContacts) {
+                        authService.authenticateAction(
+                          context,
+                          route: Routes.addressBookAddContact,
+                          conditionToDetermineIfToUse2FA:
+                              contactListViewModel.shouldRequireTOTP2FAForAddingContacts,
+                        );
+                      } else {
+                        await Navigator.of(context).pushNamed(Routes.addressBookAddContact);
+                      }
+                    },
+                    child: Offstage()),
               )
             ],
           ),
@@ -116,45 +115,46 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
         children: [
           Padding(
             padding: const EdgeInsets.only(left: 24, right: 24, bottom: 8),
-            child: Align(
-              alignment: Alignment.centerLeft,
-              child: TabBar(
-                controller: _tabController,
-                splashFactory: NoSplash.splashFactory,
-                indicatorSize: TabBarIndicatorSize.label,
-                isScrollable: true,
-                labelStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                      fontSize: 20,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.primary,
-                    ),
-                unselectedLabelStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                      fontSize: 20,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
-                indicatorColor: Theme.of(context).colorScheme.primary,
-                indicatorPadding: EdgeInsets.zero,
-                labelPadding: EdgeInsets.only(right: 24),
-                tabAlignment: TabAlignment.start,
-                dividerColor: Colors.transparent,
-                padding: EdgeInsets.zero,
-                tabs: [
-                  Tab(text: S.of(context).wallets),
-                  Tab(text: S.of(context).contact_list_contacts),
-                ],
+          child: Align(
+            alignment: Alignment.centerLeft,
+            child: TabBar(
+              controller: _tabController,
+              splashFactory: NoSplash.splashFactory,
+              indicatorSize: TabBarIndicatorSize.label,
+              isScrollable: true,
+              labelStyle: TextStyle(
+                fontSize: 18,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).appBarTheme.titleTextStyle!.color,
               ),
+              unselectedLabelStyle: TextStyle(
+                  fontSize: 18,
+                  fontFamily: 'Lato',
+                  fontWeight: FontWeight.w600,
+                  color: Theme.of(context).appBarTheme.titleTextStyle!.color?.withOpacity(0.5)),
+              labelColor: Theme.of(context).appBarTheme.titleTextStyle!.color,
+              indicatorColor: Theme.of(context).appBarTheme.titleTextStyle!.color,
+              indicatorPadding: EdgeInsets.zero,
+              labelPadding: EdgeInsets.only(right: 24),
+              tabAlignment: TabAlignment.start,
+              dividerColor: Colors.transparent,
+              padding: EdgeInsets.zero,
+              tabs: [
+                Tab(text: S.of(context).wallets),
+                Tab(text: S.of(context).contact_list_contacts),
+              ],
             ),
           ),
+          ),
           Expanded(
             child: TabBarView(
               controller: _tabController,
               children: [
                 _buildWalletContacts(context),
                 ContactListBody(
-                  contactListViewModel: widget.contactListViewModel,
-                  tabController: _tabController,
-                ),
+                    contactListViewModel: widget.contactListViewModel,
+                    tabController: _tabController),
               ],
             ),
           ),
@@ -193,22 +193,26 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
 
             return Padding(
               padding: const EdgeInsets.only(left: 16, right: 16, top: 4, bottom: 4),
-              child: ExpansionTile(
-                title: Text(
-                  groupName,
-                  style: Theme.of(context).textTheme.bodyMedium!,
+                child: ExpansionTile(
+              title: Text(
+                groupName,
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.normal,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
-                leading: _buildCurrencyIcon(activeContact),
-                tilePadding: const EdgeInsets.only(left: 16, right: 16),
-                childrenPadding: const EdgeInsets.only(left: 16),
-                expandedCrossAxisAlignment: CrossAxisAlignment.start,
-                expandedAlignment: Alignment.topLeft,
-                backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
-                collapsedBackgroundColor: Theme.of(context).colorScheme.surfaceContainer,
-                collapsedShape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
-                children: groupContacts.map((contact) => generateRaw(context, contact)).toList(),
               ),
+              leading: _buildCurrencyIcon(activeContact),
+              tilePadding: const EdgeInsets.only(left: 16, right: 16),
+              childrenPadding: const EdgeInsets.only(left: 16),
+              expandedCrossAxisAlignment: CrossAxisAlignment.start,
+              expandedAlignment: Alignment.topLeft,
+              backgroundColor: Theme.of(context).cardColor,
+              collapsedBackgroundColor: Theme.of(context).cardColor,
+              collapsedShape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+              children: groupContacts.map((contact) => generateRaw(context, contact)).toList(),
+            ),
             );
           }
         }
@@ -231,7 +235,7 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
           return;
         }
 
-        final isCopied = await DialogService.showNameAndAddressDialog(context, contact);
+        final isCopied = await showNameAndAddressDialog(context, contact.name, contact.address);
 
         if (isCopied) {
           await Clipboard.setData(ClipboardData(text: contact.address));
@@ -240,10 +244,10 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
       },
       behavior: HitTestBehavior.opaque,
       child: Container(
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(10)),
-          color: Theme.of(context).colorScheme.surfaceContainer,
-        ),
+    decoration: BoxDecoration(
+    borderRadius: BorderRadius.all(Radius.circular(10)),
+    color: Theme.of(context).cardColor,
+    ),
         margin: const EdgeInsets.only(top: 4, bottom: 4, left: 16, right: 16),
         padding: const EdgeInsets.only(top: 16, bottom: 16, right: 16, left: 16),
         child: Row(
@@ -256,7 +260,11 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
                 padding: EdgeInsets.only(left: 12),
                 child: Text(
                   contact.name,
-                  style: Theme.of(context).textTheme.bodyMedium!,
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                  ),
                 ),
               ),
             ),
@@ -272,6 +280,21 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
         ? Image.asset(image, height: 24, width: 24)
         : const SizedBox(height: 24, width: 24);
   }
+
+  Future<bool> showNameAndAddressDialog(BuildContext context, String name, String address) async {
+    return await showPopUp<bool>(
+            context: context,
+            builder: (BuildContext context) {
+              return AlertWithTwoActions(
+                  alertTitle: name,
+                  alertContent: address,
+                  rightButtonText: S.of(context).copy,
+                  leftButtonText: S.of(context).cancel,
+                  actionRightButton: () => Navigator.of(context).pop(true),
+                  actionLeftButton: () => Navigator.of(context).pop(false));
+            }) ??
+        false;
+  }
 }
 
 class ContactListBody extends StatefulWidget {
@@ -314,7 +337,7 @@ class _ContactListBodyState extends State<ContactListBody> {
         ? widget.contactListViewModel.contacts
         : widget.contactListViewModel.contactsToShow;
     return Scaffold(
-      backgroundColor: Theme.of(context).colorScheme.surface,
+      backgroundColor: Theme.of(context).colorScheme.background,
       body: Container(
         child: FilteredList(
           list: contacts,
@@ -333,7 +356,8 @@ class _ContactListBodyState extends State<ContactListBody> {
                   return;
                 }
 
-                final isCopied = await DialogService.showNameAndAddressDialog(context, contact);
+                final isCopied =
+                    await showNameAndAddressDialog(context, contact.name, contact.address);
 
                 if (isCopied) {
                   await Clipboard.setData(ClipboardData(text: contact.address));
@@ -345,8 +369,7 @@ class _ContactListBodyState extends State<ContactListBody> {
                   ? Slidable(
                       key: Key('${contact.key}'),
                       endActionPane: _actionPane(context, contact),
-                      child: contactContent,
-                    )
+                      child: contactContent)
                   : contactContent,
             );
           },
@@ -369,7 +392,7 @@ class _ContactListBodyState extends State<ContactListBody> {
           key: Key('${contact.name}'),
           decoration: BoxDecoration(
             borderRadius: BorderRadius.all(Radius.circular(8)),
-            color: Theme.of(context).colorScheme.surfaceContainer,
+            color: Theme.of(context).cardColor,
           ),
           margin: const EdgeInsets.only(top: 4, bottom: 4, left: 16, right: 16),
           padding: const EdgeInsets.only(top: 16, bottom: 16, right: 16, left: 16),
@@ -383,7 +406,11 @@ class _ContactListBodyState extends State<ContactListBody> {
                 padding: EdgeInsets.only(left: 12),
                 child: Text(
                   contact.name,
-                  style: Theme.of(context).textTheme.bodyMedium!,
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                  ),
                 ),
               ))
             ],
@@ -393,41 +420,37 @@ class _ContactListBodyState extends State<ContactListBody> {
     );
   }
 
-  ActionPane _actionPane(BuildContext context, ContactRecord contact) {
-    return ActionPane(
+  ActionPane _actionPane(BuildContext context, ContactRecord contact) => ActionPane(
         motion: const ScrollMotion(),
         extentRatio: 0.4,
         children: [
           SlidableAction(
             onPressed: (_) async => await Navigator.of(context)
                 .pushNamed(Routes.addressBookAddContact, arguments: contact),
-            backgroundColor: Theme.of(context).colorScheme.primary,
-            foregroundColor: Theme.of(context).colorScheme.onSurface,
+            backgroundColor: Colors.blue,
+            foregroundColor: Colors.white,
             icon: Icons.edit,
             label: S.of(context).edit,
           ),
           SlidableAction(
             onPressed: (_) async {
-              final isDelete = await DialogService.showAlertDialog(context);
-  
+              final isDelete = await showAlertDialog(context);
+
               if (isDelete) {
                 await widget.contactListViewModel.delete(contact);
               }
             },
-            backgroundColor: Theme.of(context).colorScheme.error,
-            foregroundColor: Theme.of(context).colorScheme.onSurface,
+            backgroundColor: Colors.red,
+            foregroundColor: Colors.white,
             icon: CupertinoIcons.delete,
             label: S.of(context).delete,
           ),
         ],
       );
-  }
 
   Widget filterButtonWidget(BuildContext context, ContactListViewModel contactListViewModel) {
-    final filterIcon = Image.asset(
-      'assets/images/filter_icon.png',
-      color: Theme.of(context).colorScheme.onSurface,
-    );
+    final filterIcon = Image.asset('assets/images/filter_icon.png',
+        color: Theme.of(context).appBarTheme.titleTextStyle!.color);
     return MergeSemantics(
       child: SizedBox(
         height: 58,
@@ -459,7 +482,7 @@ class _ContactListBodyState extends State<ContactListBody> {
                   width: 36,
                   decoration: BoxDecoration(
                     shape: BoxShape.circle,
-                    color: Theme.of(context).colorScheme.surfaceContainer,
+                    color: Theme.of(context).extension<ExchangePageTheme>()!.buttonBackgroundColor,
                   ),
                   child: filterIcon,
                 ),
@@ -470,10 +493,8 @@ class _ContactListBodyState extends State<ContactListBody> {
       ),
     );
   }
-}
 
-class DialogService {
-  static Future<bool> showAlertDialog(BuildContext context) async {
+  Future<bool> showAlertDialog(BuildContext context) async {
     return await showPopUp<bool>(
             context: context,
             builder: (BuildContext context) {
@@ -488,22 +509,13 @@ class DialogService {
         false;
   }
 
-  static Future<bool> showNameAndAddressDialog(BuildContext context, ContactBase contact) async {
+  Future<bool> showNameAndAddressDialog(BuildContext context, String name, String address) async {
     return await showPopUp<bool>(
             context: context,
             builder: (BuildContext context) {
               return AlertWithTwoActions(
-                  alertTitle: contact.name,
-                  alertContent: contact.address,
-                  alertContentTextWidget: AddressFormatter.buildSegmentedAddress(
-                    address: contact.address,
-                    textAlign: TextAlign.center,
-                    walletType: cryptoCurrencyToWalletType(contact.type),
-                    evenTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      fontSize: 16,
-                      decoration: TextDecoration.none,
-                    ),
-                  ),
+                  alertTitle: name,
+                  alertContent: address,
                   rightButtonText: S.of(context).copy,
                   leftButtonText: S.of(context).cancel,
                   actionRightButton: () => Navigator.of(context).pop(true),
diff --git a/lib/src/screens/contact/contact_page.dart b/lib/src/screens/contact/contact_page.dart
index 2b54736cc..7dea970ec 100644
--- a/lib/src/screens/contact/contact_page.dart
+++ b/lib/src/screens/contact/contact_page.dart
@@ -1,4 +1,6 @@
 import 'package:cake_wallet/core/address_validator.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cw_core/currency.dart';
 import 'package:flutter/material.dart';
@@ -16,6 +18,8 @@ import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class ContactPage extends BasePage {
   ContactPage(this.contactViewModel)
@@ -25,10 +29,13 @@ class ContactPage extends BasePage {
         _currencyTypeController = TextEditingController() {
     _nameController.text = contactViewModel.name;
     _addressController.text = contactViewModel.address;
-    _nameController.addListener(() => contactViewModel.name = _nameController.text);
-    _addressController.addListener(() => contactViewModel.address = _addressController.text);
+    _nameController
+        .addListener(() => contactViewModel.name = _nameController.text);
+    _addressController
+        .addListener(() => contactViewModel.address = _addressController.text);
 
-    autorun((_) => _currencyTypeController.text = contactViewModel.currency?.toString() ?? '');
+    autorun((_) => _currencyTypeController.text =
+        contactViewModel.currency?.toString() ?? '');
   }
 
   @override
@@ -43,11 +50,9 @@ class ContactPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final downArrow = Image.asset(
-      'assets/images/arrow_bottom_purple_icon.png',
-      color: Theme.of(context).colorScheme.primary,
-      height: 8,
-    );
+    final downArrow = Image.asset('assets/images/arrow_bottom_purple_icon.png',
+        color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+        height: 8);
 
     _setEffects(context);
 
@@ -60,29 +65,24 @@ class ContactPage extends BasePage {
               mainAxisSize: MainAxisSize.min,
               children: <Widget>[
                 BaseTextFormField(
-                  controller: _nameController,
-                  hintText: S.of(context).contact_name,
-                  validator: ContactNameValidator(),
-                ),
+                    controller: _nameController,
+                    hintText: S.of(context).contact_name,
+                    validator: ContactNameValidator()),
                 Padding(
                   padding: EdgeInsets.only(top: 20),
                   child: Container(
                     child: InkWell(
                       onTap: () => _presentCurrencyPicker(context),
                       child: IgnorePointer(
-                        child: BaseTextFormField(
-                          controller: _currencyTypeController,
-                          hintText: S.of(context).settings_currency,
-                          suffixIcon: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: <Widget>[
-                              downArrow,
-                              SizedBox(width: 16),
-                            ],
-                          ),
+                          child: BaseTextFormField(
+                        controller: _currencyTypeController,
+                        hintText: S.of(context).settings_currency,
+                        suffixIcon: Row(
+                          mainAxisSize: MainAxisSize.min,
+                          mainAxisAlignment: MainAxisAlignment.end,
+                          children: <Widget>[downArrow],
                         ),
-                      ),
+                      )),
                     ),
                   ),
                 ),
@@ -95,47 +95,47 @@ class ContactPage extends BasePage {
                         AddressTextFieldOption.paste,
                         AddressTextFieldOption.qrCode,
                       ],
-                      buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                      iconColor: Theme.of(context).colorScheme.onSurfaceVariant,
-                      validator: AddressValidator(type: contactViewModel.currency!),
+                      buttonColor: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
+                      iconColor: PaletteDark.gray,
+                      borderColor: Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
+                      validator:
+                          AddressValidator(type: contactViewModel.currency!),
                     ),
                   )
               ],
             ),
           ),
-          bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+          bottomSectionPadding:
+              EdgeInsets.only(left: 24, right: 24, bottom: 24),
           bottomSection: Row(
             children: <Widget>[
               Expanded(
                 child: PrimaryButton(
-                  onPressed: () {
-                    contactViewModel.reset();
-                    _nameController.text = '';
-                    _addressController.text = '';
-                  },
-                  text: S.of(context).reset,
-                  color: Theme.of(context).colorScheme.surfaceContainer,
-                  textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-                ),
+                    onPressed: () {
+                      contactViewModel.reset();
+                      _nameController.text = '';
+                      _addressController.text = '';
+                    },
+                    text: S.of(context).reset,
+                    color: Colors.orange,
+                    textColor: Colors.white),
               ),
               SizedBox(width: 20),
               Expanded(
-                child: Observer(
-                  builder: (_) => PrimaryButton(
-                    onPressed: () async {
-                      if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
-                        return;
-                      }
+                  child: Observer(
+                      builder: (_) => PrimaryButton(
+                          onPressed: () async {
+                            if (_formKey.currentState != null &&
+                                !_formKey.currentState!.validate()) {
+                              return;
+                            }
 
-                      await contactViewModel.save();
-                    },
-                    text: S.of(context).save,
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
-                    isDisabled: !contactViewModel.isReady,
-                  ),
-                ),
-              )
+                            await contactViewModel.save();
+                          },
+                          text: S.of(context).save,
+                          color: Theme.of(context).primaryColor,
+                          textColor: Colors.white,
+                          isDisabled: !contactViewModel.isReady)))
             ],
           )),
     );
@@ -143,16 +143,17 @@ class ContactPage extends BasePage {
 
   void _presentCurrencyPicker(BuildContext context) {
     showPopUp<void>(
-      builder: (_) => CurrencyPicker(
-          selectedAtIndex: contactViewModel.currency != null
-              ? contactViewModel.currencies.indexOf(contactViewModel.currency!)
-              : -1,
-          items: contactViewModel.currencies,
-          title: S.of(context).please_select,
-          hintText: S.of(context).search_currency,
-          onItemSelected: (Currency item) => contactViewModel.currency = item as CryptoCurrency),
-      context: context,
-    );
+        builder: (_) => CurrencyPicker(
+            selectedAtIndex: contactViewModel.currency != null
+                ? contactViewModel.currencies
+                    .indexOf(contactViewModel.currency!)
+                : -1,
+            items: contactViewModel.currencies,
+            title: S.of(context).please_select,
+            hintText: S.of(context).search_currency,
+            onItemSelected: (Currency item) =>
+                contactViewModel.currency = item as CryptoCurrency),
+        context: context);
   }
 
   void _onContactSavingFailure(BuildContext context, String error) {
@@ -160,15 +161,15 @@ class ContactPage extends BasePage {
         context: context,
         builder: (BuildContext context) {
           return AlertWithOneAction(
-            alertTitle: S.current.contact,
-            alertContent: error,
-            buttonText: S.of(context).ok,
-            buttonAction: () => Navigator.of(context).pop(),
-          );
+              alertTitle: S.current.contact,
+              alertContent: error,
+              buttonText: S.of(context).ok,
+              buttonAction: () => Navigator.of(context).pop());
         });
   }
 
-  void _onContactSavedSuccessfully(BuildContext context) => Navigator.of(context).pop();
+  void _onContactSavedSuccessfully(BuildContext context) =>
+      Navigator.of(context).pop();
 
   void _setEffects(BuildContext context) {
     if (_isEffectsApplied) {
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 98cb2f2db..cf1f6fa17 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart';
 import 'package:cake_wallet/src/screens/dashboard/pages/cake_features_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_listener_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/haven_wallet_removal_popup.dart';
 import 'package:cake_wallet/src/widgets/services_updates_widget.dart';
@@ -27,12 +27,12 @@ import 'package:cake_wallet/src/screens/dashboard/pages/transactions_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:mobx/mobx.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
 import 'package:cake_wallet/main.dart';
 import 'package:cake_wallet/src/screens/release_notes/release_notes_screen.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class DashboardPage extends StatefulWidget {
   DashboardPage({
@@ -164,19 +164,18 @@ class _DashboardPageView extends BasePage {
 
   @override
   Widget trailing(BuildContext context) {
+    final menuButton = Image.asset(
+      'assets/images/menu.png',
+      color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+    );
+
     return Container(
       alignment: Alignment.centerRight,
-      width: 42,
+      width: 40,
       child: TextButton(
         key: ValueKey('dashboard_page_wallet_menu_button_key'),
         onPressed: () => onOpenEndDrawer(),
-        child: Semantics(
-          label: S.of(context).wallet_menu,
-          child: SvgPicture.asset(
-            'assets/images/menu.svg',
-            color: Theme.of(context).colorScheme.onSurface,
-          ),
-        ),
+        child: Semantics(label: S.of(context).wallet_menu, child: menuButton),
       ),
     );
   }
@@ -251,8 +250,14 @@ class _DashboardPageView extends BasePage {
                             radius: 6.0,
                             dotWidth: 6.0,
                             dotHeight: 6.0,
-                            dotColor: Theme.of(context).colorScheme.primary.withOpacity(0.4),
-                            activeDotColor: Theme.of(context).colorScheme.primary,
+                            dotColor: Theme.of(context)
+                                .extension<DashboardPageTheme>()!
+                                .indicatorDotTheme
+                                .indicatorColor,
+                            activeDotColor: Theme.of(context)
+                                .extension<DashboardPageTheme>()!
+                                .indicatorDotTheme
+                                .activeIndicatorColor,
                           ),
                         ),
                       );
@@ -260,10 +265,7 @@ class _DashboardPageView extends BasePage {
                   ),
                 ),
               ),
-              NavigationDock(
-                dashboardViewModel: dashboardViewModel,
-                currentTheme: currentTheme,
-              )
+              NavigationDock(dashboardViewModel: dashboardViewModel)
             ],
           ),
         ),
@@ -305,6 +307,7 @@ class _DashboardPageView extends BasePage {
 
     rootKey.currentState?.isInactive.listen(
       (inactive) {
+
         if (needToPresentYat) {
           Future<void>.delayed(Duration(milliseconds: 500)).then(
             (_) {
diff --git a/lib/src/screens/dashboard/desktop_dashboard_page.dart b/lib/src/screens/dashboard/desktop_dashboard_page.dart
index 3e515377e..c7cd67dfa 100644
--- a/lib/src/screens/dashboard/desktop_dashboard_page.dart
+++ b/lib/src/screens/dashboard/desktop_dashboard_page.dart
@@ -35,7 +35,7 @@ class DesktopDashboardPage extends StatelessWidget {
     _setEffects(context);
 
     return Container(
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.background,
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart
index 7b9897abb..f49047e0b 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart
@@ -1,4 +1,10 @@
 import 'package:auto_size_text/auto_size_text.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
 
 class DesktopActionButton extends StatelessWidget {
@@ -32,7 +38,7 @@ class DesktopActionButton extends StatelessWidget {
             width: double.infinity,
             decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(15.0),
-              color: Theme.of(context).colorScheme.surfaceContainer,
+              color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
             ),
             child: Center(
               child: Row(
@@ -43,18 +49,19 @@ class DesktopActionButton extends StatelessWidget {
                     height: 30,
                     width: 30,
                     color: isEnabled
-                        ? Theme.of(context).colorScheme.onPrimaryContainer
-                        : Theme.of(context).colorScheme.onSurfaceVariant,
+                        ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                        : Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
                   ),
                   const SizedBox(width: 10),
                   AutoSizeText(
                     title,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    style: TextStyle(
                       fontSize: 24,
+                      fontFamily: 'Lato',
                       fontWeight: FontWeight.bold,
                       color: isEnabled
-                          ? Theme.of(context).colorScheme.onPrimaryContainer
-                          : Theme.of(context).colorScheme.onSurfaceVariant,
+                          ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                          : null,
                       height: 1,
                     ),
                     maxLines: 1,
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_actions.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_actions.dart
index dbb200ca5..a1e89c0f6 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_actions.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_actions.dart
@@ -15,7 +15,7 @@ class DesktopDashboardActions extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.background,
       child: Observer(
         builder: (_) {
           return Column(
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_navbar.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_navbar.dart
index 88b527fba..b97def132 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_navbar.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_navbar.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -16,14 +16,16 @@ class DesktopDashboardNavbar extends StatelessWidget implements ObstructingPrefe
     required this.trailing,
   });
 
-  MaterialThemeBase get currentTheme => getIt.get<ThemeStore>().currentTheme;
+  ThemeBase get currentTheme => getIt.get<SettingsStore>().currentTheme;
 
   @override
   Widget build(BuildContext context) {
+    final appBarColor =
+        currentTheme.type == ThemeType.dark ? Colors.black.withOpacity(0.1) : Colors.white;
 
     return Container(
       padding: const EdgeInsetsDirectional.only(end: 24),
-      color: Theme.of(context).colorScheme.surfaceContainerLowest.withOpacity(0.1),
+      color: appBarColor,
       child: Center(
         child: Row(
           mainAxisSize: MainAxisSize.max,
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu.dart
index 510c15db6..bc7c0af84 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu.dart
@@ -16,7 +16,7 @@ class SideMenu extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: Theme.of(context).colorScheme.surfaceContainerLowest.withOpacity(0.1),
+      color: Colors.black.withOpacity(0.1),
       width: width,
       height: MediaQuery.of(context).size.height,
       child: Column(
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
index 1f169d202..f839f9d27 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
@@ -1,5 +1,5 @@
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class SideMenuItem extends StatelessWidget {
   const SideMenuItem({
@@ -19,9 +19,9 @@ class SideMenuItem extends StatelessWidget {
 
   Color _setColor(BuildContext context) {
     if (isSelected) {
-      return Theme.of(context).colorScheme.primary;
+      return Theme.of(context).extension<CakeTextTheme>()!.titleColor;
     } else {
-      return Theme.of(context).colorScheme.onSurfaceVariant;
+      return Theme.of(context).highlightColor;
     }
   }
 
@@ -47,8 +47,8 @@ class SideMenuItem extends StatelessWidget {
             color: _setColor(context),
             size: 30,
           )
-        : CakeImageWidget(
-            imageUrl: imagePath ?? '',
+        : Image.asset(
+            imagePath ?? '',
             fit: BoxFit.cover,
             height: 30,
             width: 30,
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
index a26f48928..d9b509136 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
@@ -7,8 +8,7 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sideba
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_listener_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart';
 import 'package:cake_wallet/src/widgets/services_updates_widget.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/desktop_sidebar_view_model.dart';
@@ -63,6 +63,9 @@ class DesktopSidebarWrapper extends BasePage {
 
   final pageController = PageController();
 
+  final selectedIconPath = 'assets/images/desktop_transactions_solid_icon.png';
+  final unselectedIconPath = 'assets/images/desktop_transactions_outline_icon.png';
+
   double get sideMenuWidth => 76.0;
 
   @override
@@ -100,7 +103,9 @@ class DesktopSidebarWrapper extends BasePage {
                     }
                   },
                   isSelected: desktopSidebarViewModel.currentPage == SidebarItem.transactions,
-                  imagePath: 'assets/images/history.svg',
+                  imagePath: desktopSidebarViewModel.currentPage == SidebarItem.transactions
+                      ? selectedIconPath
+                      : unselectedIconPath,
                 ),
                 SideMenuItem(
                   widget: ServicesUpdatesWidget(
@@ -132,7 +137,7 @@ class DesktopSidebarWrapper extends BasePage {
               children: [
                 child,
                 Container(
-                  color: Theme.of(context).colorScheme.surface,
+                  color: Theme.of(context).colorScheme.background,
                   padding: EdgeInsets.all(20),
                   child: Navigator(
                     initialRoute: Routes.support,
diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
index b4b6d0b8b..fed9cb6fe 100644
--- a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
@@ -1,5 +1,6 @@
 import 'package:another_flushbar/flushbar.dart';
 import 'package:cake_wallet/core/new_wallet_arguments.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/desktop_dropdown_item.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -9,6 +10,8 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/dropdown_item_
 import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
@@ -51,14 +54,14 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
         'assets/images/new_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).colorScheme.onSurface,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       );
 
   Image _restoreWalletImage(BuildContext context) => Image.asset(
         'assets/images/restore_wallet.png',
         height: 12,
         width: 12,
-        color: Theme.of(context).colorScheme.onSurface,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
       );
 
   Flushbar<void>? _progressBar;
@@ -116,8 +119,8 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
         onChanged: (item) {
           item?.onSelected();
         },
-        dropdownColor: themeData.colorScheme.surface,
-        style: themeData.textTheme.bodyMedium,
+        dropdownColor: themeData.extension<CakeMenuTheme>()!.backgroundColor,
+        style: TextStyle(color: themeData.extension<CakeTextTheme>()!.titleColor),
         selectedItemBuilder: (context) => dropDownItems.map((item) => item.child).toList(),
         value: selectedItem,
         underline: const SizedBox(),
@@ -253,7 +256,7 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
   }
 
   void changeProcessText(String text) {
-    _progressBar = createBar<void>(text,context, duration: null)..show(context);
+    _progressBar = createBar<void>(text, duration: null)..show(context);
   }
 
   void hideProgressText() {
diff --git a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
index 9ceedc73a..f8f92dc08 100644
--- a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
+++ b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class DropDownItemWidget extends StatelessWidget {
@@ -20,7 +21,11 @@ class DropDownItemWidget extends StatelessWidget {
           Flexible(
             child: Text(
               title,
-              style: Theme.of(context).textTheme.bodyMedium,
+              style: TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              ),
               overflow: TextOverflow.ellipsis,
               maxLines: 1,
             ),
diff --git a/lib/src/screens/dashboard/edit_token_page.dart b/lib/src/screens/dashboard/edit_token_page.dart
index 8f9f67178..11a584b39 100644
--- a/lib/src/screens/dashboard/edit_token_page.dart
+++ b/lib/src/screens/dashboard/edit_token_page.dart
@@ -8,6 +8,8 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/checkbox_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/home_settings_view_model.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -73,7 +75,6 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
 
   bool _showDisclaimer = false;
   bool _disclaimerChecked = false;
-  bool isEditingToken = false;
 
   @override
   void initState() {
@@ -89,8 +90,6 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
       _tokenSymbolController.text = widget.token!.title;
       _tokenDecimalController.text = widget.token!.decimals.toString();
       _tokenIconPathController.text = widget.token?.iconPath ?? '';
-
-      isEditingToken = true;
     }
 
     if (widget.initialContractAddress != null) {
@@ -125,7 +124,7 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
               Container(
                 padding: EdgeInsets.symmetric(vertical: 16, horizontal: 28),
                 decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                  color: Theme.of(context).cardColor,
                   borderRadius: BorderRadius.circular(12),
                 ),
                 child: Row(
@@ -139,18 +138,23 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
                         children: [
                           Text(
                             S.of(context).warning,
-                            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                  fontWeight: FontWeight.w500,
-                                ),
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.bold,
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                            ),
                           ),
                           Padding(
                             padding: EdgeInsets.only(top: 5),
                             child: Text(
                               S.of(context).add_token_warning,
-                              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    height: 1.6,
-                                  ),
+                              style: TextStyle(
+                                fontSize: 14,
+                                fontWeight: FontWeight.bold,
+                                color: Theme.of(context)
+                                    .extension<TransactionTradeTheme>()!
+                                    .detailsTitlesColor,
+                              ),
                             ),
                           ),
                         ],
@@ -191,8 +195,8 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
                           Navigator.pop(context);
                         },
                         text: widget.token != null ? S.of(context).delete : S.of(context).cancel,
-                        color: Theme.of(context).colorScheme.errorContainer,
-                        textColor: Theme.of(context).colorScheme.onErrorContainer,
+                        color: Colors.red,
+                        textColor: Colors.white,
                       ),
                     ),
                     SizedBox(width: 20),
@@ -203,43 +207,22 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
                         onPressed: () async {
                           if (_formKey.currentState!.validate() &&
                               (!_showDisclaimer || _disclaimerChecked)) {
-                            final isTokenAlreadyAdded = isEditingToken
-                                ? false
-                                : await widget.homeSettingsViewModel
-                                    .checkIfTokenIsAlreadyAdded(_contractAddressController.text);
-                            if (isTokenAlreadyAdded) {
-                              showPopUp<void>(
-                                context: context,
-                                builder: (dialogContext) {
-                                  return AlertWithOneAction(
-                                    alertTitle: S.current.warning,
-                                    alertContent: S.of(context).token_already_exists,
-                                    buttonText: S.of(context).ok,
-                                    buttonAction: () => Navigator.of(dialogContext).pop(),
-                                  );
-                                },
-                              );
-                              return;
-                            }
+                            final hasPotentialError = await widget.homeSettingsViewModel
+                                .checkIfERC20TokenContractAddressIsAPotentialScamAddress(
+                              _contractAddressController.text,
+                            );
 
                             final isWhitelisted = await widget.homeSettingsViewModel
                                 .checkIfTokenIsWhitelisted(_contractAddressController.text);
 
-                            final hasPotentialError = !isWhitelisted &&
-                                await widget.homeSettingsViewModel
-                                    .checkIfERC20TokenContractAddressIsAPotentialScamAddress(
-                                  _contractAddressController.text,
-                                );
-
-                            bool isPotentialScam = hasPotentialError && !isWhitelisted;
+                            bool isPotentialScam = hasPotentialError;
                             final tokenSymbol = _tokenSymbolController.text.toUpperCase();
-
+                            
                             // check if the token symbol is the same as any of the base currencies symbols (ETH, SOL, POL, TRX, etc):
                             // if it is, then it's probably a scam unless it's in the whitelist
                             final baseCurrencySymbols =
                                 CryptoCurrency.all.map((e) => e.title.toUpperCase()).toList();
-                            if (baseCurrencySymbols.contains(tokenSymbol.trim().toUpperCase()) &&
-                                !isWhitelisted) {
+                            if (baseCurrencySymbols.contains(tokenSymbol) && !isWhitelisted) {
                               isPotentialScam = true;
                             }
 
@@ -274,7 +257,7 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
                               }
                             };
 
-                            if (hasPotentialError && !isWhitelisted) {
+                            if (hasPotentialError) {
                               showPopUp<void>(
                                 context: context,
                                 builder: (dialogContext) {
@@ -314,8 +297,8 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
                           }
                         },
                         text: S.of(context).save,
-                        color: Theme.of(context).colorScheme.primary,
-                        textColor: Theme.of(context).colorScheme.onPrimary,
+                        color: Theme.of(context).primaryColor,
+                        textColor: Colors.white,
                       ),
                     ),
                   ],
@@ -370,6 +353,7 @@ class _EditTokenPageBodyState extends State<EditTokenPageBody> {
             focusNode: _contractAddressFocusNode,
             placeholder: S.of(context).token_contract_address,
             options: [AddressTextFieldOption.paste],
+            buttonColor: Theme.of(context).hintColor,
             validator: widget.homeSettingsViewModel.walletType == WalletType.zano
                 ? null
                 : AddressValidator(type: widget.homeSettingsViewModel.nativeToken).call,
diff --git a/lib/src/screens/dashboard/home_settings_page.dart b/lib/src/screens/dashboard/home_settings_page.dart
index a51f665bf..aa6bb12c0 100644
--- a/lib/src/screens/dashboard/home_settings_page.dart
+++ b/lib/src/screens/dashboard/home_settings_page.dart
@@ -5,13 +5,16 @@ import 'package:cake_wallet/entities/sort_balance_types.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/view_model/dashboard/home_settings_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:cake_wallet/view_model/dashboard/home_settings_view_model.dart';
 
 class HomeSettingsPage extends BasePage {
   HomeSettingsPage(this._homeSettingsViewModel);
@@ -36,7 +39,7 @@ class HomeSettingsPage extends BasePage {
               onItemSelected: _homeSettingsViewModel.setSortBalanceBy,
             ),
           ),
-          Divider(color: Theme.of(context).colorScheme.outlineVariant),
+          Divider(color: Theme.of(context).extension<CakeMenuTheme>()!.dividerColor),
           Observer(
             builder: (_) => SettingsSwitcherCell(
               title: S.of(context).pin_at_top(_homeSettingsViewModel.nativeToken.title),
@@ -46,52 +49,56 @@ class HomeSettingsPage extends BasePage {
               },
             ),
           ),
-          Divider(color: Theme.of(context).colorScheme.outlineVariant),
+          Divider(color: Theme.of(context).extension<CakeMenuTheme>()!.dividerColor),
           const SizedBox(height: 20),
           Row(
             children: [
               Expanded(
                 child: Padding(
                   padding: const EdgeInsetsDirectional.only(start: 16),
-                  child: BaseTextFormField(
+                  child: TextFormField(
                     controller: _searchController,
-                    textStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
-                    hintText: S.of(context).search_add_token,
-                    prefixIcon: Image.asset(
-                      "assets/images/search_icon.png",
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    style: TextStyle(
+                        color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
+                    decoration: InputDecoration(
+                      hintText: S.of(context).search_add_token,
+                      prefixIcon: Image.asset("assets/images/search_icon.png"),
+                      filled: true,
+                      fillColor: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
+                      alignLabelWithHint: false,
+                      contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
+                      enabledBorder: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(30),
+                        borderSide: const BorderSide(color: Colors.transparent),
+                      ),
+                      focusedBorder: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(30),
+                        borderSide: const BorderSide(color: Colors.transparent),
+                      ),
                     ),
-                    alignLabelWithHint: false,
-                    contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
                     onChanged: (String text) => _homeSettingsViewModel.changeSearchText(text),
                   ),
                 ),
               ),
               RawMaterialButton(
                 onPressed: () async {
-                  Navigator.pushNamed(
-                    context,
-                    Routes.editToken,
-                    arguments: {
-                      'homeSettingsViewModel': _homeSettingsViewModel,
-                      if (AddressValidator(type: _homeSettingsViewModel.nativeToken)
-                          .isValid(_searchController.text))
-                        'contractAddress': _searchController.text,
-                    },
-                  );
+                  Navigator.pushNamed(context, Routes.editToken, arguments: {
+                    'homeSettingsViewModel': _homeSettingsViewModel,
+                    if (AddressValidator(type: _homeSettingsViewModel.nativeToken)
+                        .isValid(_searchController.text))
+                      'contractAddress': _searchController.text,
+                  });
                 },
                 elevation: 0,
-                fillColor: Theme.of(context).colorScheme.surfaceContainer,
+                fillColor: Theme.of(context).cardColor,
                 child: Icon(
                   Icons.add,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   size: 22.0,
                 ),
                 padding: EdgeInsets.all(12),
                 shape: CircleBorder(),
-                splashColor: Theme.of(context).colorScheme.surfaceContainer,
+                splashColor: Theme.of(context).cardColor,
               ),
             ],
           ),
@@ -129,27 +136,24 @@ class HomeSettingsPage extends BasePage {
                               imageUrl: token.iconPath,
                               height: 40,
                               width: 40,
-                              errorWidget: Container(
+                              displayOnError: Container(
                                 height: 30.0,
                                 width: 30.0,
                                 child: Center(
                                   child: Text(
                                     token.title.substring(0, min(token.title.length, 2)),
-                                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                          fontSize: 11,
-                                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                        ),
+                                    style: TextStyle(fontSize: 11),
                                   ),
                                 ),
                                 decoration: BoxDecoration(
                                   shape: BoxShape.circle,
-                                  color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                                  color: Colors.grey.shade400,
                                 ),
                               ),
                             ),
                           ),
                           decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.surfaceContainer,
+                            color: Theme.of(context).cardColor,
                             borderRadius: BorderRadius.circular(30),
                           ),
                         );
diff --git a/lib/src/screens/dashboard/pages/address_page.dart b/lib/src/screens/dashboard/pages/address_page.dart
index ba399e82b..10f9aef43 100644
--- a/lib/src/screens/dashboard/pages/address_page.dart
+++ b/lib/src/screens/dashboard/pages/address_page.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/anonpay/anonpay_donation_link_info.dart';
@@ -8,7 +9,8 @@ import 'package:cw_core/receive_page_option.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/present_receive_option_picker.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/share_util.dart';
 import 'package:cake_wallet/view_model/dashboard/receive_option_view_model.dart';
@@ -23,6 +25,7 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:keyboard_actions/keyboard_actions.dart';
 import 'package:mobx/mobx.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 
 class AddressPage extends BasePage {
   AddressPage({
@@ -65,7 +68,7 @@ class AddressPage extends BasePage {
       size: 16,
     );
     final _closeButton =
-        currentTheme.isDark ? closeButtonImageDarkTheme : closeButtonImage;
+        currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
     bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
 
@@ -127,57 +130,53 @@ class AddressPage extends BasePage {
     _setEffects(context);
 
     return KeyboardActions(
-      autoScroll: false,
-      disableScroll: true,
-      tapOutsideBehavior: TapOutsideBehavior.translucentDismiss,
-      config: KeyboardActionsConfig(
-        keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-        keyboardBarColor: Theme.of(context).colorScheme.surface,
-        nextFocus: false,
-        actions: [
-          KeyboardActionsItem(
-            focusNode: _cryptoAmountFocus,
-            toolbarButtons: [(_) => KeyboardDoneButton()],
-          )
-        ],
-      ),
-      child: Container(
-        padding: EdgeInsets.fromLTRB(24, 0, 24, 32),
-        child: Column(
-          children: <Widget>[
-            Expanded(
-              child: Observer(
-                builder: (_) => QRWidget(
-                  formKey: _formKey,
-                  addressListViewModel: addressListViewModel,
-                  amountTextFieldFocusNode: _cryptoAmountFocus,
-                  amountController: _amountController,
-                  currentTheme: dashboardViewModel.appStore.themeStore.currentTheme,
-                ),
-              ),
-            ),
-            SizedBox(height: 16),
-            Observer(
-              builder: (_) {
+        autoScroll: false,
+        disableScroll: true,
+        tapOutsideBehavior: TapOutsideBehavior.translucentDismiss,
+        config: KeyboardActionsConfig(
+            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
+            nextFocus: false,
+            actions: [
+              KeyboardActionsItem(
+                focusNode: _cryptoAmountFocus,
+                toolbarButtons: [(_) => KeyboardDoneButton()],
+              )
+            ]),
+        child: Container(
+          padding: EdgeInsets.fromLTRB(24, 0, 24, 32),
+          child: Column(
+            children: <Widget>[
+              Expanded(
+                  child: Observer(
+                      builder: (_) => QRWidget(
+                          formKey: _formKey,
+                          addressListViewModel: addressListViewModel,
+                          amountTextFieldFocusNode: _cryptoAmountFocus,
+                          amountController: _amountController,
+                          isLight: dashboardViewModel.settingsStore.currentTheme.type ==
+                              ThemeType.light,
+                        ))),
+              SizedBox(height: 16),
+              Observer(builder: (_) {
                 if (addressListViewModel.hasAddressList) {
                   return SelectButton(
                     text: addressListViewModel.buttonTitle,
                     onTap: () => Navigator.of(context).pushNamed(Routes.receive),
-                    textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-                    color: Theme.of(context).colorScheme.surfaceContainer,
-                    arrowColor: Theme.of(context).colorScheme.onSurfaceVariant,
+                    textColor: Theme.of(context).extension<SyncIndicatorTheme>()!.textColor,
+                    color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+                    borderColor: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
+                    arrowColor: Theme.of(context).extension<SyncIndicatorTheme>()!.textColor,
                     textSize: 14,
                     height: 50,
                   );
                 } else {
                   return const SizedBox();
                 }
-              },
-            ),
-          ],
-        ),
-      ),
-    );
+              }),
+            ],
+          ),
+        ));
   }
 
   void _setEffects(BuildContext context) {
@@ -186,8 +185,7 @@ class AddressPage extends BasePage {
     }
 
     reaction((_) => receiveOptionViewModel.selectedReceiveOption, (ReceivePageOption option) {
-      if (dashboardViewModel.type == WalletType.bitcoin &&
-          bitcoin!.isBitcoinReceivePageOption(option)) {
+      if (bitcoin!.isBitcoinReceivePageOption(option)) {
         addressListViewModel.setAddressType(bitcoin!.getOptionToType(option));
         return;
       }
diff --git a/lib/src/screens/dashboard/pages/balance/balance_page.dart b/lib/src/screens/dashboard/pages/balance/balance_page.dart
index 88ddc55d5..8577ba0ad 100644
--- a/lib/src/screens/dashboard/pages/balance/balance_page.dart
+++ b/lib/src/screens/dashboard/pages/balance/balance_page.dart
@@ -2,6 +2,7 @@ import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/src/screens/dashboard/pages/balance/crypto_balance_widget.dart';
 import 'package:cake_wallet/src/screens/dashboard/pages/nft_listing_page.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
 import 'package:flutter/material.dart';
@@ -36,26 +37,34 @@ class BalancePage extends StatelessWidget {
                     child: TabBar(
                       indicatorSize: TabBarIndicatorSize.label,
                       isScrollable: true,
-                      physics: const NeverScrollableScrollPhysics(),
-                      labelStyle: Theme.of(context).textTheme.titleMedium?.copyWith(
-                            fontWeight: FontWeight.w600,
-                            fontSize: 18,
-                            height: 1,
-                            color: Theme.of(context).colorScheme.primary,
-                          ),
-                      unselectedLabelStyle: Theme.of(context).textTheme.titleMedium?.copyWith(
-                            fontWeight: FontWeight.w600,
-                            fontSize: 18,
-                            height: 1,
-                            color: Theme.of(context).colorScheme.primary,
-                          ),
-                      labelColor: Theme.of(context).colorScheme.primary,
+                      physics: NeverScrollableScrollPhysics(),
+                      labelStyle: TextStyle(
+                        fontSize: 18,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w600,
+                        color:
+                            Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                        height: 1,
+                      ),
+                      unselectedLabelStyle: TextStyle(
+                        fontSize: 18,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w600,
+                        color:
+                            Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                        height: 1,
+                      ),
+                      labelColor:
+                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                       dividerColor: Colors.transparent,
-                      indicatorColor: Theme.of(context).colorScheme.primary,
-                      unselectedLabelColor:
-                          Theme.of(context).colorScheme.secondary.withOpacity(0.7),
+                      indicatorColor:
+                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                      unselectedLabelColor: Theme.of(context)
+                          .extension<DashboardPageTheme>()!
+                          .pageTitleTextColor
+                          .withOpacity(0.5),
                       tabAlignment: TabAlignment.start,
-                      tabs: const [
+                      tabs: [
                         Tab(text: 'My Crypto'),
                         Tab(text: 'My NFTs'),
                       ],
@@ -64,7 +73,7 @@ class BalancePage extends StatelessWidget {
                 ),
               Expanded(
                 child: TabBarView(
-                  physics: const NeverScrollableScrollPhysics(),
+                  physics: NeverScrollableScrollPhysics(),
                   children: [
                     CryptoBalanceWidget(dashboardViewModel: dashboardViewModel),
                     if (isNFTActivated) NFTListingPage(nftViewModel: nftViewModel)
diff --git a/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart b/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart
index 288429363..875618784 100644
--- a/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart
+++ b/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart
@@ -6,7 +6,8 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
@@ -15,6 +16,7 @@ import 'package:cw_core/unspent_coin_type.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 
 class BalanceRowWidget extends StatelessWidget {
   BalanceRowWidget({
@@ -64,38 +66,40 @@ class BalanceRowWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    bool brightThemeType = false;
+    if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright) brightThemeType = true;
     return Column(
       children: [
         Container(
           margin: const EdgeInsets.only(left: 16, right: 16),
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(15.0),
-            gradient: LinearGradient(
-          colors: [
-            dashboardViewModel.isDarkTheme
-                ? CustomThemeColors.cardGradientColorPrimaryDark
-                : CustomThemeColors.cardGradientColorPrimaryLight,
-                    dashboardViewModel.isDarkTheme
-                ? CustomThemeColors.cardGradientColorSecondaryDark
-                : CustomThemeColors.cardGradientColorSecondaryLight,
-          ],
-          begin: Alignment.topCenter,
-          end: Alignment.bottomCenter,
-        ),
+            borderRadius: BorderRadius.circular(30.0),
+            border: Border.all(
+              color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
+              width: 1,
+            ),
+            color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+            // boxShadow: [
+            //   BoxShadow(
+            //       color: Theme.of(context)
+            //           .extension<BalancePageTheme>()!
+            //           .cardBorderColor
+            //           .withAlpha(50),
+            //       spreadRadius: dashboardViewModel.getShadowSpread(),
+            //       blurRadius: dashboardViewModel.getShadowBlur())
+            // ],
           ),
           child: TextButton(
-            onPressed: _showToast,
+            onPressed: () => Fluttertoast.showToast(
+              msg: S.current.show_balance_toast,
+              backgroundColor: Color.fromRGBO(0, 0, 0, 0.85),
+            ),
             onLongPress: () => dashboardViewModel.balanceViewModel.switchBalanceValue(),
             style: TextButton.styleFrom(
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30)),
             ),
             child: Container(
-              margin: const EdgeInsets.only(
-                top: 10,
-                left: 12,
-                right: 12,
-                bottom: 10,
-              ),
+              margin: const EdgeInsets.only(top: 10, left: 12, right: 12, bottom: 10),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -117,58 +121,61 @@ class BalanceRowWidget extends StatelessWidget {
                                 Semantics(
                                   hint: 'Double tap to see more information',
                                   container: true,
-                                  child: Text(
-                                    '${availableBalanceLabel}',
-                                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                          height: 1,
-                                        ),
-                                  ),
+                                  child: Text('${availableBalanceLabel}',
+                                      style: TextStyle(
+                                          fontSize: 12,
+                                          fontFamily: 'Lato',
+                                          fontWeight: FontWeight.w400,
+                                          color: Theme.of(context)
+                                              .extension<BalancePageTheme>()!
+                                              .labelTextColor,
+                                          height: 1)),
                                 ),
                                 if (hasAdditionalBalance)
                                   Padding(
                                     padding: const EdgeInsets.symmetric(horizontal: 4),
-                                    child: Icon(
-                                      Icons.help_outline,
-                                      size: 16,
-                                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    ),
+                                    child: Icon(Icons.help_outline,
+                                        size: 16,
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .labelTextColor),
                                   ),
                               ],
                             ),
                           ),
                           SizedBox(height: 6),
-                          AutoSizeText(
-                            availableBalance,
-                            style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurface,
-                                  fontWeight: FontWeight.w900,
+                          AutoSizeText(availableBalance,
+                              style: TextStyle(
                                   fontSize: 24,
-                                  height: 1,
-                                ),
-                            maxLines: 1,
-                            textAlign: TextAlign.start,
-                          ),
+                                  fontFamily: 'Lato',
+                                  fontWeight: FontWeight.w900,
+                                  color: Theme.of(context)
+                                      .extension<BalancePageTheme>()!
+                                      .balanceAmountColor,
+                                  height: 1),
+                              maxLines: 1,
+                              textAlign: TextAlign.start),
                           SizedBox(height: 6),
                           if (isTestnet)
-                            Text(
-                              S.of(context).testnet_coins_no_value,
-                              textAlign: TextAlign.center,
-                              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    height: 1,
-                                  ),
-                            ),
+                            Text(S.of(context).testnet_coins_no_value,
+                                textAlign: TextAlign.center,
+                                style: TextStyle(
+                                    fontSize: 14,
+                                    fontFamily: 'Lato',
+                                    fontWeight: FontWeight.w400,
+                                    color:
+                                        Theme.of(context).extension<BalancePageTheme>()!.textColor,
+                                    height: 1)),
                           if (!isTestnet)
-                            Text(
-                              '${availableFiatBalance}',
-                              textAlign: TextAlign.center,
-                              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                            Text('${availableFiatBalance}',
+                                textAlign: TextAlign.center,
+                                style: TextStyle(
                                     fontSize: 16,
+                                    fontFamily: 'Lato',
                                     fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    height: 1,
-                                  ),
-                            ),
+                                    color:
+                                        Theme.of(context).extension<BalancePageTheme>()!.textColor,
+                                    height: 1)),
                         ],
                       ),
                       SizedBox(
@@ -180,33 +187,33 @@ class BalanceRowWidget extends StatelessWidget {
                                 imageUrl: currency.iconPath,
                                 height: 40,
                                 width: 40,
-                                errorWidget: Container(
+                                displayOnError: Container(
                                   height: 30.0,
                                   width: 30.0,
                                   child: Center(
                                     child: Text(
                                       currency.title.substring(0, min(currency.title.length, 2)),
-                                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                            fontSize: 11,
-                                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                          ),
+                                      style: TextStyle(fontSize: 11),
                                     ),
                                   ),
                                   decoration: BoxDecoration(
                                     shape: BoxShape.circle,
-                                    color: Theme.of(context).colorScheme.surfaceContainer,
+                                    color: Colors.grey.shade400,
                                   ),
                                 ),
                               ),
                               const SizedBox(height: 10),
                               Text(
                                 currency.title,
-                                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.w700,
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                      height: 1,
-                                    ),
+                                style: TextStyle(
+                                  fontSize: 15,
+                                  fontFamily: 'Lato',
+                                  fontWeight: FontWeight.w800,
+                                  color: Theme.of(context)
+                                      .extension<BalancePageTheme>()!
+                                      .assetTitleColor,
+                                  height: 1,
+                                ),
                               ),
                             ],
                           ),
@@ -214,33 +221,7 @@ class BalanceRowWidget extends StatelessWidget {
                       ),
                     ],
                   ),
-                  if (currency.isPotentialScam)
-                    Container(
-                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-                      margin: EdgeInsets.only(top: 4),
-                      decoration: BoxDecoration(
-                        color: Theme.of(context).colorScheme.errorContainer,
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                      child: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          Icon(
-                            Icons.warning_amber_outlined,
-                            size: 16,
-                            color: Theme.of(context).colorScheme.onErrorContainer,
-                          ),
-                          const SizedBox(width: 4),
-                          Text(
-                            S.of(context).potential_scam,
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  color: Theme.of(context).colorScheme.onErrorContainer,
-                                  fontWeight: FontWeight.w700,
-                                ),
-                          ),
-                        ],
-                      ),
-                    ),
+                  //),
                   if (frozenBalance.isNotEmpty)
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
@@ -251,21 +232,28 @@ class BalanceRowWidget extends StatelessWidget {
                             Text(
                               S.of(context).frozen_balance,
                               textAlign: TextAlign.center,
-                              style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    height: 1,
-                                  ),
+                              style: TextStyle(
+                                fontSize: 12,
+                                fontFamily: 'Lato',
+                                fontWeight: FontWeight.w400,
+                                color:
+                                    Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+                                height: 1,
+                              ),
                             ),
                           ],
                         ),
                         SizedBox(height: 8),
                         AutoSizeText(
                           frozenBalance,
-                          style: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                                fontSize: 20,
-                                color: Theme.of(context).colorScheme.primary,
-                                height: 1,
-                              ),
+                          style: TextStyle(
+                            fontSize: 20,
+                            fontFamily: 'Lato',
+                            fontWeight: FontWeight.w400,
+                            color:
+                                Theme.of(context).extension<BalancePageTheme>()!.balanceAmountColor,
+                            height: 1,
+                          ),
                           maxLines: 1,
                           textAlign: TextAlign.center,
                         ),
@@ -274,9 +262,13 @@ class BalanceRowWidget extends StatelessWidget {
                           Text(
                             frozenFiatBalance,
                             textAlign: TextAlign.center,
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  height: 1,
-                                ),
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontFamily: 'Lato',
+                              fontWeight: FontWeight.w400,
+                              color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
+                              height: 1,
+                            ),
                           ),
                       ],
                     ),
@@ -288,19 +280,24 @@ class BalanceRowWidget extends StatelessWidget {
                         Text(
                           '${additionalBalanceLabel}',
                           textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                height: 1,
-                              ),
+                          style: TextStyle(
+                            fontSize: 12,
+                            fontFamily: 'Lato',
+                            fontWeight: FontWeight.w400,
+                            color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+                            height: 1,
+                          ),
                         ),
                         SizedBox(height: 8),
                         AutoSizeText(
                           additionalBalance,
-                          style: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                                fontSize: 20,
-                                color: Theme.of(context).colorScheme.secondary,
-                                height: 1,
-                              ),
+                          style: TextStyle(
+                            fontSize: 20,
+                            fontFamily: 'Lato',
+                            fontWeight: FontWeight.w400,
+                            color: Theme.of(context).extension<BalancePageTheme>()!.assetTitleColor,
+                            height: 1,
+                          ),
                           maxLines: 1,
                           textAlign: TextAlign.center,
                         ),
@@ -309,9 +306,13 @@ class BalanceRowWidget extends StatelessWidget {
                           Text(
                             '${additionalFiatBalance}',
                             textAlign: TextAlign.center,
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  height: 1,
-                                ),
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontFamily: 'Lato',
+                              fontWeight: FontWeight.w400,
+                              color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
+                              height: 1,
+                            ),
                           ),
                       ],
                     ),
@@ -321,23 +322,16 @@ class BalanceRowWidget extends StatelessWidget {
           ),
         ),
         if (hasSecondAdditionalBalance || hasSecondAvailableBalance) ...[
-          SizedBox(height: 10),
+          SizedBox(height: 16),
           Container(
             margin: const EdgeInsets.only(left: 16, right: 16),
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(15),
-              gradient: LinearGradient(
-                colors: [
-                  dashboardViewModel.isDarkTheme
-                      ? CustomThemeColors.cardGradientColorPrimaryDark
-                      : CustomThemeColors.cardGradientColorPrimaryLight,
-                  dashboardViewModel.isDarkTheme
-                      ? CustomThemeColors.cardGradientColorSecondaryDark
-                      : CustomThemeColors.cardGradientColorSecondaryLight,
-                ],
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
+              borderRadius: BorderRadius.circular(30.0),
+              border: Border.all(
+                color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
+                width: 1,
               ),
+              color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
               // boxShadow: [
               //   BoxShadow(
               //       color: Theme.of(context)
@@ -349,16 +343,19 @@ class BalanceRowWidget extends StatelessWidget {
               // ],
             ),
             child: TextButton(
-              onPressed: _showToast,
+              onPressed: () => Fluttertoast.showToast(
+                msg: S.current.show_balance_toast,
+                backgroundColor: Color.fromRGBO(0, 0, 0, 0.85),
+              ),
               onLongPress: () => dashboardViewModel.balanceViewModel.switchBalanceValue(),
               style: TextButton.styleFrom(
-                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(30)),
               ),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Container(
-                    margin: const EdgeInsets.only(top: 10, left: 12, right: 8, bottom: 10),
+                    margin: const EdgeInsets.only(top: 10, left: 12, right: 12, bottom: 10),
                     child: Stack(
                       children: [
                         if (currency == CryptoCurrency.ltc)
@@ -371,18 +368,24 @@ class BalanceRowWidget extends StatelessWidget {
                                     Container(
                                       child: ImageIcon(
                                         AssetImage('assets/images/mweb_logo.png'),
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .assetTitleColor,
                                         size: 40,
                                       ),
                                     ),
                                     const SizedBox(height: 10),
                                     Text(
                                       'MWEB',
-                                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                            fontSize: 16,
-                                            fontWeight: FontWeight.w700,
-                                            color: Theme.of(context).colorScheme.onSurface,
-                                            height: 1,
-                                          ),
+                                      style: TextStyle(
+                                        fontSize: 15,
+                                        fontFamily: 'Lato',
+                                        fontWeight: FontWeight.w800,
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .assetTitleColor,
+                                        height: 1,
+                                      ),
                                     ),
                                   ],
                                 ),
@@ -407,19 +410,23 @@ class BalanceRowWidget extends StatelessWidget {
                                         Text(
                                           '${secondAvailableBalanceLabel}',
                                           textAlign: TextAlign.center,
-                                          style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                                color:
-                                                    Theme.of(context).colorScheme.onSurfaceVariant,
-                                                height: 1,
-                                              ),
+                                          style: TextStyle(
+                                            fontSize: 12,
+                                            fontFamily: 'Lato',
+                                            fontWeight: FontWeight.w400,
+                                            color: Theme.of(context)
+                                                .extension<BalancePageTheme>()!
+                                                .labelTextColor,
+                                            height: 1,
+                                          ),
                                         ),
                                         Padding(
                                           padding: const EdgeInsets.symmetric(horizontal: 4),
-                                          child: Icon(
-                                            Icons.help_outline,
-                                            size: 16,
-                                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                          ),
+                                          child: Icon(Icons.help_outline,
+                                              size: 16,
+                                              color: Theme.of(context)
+                                                  .extension<BalancePageTheme>()!
+                                                  .labelTextColor),
                                         )
                                       ],
                                     ),
@@ -427,12 +434,15 @@ class BalanceRowWidget extends StatelessWidget {
                                   SizedBox(height: 8),
                                   AutoSizeText(
                                     secondAvailableBalance,
-                                    style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                          fontSize: 24,
-                                          fontWeight: FontWeight.w800,
-                                          color: Theme.of(context).colorScheme.onSurface,
-                                          height: 1,
-                                        ),
+                                    style: TextStyle(
+                                      fontSize: 24,
+                                      fontFamily: 'Lato',
+                                      fontWeight: FontWeight.w900,
+                                      color: Theme.of(context)
+                                          .extension<BalancePageTheme>()!
+                                          .assetTitleColor,
+                                      height: 1,
+                                    ),
                                     maxLines: 1,
                                     textAlign: TextAlign.center,
                                   ),
@@ -441,12 +451,15 @@ class BalanceRowWidget extends StatelessWidget {
                                     Text(
                                       '${secondAvailableFiatBalance}',
                                       textAlign: TextAlign.center,
-                                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                            fontSize: 16,
-                                            fontWeight: FontWeight.w500,
-                                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                            height: 1,
-                                          ),
+                                      style: TextStyle(
+                                        fontSize: 16,
+                                        fontFamily: 'Lato',
+                                        fontWeight: FontWeight.w500,
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .textColor,
+                                        height: 1,
+                                      ),
                                     ),
                                 ],
                               ),
@@ -469,19 +482,28 @@ class BalanceRowWidget extends StatelessWidget {
                                   Text(
                                     '${secondAdditionalBalanceLabel}',
                                     textAlign: TextAlign.center,
-                                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                          height: 1,
-                                        ),
+                                    style: TextStyle(
+                                      fontSize: 12,
+                                      fontFamily: 'Lato',
+                                      fontWeight: FontWeight.w400,
+                                      color: Theme.of(context)
+                                          .extension<BalancePageTheme>()!
+                                          .labelTextColor,
+                                      height: 1,
+                                    ),
                                   ),
                                   SizedBox(height: 8),
                                   AutoSizeText(
                                     secondAdditionalBalance,
-                                    style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                          fontSize: 20,
-                                          color: Theme.of(context).colorScheme.secondary,
-                                          height: 1,
-                                        ),
+                                    style: TextStyle(
+                                      fontSize: 20,
+                                      fontFamily: 'Lato',
+                                      fontWeight: FontWeight.w400,
+                                      color: Theme.of(context)
+                                          .extension<BalancePageTheme>()!
+                                          .assetTitleColor,
+                                      height: 1,
+                                    ),
                                     maxLines: 1,
                                     textAlign: TextAlign.center,
                                   ),
@@ -490,9 +512,15 @@ class BalanceRowWidget extends StatelessWidget {
                                     Text(
                                       '${secondAdditionalFiatBalance}',
                                       textAlign: TextAlign.center,
-                                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                            height: 1,
-                                          ),
+                                      style: TextStyle(
+                                        fontSize: 12,
+                                        fontFamily: 'Lato',
+                                        fontWeight: FontWeight.w400,
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .textColor,
+                                        height: 1,
+                                      ),
                                     ),
                                 ],
                               ),
@@ -529,13 +557,11 @@ class BalanceRowWidget extends StatelessWidget {
                                   );
                                 },
                                 style: OutlinedButton.styleFrom(
-                                  backgroundColor: Theme.of(context).colorScheme.primary,
+                                  backgroundColor: Colors.grey.shade400.withAlpha(50),
                                   side: BorderSide(
-                                    color: Theme.of(context).colorScheme.outlineVariant.withAlpha(0),
-                                    width: 0,
-                                  ),
+                                      color: Colors.grey.shade400.withAlpha(50), width: 0),
                                   shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(10),
+                                    borderRadius: BorderRadius.circular(20),
                                   ),
                                 ),
                                 child: Container(
@@ -547,15 +573,18 @@ class BalanceRowWidget extends StatelessWidget {
                                         height: 30,
                                         width: 30,
                                         'assets/images/received.png',
-                                        color: Theme.of(context).colorScheme.onPrimary,
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .balanceAmountColor,
                                       ),
                                       const SizedBox(width: 8),
                                       Text(
                                         S.of(context).litecoin_mweb_pegin,
-                                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                              color: Theme.of(context).colorScheme.onPrimary,
-                                              fontWeight: FontWeight.w700,
-                                            ),
+                                        style: TextStyle(
+                                          color: Theme.of(context)
+                                              .extension<BalancePageTheme>()!
+                                              .textColor,
+                                        ),
                                       ),
                                     ],
                                   ),
@@ -563,7 +592,7 @@ class BalanceRowWidget extends StatelessWidget {
                               ),
                             ),
                           ),
-                          SizedBox(width: 16),
+                          SizedBox(width: 24),
                           Expanded(
                             child: Semantics(
                               label: S.of(context).litecoin_mweb_pegout,
@@ -586,13 +615,11 @@ class BalanceRowWidget extends StatelessWidget {
                                   );
                                 },
                                 style: OutlinedButton.styleFrom(
-                                  backgroundColor: Theme.of(context).colorScheme.surface,
+                                  backgroundColor: Colors.grey.shade400.withAlpha(50),
                                   side: BorderSide(
-                                    color: Theme.of(context).colorScheme.outlineVariant.withAlpha(0),
-                                    width: 0,
-                                  ),
+                                      color: Colors.grey.shade400.withAlpha(50), width: 0),
                                   shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(10),
+                                    borderRadius: BorderRadius.circular(20),
                                   ),
                                 ),
                                 child: Container(
@@ -604,17 +631,18 @@ class BalanceRowWidget extends StatelessWidget {
                                         height: 30,
                                         width: 30,
                                         'assets/images/upload.png',
-                                        color: Theme.of(context).colorScheme.onSecondaryContainer,
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .balanceAmountColor,
                                       ),
                                       const SizedBox(width: 8),
                                       Text(
                                         S.of(context).litecoin_mweb_pegout,
-                                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .onSecondaryContainer,
-                                              fontWeight: FontWeight.w700,
-                                            ),
+                                        style: TextStyle(
+                                          color: Theme.of(context)
+                                              .extension<BalancePageTheme>()!
+                                              .textColor,
+                                        ),
                                       ),
                                     ],
                                   ),
@@ -638,29 +666,24 @@ class BalanceRowWidget extends StatelessWidget {
 
   //  double getShadowSpread(){
   //   double spread = 3;
-  //   else if (!dashboardViewModel.settingsStore.currentTheme.isDark) spread = 3;
-  //   else if (dashboardViewModel.settingsStore.currentTheme.isDark) spread = 1;
+  //   if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright) spread = 3;
+  //   else if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.light) spread = 3;
+  //   else if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.dark) spread = 1;
+  //   else if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.oled) spread = 3;
   //   return spread;
   // }
   //
   //
   // double getShadowBlur(){
   //   double blur = 7;
-  //   else if (dashboardViewModel.settingsStore.currentTheme.isDark) blur = 7;
-  //   else if (dashboardViewModel.settingsStore.currentTheme.isDark) blur = 3;
+  //   if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright) blur = 7;
+  //   else if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.light) blur = 7;
+  //   else if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.dark) blur = 3;
+  //   else if (dashboardViewModel.settingsStore.currentTheme.type == ThemeType.oled) blur = 7;
   //   return blur;
   // }
 
   void _showBalanceDescription(BuildContext context, String content) {
     showPopUp<void>(context: context, builder: (_) => InformationPage(information: content));
   }
-
-  void _showToast() async {
-    try {
-      await Fluttertoast.showToast(
-        msg: S.current.show_balance_toast,
-        backgroundColor: Color.fromRGBO(0, 0, 0, 0.85),
-      );
-    } catch (_) {}
-  }
 }
diff --git a/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart b/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart
index ee377651b..cef313780 100644
--- a/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart
+++ b/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart
@@ -9,12 +9,13 @@ import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/dashboard_card_widget.dart';
 import 'package:cake_wallet/src/widgets/introducing_card.dart';
 import 'package:cake_wallet/src/widgets/standard_switch.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class CryptoBalanceWidget extends StatelessWidget {
@@ -24,8 +25,6 @@ class CryptoBalanceWidget extends StatelessWidget {
   });
 
   final DashboardViewModel dashboardViewModel;
-  final btcLockLight = 'assets/images/btc_lock_light.png';
-  final btcLockDark = 'assets/images/btc_lock_dark.png';
 
   @override
   Widget build(BuildContext context) {
@@ -39,7 +38,6 @@ class CryptoBalanceWidget extends StatelessWidget {
                 return Padding(
                   padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
                   child: DashBoardRoundedCardWidget(
-                    isDarkTheme: dashboardViewModel.isDarkTheme,
                     title: "Invalid monero bindings",
                     subTitle: dashboardViewModel.getMoneroError.toString(),
                   ),
@@ -52,13 +50,11 @@ class CryptoBalanceWidget extends StatelessWidget {
             builder: (_) {
               if (dashboardViewModel.getWowneroError != null) {
                 return Padding(
-                  padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-                  child: DashBoardRoundedCardWidget(
-                    isDarkTheme: dashboardViewModel.isDarkTheme,
-                    title: "Invalid wownero bindings",
-                    subTitle: dashboardViewModel.getWowneroError.toString(),
-                  ),
-                );
+                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+                    child: DashBoardRoundedCardWidget(
+                      title: "Invalid wownero bindings",
+                      subTitle: dashboardViewModel.getWowneroError.toString(),
+                    ));
               }
               return Container();
             },
@@ -78,39 +74,42 @@ class CryptoBalanceWidget extends StatelessWidget {
                                 children: [
                                   Text(
                                     dashboardViewModel.balanceViewModel.asset,
-                                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(
-                                          fontWeight: FontWeight.w500,
-                                          color: Theme.of(context).colorScheme.onSurface,
-                                          height: 1,
-                                        ),
+                                    style: TextStyle(
+                                      fontSize: 24,
+                                      fontFamily: 'Lato',
+                                      fontWeight: FontWeight.w600,
+                                      color: Theme.of(context)
+                                          .extension<DashboardPageTheme>()!
+                                          .pageTitleTextColor,
+                                      height: 1,
+                                    ),
                                     maxLines: 1,
                                     textAlign: TextAlign.center,
                                   ),
                                   if (dashboardViewModel.wallet.isHardwareWallet)
-                                    Container(
+                                    Padding(
+                                      padding: const EdgeInsets.all(8.0),
                                       child: Image.asset(
                                         'assets/images/hardware_wallet/ledger_nano_x.png',
                                         width: 24,
-                                        color: Theme.of(context).colorScheme.onSurface,
+                                        color: Theme.of(context)
+                                            .extension<DashboardPageTheme>()!
+                                            .pageTitleTextColor,
                                       ),
                                     ),
                                   if (dashboardViewModel
                                       .balanceViewModel.isHomeScreenSettingsEnabled)
-                                    TextButton(
-                                      style: TextButton.styleFrom(
-                                          minimumSize: Size(50, 30),
-                                          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                                          alignment: Alignment.centerLeft),
-                                      onPressed: () => Navigator.pushNamed(
-                                        context,
-                                        Routes.homeSettings,
-                                        arguments: dashboardViewModel.balanceViewModel,
-                                      ),
-                                      child: Container(
-                                        child: SvgPicture.asset(
-                                            'assets/images/home_screen_setting_icon.svg',
-                                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                            height: 30),
+                                    InkWell(
+                                      onTap: () => Navigator.pushNamed(context, Routes.homeSettings,
+                                          arguments: dashboardViewModel.balanceViewModel),
+                                      child: Padding(
+                                        padding: const EdgeInsets.all(8.0),
+                                        child: Image.asset(
+                                          'assets/images/home_screen_settings_icon.png',
+                                          color: Theme.of(context)
+                                              .extension<DashboardPageTheme>()!
+                                              .pageTitleTextColor,
+                                        ),
                                       ),
                                     ),
                                 ],
@@ -126,7 +125,7 @@ class CryptoBalanceWidget extends StatelessWidget {
                 return IntroducingCard(
                     title: S.of(context).introducing_cake_pay,
                     subTitle: S.of(context).cake_pay_learn_more,
-                    borderColor: Theme.of(context).colorScheme.outline,
+                    borderColor: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
                     closeCard: dashboardViewModel.balanceViewModel.disableIntroCakePayCard);
               }
               return Container();
@@ -139,7 +138,6 @@ class CryptoBalanceWidget extends StatelessWidget {
             return Padding(
               padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
               child: DashBoardRoundedCardWidget(
-                isDarkTheme: dashboardViewModel.isDarkTheme,
                 title: S.of(context).rep_warning,
                 subTitle: S.of(context).rep_warning_sub,
                 onTap: () => Navigator.of(context).pushNamed(Routes.changeRep),
@@ -154,7 +152,7 @@ class CryptoBalanceWidget extends StatelessWidget {
               return ListView.separated(
                 physics: NeverScrollableScrollPhysics(),
                 shrinkWrap: true,
-                separatorBuilder: (_, __) => Container(padding: EdgeInsets.only(bottom: 10)),
+                separatorBuilder: (_, __) => Container(padding: EdgeInsets.only(bottom: 16)),
                 itemCount: dashboardViewModel.balanceViewModel.formattedBalances.length,
                 itemBuilder: (__, index) {
                   final balance =
@@ -202,7 +200,6 @@ class CryptoBalanceWidget extends StatelessWidget {
                   Padding(
                       padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
                       child: DashBoardRoundedCardWidget(
-                        isDarkTheme: dashboardViewModel.isDarkTheme,
                         customBorder: 30,
                         title: "This wallet has encountered an issue",
                         subTitle: "Here are the things that you should note:\n - " +
@@ -211,11 +208,10 @@ class CryptoBalanceWidget extends StatelessWidget {
                       ))
                 ],
                 if (dashboardViewModel.showSilentPaymentsCard) ...[
-                  SizedBox(height: 10),
+                  SizedBox(height: 16),
                   Padding(
-                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 0),
+                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
                     child: DashBoardRoundedCardWidget(
-                      isDarkTheme: dashboardViewModel.isDarkTheme,
                       shadowBlur: dashboardViewModel.getShadowBlur(),
                       shadowSpread: dashboardViewModel.getShadowSpread(),
                       marginV: 0,
@@ -239,19 +235,24 @@ class CryptoBalanceWidget extends StatelessWidget {
                                   children: [
                                     Text(
                                       S.of(context).what_is_silent_payments,
-                                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                            height: 1,
-                                          ),
+                                      style: TextStyle(
+                                        fontSize: 12,
+                                        fontFamily: 'Lato',
+                                        fontWeight: FontWeight.w400,
+                                        color: Theme.of(context)
+                                            .extension<BalancePageTheme>()!
+                                            .labelTextColor,
+                                        height: 1,
+                                      ),
                                       softWrap: true,
                                     ),
                                     Padding(
                                       padding: const EdgeInsets.symmetric(horizontal: 4),
-                                      child: Icon(
-                                        Icons.help_outline,
-                                        size: 16,
-                                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                      ),
+                                      child: Icon(Icons.help_outline,
+                                          size: 16,
+                                          color: Theme.of(context)
+                                              .extension<BalancePageTheme>()!
+                                              .labelTextColor),
                                     )
                                   ],
                                 ),
@@ -259,7 +260,7 @@ class CryptoBalanceWidget extends StatelessWidget {
                               Observer(
                                 builder: (_) => StandardSwitch(
                                   value: dashboardViewModel.silentPaymentsScanningActive,
-                                  onTapped: () => _toggleSilentPaymentsScanning(context),
+                                  onTaped: () => _toggleSilentPaymentsScanning(context),
                                 ),
                               )
                             ],
@@ -267,18 +268,20 @@ class CryptoBalanceWidget extends StatelessWidget {
                         ],
                       ),
                       onTap: () => _toggleSilentPaymentsScanning(context),
-                      image: !dashboardViewModel.appStore.themeStore.currentTheme.isDark
-                          ? Image.asset(btcLockLight, height: 48)
-                          : Image.asset(btcLockDark, height: 48),
+                      icon: Icon(
+                        Icons.lock,
+                        color:
+                            Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                        size: 50,
+                      ),
                     ),
                   ),
                 ],
                 if (dashboardViewModel.showMwebCard) ...[
-                  SizedBox(height: 10),
+                  SizedBox(height: 16),
                   Padding(
                     padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
                     child: InfoCard(
-                      isDarkTheme: dashboardViewModel.isDarkTheme,
                       title: S.of(context).litecoin_mweb,
                       description: S.of(context).litecoin_mweb_description,
                       leftButtonTitle: S.of(context).litecoin_mweb_dismiss,
@@ -294,10 +297,13 @@ class CryptoBalanceWidget extends StatelessWidget {
                         ),
                         child: Text(
                           S.of(context).learn_more,
-                          style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                height: 1,
-                              ),
+                          style: TextStyle(
+                            fontSize: 12,
+                            fontFamily: 'Lato',
+                            fontWeight: FontWeight.w400,
+                            color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+                            height: 1,
+                          ),
                           softWrap: true,
                         ),
                       ),
@@ -309,58 +315,13 @@ class CryptoBalanceWidget extends StatelessWidget {
                   Padding(
                     padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
                     child: InfoCard(
-                      isDarkTheme: dashboardViewModel.isDarkTheme,
-                      title: S.of(context).synchronizing,
+                      title: S.of(context).decred_info_title,
                       description: S.of(context).decred_info_card_details,
                       image: 'assets/images/dcr_icon.png',
                       leftButtonTitle: S.of(context).litecoin_mweb_dismiss,
                       rightButtonTitle: S.of(context).learn_more,
                       leftButtonAction: () => dashboardViewModel.dismissDecredInfoCard(),
-                      rightButtonAction: () => launchUrl(
-                          Uri.parse("https://docs.cakewallet.com/cryptos/decred/#spv-sync")),
-                    ),
-                  ),
-                ],
-                if (dashboardViewModel.showPayjoinCard) ...[
-                  SizedBox(height: 10),
-                  Padding(
-                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
-                    child: InfoCard(
-                      isDarkTheme: dashboardViewModel.isDarkTheme,
-                      title: "Payjoin",
-                      description: S.of(context).payjoin_card_content,
-                      hintWidget: GestureDetector(
-                        behavior: HitTestBehavior.opaque,
-                        onTap: () => launchUrl(
-                          Uri.parse("https://docs.cakewallet.com/cryptos/bitcoin/#payjoin"),
-                          mode: LaunchMode.externalApplication,
-                        ),
-                        child: Row(
-                          children: [
-                            Text(
-                              S.of(context).what_is_payjoin,
-                              style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    height: 1,
-                                  ),
-                              softWrap: true,
-                            ),
-                            Padding(
-                              padding: const EdgeInsets.symmetric(horizontal: 4),
-                              child: Icon(
-                                Icons.help_outline,
-                                size: 16,
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
-                            )
-                          ],
-                        ),
-                      ),
-                      image: 'assets/images/payjoin.png',
-                      leftButtonTitle: S.of(context).litecoin_mweb_dismiss,
-                      rightButtonTitle: S.of(context).enable,
-                      leftButtonAction: () => dashboardViewModel.dismissPayjoin(),
-                      rightButtonAction: () => _enablePayjoin(context),
+                      rightButtonAction: () => launchUrl(Uri.parse("https://docs.cakewallet.com/cryptos/decred/#spv-sync")),
                     ),
                   ),
                 ],
@@ -404,21 +365,6 @@ class CryptoBalanceWidget extends StatelessWidget {
     return dashboardViewModel.setSilentPaymentsScanning(newValue);
   }
 
-  void _enablePayjoin(BuildContext context) {
-    showPopUp<void>(
-        context: context,
-        builder: (BuildContext context) => AlertWithOneAction(
-              alertTitle: S.of(context).payjoin_enabling_popup_title,
-              alertContent: S.of(context).payjoin_enabling_popup_content,
-              buttonText: S.of(context).ok,
-              buttonAction: () {
-                Navigator.of(context).pop();
-              },
-            ));
-
-    dashboardViewModel.enablePayjoin();
-  }
-
   Future<void> _enableMweb(BuildContext context) async {
     if (!dashboardViewModel.hasEnabledMwebBefore) {
       await showPopUp<void>(
diff --git a/lib/src/screens/dashboard/pages/cake_features_page.dart b/lib/src/screens/dashboard/pages/cake_features_page.dart
index 29066bc75..c98182d32 100644
--- a/lib/src/screens/dashboard/pages/cake_features_page.dart
+++ b/lib/src/screens/dashboard/pages/cake_features_page.dart
@@ -4,11 +4,12 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/dashboard_card_widget.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/view_model/dashboard/cake_features_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/view_model/dashboard/cake_features_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -21,85 +22,64 @@ class CakeFeaturesPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Padding(
-            padding: EdgeInsets.only(left: 24, top: 16),
+      return Container(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: EdgeInsets.only(left: 24, top: 16),
             child: Text(
               'Cake ${S.of(context).features}',
-              style: Theme.of(context).textTheme.headlineSmall?.copyWith(
-                    fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+              style: TextStyle(
+                fontSize: 24,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+              ),
             ),
-          ),
-          Expanded(
-            child: ListView(
-              children: <Widget>[
-                SizedBox(height: 2),
-                DashBoardRoundedCardWidget(
-                  isDarkTheme: dashboardViewModel.isDarkTheme,
-                  shadowBlur: dashboardViewModel.getShadowBlur(),
-                  shadowSpread: dashboardViewModel.getShadowSpread(),
-                  onTap: () {
-                    if (Platform.isMacOS) {
-                      _launchUrl("buy.cakepay.com");
-                    } else {
-                      _navigatorToGiftCardsPage(context);
-                    }
-                  },
-                  title: 'Cake Pay',
-                  subTitle: S.of(context).cake_pay_subtitle,
-                  image: Image.asset(
-                    'assets/images/cards.png',
-                    height: 100,
-                    width: 115,
-                    fit: BoxFit.cover,
-                  ),
-                ),
-                Observer(builder: (_) {
-                  if (dashboardViewModel.type == WalletType.ethereum) {
-                    return DashBoardRoundedCardWidget(
-                      isDarkTheme: dashboardViewModel.isDarkTheme,
-                      shadowBlur: dashboardViewModel.getShadowBlur(),
-                      shadowSpread: dashboardViewModel.getShadowSpread(),
-                      onTap: () => Navigator.of(context).pushNamed(Routes.dEuroSavings),
-                      title: S.of(context).deuro_savings,
-                      subTitle: S.of(context).deuro_savings_subtitle,
-                      image: Image.asset(
-                        'assets/images/deuro_icon.png',
-                        height: 80,
-                        width: 80,
-                        fit: BoxFit.cover,
-                      ),
-                    );
-                  }
-
-                  return const SizedBox();
-                }),
-                DashBoardRoundedCardWidget(
-                  isDarkTheme: dashboardViewModel.isDarkTheme,
-                  shadowBlur: dashboardViewModel.getShadowBlur(),
-                  shadowSpread: dashboardViewModel.getShadowSpread(),
-                  onTap: () => _launchUrl("cake.nano-gpt.com"),
-                  title: "NanoGPT",
-                  subTitle: S.of(context).nanogpt_subtitle,
-                  image: Image.asset(
-                    'assets/images/nanogpt.png',
-                    height: 80,
-                    width: 80,
-                    fit: BoxFit.cover,
-                  ),
-                ),
-                SizedBox(height: 125),
-              ],
             ),
-          ),
-        ],
-      ),
-    );
+            Expanded(
+              child: ListView(
+                children: <Widget>[
+                  SizedBox(height: 2),
+                  DashBoardRoundedCardWidget(
+                    shadowBlur: dashboardViewModel.getShadowBlur(),
+                    shadowSpread: dashboardViewModel.getShadowSpread(),
+                    onTap: () {
+                      if (Platform.isMacOS) {
+                        _launchUrl("buy.cakepay.com");
+                      } else {
+                        _navigatorToGiftCardsPage(context);
+                      }
+                    },
+                    title: 'Cake Pay',
+                    subTitle: S.of(context).cake_pay_subtitle,
+                    image: Image.asset(
+                      'assets/images/cards.png',
+                      height: 100,
+                      width: 115,
+                      fit: BoxFit.cover,
+                    ),
+                  ),
+                  DashBoardRoundedCardWidget(
+                    shadowBlur: dashboardViewModel.getShadowBlur(),
+                    shadowSpread: dashboardViewModel.getShadowSpread(),
+                    onTap: () => _launchUrl("cake.nano-gpt.com"),
+                    title: "NanoGPT",
+                    subTitle: S.of(context).nanogpt_subtitle,
+                    image: Image.asset(
+                      'assets/images/nanogpt.png',
+                      height: 80,
+                      width: 80,
+                      fit: BoxFit.cover,
+                    ),
+                  ),
+                  SizedBox(height: 125),
+                ],
+              ),
+            ),
+          ],
+        ),
+      );
   }
 
   void _launchUrl(String url) {
diff --git a/lib/src/screens/dashboard/pages/navigation_dock.dart b/lib/src/screens/dashboard/pages/navigation_dock.dart
index 27f846775..4eda169d3 100644
--- a/lib/src/screens/dashboard/pages/navigation_dock.dart
+++ b/lib/src/screens/dashboard/pages/navigation_dock.dart
@@ -1,20 +1,20 @@
 import 'dart:ui';
 import 'package:cake_wallet/entities/main_actions.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/action_button.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import '../../../../themes/theme_base.dart';
 
 class NavigationDock extends StatelessWidget {
   const NavigationDock({
     required this.dashboardViewModel,
-    required this.currentTheme,
   });
 
   final DashboardViewModel dashboardViewModel;
-  final MaterialThemeBase currentTheme;
 
   @override
   Widget build(BuildContext context) {
@@ -28,20 +28,11 @@ class NavigationDock extends StatelessWidget {
               gradient: LinearGradient(
                 begin: Alignment.topCenter,
                 end: Alignment.bottomCenter,
-                colors: _getColors(context, !currentTheme.isDark),
+                colors: _getColors(context),
               ),
             ),
-            //color: Colors.transparent,
             child: Container(
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(50),
-                gradient: LinearGradient(
-                  begin: Alignment.topCenter,
-                  end: Alignment.bottomCenter,
-                  colors: _getColors(context, !currentTheme.isDark),
-                ),
-              ),
-              margin: const EdgeInsets.only(left: 8, right: 8, bottom: 16),
+              margin: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
               child: ClipRRect(
                 borderRadius: BorderRadius.circular(50),
                 child: BackdropFilter(
@@ -49,10 +40,15 @@ class NavigationDock extends StatelessWidget {
                   child: Container(
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(50.0),
-                      color: Theme.of(context).colorScheme.surfaceContainer,
+                      border: Border.all(
+                        color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
+                        width: 1,
+                      ),
+                      color:
+                          Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
                     ),
                     child: Container(
-                      padding: EdgeInsets.symmetric(horizontal: 8),
+                      padding: EdgeInsets.symmetric(horizontal: 10),
                       child: IntrinsicHeight(
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -66,10 +62,18 @@ class NavigationDock extends StatelessWidget {
                                     child: ActionButton(
                                       key: ValueKey(
                                           'dashboard_page_${action.name(context)}_action_button_key'),
-                                      image: Image.asset(action.image,
-                                          height: 24,
-                                          width: 24,
-                                          color: Theme.of(context).colorScheme.primary),
+                                      image: Image.asset(
+                                        action.image,
+                                        height: 24,
+                                        width: 24,
+                                        color: action.isEnabled?.call(dashboardViewModel) ?? true
+                                            ? Theme.of(context)
+                                                .extension<DashboardPageTheme>()!
+                                                .mainActionsIconColor
+                                            : Theme.of(context)
+                                                .extension<BalancePageTheme>()!
+                                                .labelTextColor,
+                                      ),
                                       title: action.name(context),
                                       onClick: (action.isEnabled?.call(dashboardViewModel) ?? true)
                                           ? () async =>
@@ -77,7 +81,9 @@ class NavigationDock extends StatelessWidget {
                                           : null,
                                       textColor: action.isEnabled?.call(dashboardViewModel) ?? true
                                           ? null
-                                          : Theme.of(context).colorScheme.onSurface,
+                                          : Theme.of(context)
+                                              .extension<BalancePageTheme>()!
+                                              .labelTextColor,
                                     ),
                                   ),
                                 ),
@@ -96,25 +102,48 @@ class NavigationDock extends StatelessWidget {
     );
   }
 
-  List<Color> _getColors(BuildContext context, bool isBright) {
+  List<Color> _getColors(BuildContext context) {
+    final isBright = dashboardViewModel.settingsStore.currentTheme.type == ThemeType.bright;
     return isBright
         ? <Color>[
-            CustomThemeColors.backgroundGradientColorLight.withAlpha(5),
-            CustomThemeColors.backgroundGradientColorLight.withAlpha(50),
-            CustomThemeColors.backgroundGradientColorLight.withAlpha(125),
-            CustomThemeColors.backgroundGradientColorLight.withAlpha(150),
-            CustomThemeColors.backgroundGradientColorLight.withAlpha(200),
-            CustomThemeColors.backgroundGradientColorLight,
-            CustomThemeColors.backgroundGradientColorLight
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(10),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(75),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(150),
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor,
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor
           ]
         : <Color>[
-            CustomThemeColors.backgroundGradientColorDark.withAlpha(5),
-            CustomThemeColors.backgroundGradientColorDark.withAlpha(50),
-            CustomThemeColors.backgroundGradientColorDark.withAlpha(125),
-            CustomThemeColors.backgroundGradientColorDark.withAlpha(150),
-            CustomThemeColors.backgroundGradientColorDark.withAlpha(200),
-            CustomThemeColors.backgroundGradientColorDark,
-            CustomThemeColors.backgroundGradientColorDark
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(5),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(50),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(125),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(150),
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor
+                .withAlpha(200),
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor,
+            Theme.of(context).extension<DashboardPageTheme>()!.thirdGradientBackgroundColor
           ];
   }
 }
diff --git a/lib/src/screens/dashboard/pages/nft_details_page.dart b/lib/src/screens/dashboard/pages/nft_details_page.dart
index 67139d480..c82c5ce90 100644
--- a/lib/src/screens/dashboard/pages/nft_details_page.dart
+++ b/lib/src/screens/dashboard/pages/nft_details_page.dart
@@ -6,6 +6,9 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/menu_widget.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 
 class NFTDetailsPage extends BasePage {
@@ -38,7 +41,7 @@ class NFTDetailsPage extends BasePage {
   Widget trailing(BuildContext context) {
     final menuButton = Image.asset(
       'assets/images/menu.png',
-      color: Theme.of(context).colorScheme.onSurface,
+      color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
     );
 
     return Container(
@@ -61,13 +64,14 @@ class NFTDetailsPage extends BasePage {
       child: Container(
         width: double.infinity,
         margin: const EdgeInsets.all(16),
+        padding: const EdgeInsets.symmetric(vertical: 16),
         decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(24.0),
+          borderRadius: BorderRadius.circular(30.0),
           border: Border.all(
-            color: Theme.of(context).colorScheme.outline,
+            color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
             width: 1,
           ),
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
         ),
         child: arguments.isSolanaNFT
             ? SolanaNFTDetailsWidget(
@@ -88,18 +92,21 @@ class _NFTImageWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final balanceTheme = Theme.of(context).extension<BalancePageTheme>()!;
+    final syncTheme = Theme.of(context).extension<SyncIndicatorTheme>()!;
+
     return Container(
       height: MediaQuery.sizeOf(context).height / 2.5,
       width: double.infinity,
       margin: const EdgeInsets.all(8),
       clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(24.0),
+        borderRadius: BorderRadius.circular(16.0),
         border: Border.all(
-          color: Theme.of(context).colorScheme.outline,
+          color: balanceTheme.cardBorderColor,
           width: 1,
         ),
-        color: Theme.of(context).colorScheme.surface,
+        color: syncTheme.syncedBackgroundColor,
       ),
       child: CakeImageWidget(imageUrl: imageUrl),
     );
@@ -224,6 +231,7 @@ class _NFTSingleInfoTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final balanceTheme = Theme.of(context).extension<BalancePageTheme>()!;
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 24),
       child: Column(
@@ -231,18 +239,22 @@ class _NFTSingleInfoTile extends StatelessWidget {
         children: [
           Text(
             infoType,
-            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-              fontWeight: FontWeight.w500,
+            style: TextStyle(
+              fontSize: 12,
+              fontFamily: 'Lato',
+              fontWeight: FontWeight.w400,
+              color: balanceTheme.labelTextColor,
               height: 1,
             ),
           ),
           const SizedBox(height: 8),
           Text(
             infoValue,
-            style: Theme.of(context).textTheme.titleMedium?.copyWith(
+            style: TextStyle(
+              fontSize: 16,
+              fontFamily: 'Lato',
               fontWeight: FontWeight.w600,
-              color: Theme.of(context).colorScheme.onSurface,
+              color: balanceTheme.assetTitleColor,
               height: 1,
             ),
           ),
diff --git a/lib/src/screens/dashboard/pages/nft_import_page.dart b/lib/src/screens/dashboard/pages/nft_import_page.dart
index 612889539..3ed30d6f8 100644
--- a/lib/src/screens/dashboard/pages/nft_import_page.dart
+++ b/lib/src/screens/dashboard/pages/nft_import_page.dart
@@ -1,7 +1,10 @@
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
 import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
@@ -69,13 +72,14 @@ class _ImportNFTPage extends BasePage {
           Text(
             S.current.address,
             textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                  fontWeight: FontWeight.w800,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  height: 1,
-                ),
+            style: TextStyle(
+              fontSize: 16,
+              fontFamily: 'Lato',
+              fontWeight: FontWeight.w800,
+              color: Theme.of(context).extension<SeedWidgetTheme>()!.hintTextColor,
+              height: 1,
+            ),
           ),
-          SizedBox(height: 8),
           AddressTextField(
             controller: tokenAddressController,
             options: [AddressTextFieldOption.paste],
@@ -87,28 +91,33 @@ class _ImportNFTPage extends BasePage {
                 tokenAddressController.text = tokenAddress;
               }
             },
-            fillColor: Theme.of(context).colorScheme.surfaceContainer,
-            iconColor: Theme.of(context).colorScheme.primary,
+            borderColor: Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
+            iconColor: Theme.of(context).primaryColor,
             placeholder: '0x...',
-            textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-            hintStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
+            textStyle: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w400,
+              color: PaletteDark.darkCyanBlue,
+            ),
+            hintStyle: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w400,
+              color: PaletteDark.darkCyanBlue,
+            ),
           ),
           if (nftViewModel.appStore.wallet!.type != WalletType.solana) ...[
             SizedBox(height: 48),
             Text(
               S.current.tokenID,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.w800,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    height: 1,
-                  ),
+              style: TextStyle(
+                fontSize: 16,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.w800,
+                color: Theme.of(context).extension<SeedWidgetTheme>()!.hintTextColor,
+                height: 1,
+              ),
             ),
-            SizedBox(height: 8),
             AddressTextField(
               controller: tokenIDController,
               options: [AddressTextFieldOption.paste],
@@ -120,14 +129,19 @@ class _ImportNFTPage extends BasePage {
                   tokenIDController.text = tokenID;
                 }
               },
-              iconColor: Theme.of(context).colorScheme.primary,
+              borderColor: Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
+              iconColor: Theme.of(context).primaryColor,
               placeholder: S.current.enterTokenID,
-              textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
-              hintStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
+              textStyle: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w400,
+                color: PaletteDark.darkCyanBlue,
+              ),
+              hintStyle: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w400,
+                color: PaletteDark.darkCyanBlue,
+              ),
             ),
           ],
           Spacer(),
@@ -135,8 +149,8 @@ class _ImportNFTPage extends BasePage {
             return LoadingPrimaryButton(
               isLoading: nftViewModel.isImportNFTLoading,
               text: S.current.import,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
+              color: Theme.of(context).primaryColor,
+              textColor: Colors.white,
               onPressed: () async {
                 await nftViewModel.importNFT(tokenAddressController.text, tokenIDController.text);
                 Navigator.pop(context);
diff --git a/lib/src/screens/dashboard/pages/nft_listing_page.dart b/lib/src/screens/dashboard/pages/nft_listing_page.dart
index ced4a656c..8da63fce6 100644
--- a/lib/src/screens/dashboard/pages/nft_listing_page.dart
+++ b/lib/src/screens/dashboard/pages/nft_listing_page.dart
@@ -5,32 +5,23 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/nft_tile_widget.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/solana_nft_tile_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
 
-class NFTListingPage extends StatefulWidget {
+class NFTListingPage extends StatelessWidget {
   final NFTViewModel nftViewModel;
 
   const NFTListingPage({super.key, required this.nftViewModel});
 
-  @override
-  State<NFTListingPage> createState() => _NFTListingPageState();
-}
-
-class _NFTListingPageState extends State<NFTListingPage> {
-  @override
-  void initState() {
-    super.initState();
-
-    fetchNFTsForWallet();
-  }
-
-  Future<void> fetchNFTsForWallet() async {
-    await widget.nftViewModel.getNFTAssetByWallet();
-  }
-
   @override
   Widget build(BuildContext context) {
+    final dashboardTheme = Theme.of(context).extension<DashboardPageTheme>()!;
+    final syncIndicatorTheme = Theme.of(context).extension<SyncIndicatorTheme>()!;
+    final exchangeTheme = Theme.of(context).extension<ExchangePageTheme>()!;
+
     return Observer(
       builder: (context) {
         return Column(
@@ -40,29 +31,29 @@ class _NFTListingPageState extends State<NFTListingPage> {
               padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
               child: PrimaryButton(
                 text: S.current.import,
-                color: Theme.of(context).colorScheme.surfaceContainer,
-                textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+                color: syncIndicatorTheme.syncedBackgroundColor,
+                textColor: Colors.white,
                 onPressed: () => Navigator.pushNamed(
                   context,
                   Routes.importNFTPage,
-                  arguments: widget.nftViewModel,
+                  arguments: nftViewModel,
                 ),
               ),
             ),
-            if (widget.nftViewModel.isLoading)
+            if (nftViewModel.isLoading)
               Expanded(
                 child: Center(
                   child: CircularProgressIndicator(
-                    backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
+                    backgroundColor: dashboardTheme.textColor,
                     valueColor: AlwaysStoppedAnimation<Color>(
-                      Theme.of(context).colorScheme.primary,
+                      exchangeTheme.firstGradientBottomPanelColor,
                     ),
                   ),
                 ),
               )
             else
               Expanded(
-                child: NFTListWidget(nftViewModel: widget.nftViewModel),
+                child: NFTListWidget(nftViewModel: nftViewModel),
               ),
           ],
         );
@@ -86,9 +77,13 @@ class NFTListWidget extends StatelessWidget {
           child: Text(
             S.current.noNFTYet,
             textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
+            style: TextStyle(
+              fontSize: 20,
+              fontFamily: 'Lato',
+              fontWeight: FontWeight.w600,
+              color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+              height: 1,
+            ),
           ),
         );
 
diff --git a/lib/src/screens/dashboard/pages/transactions_page.dart b/lib/src/screens/dashboard/pages/transactions_page.dart
index 7a3aa156a..654663f92 100644
--- a/lib/src/screens/dashboard/pages/transactions_page.dart
+++ b/lib/src/screens/dashboard/pages/transactions_page.dart
@@ -1,13 +1,12 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/anonpay_transaction_row.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/order_row.dart';
-import 'package:cake_wallet/src/screens/dashboard/widgets/payjoin_transaction_row.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/trade_row.dart';
+import 'package:cake_wallet/themes/extensions/placeholder_theme.dart';
 import 'package:cake_wallet/src/widgets/dashboard_card_widget.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/view_model/dashboard/anonpay_transaction_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/order_list_item.dart';
-import 'package:cake_wallet/view_model/dashboard/payjoin_transaction_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/sync_status.dart';
@@ -40,23 +39,26 @@ class TransactionsPage extends StatelessWidget {
       child: Container(
         color: responsiveLayoutUtil.shouldRenderMobileUI
             ? null
-            : Theme.of(context).colorScheme.surface,
+            : Theme.of(context).colorScheme.background,
         child: Column(
           children: <Widget>[
             Observer(builder: (_) {
               final status = dashboardViewModel.status;
               if (status is SyncingSyncStatus) {
-                return DashBoardRoundedCardWidget(
-                  isDarkTheme: dashboardViewModel.isDarkTheme,
-                  key: ValueKey('transactions_page_syncing_alert_card_key'),
-                  onTap: () {
-                    try {
-                      final uri = Uri.parse("https://docs.cakewallet.com/faq/funds-not-appearing");
-                      launchUrl(uri, mode: LaunchMode.externalApplication);
-                    } catch (_) {}
-                  },
-                  title: S.of(context).syncing_wallet_alert_title,
-                  subTitle: S.of(context).syncing_wallet_alert_content,
+                return Padding(
+                  padding: const EdgeInsets.fromLTRB(24, 0, 24, 8),
+                  child: DashBoardRoundedCardWidget(
+                    key: ValueKey('transactions_page_syncing_alert_card_key'),
+                    onTap: () {
+                      try {
+                        final uri = Uri.parse(
+                            "https://docs.cakewallet.com/faq/funds-not-appearing");
+                        launchUrl(uri, mode: LaunchMode.externalApplication);
+                      } catch (_) {}
+                    },
+                    title: S.of(context).syncing_wallet_alert_title,
+                    subTitle: S.of(context).syncing_wallet_alert_content,
+                  ),
                 );
               } else {
                 return Container();
@@ -70,12 +72,14 @@ class TransactionsPage extends StatelessWidget {
               child: Observer(
                 builder: (_) {
                   final items = dashboardViewModel.items;
+                  final amount = items.length + 1;
                   return items.isNotEmpty
                       ? ListView.builder(
                           key: ValueKey('transactions_page_list_view_builder_key'),
                           itemCount: items.length + 1,
                           itemBuilder: (context, index) {
-                            if (index == items.length) return SizedBox(height: 150);
+
+                            if(index == items.length) return SizedBox(height: 150);
 
                             final item = items[index];
 
@@ -143,24 +147,6 @@ class TransactionsPage extends StatelessWidget {
                               );
                             }
 
-                            if (item is PayjoinTransactionListItem) {
-                              final session = item.session;
-
-                              return PayjoinTransactionRow(
-                                key: item.key,
-                                onTap: () => Navigator.of(context).pushNamed(
-                                  Routes.payjoinDetails,
-                                  arguments: [item.sessionId, item.transaction],
-                                ),
-                                currency: "BTC",
-                                state: item.status,
-                                amount: bitcoin!
-                                    .formatterBitcoinAmountToString(amount: session.amount.toInt()),
-                                createdAt: DateFormat('HH:mm').format(session.inProgressSince!),
-                                isSending: session.isSenderSession,
-                              );
-                            }
-
                             if (item is TradeListItem) {
                               final trade = item.trade;
 
@@ -169,8 +155,7 @@ class TransactionsPage extends StatelessWidget {
                                   key: item.key,
                                   onTap: () => Navigator.of(context)
                                       .pushNamed(Routes.tradeDetails, arguments: trade),
-                                    swapState: trade.state,
-                                    provider: trade.provider,
+                                  provider: trade.provider,
                                   from: trade.from,
                                   to: trade.to,
                                   createdAtFormattedDate: trade.createdAt != null
@@ -199,15 +184,15 @@ class TransactionsPage extends StatelessWidget {
                               );
                             }
                             return Container(color: Colors.transparent, height: 1);
-                          },
-                        )
+                          })
                       : Center(
                           child: Text(
                             key: ValueKey('transactions_page_placeholder_transactions_text_key'),
                             S.of(context).placeholder_transactions,
-                            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                ),
+                            style: TextStyle(
+                              fontSize: 14,
+                              color: Theme.of(context).extension<PlaceholderTheme>()!.color,
+                            ),
                           ),
                         );
                 },
diff --git a/lib/src/screens/dashboard/sign_page.dart b/lib/src/screens/dashboard/sign_page.dart
index c9f188fe9..05cf63728 100644
--- a/lib/src/screens/dashboard/sign_page.dart
+++ b/lib/src/screens/dashboard/sign_page.dart
@@ -6,7 +6,9 @@ import 'package:cake_wallet/src/screens/dashboard/widgets/verify_form.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/sign_view_model.dart';
 import 'package:flutter/material.dart';
@@ -34,16 +36,15 @@ class SignPage extends BasePage {
 
   @override
   Widget middle(BuildContext context) => Observer(
-        builder: (_) {
-          return Text(
+      builder: (_) => Text(
             S.current.sign_verify_title,
-            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  fontSize: 18,
-                ),
-          );
-        },
-      );
+            style: TextStyle(
+              fontSize: 18.0,
+              fontWeight: FontWeight.bold,
+              fontFamily: 'Lato',
+              color: titleColor(context),
+            ),
+          ));
 
   final SignViewModel signViewModel;
   final PageController _controller;
@@ -59,7 +60,7 @@ class SignPage extends BasePage {
     return KeyboardActions(
       config: KeyboardActionsConfig(
         keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-        keyboardBarColor: Theme.of(context).colorScheme.surfaceVariant,
+        keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
         nextFocus: false,
         actions: [
           KeyboardActionsItem(
@@ -70,61 +71,69 @@ class SignPage extends BasePage {
       ),
       child: Container(
         height: 0,
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).colorScheme.background,
         child: Center(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Expanded(
-                child: PageView.builder(
-                  onPageChanged: (page) {
-                    signViewModel.isSigning = page == 0;
-                  },
-                  controller: _controller,
-                  itemCount: _pages.length,
-                  itemBuilder: (_, index) => SingleChildScrollView(child: _pages[index]),
-                ),
-              ),
-              if (_pages.length > 1)
-                Padding(
-                  padding: EdgeInsets.only(top: 10),
-                  child: SmoothPageIndicator(
+          child: ConstrainedBox(
+            constraints:
+                BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Expanded(
+                  child: PageView.builder(
+                    onPageChanged: (page) {
+                      signViewModel.isSigning = page == 0;
+                    },
                     controller: _controller,
-                    count: _pages.length,
-                    effect: ColorTransitionEffect(
-                      spacing: 6.0,
-                      radius: 6.0,
-                      dotWidth: 6.0,
-                      dotHeight: 6.0,
-                      dotColor: Theme.of(context).colorScheme.outline.withOpacity(0.5),
-                      activeDotColor: Theme.of(context).colorScheme.outline,
-                    ),
+                    itemCount: _pages.length,
+                    itemBuilder: (_, index) => SingleChildScrollView(child: _pages[index]),
                   ),
                 ),
-              Padding(
-                padding: EdgeInsets.only(top: 20, bottom: 24, left: 24, right: 24),
-                child: Column(
-                  children: [
-                    Observer(
-                      builder: (context) {
-                        return LoadingPrimaryButton(
-                          onPressed: () async {
-                            await _confirmForm(context);
-                          },
-                          text: signViewModel.isSigning
-                              ? S.current.sign_message
-                              : S.current.verify_message,
-                          color: Theme.of(context).colorScheme.primary,
-                          textColor: Theme.of(context).colorScheme.onPrimary,
-                          isLoading: signViewModel.state is IsExecutingState,
-                          isDisabled: signViewModel.state is IsExecutingState,
-                        );
-                      },
+                if (_pages.length > 1)
+                  Padding(
+                    padding: EdgeInsets.only(top: 10),
+                    child: SmoothPageIndicator(
+                      controller: _controller,
+                      count: _pages.length,
+                      effect: ColorTransitionEffect(
+                        spacing: 6.0,
+                        radius: 6.0,
+                        dotWidth: 6.0,
+                        dotHeight: 6.0,
+                        dotColor: Theme.of(context).hintColor.withOpacity(0.5),
+                        activeDotColor: Theme.of(context).hintColor,
+                      ),
                     ),
-                  ],
-                ),
-              )
-            ],
+                  ),
+                Padding(
+                  padding: EdgeInsets.only(top: 20, bottom: 24, left: 24, right: 24),
+                  child: Column(
+                    children: [
+                      Observer(
+                        builder: (context) {
+                          return LoadingPrimaryButton(
+                            onPressed: () async {
+                              await _confirmForm(context);
+                            },
+                            text: signViewModel.isSigning
+                                ? S.current.sign_message
+                                : S.current.verify_message,
+                            color: Theme.of(context)
+                                .extension<WalletListTheme>()!
+                                .createNewWalletButtonBackgroundColor,
+                            textColor: Theme.of(context)
+                                .extension<WalletListTheme>()!
+                                .restoreWalletButtonTextColor,
+                            isLoading: signViewModel.state is IsExecutingState,
+                            isDisabled: signViewModel.state is IsExecutingState,
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                )
+              ],
+            ),
           ),
         ),
       ),
diff --git a/lib/src/screens/dashboard/widgets/action_button.dart b/lib/src/screens/dashboard/widgets/action_button.dart
index 535181da8..786c56658 100644
--- a/lib/src/screens/dashboard/widgets/action_button.dart
+++ b/lib/src/screens/dashboard/widgets/action_button.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class ActionButton extends StatelessWidget {
   ActionButton({
@@ -46,10 +47,10 @@ class ActionButton extends StatelessWidget {
             SizedBox(height: 4),
             Text(
               title,
-              maxLines: 1,
-              overflow: TextOverflow.visible,
-              style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                  color: textColor ?? Theme.of(context).colorScheme.onSurface),
+              style: TextStyle(
+                  fontSize: 9,
+                  color: textColor ??
+                      Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor),
               textAlign: TextAlign.center,
             )
           ],
diff --git a/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart b/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart
index 14cf44a05..64d4bfe85 100644
--- a/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart
+++ b/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class AnonpayTransactionRow extends StatelessWidget {
   AnonpayTransactionRow({
@@ -19,53 +21,44 @@ class AnonpayTransactionRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return InkWell(
-      onTap: onTap,
-      child: Container(
-        padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
-        color: Colors.transparent,
-        child: Row(
-          mainAxisSize: MainAxisSize.max,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            _getImage(),
-            SizedBox(width: 12),
-            Expanded(
-              child: Column(
+        onTap: onTap,
+        child: Container(
+          padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
+          color: Colors.transparent,
+          child: Row(
+            mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              _getImage(),
+              SizedBox(width: 12),
+              Expanded(
+                  child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
-                    Text(
-                      provider,
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    Text(provider,
+                        style: TextStyle(
+                            fontSize: 16,
                             fontWeight: FontWeight.w500,
-                          ),
-                    ),
-                    Text(
-                      amount + ' ' + currency,
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor)),
+                    Text(amount + ' ' + currency,
+                        style: TextStyle(
+                            fontSize: 16,
                             fontWeight: FontWeight.w500,
-                          ),
-                    ),
+                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor))
                   ]),
                   SizedBox(height: 5),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: <Widget>[
-                      Text(
-                        createdAt,
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            ),
-                      ),
-                    ],
-                  )
+                  Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
+                    Text(createdAt,
+                        style: TextStyle(
+                            fontSize: 14,
+                            color: Theme.of(context).extension<CakeTextTheme>()!.dateSectionRowColor))
+                  ])
                 ],
-              ),
-            )
-          ],
-        ),
-      ),
-    );
+              ))
+            ],
+          ),
+        ));
   }
 
   Widget _getImage() => ClipRRect(
diff --git a/lib/src/screens/dashboard/widgets/date_section_raw.dart b/lib/src/screens/dashboard/widgets/date_section_raw.dart
index 05658a633..02fcef7f4 100644
--- a/lib/src/screens/dashboard/widgets/date_section_raw.dart
+++ b/lib/src/screens/dashboard/widgets/date_section_raw.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/date_formatter.dart';
 
 class DateSectionRaw extends StatelessWidget {
@@ -16,8 +17,9 @@ class DateSectionRaw extends StatelessWidget {
       color: Colors.transparent,
       child: Text(
         title,
-        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-          color: Theme.of(context).colorScheme.onSurfaceVariant,
+        style: TextStyle(
+          fontSize: 12,
+          color: Theme.of(context).extension<CakeTextTheme>()!.dateSectionRowColor,
         ),
       ),
     );
diff --git a/lib/src/screens/dashboard/widgets/filter_list_widget.dart b/lib/src/screens/dashboard/widgets/filter_list_widget.dart
index c7a2067de..8e95de2af 100644
--- a/lib/src/screens/dashboard/widgets/filter_list_widget.dart
+++ b/lib/src/screens/dashboard/widgets/filter_list_widget.dart
@@ -1,11 +1,15 @@
 import 'package:cake_wallet/entities/list_order_mode.dart';
 import 'package:cake_wallet/entities/wallet_list_order_types.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
 import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
+import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class FilterListWidget extends StatefulWidget {
   FilterListWidget({
@@ -53,17 +57,19 @@ class FilterListWidgetState extends State<FilterListWidget> {
           child: ClipRRect(
             borderRadius: BorderRadius.all(Radius.circular(24)),
             child: Container(
-              color: Theme.of(context).colorScheme.surface,
+              color: Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor,
               child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
                 Padding(
                   padding: EdgeInsets.all(24.0),
                   child: Text(
                     S.of(context).order_by,
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontSize: 16,
-                          decoration: TextDecoration.none,
-                        ),
+                    style: TextStyle(
+                      color:
+                          Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+                      fontSize: 16,
+                      fontFamily: 'Lato',
+                      decoration: TextDecoration.none,
+                    ),
                   ),
                 ),
                 if (type != FilterListOrderType.Custom) ...[
@@ -87,56 +93,60 @@ class FilterListWidgetState extends State<FilterListWidget> {
                   groupValue: type,
                   title: Text(
                     FilterListOrderType.CreationDate.toString(),
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontSize: 16,
-                          fontWeight: FontWeight.bold,
-                        ),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
                   ),
                   onChanged: setSelectedOrderType,
-                  activeColor: Theme.of(context).colorScheme.primary,
+                  activeColor: Theme.of(context).primaryColor,
                 ),
                 RadioListTile(
                   value: FilterListOrderType.Alphabetical,
                   groupValue: type,
                   title: Text(
                     FilterListOrderType.Alphabetical.toString(),
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontSize: 16,
-                          fontWeight: FontWeight.bold,
-                        ),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
                   ),
                   onChanged: setSelectedOrderType,
-                  activeColor: Theme.of(context).colorScheme.primary,
+                  activeColor: Theme.of(context).primaryColor,
                 ),
                 RadioListTile(
                   value: FilterListOrderType.GroupByType,
                   groupValue: type,
                   title: Text(
                     FilterListOrderType.GroupByType.toString(),
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontSize: 16,
-                          fontWeight: FontWeight.bold,
-                        ),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
                   ),
                   onChanged: setSelectedOrderType,
-                  activeColor: Theme.of(context).colorScheme.primary,
+                  activeColor: Theme.of(context).primaryColor,
                 ),
                 RadioListTile(
                   value: FilterListOrderType.Custom,
                   groupValue: type,
                   title: Text(
                     FilterListOrderType.Custom.toString(),
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontSize: 16,
-                          fontWeight: FontWeight.bold,
-                        ),
+                    style: TextStyle(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.bold,
+                        decoration: TextDecoration.none),
                   ),
                   onChanged: setSelectedOrderType,
-                  activeColor: Theme.of(context).colorScheme.primary,
+                  activeColor: Theme.of(context).primaryColor,
                 ),
               ]),
             ),
diff --git a/lib/src/screens/dashboard/widgets/filter_widget.dart b/lib/src/screens/dashboard/widgets/filter_widget.dart
index fa8daea2d..eaf00a1de 100644
--- a/lib/src/screens/dashboard/widgets/filter_widget.dart
+++ b/lib/src/screens/dashboard/widgets/filter_widget.dart
@@ -1,169 +1,123 @@
-import 'package:cake_wallet/src/widgets/alert_background.dart';
-import 'package:cake_wallet/src/widgets/alert_close_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/filter_tile.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
-import 'package:cake_wallet/utils/responsive_layout_util.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/view_model/dashboard/dropdown_filter_item.dart';
+import 'package:cake_wallet/view_model/dashboard/dropdown_filter_item_widget.dart';
 import 'package:cake_wallet/view_model/dashboard/filter_item.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 
-class FilterWidget extends StatefulWidget {
-  const FilterWidget({required this.filterItems, this.onClose, Key? key}) : super(key: key);
+//import 'package:date_range_picker/date_range_picker.dart' as date_rage_picker;
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+
+class FilterWidget extends StatelessWidget {
+  FilterWidget({required this.filterItems});
 
   final Map<String, List<FilterItem>> filterItems;
-  final Function()? onClose;
-
-  @override
-  _FilterWidgetState createState() => _FilterWidgetState();
-}
-
-class _FilterWidgetState extends State<FilterWidget> {
-  final ScrollController _scrollController = ScrollController();
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
 
   @override
   Widget build(BuildContext context) {
-    return AlertBackground(
-      child: Column(
-        children: [
-          const Expanded(child: SizedBox()),
-          Expanded(
-            flex: responsiveLayoutUtil.shouldRenderTabletUI ? 16 : 8,
-            child: LayoutBuilder(
-              builder: (context, constraints) {
-                double availableHeight = constraints.maxHeight;
-                return _buildFilterContent(context, availableHeight);
-              },
-            ),
-          ),
-          Expanded(
-            child: AlertCloseButton(
-              key: const ValueKey('filter_wrapper_close_button_key'),
-              isPositioned: false,
-              onTap: widget.onClose,
-            ),
-          ),
-          const SizedBox(height: 24),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildFilterContent(BuildContext context, double availableHeight) {
-    const sectionDivider = HorizontalSectionDivider();
-
-    const double totalHeaderHeight = 73;
-    const double filterTileMinHeight = 40;
-    double availableHeightForItems = availableHeight - totalHeaderHeight;
-
-    return Center(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(left: 24, right: 24, top: 24),
-            child: ClipRRect(
-              borderRadius: BorderRadius.circular(24),
-              child: Container(
-                color: Theme.of(context).colorScheme.surface,
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.all(24.0),
-                      child: Text(
-                        S.of(context).filter_by,
-                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurface,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
+    const sectionDivider = const HorizontalSectionDivider();
+    return PickerWrapperWidget(
+      children: [
+        Padding(
+          padding: EdgeInsets.only(left: 24, right: 24, top: 24),
+          child: ClipRRect(
+            borderRadius: BorderRadius.all(Radius.circular(24)),
+            child: Container(
+              color: Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor,
+              child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+                Padding(
+                  padding: EdgeInsets.all(24.0),
+                  child: Text(
+                    S.of(context).filter_by,
+                    style: TextStyle(
+                      color:
+                          Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+                      fontSize: 16,
+                      fontFamily: 'Lato',
+                      decoration: TextDecoration.none,
                     ),
-                    sectionDivider,
-                    ListView.separated(
-                      padding: EdgeInsets.zero,
-                      shrinkWrap: true,
-                      physics: const NeverScrollableScrollPhysics(),
-                      itemCount: widget.filterItems.length,
-                      separatorBuilder: (context, _) => sectionDivider,
-                      itemBuilder: (_, index1) {
-                        final title = widget.filterItems.keys.elementAt(index1);
-                        final section = widget.filterItems.values.elementAt(index1);
-
-                        final double itemHeight =
-                            availableHeightForItems / widget.filterItems.length;
-
-                        final isSectionScrollable =
-                            (itemHeight < (section.length * filterTileMinHeight));
-
-                        final Widget sectionListView = ListView.builder(
-                          controller: isSectionScrollable ? _scrollController : null,
-                          padding: const EdgeInsets.symmetric(horizontal: 28.0),
-                          shrinkWrap: isSectionScrollable ? false : true,
-                          physics: isSectionScrollable
-                              ? const BouncingScrollPhysics()
-                              : const NeverScrollableScrollPhysics(),
+                  ),
+                ),
+                sectionDivider,
+                ListView.separated(
+                  padding: EdgeInsets.zero,
+                  shrinkWrap: true,
+                  physics: const NeverScrollableScrollPhysics(),
+                  itemCount: filterItems.length,
+                  separatorBuilder: (context, _) => sectionDivider,
+                  itemBuilder: (_, index1) {
+                    final title = filterItems.keys.elementAt(index1);
+                    final section = filterItems.values.elementAt(index1);
+                    return Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: <Widget>[
+                        Padding(
+                          padding: EdgeInsets.only(top: 20, left: 24, right: 24),
+                          child: Text(
+                            title,
+                            style: TextStyle(
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                fontSize: 16,
+                                fontFamily: 'Lato',
+                                fontWeight: FontWeight.bold,
+                                decoration: TextDecoration.none),
+                          ),
+                        ),
+                        ListView.builder(
+                          padding: EdgeInsets.symmetric(horizontal: 28.0),
+                          shrinkWrap: true,
+                          physics: const NeverScrollableScrollPhysics(),
                           itemCount: section.length,
                           itemBuilder: (_, index2) {
                             final item = section[index2];
-                            final content = Observer(
-                              builder: (_) => StandardCheckbox(
-                                value: item.value(),
-                                caption: item.caption,
-                                gradientBackground: true,
-                                borderColor: Theme.of(context).colorScheme.outlineVariant,
-                                iconColor: Theme.of(context).colorScheme.onSurface,
-                                onChanged: (value) => item.onChanged(),
-                              ),
-                            );
-                            return FilterTile(
-                              child: content,
-                            );
-                          },
-                        );
 
-                        return Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Padding(
-                              padding: const EdgeInsets.only(top: 20, left: 24, right: 24),
-                              child: Text(
-                                title,
-                                style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurface,
-                                  fontWeight: FontWeight.bold,
-                                  decoration: TextDecoration.none,
+                            if (item is DropdownFilterItem) {
+                              return  Padding(
+                                padding: EdgeInsets.fromLTRB(8, 0, 8, 16),
+                                child: Container(
+                                  decoration: BoxDecoration(
+                                    border: Border(
+                                      bottom: BorderSide(
+                                          width: 1.0,
+                                          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor),
+                                    ),
+                                  ),
+                                  child: DropdownFilterList(
+                                    items: item.items,
+                                    caption: item.caption,
+                                    selectedItem: item.selectedItem,
+                                    onItemSelected: item.onItemSelected,
+                                  ),
                                 ),
-                              ),
-                            ),
-                            Container(
-                              height: isSectionScrollable ? itemHeight - totalHeaderHeight : null,
-                              child: isSectionScrollable
-                                  ? Scrollbar(
-                                      controller: _scrollController,
-                                      thumbVisibility: true,
-                                      child: sectionListView,
-                                    )
-                                  : sectionListView,
-                            ),
-                          ],
-                        );
-                      },
-                    ),
-                  ],
+                              );
+                            }
+                            final content = Observer(
+                                builder: (_) => StandardCheckbox(
+                                      value: item.value(),
+                                      caption: item.caption,
+                                      gradientBackground: true,
+                                      borderColor: Theme.of(context).dividerColor,
+                                      iconColor: Colors.white,
+                                      onChanged: (value) => item.onChanged(),
+                                    ));
+                            return FilterTile(child: content);
+                          },
+                        )
+                      ],
+                    );
+                  },
                 ),
-              ),
+              ]),
             ),
           ),
-        ],
-      ),
+        )
+      ],
     );
   }
 }
diff --git a/lib/src/screens/dashboard/widgets/header_row.dart b/lib/src/screens/dashboard/widgets/header_row.dart
index c501ef00a..f1f3f0889 100644
--- a/lib/src/screens/dashboard/widgets/header_row.dart
+++ b/lib/src/screens/dashboard/widgets/header_row.dart
@@ -1,8 +1,10 @@
 import 'package:cake_wallet/src/screens/dashboard/widgets/filter_widget.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class HeaderRow extends StatelessWidget {
   HeaderRow({required this.dashboardViewModel, super.key});
@@ -12,7 +14,7 @@ class HeaderRow extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final filterIcon = Image.asset('assets/images/filter_icon.png',
-        color: Theme.of(context).colorScheme.onSurface);
+        color: Theme.of(context).extension<FilterTheme>()!.iconColor);
 
     return Container(
       height: 52,
@@ -24,9 +26,10 @@ class HeaderRow extends StatelessWidget {
         children: <Widget>[
           Text(
             S.of(context).transactions,
-            style: Theme.of(context).textTheme.titleLarge?.copyWith(
+            style: TextStyle(
+                fontSize: 20,
                 fontWeight: FontWeight.w500,
-                color: Theme.of(context).colorScheme.onSurface),
+                color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor),
           ),
           Semantics(
             container: true,
@@ -47,7 +50,7 @@ class HeaderRow extends StatelessWidget {
                   width: 36,
                   decoration: BoxDecoration(
                     shape: BoxShape.circle,
-                    color: Theme.of(context).colorScheme.surfaceContainer,
+                    color: Theme.of(context).extension<FilterTheme>()!.buttonColor,
                   ),
                   child: filterIcon,
                 ),
diff --git a/lib/src/screens/dashboard/widgets/home_screen_account_widget.dart b/lib/src/screens/dashboard/widgets/home_screen_account_widget.dart
index e54aa8359..df20c5c43 100644
--- a/lib/src/screens/dashboard/widgets/home_screen_account_widget.dart
+++ b/lib/src/screens/dashboard/widgets/home_screen_account_widget.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/monero_accounts/monero_account_list_page.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 
@@ -31,9 +32,11 @@ class HomeScreenAccountWidget extends StatelessWidget {
                 Container(
                   child: Text(
                     walletName ?? '',
-                    style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                    style: TextStyle(
+                      fontSize: 22.0,
                       fontWeight: FontWeight.bold,
-                      color: Theme.of(context).colorScheme.onSurface,
+                      fontFamily: 'Lato',
+                      color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                     ),
                   ),
                 ),
@@ -43,9 +46,11 @@ class HomeScreenAccountWidget extends StatelessWidget {
                 Container(
                   child: Text(
                     accountName ?? '',
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    style: TextStyle(
+                      fontSize: 14.0,
                       fontWeight: FontWeight.bold,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      fontFamily: 'Lato',
+                      color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                     ),
                   ),
                 ),
@@ -54,7 +59,7 @@ class HomeScreenAccountWidget extends StatelessWidget {
             Container(
               child: Icon(
                 Icons.keyboard_arrow_down,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
+                color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
               ),
             ),
           ],
diff --git a/lib/src/screens/dashboard/widgets/info_card.dart b/lib/src/screens/dashboard/widgets/info_card.dart
index cb13d7035..1bf8a11bf 100644
--- a/lib/src/screens/dashboard/widgets/info_card.dart
+++ b/lib/src/screens/dashboard/widgets/info_card.dart
@@ -8,7 +8,7 @@ class InfoCard extends StatelessWidget {
   final String title;
   final String description;
   final String image;
-  final bool isDarkTheme;
+
   final Function() leftButtonAction;
   final Function() rightButtonAction;
 
@@ -23,14 +23,12 @@ class InfoCard extends StatelessWidget {
     required this.leftButtonAction,
     required this.rightButtonAction,
     required this.image,
-    required this.isDarkTheme,
     this.hintWidget,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return DashBoardRoundedCardWidget(
-      isDarkTheme: isDarkTheme,
       marginH: 0,
       marginV: 0,
       customBorder: 30,
@@ -47,16 +45,11 @@ class InfoCard extends StatelessWidget {
                 child: ElevatedButton(
                   onPressed: leftButtonAction,
                   style: ElevatedButton.styleFrom(
-                    backgroundColor: Theme.of(context).colorScheme.surface,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(10),
-                    ),
+                    backgroundColor: Theme.of(context).primaryColor,
                   ),
                   child: Text(
                     leftButtonTitle,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSecondaryContainer,
-                        ),
+                    style: TextStyle(color: Colors.white),
                   ),
                 ),
               ),
@@ -65,17 +58,12 @@ class InfoCard extends StatelessWidget {
                 child: ElevatedButton(
                   onPressed: rightButtonAction,
                   style: ElevatedButton.styleFrom(
-                    backgroundColor: Theme.of(context).colorScheme.primary,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(10),
-                    ),
+                    backgroundColor: Colors.white,
+                    foregroundColor: Colors.black,
                   ),
                   child: Text(
                     rightButtonTitle,
                     maxLines: 1,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onPrimary,
-                        ),
                   ),
                 ),
               ),
@@ -86,7 +74,7 @@ class InfoCard extends StatelessWidget {
       onTap: () => {},
       icon: Container(
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
+          color: Colors.white,
           shape: BoxShape.circle,
         ),
         child: CakeImageWidget(
diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart
index b394e96ad..dbf55d046 100644
--- a/lib/src/screens/dashboard/widgets/menu_widget.dart
+++ b/lib/src/screens/dashboard/widgets/menu_widget.dart
@@ -1,7 +1,9 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/setting_action_button.dart';
 import 'package:cake_wallet/src/widgets/setting_actions.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -101,8 +103,7 @@ class MenuWidgetState extends State<MenuWidget> {
   Widget build(BuildContext context) {
     List<SettingActions> items = List.of(SettingActions.all);
     if (!widget.dashboardViewModel.hasSilentPayments) {
-      items.removeWhere(
-          (element) => element.name(context) == S.of(context).silent_payments_settings);
+      items.removeWhere((element) => element.name(context) == S.of(context).silent_payments_settings);
     }
     if (!widget.dashboardViewModel.isMoneroViewOnly) {
       items.removeWhere((element) => element.name(context) == S.of(context).export_outputs);
@@ -112,10 +113,10 @@ class MenuWidgetState extends State<MenuWidget> {
     }
     int itemCount = items.length;
 
-    moneroIcon =
-        Image.asset('assets/images/monero_menu.png', color: Theme.of(context).colorScheme.primary);
-    bitcoinIcon =
-        Image.asset('assets/images/bitcoin_menu.png', color: Theme.of(context).colorScheme.primary);
+    moneroIcon = Image.asset('assets/images/monero_menu.png',
+        color: Theme.of(context).extension<CakeMenuTheme>()!.iconColor);
+    bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png',
+        color: Theme.of(context).extension<CakeMenuTheme>()!.iconColor);
 
     return Row(
       mainAxisSize: MainAxisSize.max,
@@ -127,20 +128,16 @@ class MenuWidgetState extends State<MenuWidget> {
             height: 60,
             width: 4,
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.all(Radius.circular(2)),
-              color: Theme.of(context).colorScheme.outline,
-            ),
+                borderRadius: BorderRadius.all(Radius.circular(2)), color: PaletteDark.gray),
           ),
         ),
         SizedBox(width: 12),
         Expanded(
           child: ClipRRect(
-            borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(24),
-              bottomLeft: Radius.circular(24),
-            ),
+            borderRadius:
+                BorderRadius.only(topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)),
             child: Container(
-              color: Theme.of(context).colorScheme.surface,
+              color: Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor,
               child: ListView.separated(
                 padding: EdgeInsets.only(top: 0),
                 itemBuilder: (_, index) {
@@ -149,14 +146,13 @@ class MenuWidgetState extends State<MenuWidget> {
                       height: headerHeight,
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24)),
-                        color: Theme.of(context).colorScheme.surface,
+                        gradient: LinearGradient(colors: [
+                          Theme.of(context).extension<CakeMenuTheme>()!.headerFirstGradientColor,
+                          Theme.of(context).extension<CakeMenuTheme>()!.headerSecondGradientColor,
+                        ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                       ),
                       padding: EdgeInsets.only(
-                        left: 24,
-                        top: fromTopEdge,
-                        right: 24,
-                        bottom: fromBottomEdge,
-                      ),
+                          left: 24, top: fromTopEdge, right: 24, bottom: fromBottomEdge),
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.start,
                         children: <Widget>[
@@ -172,18 +168,21 @@ class MenuWidgetState extends State<MenuWidget> {
                                 children: <Widget>[
                                   Text(
                                     widget.dashboardViewModel.name,
-                                    style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                          fontWeight: FontWeight.w700,
-                                        ),
+                                    style: TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.bold),
                                   ),
                                   if (widget.dashboardViewModel.subname.isNotEmpty)
                                     Observer(
                                       builder: (_) => Text(
                                         widget.dashboardViewModel.subname,
-                                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                              fontWeight: FontWeight.w500,
-                                            ),
+                                        style: TextStyle(
+                                            color: Theme.of(context)
+                                                .extension<CakeMenuTheme>()!
+                                                .subnameTextColor,
+                                            fontWeight: FontWeight.w500,
+                                            fontSize: 12),
                                       ),
                                     ),
                                 ],
@@ -214,7 +213,7 @@ class MenuWidgetState extends State<MenuWidget> {
                 },
                 separatorBuilder: (_, index) => Container(
                   height: 0,
-                  color: Theme.of(context).colorScheme.outline,
+                  color: Theme.of(context).extension<CakeMenuTheme>()!.dividerColor,
                 ),
                 itemCount: itemCount + 1,
               ),
diff --git a/lib/src/screens/dashboard/widgets/nft_tile_widget.dart b/lib/src/screens/dashboard/widgets/nft_tile_widget.dart
index 12cfd3056..c7d79bfa7 100644
--- a/lib/src/screens/dashboard/widgets/nft_tile_widget.dart
+++ b/lib/src/screens/dashboard/widgets/nft_tile_widget.dart
@@ -2,6 +2,8 @@ import 'package:cake_wallet/entities/wallet_nft_response.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/dashboard/pages/nft_details_page.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
 
 class NFTTileWidget extends StatelessWidget {
@@ -25,10 +27,8 @@ class NFTTileWidget extends StatelessWidget {
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(30.0),
           border: Border.all(
-            color: Theme.of(context).colorScheme.outline,
-            width: 0.0,
-          ),
-          color: Theme.of(context).colorScheme.surfaceContainer,
+              color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor, width: 1),
+          color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
         ),
         child: Row(
           children: [
@@ -38,12 +38,12 @@ class NFTTileWidget extends StatelessWidget {
               clipBehavior: Clip.hardEdge,
               margin: const EdgeInsets.all(8),
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(24.0),
+                borderRadius: BorderRadius.circular(16.0),
                 border: Border.all(
-                  color: Theme.of(context).colorScheme.outline,
-                  width: 0.0,
+                  color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
+                  width: 1,
                 ),
-                color: Theme.of(context).colorScheme.surface,
+                color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
               ),
               child: CakeImageWidget(
                 imageUrl: nftAsset.normalizedMetadata?.imageUrl,
@@ -56,19 +56,24 @@ class NFTTileWidget extends StatelessWidget {
                 children: [
                   Text(
                     '${nftAsset.name ?? '---'} - ${nftAsset.symbol ?? '---'}',
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          height: 1,
-                        ),
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+                      height: 1,
+                    ),
                   ),
                   SizedBox(height: 8),
                   Text(
                     nftAsset.normalizedMetadata?.name ?? nftAsset.name ?? "---",
-                    style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.w900,
-                          color: Theme.of(context).colorScheme.onSurface,
-                          height: 1,
-                        ),
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w900,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.assetTitleColor,
+                      height: 1,
+                    ),
                   ),
                 ],
               ),
diff --git a/lib/src/screens/dashboard/widgets/order_row.dart b/lib/src/screens/dashboard/widgets/order_row.dart
index 2e35a1cdb..221ea5689 100644
--- a/lib/src/screens/dashboard/widgets/order_row.dart
+++ b/lib/src/screens/dashboard/widgets/order_row.dart
@@ -1,6 +1,9 @@
 import 'package:cake_wallet/buy/buy_provider_description.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/buy/get_buy_provider_icon.dart';
+import 'package:cake_wallet/themes/extensions/order_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class OrderRow extends StatelessWidget {
   OrderRow({
@@ -12,7 +15,7 @@ class OrderRow extends StatelessWidget {
     this.formattedAmount,
     super.key,
   });
-
+  
   final VoidCallback? onTap;
   final BuyProviderDescription provider;
   final String from;
@@ -22,64 +25,55 @@ class OrderRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final iconColor = Theme.of(context).colorScheme.onSurfaceVariant;
+    final iconColor = Theme.of(context).extension<OrderTheme>()!.iconColor;
 
     final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor);
 
     return InkWell(
-      onTap: onTap,
-      child: Container(
-        padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
-        color: Colors.transparent,
-        child: Row(
-          mainAxisSize: MainAxisSize.max,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            if (providerIcon != null)
-              Padding(
-                padding: EdgeInsets.only(right: 12),
-                child: providerIcon,
-              ),
-            Expanded(
-              child: Column(
+        onTap: onTap,
+        child: Container(
+          padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
+          color: Colors.transparent,
+          child: Row(
+            mainAxisSize: MainAxisSize.max,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              if (providerIcon != null)
+                Padding(
+                  padding: EdgeInsets.only(right: 12),
+                  child: providerIcon,
+                ),
+              Expanded(
+                  child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
-                    Text(
-                      '$from → $to',
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    Text('$from → $to',
+                        style: TextStyle(
                             fontSize: 16,
                             fontWeight: FontWeight.w500,
-                          ),
-                    ),
+                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor)),
                     formattedAmount != null
-                        ? Text(
-                            formattedAmount! + ' ' + to,
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w500,
-                                ),
-                          )
+                        ? Text(formattedAmount! + ' ' + to,
+                            style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w500,
+                                color:
+                                    Theme.of(context).extension<DashboardPageTheme>()!.textColor))
                         : Container()
                   ]),
                   SizedBox(height: 5),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: <Widget>[
-                      Text(
-                        createdAtFormattedDate,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            ),
-                      ),
-                    ],
-                  )
+                  Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
+                    Text(createdAtFormattedDate,
+                        style: TextStyle(
+                            fontSize: 14,
+                            color:
+                                Theme.of(context).extension<CakeTextTheme>()!.dateSectionRowColor))
+                  ])
                 ],
-              ),
-            )
-          ],
-        ),
-      ),
-    );
+              ))
+            ],
+          ),
+        ));
   }
 }
diff --git a/lib/src/screens/dashboard/widgets/payjoin_transaction_row.dart b/lib/src/screens/dashboard/widgets/payjoin_transaction_row.dart
deleted file mode 100644
index b61df506d..000000000
--- a/lib/src/screens/dashboard/widgets/payjoin_transaction_row.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:flutter/material.dart';
-
-class PayjoinTransactionRow extends StatelessWidget {
-  PayjoinTransactionRow({
-    required this.createdAt,
-    required this.currency,
-    required this.onTap,
-    required this.amount,
-    required this.state,
-    required this.isSending,
-    super.key,
-  });
-
-  final VoidCallback? onTap;
-  final String createdAt;
-  final String amount;
-  final String currency;
-  final String state;
-  final bool isSending;
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-        onTap: onTap,
-        child: Container(
-          padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
-          color: Colors.transparent,
-          child: Row(
-            mainAxisSize: MainAxisSize.max,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              _getImage(),
-              SizedBox(width: 12),
-              Expanded(
-                  child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
-                    Text(
-                      "${isSending ? S.current.outgoing : S.current.incoming} Payjoin",
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
-                    ),
-                    Text(
-                      amount + ' ' + currency,
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
-                    )
-                  ]),
-                  SizedBox(height: 5),
-                  Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
-                    Text(
-                      createdAt,
-                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
-                    ),
-                    Text(
-                      state,
-                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
-                    ),
-                  ])
-                ],
-              ))
-            ],
-          ),
-        ));
-  }
-
-  Widget _getImage() => ClipRRect(
-        borderRadius: BorderRadius.circular(50),
-        child: Image.asset(
-          'assets/images/payjoin.png',
-          width: 36,
-          height: 36,
-        ),
-      );
-}
diff --git a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
index f69586a65..3abcbbfeb 100644
--- a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
+++ b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/screens/cake_pay/widgets/rounded_checkbox.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/typography.dart';
@@ -25,10 +26,10 @@ class PresentReceiveOptionPicker extends StatelessWidget {
     return TextButton(
       onPressed: () => _showPicker(context),
       style: ButtonStyle(
-        padding: WidgetStateProperty.all(EdgeInsets.zero),
+        padding: MaterialStateProperty.all(EdgeInsets.zero),
         splashFactory: NoSplash.splashFactory,
-        foregroundColor: WidgetStateProperty.all(Colors.transparent),
-        overlayColor: WidgetStateProperty.all(Colors.transparent),
+        foregroundColor: MaterialStateProperty.all(Colors.transparent),
+        overlayColor: MaterialStateProperty.all(Colors.transparent),
       ),
       child: Row(
         mainAxisSize: MainAxisSize.min,
@@ -40,27 +41,18 @@ class PresentReceiveOptionPicker extends StatelessWidget {
             children: <Widget>[
               Text(
                 S.current.receive,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      fontSize: 18.0,
-                      fontWeight: FontWeight.bold,
-                      color: color,
-                    ),
+                style: TextStyle(
+                    fontSize: 18.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', color: color),
               ),
               Observer(
-                builder: (_) => Text(
-                  receiveOptionViewModel.selectedReceiveOption
-                      .toString()
-                      .replaceAll(RegExp(r'silent payments', caseSensitive: false),
-                          S.current.silent_payments)
-                      .replaceAll(
-                          RegExp(r'default', caseSensitive: false), S.current.string_default),
-                  style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                        fontSize: 10.0,
-                        fontWeight: FontWeight.w500,
-                        color: color,
-                      ),
-                ),
-              )
+                  builder: (_) => Text(
+                      receiveOptionViewModel.selectedReceiveOption
+                          .toString()
+                          .replaceAll(RegExp(r'silent payments', caseSensitive: false),
+                              S.current.silent_payments)
+                          .replaceAll(
+                              RegExp(r'default', caseSensitive: false), S.current.string_default),
+                      style: TextStyle(fontSize: 10.0, fontWeight: FontWeight.w500, color: color)))
             ],
           ),
           SizedBox(width: 5),
@@ -91,7 +83,7 @@ class PresentReceiveOptionPicker extends StatelessWidget {
                     margin: EdgeInsets.symmetric(horizontal: 24),
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(30),
-                      color: Theme.of(context).colorScheme.surface,
+                      color: Theme.of(context).colorScheme.background,
                     ),
                     child: Padding(
                       padding: const EdgeInsets.only(top: 24, bottom: 24),
@@ -125,7 +117,9 @@ class PresentReceiveOptionPicker extends StatelessWidget {
                                                 S.current.string_default),
                                         textAlign: TextAlign.left,
                                         style: textSmall(
-                                          color: Theme.of(context).colorScheme.onSurface,
+                                          color: Theme.of(context)
+                                              .extension<CakeTextTheme>()!
+                                              .titleColor,
                                         ).copyWith(
                                           fontWeight:
                                               value == option ? FontWeight.w800 : FontWeight.w500,
diff --git a/lib/src/screens/dashboard/widgets/sign_form.dart b/lib/src/screens/dashboard/widgets/sign_form.dart
index 9fe661cda..deead87a4 100644
--- a/lib/src/screens/dashboard/widgets/sign_form.dart
+++ b/lib/src/screens/dashboard/widgets/sign_form.dart
@@ -44,7 +44,7 @@ class SignFormState extends State<SignForm> with AutomaticKeepAliveClientMixin {
 
   @override
   bool get wantKeepAlive => true;
-
+  
   @override
   Widget build(BuildContext context) {
     super.build(context);
@@ -60,8 +60,7 @@ class SignFormState extends State<SignForm> with AutomaticKeepAliveClientMixin {
                     controller: messageController,
                     placeholder: S.current.message,
                     options: [AddressTextFieldOption.paste],
-                    buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                    fillColor: Theme.of(context).colorScheme.surface,
+                    buttonColor: Theme.of(context).hintColor,
                   ),
                   if (widget.includeAddress) ...[
                     const SizedBox(height: 20),
@@ -71,12 +70,11 @@ class SignFormState extends State<SignForm> with AutomaticKeepAliveClientMixin {
                         AddressTextFieldOption.paste,
                         AddressTextFieldOption.walletAddresses
                       ],
-                      buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
+                      buttonColor: Theme.of(context).hintColor,
                       onSelectedContact: (contact) {
                         addressController.text = contact.address;
                       },
                       selectedCurrency: walletTypeToCryptoCurrency(widget.type),
-                      fillColor: Theme.of(context).colorScheme.surface,
                     ),
                   ],
                 ],
diff --git a/lib/src/screens/dashboard/widgets/solana_nft_tile_widget.dart b/lib/src/screens/dashboard/widgets/solana_nft_tile_widget.dart
index b2669095d..bd134d7b5 100644
--- a/lib/src/screens/dashboard/widgets/solana_nft_tile_widget.dart
+++ b/lib/src/screens/dashboard/widgets/solana_nft_tile_widget.dart
@@ -3,6 +3,8 @@ import 'package:cake_wallet/entities/solana_nft_asset_model.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/dashboard/pages/nft_details_page.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 
 class SolanaNFTTileWidget extends StatelessWidget {
   const SolanaNFTTileWidget({super.key, required this.nftAsset});
@@ -11,6 +13,9 @@ class SolanaNFTTileWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final balanceTheme = Theme.of(context).extension<BalancePageTheme>()!;
+    final syncTheme = Theme.of(context).extension<SyncIndicatorTheme>()!;
+
     return InkWell(
       onTap: () {
         Navigator.pushNamed(
@@ -29,10 +34,10 @@ class SolanaNFTTileWidget extends StatelessWidget {
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(16.0),
           border: Border.all(
-            color: Theme.of(context).colorScheme.outline,
-            width: 0.0,
+            color: balanceTheme.cardBorderColor,
+            width: 1,
           ),
-          color: Theme.of(context).colorScheme.surfaceContainer,
+          color: syncTheme.syncedBackgroundColor,
         ),
         child: Row(
           children: [
@@ -42,12 +47,12 @@ class SolanaNFTTileWidget extends StatelessWidget {
               margin: const EdgeInsets.all(8),
               clipBehavior: Clip.hardEdge,
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(24.0),
+                borderRadius: BorderRadius.circular(16.0),
                 border: Border.all(
-                  color: Theme.of(context).colorScheme.outline,
-                  width: 0.0,
+                  color: balanceTheme.cardBorderColor,
+                  width: 1,
                 ),
-                color: Theme.of(context).colorScheme.surface,
+                color: syncTheme.syncedBackgroundColor,
               ),
               child: CakeImageWidget(
                 imageUrl: nftAsset.imageOriginalUrl,
@@ -60,8 +65,11 @@ class SolanaNFTTileWidget extends StatelessWidget {
                 children: [
                   Text(
                     'Symbol: ${nftAsset.symbol ?? '---'}',
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w400,
+                      color: balanceTheme.labelTextColor,
                       height: 1,
                     ),
                   ),
@@ -70,9 +78,11 @@ class SolanaNFTTileWidget extends StatelessWidget {
                     (nftAsset.name?.isNotEmpty ?? false)
                         ? nftAsset.name!
                         : (nftAsset.symbol ?? '---'),
-                    style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontFamily: 'Lato',
                       fontWeight: FontWeight.w900,
-                      color: Theme.of(context).colorScheme.onSurface,
+                      color: balanceTheme.assetTitleColor,
                       height: 1,
                     ),
                   ),
diff --git a/lib/src/screens/dashboard/widgets/sync_indicator.dart b/lib/src/screens/dashboard/widgets/sync_indicator.dart
index 526abec2f..860747d1e 100644
--- a/lib/src/screens/dashboard/widgets/sync_indicator.dart
+++ b/lib/src/screens/dashboard/widgets/sync_indicator.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/core/sync_status_title.dart';
@@ -17,65 +18,71 @@ class SyncIndicator extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Observer(builder: (_) {
-      final syncIndicatorWidth = 237.0;
-      final status = dashboardViewModel.status;
-      final statusText = syncStatusTitle(status);
-      final progress = status.progress();
-      final indicatorOffset = progress * syncIndicatorWidth;
-      final indicatorWidth = progress < 1
-          ? indicatorOffset > 0
-              ? indicatorOffset
-              : 0.0
-          : syncIndicatorWidth;
+    return Observer(
+      builder: (_) {
+        final syncIndicatorWidth = 237.0;
+        final status = dashboardViewModel.status;
+        final statusText = syncStatusTitle(status);
+        final progress = status.progress();
+        final indicatorOffset = progress * syncIndicatorWidth;
+        final indicatorWidth = progress < 1
+            ? indicatorOffset > 0 ? indicatorOffset : 0.0
+            : syncIndicatorWidth;
 
-      return ClipRRect(
+
+        return ClipRRect(
           borderRadius: BorderRadius.all(Radius.circular(15)),
-          child: GestureDetector(
+          child:  GestureDetector(
             onTap: onTap,
-            child: Container(
-              height: 30,
-              width: syncIndicatorWidth,
-              color: Theme.of(context).colorScheme.surfaceContainerLow,
-              child: Stack(
-                alignment: Alignment.center,
-                children: <Widget>[
-                  progress <= 1
-                      ? Positioned(
-                          left: 0,
-                          top: 0,
-                          bottom: 0,
-                          child: Container(
-                            width: indicatorWidth,
-                            height: 30,
-                            color: Theme.of(context).colorScheme.surfaceContainer,
-                          ))
-                      : Offstage(),
-                  Padding(
-                    padding: EdgeInsets.only(left: 24, right: 24),
-                    child: Row(
-                      mainAxisSize: MainAxisSize.max,
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: <Widget>[
-                        SyncIndicatorIcon(isSynced: status is SyncedSyncStatus),
-                        Padding(
-                          padding: EdgeInsets.only(left: 6),
-                          child: Text(
-                            statusText,
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).colorScheme.onSurface,
-                                ),
+          child: Container(
+            height: 30,
+            width: syncIndicatorWidth,
+            color: Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedBackgroundColor,
+            child: Stack(
+              alignment: Alignment.center,
+              children: <Widget>[
+                progress <= 1
+                ? Positioned(
+                    left: 0,
+                    top: 0,
+                    bottom: 0,
+                    child: Container(
+                      width: indicatorWidth,
+                      height: 30,
+                      color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+                    )
+                )
+                : Offstage(),
+                Padding(
+                  padding: EdgeInsets.only(
+                    left: 24,
+                    right: 24
+                  ),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.max,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: <Widget>[
+                      SyncIndicatorIcon(isSynced:status is SyncedSyncStatus),
+                      Padding(
+                        padding: EdgeInsets.only(left: 6),
+                        child: Text(
+                          statusText,
+                          style: TextStyle(
+                            fontSize: 12,
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).extension<SyncIndicatorTheme>()!.textColor
                           ),
-                        )
-                      ],
-                    ),
-                  )
-                ],
-              ),
+                        ),
+                      )
+                    ],
+                  ),
+                )
+              ],
             ),
-          ));
-    });
+          ),
+        ));
+      }
+    );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
index 91d75af6a..c1202d3ff 100644
--- a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
+++ b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
@@ -1,9 +1,14 @@
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
 class SyncIndicatorIcon extends StatelessWidget {
   SyncIndicatorIcon(
-      {this.boolMode = true, this.isSynced = false, this.value = waiting, this.size = 6.0});
+      {this.boolMode = true,
+      this.isSynced = false,
+      this.value = waiting,
+      this.size = 6.0});
 
   final bool boolMode;
   final bool isSynced;
@@ -24,32 +29,36 @@ class SyncIndicatorIcon extends StatelessWidget {
 
     if (boolMode) {
       indicatorColor = isSynced
-          ? CustomThemeColors.syncGreen
-          : CustomThemeColors.syncYellow;
+          ? PaletteDark.brightGreen
+          : Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedIconColor;
     } else {
       switch (value.toLowerCase()) {
+        case waiting:
+          indicatorColor = Colors.red;
+          break;
         case actionRequired:
-          indicatorColor = Theme.of(context).colorScheme.surfaceContainer;
+          indicatorColor =
+              Theme.of(context).extension<ReceivePageTheme>()!.currentTileBackgroundColor;
           break;
         case created:
+          indicatorColor = PaletteDark.brightGreen;
+          break;
+        case fetching:
+          indicatorColor = Colors.red;
+          break;
         case finished:
         case success:
         case complete:
-          indicatorColor = CustomThemeColors.syncGreen;
+          indicatorColor = PaletteDark.brightGreen;
           break;
-        case waiting:
-        case fetching:
         default:
-          indicatorColor = Theme.of(context).colorScheme.errorContainer;
+          indicatorColor = Colors.red;
       }
     }
     return Container(
-      height: size,
-      width: size,
-      decoration: BoxDecoration(
-        shape: BoxShape.circle,
-        color: indicatorColor,
-      ),
-    );
+        height: size,
+        width: size,
+        decoration:
+            BoxDecoration(shape: BoxShape.circle, color: indicatorColor));
   }
 }
diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart
index e50cb9718..8eea77b19 100644
--- a/lib/src/screens/dashboard/widgets/trade_row.dart
+++ b/lib/src/screens/dashboard/widgets/trade_row.dart
@@ -1,9 +1,9 @@
-import 'package:cake_wallet/exchange/trade_state.dart';
-import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/image_utill.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cw_core/crypto_currency.dart';
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class TradeRow extends StatelessWidget {
   TradeRow({
@@ -14,7 +14,6 @@ class TradeRow extends StatelessWidget {
     this.onTap,
     this.formattedAmount,
     this.formattedReceiveAmount,
-    required this.swapState,
     super.key,
   });
 
@@ -25,7 +24,6 @@ class TradeRow extends StatelessWidget {
   final String? createdAtFormattedDate;
   final String? formattedAmount;
   final String? formattedReceiveAmount;
-  final TradeState swapState;
 
   @override
   Widget build(BuildContext context) {
@@ -41,102 +39,51 @@ class TradeRow extends StatelessWidget {
             mainAxisSize: MainAxisSize.max,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              Stack(
-                clipBehavior: Clip.none,
-                children: [
-                  ClipRRect(
-                      borderRadius: BorderRadius.circular(50),
-                      child: ImageUtil.getImageFromPath(
-                          imagePath: provider.image, height: 36, width: 36),),
-                  Positioned(
-                    right: 0,
-                    bottom: 2,
-                    child: Container(
-                      height: 8,
-                      width: 8,
-                      padding: EdgeInsets.symmetric(horizontal: 8, vertical: 2),
-                      decoration: BoxDecoration(
-                        color: _statusColor(context, swapState),
-                        borderRadius: BorderRadius.circular(12),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
+              ClipRRect(
+                  borderRadius: BorderRadius.circular(50),
+                  child: ImageUtil.getImageFromPath(
+                      imagePath: provider.image, height: 36, width: 36)),
               SizedBox(width: 12),
               Expanded(
                   child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: <Widget>[
-                      Text(
-                        '${from.toString()} → ${to.toString()}',
-                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                  Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
+                    Text('${from.toString()} → ${to.toString()}',
+                        style: TextStyle(
                             fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                            color: Theme.of(context).colorScheme.primary),
-                      ),
-                      formattedAmount != null
-                          ? Text(
-                              formattedAmount! + ' ' + amountCrypto,
-                              style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).colorScheme.onSurface,
-                                  ),
-                            )
-                          : Container()
-                    ],
-                  ),
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor)),
+                    formattedAmount != null
+                        ? Text(formattedAmount! + ' ' + amountCrypto,
+                            style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w500,
+                                color:
+                                    Theme.of(context).extension<DashboardPageTheme>()!.textColor))
+                        : Container()
+                  ]),
                   SizedBox(height: 5),
                   Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: <Widget>[
-                      createdAtFormattedDate != null
-                          ? Text(
-                              createdAtFormattedDate!,
-                              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                  ),
-                            )
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween, 
+                      children: <Widget>[
+                        createdAtFormattedDate != null
+                          ? Text(createdAtFormattedDate!,
+                              style: TextStyle(
+                                  fontSize: 14,
+                                  color: Theme.of(context).extension<CakeTextTheme>()!.dateSectionRowColor))
                           : Container(),
-                      formattedReceiveAmount != null
-                          ? Text(
-                              formattedReceiveAmount! + ' ' + receiveAmountCrypto,
-                              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                  ),
-                            )
+                        formattedReceiveAmount != null
+                          ? Text(formattedReceiveAmount! + ' ' + receiveAmountCrypto,
+                              style: TextStyle(
+                                  fontSize: 14,
+                                  color: Theme.of(context).extension<CakeTextTheme>()!.dateSectionRowColor))
                           : Container(),
-                    ],
-                  )
+                  ])
                 ],
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-
-  Color _statusColor(BuildContext context, TradeState status) {
-    switch (status) {
-      case TradeState.complete:
-      case TradeState.completed:
-      case TradeState.finished:
-      case TradeState.success:
-      case TradeState.settled:
-        return PaletteDark.brightGreen;
-      case TradeState.failed:
-      case TradeState.expired:
-      case TradeState.notFound:
-        return Palette.darkRed;
-      default:
-        return const Color(0xffff6600);
-    }
+              ))
+            ],
+          ),
+        ));
   }
 }
diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart
index ed8ccd352..d604863c8 100644
--- a/lib/src/screens/dashboard/widgets/transaction_raw.dart
+++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart
@@ -1,5 +1,8 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cw_core/transaction_direction.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class TransactionRow extends StatelessWidget {
   TransactionRow({
@@ -36,9 +39,8 @@ class TransactionRow extends StatelessWidget {
               height: 36,
               width: 36,
               decoration: BoxDecoration(
-                shape: BoxShape.circle,
-                color: Theme.of(context).colorScheme.surfaceContainerHighest,
-              ),
+                  shape: BoxShape.circle,
+                  color: Theme.of(context).extension<TransactionTradeTheme>()!.rowsColor),
               child: Image.asset(direction == TransactionDirection.incoming
                   ? 'assets/images/down_arrow.png'
                   : 'assets/images/up_arrow.png'),
@@ -51,28 +53,24 @@ class TransactionRow extends StatelessWidget {
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
-                      Expanded(
-                        child: Row(
-                          children: [
-                            Flexible(
-                              child: Text(
-                                title,
-                                style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                      fontWeight: FontWeight.w600,
-                                  overflow: TextOverflow.fade,
-                                    ),
-                              ),
-                            ),
-                            ...tags
-                                .map((tag) => Row(children: [SizedBox(width: 8), TxTag(tag: tag)])),
-                          ],
+                      Row(
+                        children: [
+                          Text(
+                            title,
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w500,
+                              color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                            )),
+                        ...tags.map((tag) => Row(children: [SizedBox(width: 8), TxTag(tag: tag)])),
+                      ],
+                    ),
+                    Text(formattedAmount,
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
                         ),
-                      ),
-                      Text(
-                        formattedAmount,
-                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                              fontWeight: FontWeight.w600,
-                            ),
                       )
                     ],
                   ),
@@ -80,19 +78,18 @@ class TransactionRow extends StatelessWidget {
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
-                      Text(
-                        formattedDate,
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                              fontWeight: FontWeight.w500,
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            ),
-                      ),
+                      Text(formattedDate,
+                          style: TextStyle(
+                              fontSize: 14,
+                              color: Theme.of(context)
+                                  .extension<CakeTextTheme>()!
+                                  .dateSectionRowColor)),
                       Text(
                         formattedFiatAmount,
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                              fontWeight: FontWeight.w500,
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            ),
+                        style: TextStyle(
+                          fontSize: 14,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.dateSectionRowColor,
+                        ),
                       )
                     ],
                   ),
@@ -120,16 +117,16 @@ class TxTag extends StatelessWidget {
       padding: EdgeInsets.only(left: 6, right: 6),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.all(Radius.circular(8.5)),
-        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        color: Theme.of(context).extension<TransactionTradeTheme>()!.rowsColor,
       ),
       alignment: Alignment.center,
       child: Text(
         tag.toLowerCase(),
-        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-              fontSize: 9,
-              fontWeight: FontWeight.w600,
-            ),
+        style: TextStyle(
+          color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+          fontSize: 9,
+          fontWeight: FontWeight.w600,
+        ),
       ),
     );
   }
diff --git a/lib/src/screens/dashboard/widgets/verify_form.dart b/lib/src/screens/dashboard/widgets/verify_form.dart
index 97e94015c..282ffa9da 100644
--- a/lib/src/screens/dashboard/widgets/verify_form.dart
+++ b/lib/src/screens/dashboard/widgets/verify_form.dart
@@ -36,7 +36,7 @@ class VerifyFormState extends State<VerifyForm> with AutomaticKeepAliveClientMix
   void dispose() {
     super.dispose();
   }
-
+  
   @override
   bool get wantKeepAlive => true;
 
@@ -53,15 +53,13 @@ class VerifyFormState extends State<VerifyForm> with AutomaticKeepAliveClientMix
               controller: messageController,
               placeholder: S.current.message,
               options: [AddressTextFieldOption.paste],
-              buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-              fillColor: Theme.of(context).colorScheme.surface,
+              buttonColor: Theme.of(context).hintColor,
             ),
             const SizedBox(height: 20),
             AddressTextField(
               controller: addressController,
               options: [AddressTextFieldOption.paste, AddressTextFieldOption.walletAddresses],
-              buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-              fillColor: Theme.of(context).colorScheme.surface,
+              buttonColor: Theme.of(context).hintColor,
               onSelectedContact: (contact) {
                 addressController.text = contact.address;
               },
@@ -72,8 +70,7 @@ class VerifyFormState extends State<VerifyForm> with AutomaticKeepAliveClientMix
               controller: signatureController,
               placeholder: S.current.signature,
               options: [AddressTextFieldOption.paste],
-              buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-              fillColor: Theme.of(context).colorScheme.surface,
+              buttonColor: Theme.of(context).hintColor,
             ),
           ],
         ),
diff --git a/lib/src/screens/dev/background_sync_logs_page.dart b/lib/src/screens/dev/background_sync_logs_page.dart
deleted file mode 100644
index 8fd41d74f..000000000
--- a/lib/src/screens/dev/background_sync_logs_page.dart
+++ /dev/null
@@ -1,312 +0,0 @@
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/view_model/dev/background_sync_logs_view_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:intl/intl.dart';
-
-class DevBackgroundSyncLogsPage extends BasePage {
-  final BackgroundSyncLogsViewModel viewModel;
-
-  DevBackgroundSyncLogsPage(this.viewModel) {
-    viewModel.loadLogs();
-  }
-
-  @override
-  String? get title => "[dev] background sync logs";
-
-  @override
-  Widget? trailing(BuildContext context) {
-    return IconButton(
-      icon: Icon(Icons.refresh),
-      onPressed: () => viewModel.loadLogs(),
-    );
-  }
-
-  @override
-  Widget body(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        if (viewModel.isLoading) {
-          return Center(child: CircularProgressIndicator());
-        }
-
-        if (viewModel.error != null) {
-          return Center(child: Text("Error: ${viewModel.error}"));
-        }
-
-        if (viewModel.logData == null) {
-          return Center(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text("No logs loaded"),
-                SizedBox(height: 16),
-                ElevatedButton(
-                  onPressed: () => viewModel.loadLogs(),
-                  child: Text("Load Logs"),
-                ),
-              ],
-            ),
-          );
-        }
-
-        return DefaultTabController(
-          length: 2,
-          child: Column(
-            children: [
-              TabBar(
-                tabs: [
-                  Tab(text: "Logs (${viewModel.logs.length})"),
-                  Tab(text: "Sessions (${viewModel.sessions.length})"),
-                ],
-              ),
-              Expanded(
-                child: TabBarView(
-                  children: [
-                    _buildLogsTab(context),
-                    _buildSessionsTab(context),
-                  ],
-                ),
-              ),
-              _buildActionButtons(context),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildLogsTab(BuildContext context) {
-    final logs = viewModel.logs;
-    if (logs.isEmpty) {
-      return Center(child: Text("No logs available"));
-    }
-
-    final dateFormat = DateFormat('yyyy-MM-dd HH:mm:ss.SSS');
-
-    return ListView.builder(
-      itemCount: logs.length,
-      itemBuilder: (context, index) {
-        final log = logs[index];
-        return ListTile(
-          title: Text(
-            log.message,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontFamily: 'Monospace',
-                ),
-          ),
-          subtitle: Text(
-            '${dateFormat.format(log.timestamp)} | ${log.level}' +
-                (log.sessionId != null ? ' | Session: ${log.sessionId}' : ''),
-            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                  color: _getLevelColor(log.level),
-                ),
-          ),
-          dense: true,
-          onTap: () {
-            Clipboard.setData(ClipboardData(text: log.message));
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(content: Text('Log message copied to clipboard')),
-            );
-          },
-          onLongPress: () {
-            Clipboard.setData(ClipboardData(
-                text: '${dateFormat.format(log.timestamp)} [${log.level}] ${log.message}'));
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(content: Text('Full log entry copied to clipboard')),
-            );
-          },
-          tileColor: index % 2 == 0 ? Colors.transparent : Colors.black.withOpacity(0.03),
-        );
-      },
-    );
-  }
-
-  Widget _buildSessionsTab(BuildContext context) {
-    final sessions = viewModel.sessions;
-    if (sessions.isEmpty) {
-      return Center(child: Text("No sessions available"));
-    }
-
-    final dateFormat = DateFormat('yyyy-MM-dd HH:mm:ss');
-
-    return ListView.builder(
-      itemCount: sessions.length,
-      itemBuilder: (context, index) {
-        final session = sessions[index];
-        final isActive = session.endTime == null;
-
-        return ExpansionTile(
-          title: Text(
-            session.name,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.bold,
-                  color: isActive ? Colors.green : null,
-                ),
-          ),
-          subtitle: Text(
-            'ID: ${session.id} | Started: ${dateFormat.format(session.startTime)}',
-            style: Theme.of(context).textTheme.bodySmall!,
-          ),
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text('Start: ${session.startTime.toString()}'),
-                  if (session.endTime != null) Text('End: ${session.endTime.toString()}'),
-                  if (session.duration != null)
-                    Text('Duration: ${_formatDuration(session.duration!)}'),
-                  SizedBox(height: 8),
-                  _buildSessionLogs(context, session.id),
-                ],
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildSessionLogs(BuildContext context, int sessionId) {
-    final sessionLogs = viewModel.logs.where((log) => log.sessionId == sessionId).toList();
-
-    if (sessionLogs.isEmpty) {
-      return Text('No logs for this session');
-    }
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Session Logs (${sessionLogs.length}):',
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                fontWeight: FontWeight.bold,
-              ),
-        ),
-        SizedBox(height: 8),
-        Container(
-          height: 200,
-          decoration: BoxDecoration(
-            color: Colors.black.withOpacity(0.05),
-            borderRadius: BorderRadius.circular(4),
-          ),
-          child: ListView.builder(
-            itemCount: sessionLogs.length,
-            itemBuilder: (context, index) {
-              final log = sessionLogs[index];
-              return Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-                child: Text(
-                  '[${log.level}] ${log.message}',
-                  style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                        fontFamily: 'Monospace',
-                        color: _getLevelColor(log.level),
-                      ),
-                ),
-              );
-            },
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildActionButtons(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(16.0),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: [
-          ElevatedButton.icon(
-            icon: Icon(Icons.refresh),
-            label: Text('Refresh'),
-            onPressed: () => viewModel.loadLogs(),
-          ),
-          ElevatedButton.icon(
-            icon: Icon(Icons.copy),
-            label: Text('Copy All'),
-            onPressed: () => _copyAllLogs(context),
-          ),
-          ElevatedButton.icon(
-            icon: Icon(Icons.delete),
-            label: Text('Clear'),
-            onPressed: () => _confirmClearLogs(context),
-            style: ElevatedButton.styleFrom(
-              backgroundColor: Colors.red,
-              foregroundColor: Colors.white,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  void _copyAllLogs(BuildContext context) {
-    if (viewModel.logData == null) return;
-
-    final buffer = StringBuffer();
-    final dateFormat = DateFormat('yyyy-MM-dd HH:mm:ss.SSS');
-
-    for (final log in viewModel.logs) {
-      buffer.writeln('${dateFormat.format(log.timestamp)} [${log.level}] ${log.message}');
-    }
-
-    Clipboard.setData(ClipboardData(text: buffer.toString()));
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(content: Text('All logs copied to clipboard')),
-    );
-  }
-
-  void _confirmClearLogs(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: Text('Clear Logs'),
-          content: Text('Are you sure you want to clear the logs display?'),
-          actions: <Widget>[
-            TextButton(
-              child: Text('Cancel'),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
-            TextButton(
-              child: Text('Clear'),
-              style: TextButton.styleFrom(foregroundColor: Colors.red),
-              onPressed: () {
-                viewModel.clearLogs();
-                Navigator.of(context).pop();
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Color _getLevelColor(String level) {
-    switch (level.toLowerCase()) {
-      case 'error':
-        return Colors.red;
-      case 'warning':
-        return Colors.orange;
-      case 'info':
-        return Colors.blue;
-      case 'debug':
-        return Colors.green;
-      case 'trace':
-        return Colors.purple;
-      default:
-        return Colors.grey;
-    }
-  }
-
-  String _formatDuration(Duration duration) {
-    String twoDigits(int n) => n.toString().padLeft(2, '0');
-    String twoDigitMinutes = twoDigits(duration.inMinutes.remainder(60));
-    String twoDigitSeconds = twoDigits(duration.inSeconds.remainder(60));
-    return '${twoDigits(duration.inHours)}:$twoDigitMinutes:$twoDigitSeconds';
-  }
-}
diff --git a/lib/src/screens/dev/monero_background_sync.dart b/lib/src/screens/dev/monero_background_sync.dart
index 89af803ea..8927b33cf 100644
--- a/lib/src/screens/dev/monero_background_sync.dart
+++ b/lib/src/screens/dev/monero_background_sync.dart
@@ -12,7 +12,7 @@ class DevMoneroBackgroundSyncPage extends BasePage {
   @override
   String? get title => "[dev] xmr background sync";
 
-  Widget _buildSingleCell(String title, String value, BuildContext context) {
+  Widget _buildSingleCell(String title, String value) {
     return Container(
       decoration: BoxDecoration(
         border: Border.all(color: Colors.grey),
@@ -22,12 +22,7 @@ class DevMoneroBackgroundSyncPage extends BasePage {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          Text(
-            title,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.bold,
-                ),
-          ),
+          Text(title, style: TextStyle(fontWeight: FontWeight.bold)),
           Text(value, maxLines: 1, overflow: TextOverflow.ellipsis),
         ],
       ),
@@ -41,60 +36,59 @@ class DevMoneroBackgroundSyncPage extends BasePage {
         return GridView.count(
           padding: const EdgeInsets.all(16),
           crossAxisCount: 2,
-          childAspectRatio: 25 / 9,
+          childAspectRatio: 25/9,
           crossAxisSpacing: 16,
           mainAxisSpacing: 16,
           children: [
-            _buildSingleCell('Height (local)', viewModel.localBlockHeight ?? '', context),
-            _buildSingleCell('Height (node)', viewModel.nodeBlockHeight ?? '', context),
-            _buildSingleCell('Time', viewModel.tick.toString(), context),
-            _buildSingleCell(
-                'Background Sync', viewModel.isBackgroundSyncing ? 'Enabled' : 'Disabled', context),
-            _buildSingleCell('Public View Key', viewModel.publicViewKey ?? '', context),
-            _buildSingleCell('Private View Key', viewModel.privateViewKey ?? '', context),
-            _buildSingleCell('Public Spend Key', viewModel.publicSpendKey ?? '', context),
-            _buildSingleCell('Private Spend Key', viewModel.privateSpendKey ?? '', context),
-            _buildSingleCell('Primary Address', viewModel.primaryAddress ?? '', context),
-            _buildSingleCell('Passphrase', viewModel.passphrase ?? '', context),
-            _buildSingleCell('Seed', viewModel.seed ?? '', context),
-            _buildSingleCell('Seed Legacy', viewModel.seedLegacy ?? '', context),
-            _enableBackgroundSyncButton(context),
-            _disableBackgroundSyncButton(context),
-            _refreshButton(context),
-            _manualRescanButton(context),
+            _buildSingleCell('Height (local)', viewModel.localBlockHeight ?? ''),
+            _buildSingleCell('Height (node)', viewModel.nodeBlockHeight ?? ''),
+            _buildSingleCell('Time', viewModel.tick.toString()),
+            _buildSingleCell('Background Sync', viewModel.isBackgroundSyncing ? 'Enabled' : 'Disabled'),
+            _buildSingleCell('Public View Key', viewModel.publicViewKey ?? ''),
+            _buildSingleCell('Private View Key', viewModel.privateViewKey ?? ''),
+            _buildSingleCell('Public Spend Key', viewModel.publicSpendKey ?? ''),
+            _buildSingleCell('Private Spend Key', viewModel.privateSpendKey ?? ''),
+            _buildSingleCell('Primary Address', viewModel.primaryAddress ?? ''),
+            _buildSingleCell('Passphrase', viewModel.passphrase ?? ''),
+            _buildSingleCell('Seed', viewModel.seed ?? ''),
+            _buildSingleCell('Seed Legacy', viewModel.seedLegacy ?? ''),
+            _enableBackgroundSyncButton(),
+            _disableBackgroundSyncButton(),
+            _refreshButton(),
+            _manualRescanButton(),
           ],
         );
       },
     );
   }
 
-  PrimaryButton _enableBackgroundSyncButton(BuildContext context) {
+  PrimaryButton _enableBackgroundSyncButton() {
     return PrimaryButton(
       text: "Enable background sync",
       color: Colors.purple,
-      textColor: Theme.of(context).colorScheme.onPrimary,
+      textColor: Colors.white,
       onPressed: () {
         viewModel.startBackgroundSync();
       },
     );
   }
 
-  PrimaryButton _disableBackgroundSyncButton(BuildContext context) {
+  PrimaryButton _disableBackgroundSyncButton() {
     return PrimaryButton(
       text: "Disable background sync",
       color: Colors.purple,
-      textColor: Theme.of(context).colorScheme.onPrimary,
+      textColor: Colors.white,
       onPressed: () {
         viewModel.stopBackgroundSync();
       },
     );
   }
 
-  PrimaryButton _refreshButton(BuildContext context) {
+  PrimaryButton _refreshButton() {
     return PrimaryButton(
       text: viewModel.refreshTimer == null ? "Enable refresh" : "Disable refresh",
       color: Colors.purple,
-      textColor: Theme.of(context).colorScheme.onPrimary,
+      textColor: Colors.white,
       onPressed: () {
         if (viewModel.refreshTimer == null) {
           viewModel.startRefreshTimer();
@@ -105,11 +99,11 @@ class DevMoneroBackgroundSyncPage extends BasePage {
     );
   }
 
-  PrimaryButton _manualRescanButton(BuildContext context) {
+  PrimaryButton _manualRescanButton() {
     return PrimaryButton(
       text: "Manual rescan",
       color: Colors.purple,
-      textColor: Theme.of(context).colorScheme.onPrimary,
+      textColor: Colors.white,
       onPressed: () {
         viewModel.manualRescan();
       },
diff --git a/lib/src/screens/dev/moneroc_call_profiler.dart b/lib/src/screens/dev/moneroc_call_profiler.dart
deleted file mode 100644
index b21742410..000000000
--- a/lib/src/screens/dev/moneroc_call_profiler.dart
+++ /dev/null
@@ -1,253 +0,0 @@
-// code shamelessly stolen from xmruw
-// https://raw.githubusercontent.com/MrCyjaneK/unnamed_monero_wallet/refs/heads/master-rewrite/lib/pages/debug/performance.dart
-import 'dart:math';
-
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/monero/monero.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
-import 'package:cake_wallet/wownero/wownero.dart';
-import 'package:cake_wallet/zano/zano.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-
-class DevMoneroCallProfilerPage extends BasePage {
-  DevMoneroCallProfilerPage();
-
-  @override
-  String? get title => "[dev] xmr call profiler";
-
-  @override
-  Widget body(BuildContext context) {
-    return PerformanceDebug();
-  }
-}
-
-
-
-class PerformanceDebug extends StatefulWidget {
-  const PerformanceDebug({super.key});
-
-  @override
-  State<PerformanceDebug> createState() => _PerformanceDebugState();
-}
-
-enum ProfilableWallet {
-  monero,
-  wownero,
-  zano,
-}
-
-class _PerformanceDebugState extends State<PerformanceDebug> {
-  List<Widget> widgets = [];
-
-  final dashboardViewModel = getIt.get<DashboardViewModel>();
-
-  late ProfilableWallet wallet = switch (dashboardViewModel.wallet.type) {
-    WalletType.monero => ProfilableWallet.monero,
-    WalletType.wownero => ProfilableWallet.wownero,
-    WalletType.zano => ProfilableWallet.zano,
-    _ => throw Exception("Unknown wallet type"),
-  };
-  final precalc = 1700298;
-
-  late Map<String, List<int>> debugCallLength = switch (wallet) {
-    ProfilableWallet.monero => monero!.debugCallLength(),
-    ProfilableWallet.wownero => wownero!.debugCallLength(),
-    ProfilableWallet.zano => zano!.debugCallLength(),
-  };
-
-  int getOpenWalletTime() {
-    if (debugCallLength["MONERO_Wallet_init"] == null) {
-      return precalc;
-    }
-    if (debugCallLength["MONERO_Wallet_init"]!.isEmpty) {
-      return precalc;
-    }
-    return debugCallLength["MONERO_Wallet_init"]!.last;
-  }
-
-late final String perfInfo = """
----- Performance tuning
-This page lists all calls that take place during the app runtime.-
-As per Flutter docs we can read:
-> Flutter aims to provide 60 frames per second (fps) performance, or 120 fps-
-performance on devices capable of 120Hz updates.
-
-With that in mind we will aim to render frames every 8.3ms (~8333 µs). It is-
-however acceptable to reach 16.6 ms (~16666 µs) but we should also keep in mind-
-that there are also UI costs that aren't part of this benchmark.
-
-For some calls it is also acceptable to exceed this amount of time, for example-
-MONERO_Wallet_init takes ~${getOpenWalletTime()}µs-
-(${(getOpenWalletTime() / frameTime).toStringAsFixed(2)} frames). That time would-
-be unnaceptable in most situations but since we call this function only when-
-opening the wallet it is completely fine to freeze the UI for the time being --
-as the user won't even notice that something happened.
-
----- Details
-count: how many times did we call this function [total time (% of frame)]
-average: average execution time (% of frame)
-min: fastest execution (% of frame)
-max: slowest execution (% of frame)
-95th: 95% of the time, the function is faster than this amount of time (% of frame)
-"""
-    .split("-\n")
-    .join(" ");
-
-  late final frameTime = 8333;
-  late final frameGreenTier = frameTime ~/ 100;
-  late final frameBlueTier = frameTime ~/ 10;
-  late final frameBlueGreyTier = frameTime ~/ 2;
-  late final frameYellowTier = frameTime;
-  late final frameOrangeTier = frameTime * 2;
-
-  Color? perfc(num frame) {
-    if (frame < frameGreenTier) return Colors.green;
-    if (frame < frameBlueTier) return Colors.blue;
-    if (frame < frameBlueGreyTier) return Colors.blueGrey;
-    if (frame < frameGreenTier) return Colors.green;
-    if (frame < frameYellowTier) return Colors.yellow;
-    if (frame < frameOrangeTier) return Colors.orange;
-    return Colors.red;
-  }
-
-
-  @override
-  void initState() {
-    _buildWidgets();
-    super.initState();
-  }
-
-  SelectableText cw(String text, Color? color) {
-    return SelectableText(
-      text,
-      style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: color),
-    );
-  }
-
-  void _buildWidgets() {
-    List<Widget> ws = [];
-    ws.add(Column(
-      mainAxisSize: MainAxisSize.min,
-      mainAxisAlignment: MainAxisAlignment.start,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        SelectableText(perfInfo),
-        cw("<   1% of a frame (max: $frameGreenTierµs)", Colors.green),
-        cw("<  10% of a frame (max: $frameBlueTierµs)", Colors.blue),
-        cw("<  50% of a frame (max: $frameBlueGreyTierµs)", Colors.blueGrey),
-        cw("< 100% of a frame (max: $frameYellowTierµs)", Colors.yellow),
-        cw("< 200% of a frame (max: $frameOrangeTierµs)", Colors.orange),
-        cw("> 200% of a frame (UI junk visible)", Colors.red),
-      ],
-    ));
-    final keys = debugCallLength.keys.toList();
-    keys.sort((s1, s2) =>
-        _n95th(debugCallLength[s2]!) -
-        _n95th(debugCallLength[s1]!));
-    for (var key in keys) {
-      final value = debugCallLength[key];
-      if (value == null) continue;
-      final avg = _avg(value);
-      final min = _min(value);
-      final max = _max(value);
-      final np = _n95th(value);
-      final total = _total(value);
-      ws.add(
-        Card(
-          child: ListTile(
-            title: Text(
-              key,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: perfc(np)),
-            ),
-            subtitle: Column(
-              mainAxisSize: MainAxisSize.min,
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Row(children: [
-                  cw("count: ${value.length}", null),
-                  const Spacer(),
-                  cw("${_str(total / 1000)}ms", perfc(total)),
-                ]),
-                cw("average: ${_str(avg)}µs (~${_str(avg / (frameTime))}f)",
-                    perfc(avg)),
-                cw("min: $minµs (~${_str(min / (frameTime) * 100)})",
-                    perfc(min)),
-                cw("max: $maxµs (~${_str(max / (frameTime) * 100)}%)",
-                    perfc(max)),
-                cw("95th: $npµs (~${_str(np / (frameTime) * 100)}%)",
-                    perfc(np)),
-              ],
-            ),
-          ),
-        ),
-      );
-    }
-    if (debugCallLength.isNotEmpty) {
-      ws.add(
-        PrimaryButton(
-          text: "Purge statistics",
-          onPressed: _purgeStats,
-          color: Colors.red,
-          textColor: Colors.white,
-        ),
-      );
-    }
-    setState(() {
-      widgets = ws;
-    });
-  }
-
-  void _purgeStats() {
-    debugCallLength.clear();
-    _buildWidgets();
-  }
-
-  int _min(List<int> l) {
-    return l.reduce(min);
-  }
-
-  int _max(List<int> l) {
-    return l.reduce(max);
-  }
-
-  int _n95th(List<int> l) {
-    final l0 = l.toList();
-    l0.sort();
-    int i = (0.95 * l.length).ceil() - 1;
-    return l0[i];
-  }
-
-  double _avg(List<int> l) {
-    int c = 0;
-    for (var i = 0; i < l.length; i++) {
-      c += l[i];
-    }
-    return c / l.length;
-  }
-
-  int _total(List<int> l) {
-    int c = 0;
-    for (var i = 0; i < l.length; i++) {
-      c += l[i];
-    }
-    return c;
-  }
-
-  String _str(num d) => d.toStringAsFixed(2);
-
-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: Column(
-          children: widgets,
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/screens/dev/network_requests.dart b/lib/src/screens/dev/network_requests.dart
deleted file mode 100644
index 912c79da7..000000000
--- a/lib/src/screens/dev/network_requests.dart
+++ /dev/null
@@ -1,155 +0,0 @@
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/view_model/dev/network_requests_view_model.dart';
-import 'package:cw_core/utils/proxy_logger/abstract.dart';
-import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-
-class DevNetworkRequests extends BasePage {
-  final NetworkRequestsViewModel viewModel = NetworkRequestsViewModel();
-
-  DevNetworkRequests() {
-    viewModel.loadLogs();
-  }
-
-  @override
-  String? get title => "[dev] network requests";
-
-  @override
-  Widget? trailing(BuildContext context) {
-    return IconButton(
-      icon: Icon(Icons.refresh),
-      onPressed: () => viewModel.loadLogs(),
-    );
-  }
-
-  @override
-  Widget body(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        if (viewModel.logs.isEmpty) {
-          return Center(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text("No logs loaded"),
-                SizedBox(height: 16),
-                ElevatedButton(
-                  onPressed: () => viewModel.loadLogs(),
-                  child: Text("Load Logs"),
-                ),
-              ],
-            ),
-          );
-        } else {
-          return ListView.builder(
-            itemCount: viewModel.logs.length,
-            itemBuilder: (BuildContext context, int i) {
-              final item = viewModel.logs[i];
-              return ListTile(
-                onTap: () {
-                  Navigator.of(context).push(
-                    MaterialPageRoute(
-                      builder: (BuildContext context) {
-                        return DevRequestDetails(item);
-                      },
-                    ),
-                  );
-                },
-                leading: switch (item.network) {
-                  RequestNetwork.clearnet => Text("C"),
-                  RequestNetwork.tor => Text("T"),
-                },
-                trailing: switch (item.method) {
-                  RequestMethod.get => Text("GET"),
-                  RequestMethod.post => Text("POST"),
-                  RequestMethod.put => Text("PUT"),
-                  RequestMethod.delete => Text("DELETE"),
-                  RequestMethod.newHttpClient ||
-                  RequestMethod.newHttpIOClient ||
-                  RequestMethod.newProxySocket => null,
-                },
-                title: Text(item.time.toIso8601String()),
-                subtitle: switch (item.method) {
-                  RequestMethod.get ||
-                  RequestMethod.post ||
-                  RequestMethod.put ||
-                  RequestMethod.delete => Text("${item.uri}"),
-                  RequestMethod.newHttpClient => Text("newHttpClient"),
-                  RequestMethod.newHttpIOClient => Text("newHttpIOClient"),
-                  RequestMethod.newProxySocket => Text("newProxySocket"),
-                },
-                tileColor: item.error != null ? Colors.red : null,
-              );
-            },
-          );
-        }
-      },
-    );
-  }
-}
-
-class DevRequestDetails extends BasePage {
-  final MemoryProxyLoggerEntry req;
-  DevRequestDetails(this.req);
-
-  @override
-  Widget body(BuildContext context) {
-    return SingleChildScrollView(
-      padding: const EdgeInsets.all(16),
-      child: _body(context),
-    );
-  }
-
-  Widget _body(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        _sectionTitle("Time"),
-        SelectableText(req.time.toString()),
-
-        _sectionTitle("Method"),
-        SelectableText(req.method.toString()),
-
-        _sectionTitle("URI"),
-        SelectableText(req.uri?.toString() ?? "null"),
-
-        _sectionTitle("Network"),
-        SelectableText(req.network.toString()),
-
-        _sectionTitle("Body (as UTF-8)"),
-        SelectableText(_tryDecodeBody(req.body)),
-
-        _sectionTitle("Response"),
-        SelectableText(req.response?.body ?? "null"),
-
-        _sectionTitle("Error"),
-        SelectableText(req.error ?? "No error"),
-
-        _sectionTitle("Stack Trace"),
-        SelectableText(req.trace.toString()),
-      ],
-    );
-  }
-
-  Widget _sectionTitle(String title) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8.0),
-      child: Text(
-        title,
-        style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
-      ),
-    );
-  }
-
-  String _tryDecodeBody(Uint8List body) {
-    try {
-      return utf8.decode(body);
-    } catch (_) {
-      return 'Binary data (${body.length} bytes)';
-    }
-  }
-}
diff --git a/lib/src/screens/dev/secure_preferences_page.dart b/lib/src/screens/dev/secure_preferences_page.dart
deleted file mode 100644
index f6d957feb..000000000
--- a/lib/src/screens/dev/secure_preferences_page.dart
+++ /dev/null
@@ -1,63 +0,0 @@
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/view_model/dev/secure_preferences.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-
-class DevSecurePreferencesPage extends BasePage {
-  final DevSecurePreferences viewModel;
-
-  DevSecurePreferencesPage(this.viewModel);
-
-  @override
-  String? get title => "[dev] secure preferences";
-
-  @override
-  Widget body(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        if (viewModel.values.isEmpty) {
-          return Center(child: Text("No secure preferences found"));
-        }
-        final keys = viewModel.keys;
-        Map<String, dynamic> values = {};
-        for (final key in keys) {
-          values[key] = viewModel.get(key);
-        }
-        Map<String, PreferenceType> types = {};
-        for (final key in keys) {
-          types[key] = viewModel.getPreferenceType(key);
-        }
-        return ListView.builder(
-          itemCount: keys.length,
-          itemBuilder: (context, index) {
-            final key = keys[index];
-            final type = types[key]!;
-            return ListTile(
-              onTap: () {
-                Clipboard.setData(ClipboardData(text: key + ": " + values[key].toString()));
-              },
-              title: switch (type) {
-                PreferenceType.bool => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.blue)),
-                PreferenceType.int => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.green)),
-                PreferenceType.double => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.yellow)),
-                PreferenceType.listString => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.purple)),
-                PreferenceType.string => Text(key),
-                PreferenceType.unknown => Text(key),
-              },
-              subtitle: switch (type) {
-                PreferenceType.bool => Text("bool: ${values[key]}"),
-                PreferenceType.int => Text("int: ${values[key]}"),
-                PreferenceType.double => Text("double: ${values[key]}"),
-                PreferenceType.listString => values[key].isEmpty as bool ? Text("listString: []") : Text("listString:\n- ${values[key].join("\n- ")}"),
-                PreferenceType.string => Text("string: ${values[key]}"),
-                PreferenceType.unknown => Text("UNKNOWN(${values[key].runtimeType}): ${values[key]}"),
-              },
-            );
-          },
-        );
-      },
-    );
-  }
-
-}
\ No newline at end of file
diff --git a/lib/src/screens/dev/shared_preferences_page.dart b/lib/src/screens/dev/shared_preferences_page.dart
deleted file mode 100644
index 1d8edaab6..000000000
--- a/lib/src/screens/dev/shared_preferences_page.dart
+++ /dev/null
@@ -1,405 +0,0 @@
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
-import 'package:cake_wallet/view_model/dev/shared_preferences.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-
-class DevSharedPreferencesPage extends BasePage {
-  final DevSharedPreferences viewModel;
-
-  DevSharedPreferencesPage(this.viewModel);
-
-  @override
-  String? get title => "[dev] shared preferences";
-
-  @override
-  Widget? trailing(BuildContext context) {
-    return IconButton(
-      icon: Icon(Icons.add),
-      onPressed: () => _showCreateDialog(context),
-    );
-  }
-
-  @override
-  Widget body(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        if (viewModel.sharedPreferences == null) {
-          return Center(child: Text("No shared preferences found"));
-        }
-        final keys = viewModel.keys;
-        Map<String, dynamic> values = {};
-        for (final key in keys) {
-          values[key] = viewModel.get(key);
-        }
-        Map<String, PreferenceType> types = {};
-        for (final key in keys) {
-          types[key] = viewModel.getPreferenceType(key);
-        }
-        return ListView.builder(
-          itemCount: keys.length,
-          itemBuilder: (context, index) {
-            final key = keys[index];
-            final type = types[key]!;
-            return ListTile(
-              onTap: () {
-                Clipboard.setData(ClipboardData(text: key + ": " + values[key].toString()));
-              },
-              onLongPress: () {
-                _showEditDialog(context, key, type, values[key]);
-              },
-              title: switch (type) {
-                PreferenceType.bool => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.blue)),
-                PreferenceType.int => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.green)),
-                PreferenceType.double => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.yellow)),
-                PreferenceType.listString => Text(key, style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.purple)),
-                PreferenceType.string => Text(key),
-                PreferenceType.unknown => Text(key),
-              },
-              subtitle: switch (type) {
-                PreferenceType.bool => Text("bool: ${values[key]}"),
-                PreferenceType.int => Text("int: ${values[key]}"),
-                PreferenceType.double => Text("double: ${values[key]}"),
-                PreferenceType.listString => values[key].isEmpty as bool ? Text("listString: []") : Text("listString:\n- ${values[key].join("\n- ")}"),
-                PreferenceType.string => Text("string: ${values[key]}"),
-                PreferenceType.unknown => Text("UNKNOWN(${values[key].runtimeType}): ${values[key]}"),
-              },
-            );
-          },
-        );
-      },
-    );
-  }
-
-  void _showEditDialog(BuildContext context, String key, PreferenceType type, dynamic currentValue) {
-    dynamic newValue = currentValue;
-    bool isListString = type == PreferenceType.listString;
-    List<String> listItems = isListString ? List<String>.from(currentValue as Iterable<dynamic>) : [];
-    TextEditingController textController = TextEditingController(
-        text: isListString ? '' : currentValue?.toString() ?? '');
-
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return StatefulBuilder(
-          builder: (context, setState) {
-            return AlertDialog(
-              title: Text('Edit $key'),
-              content: SizedBox(
-                width: double.maxFinite,
-                height: double.maxFinite,
-                child: SingleChildScrollView(
-                  child: _buildDialogContent(
-                    type, 
-                    newValue, 
-                    listItems, 
-                    textController, 
-                    (value) => setState(() => newValue = value),
-                    (items) => setState(() => listItems = items),
-                  ),
-                ),
-              ),
-              actions: <Widget>[
-                TextButton(
-                  child: Text('Delete'),
-                  style: TextButton.styleFrom(foregroundColor: Colors.red),
-                  onPressed: () {
-                    _showDeleteConfirmation(context, key);
-                  },
-                ),
-                TextButton(
-                  child: Text('Cancel'),
-                  onPressed: () => Navigator.of(context).pop(),
-                ),
-                TextButton(
-                  child: Text('Save'),
-                  onPressed: () async {
-                    if (_validateAndUpdateValue(
-                      context, 
-                      type, 
-                      textController, 
-                      listItems, 
-                      (value) => newValue = value
-                    )) {
-                      await viewModel.set(key, type, newValue);
-                      Navigator.of(context).pop();
-                    }
-                  },
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-
-  void _showDeleteConfirmation(BuildContext context, String key) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: Text('Delete Preference'),
-          content: Text('Are you sure you want to delete "$key"?'),
-          actions: <Widget>[
-            TextButton(
-              child: Text('Cancel'),
-              onPressed: () => Navigator.of(context).pop(),
-            ),
-            TextButton(
-              child: Text('Delete'),
-              style: TextButton.styleFrom(foregroundColor: Colors.red),
-              onPressed: () {
-                viewModel.delete(key);
-                Navigator.of(context).pop();
-                Navigator.of(context).pop();
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildDialogContent(
-    PreferenceType type,
-    dynamic value,
-    List<String> listItems,
-    TextEditingController textController,
-    Function(dynamic) onValueChanged,
-    Function(List<String>) onListChanged,
-  ) {
-    return switch (type) {
-      PreferenceType.bool => _buildBoolEditor(value as bool, onValueChanged),
-      PreferenceType.int => _buildNumberEditor(textController, 'Integer value', true),
-      PreferenceType.double => _buildNumberEditor(textController, 'Double value', false),
-      PreferenceType.string => _buildTextEditor(textController),
-      PreferenceType.listString => _buildListEditor(listItems, textController, onListChanged),
-      PreferenceType.unknown => Text('Cannot edit unknown type'),
-    };
-  }
-
-  Widget _buildBoolEditor(bool value, Function(bool) onChanged) {
-    return CheckboxListTile(
-      title: Text('Value'),
-      value: value,
-      onChanged: (newValue) {
-        if (newValue != null) onChanged(newValue);
-      },
-    );
-  }
-
-  Widget _buildTextEditor(TextEditingController controller) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        BaseTextFormField(
-          controller: controller,
-          hintText: 'String value',
-          maxLines: null,
-        ),
-      ],
-    );
-  }
-
-  Widget _buildNumberEditor(TextEditingController controller, String label, bool isInteger) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        BaseTextFormField(
-          controller: controller,
-          hintText: label,
-          keyboardType: isInteger 
-              ? TextInputType.number 
-              : TextInputType.numberWithOptions(decimal: true),
-          inputFormatters: isInteger
-              ? [FilteringTextInputFormatter.digitsOnly]
-              : [FilteringTextInputFormatter.allow(RegExp(r'^\d*\.?\d*$'))],
-        ),
-      ],
-    );
-  }
-
-  Widget _buildListEditor(
-    List<String> items, 
-    TextEditingController controller,
-    Function(List<String>) onListChanged,
-  ) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        SizedBox(
-          height: 200,
-          child: ReorderableListView(
-            shrinkWrap: true,
-            children: [
-              for (int i = 0; i < items.length; i++)
-                ListTile(
-                  key: Key('$i'),
-                  title: Text(items[i]),
-                  trailing: IconButton(
-                    icon: Icon(Icons.delete),
-                    onPressed: () {
-                      final newList = List<String>.from(items);
-                      newList.removeAt(i);
-                      onListChanged(newList);
-                    },
-                  ),
-                )
-            ],
-            onReorder: (int oldIndex, int newIndex) {
-              final newList = List<String>.from(items);
-              if (oldIndex < newIndex) {
-                newIndex -= 1;
-              }
-              final item = newList.removeAt(oldIndex);
-              newList.insert(newIndex, item);
-              onListChanged(newList);
-            },
-          ),
-        ),
-        Row(
-          children: [
-            Expanded(
-              child: BaseTextFormField(
-                controller: controller,
-                hintText: 'New item',
-              ),
-            ),
-            IconButton(
-              icon: Icon(Icons.add),
-              onPressed: () {
-                if (controller.text.isNotEmpty) {
-                  final newList = List<String>.from(items);
-                  newList.add(controller.text);
-                  onListChanged(newList);
-                  controller.clear();
-                }
-              },
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  bool _validateAndUpdateValue(
-    BuildContext context,
-    PreferenceType type,
-    TextEditingController controller,
-    List<String> listItems,
-    Function(dynamic) setNewValue,
-  ) {
-    switch (type) {
-      case PreferenceType.int:
-        if (controller.text.isNotEmpty) {
-          try {
-            setNewValue(int.parse(controller.text));
-          } catch (e) {
-            _showErrorMessage(context, 'Invalid integer value');
-            return false;
-          }
-        }
-        break;
-      case PreferenceType.double:
-        if (controller.text.isNotEmpty) {
-          try {
-            setNewValue(double.parse(controller.text));
-          } catch (e) {
-            _showErrorMessage(context, 'Invalid double value');
-            return false;
-          }
-        }
-        break;
-      case PreferenceType.string:
-        setNewValue(controller.text);
-        break;
-      case PreferenceType.listString:
-        setNewValue(listItems);
-        break;
-      default:
-        break;
-    }
-    return true;
-  }
-
-  void _showErrorMessage(BuildContext context, String message) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(content: Text(message)),
-    );
-  }
-
-  void _showCreateDialog(BuildContext context) {
-    PreferenceType selectedType = PreferenceType.string;
-    TextEditingController keyController = TextEditingController();
-
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return StatefulBuilder(
-          builder: (context, setState) {
-            return AlertDialog(
-              title: Text('Create Preference'),
-              content: SingleChildScrollView(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    BaseTextFormField(
-                      controller: keyController,
-                      hintText: 'Preference Key',
-                    ),
-                    SizedBox(height: 16),
-                    DropdownButtonFormField<PreferenceType>(
-                      value: selectedType,
-                      decoration: InputDecoration(labelText: 'Type'),
-                      items: [
-                        DropdownMenuItem(value: PreferenceType.string, child: Text('String')),
-                        DropdownMenuItem(value: PreferenceType.bool, child: Text('Boolean')),
-                        DropdownMenuItem(value: PreferenceType.int, child: Text('Integer')),
-                        DropdownMenuItem(value: PreferenceType.double, child: Text('Double')),
-                        DropdownMenuItem(value: PreferenceType.listString, child: Text('List of Strings')),
-                      ],
-                      onChanged: (value) {
-                        if (value != null) {
-                          setState(() {
-                            selectedType = value;
-                          });
-                        }
-                      },
-                    ),
-                  ],
-                ),
-              ),
-              actions: <Widget>[
-                TextButton(
-                  child: Text('Cancel'),
-                  onPressed: () => Navigator.of(context).pop(),
-                ),
-                TextButton(
-                  child: Text('Create'),
-                  onPressed: () {
-                    if (keyController.text.isEmpty) {
-                      _showErrorMessage(context, 'Key cannot be empty');
-                      return;
-                    }
-
-                    viewModel.set(keyController.text, selectedType, switch (selectedType) {
-                      PreferenceType.bool => false,
-                      PreferenceType.int => 0,
-                      PreferenceType.double => 0.0,
-                      PreferenceType.string => '',
-                      PreferenceType.listString => [],
-                      PreferenceType.unknown => null,
-                    });
-                    Navigator.of(context).pop();
-                  },
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-}
diff --git a/lib/src/screens/disclaimer/disclaimer_page.dart b/lib/src/screens/disclaimer/disclaimer_page.dart
index 6358e4b32..a7d3b5ff9 100644
--- a/lib/src/screens/disclaimer/disclaimer_page.dart
+++ b/lib/src/screens/disclaimer/disclaimer_page.dart
@@ -1,9 +1,17 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 
 class DisclaimerPage extends BasePage {
@@ -15,10 +23,12 @@ class DisclaimerPage extends BasePage {
   String get title => 'Terms of Use';
 
   @override
-  Widget? leading(BuildContext context) => isReadOnly ? super.leading(context) : null;
+  Widget? leading(BuildContext context) =>
+      isReadOnly ? super.leading(context) : null;
 
   @override
-  Widget body(BuildContext context) => DisclaimerPageBody(isReadOnly: isReadOnly);
+  Widget body(BuildContext context) =>
+      DisclaimerPageBody(isReadOnly: isReadOnly);
 }
 
 class DisclaimerPageBody extends StatefulWidget {
@@ -31,12 +41,15 @@ class DisclaimerPageBody extends StatefulWidget {
 }
 
 class DisclaimerBodyState extends State<DisclaimerPageBody> {
+
   bool _checked = false;
   String _fileText = '';
 
-  Future<void> getFileLines() async {
+  Future getFileLines() async {
     _fileText = await rootBundle.loadString(
-        isMoneroOnly ? 'assets/text/Monerocom_Terms_of_Use.txt' : 'assets/text/Terms_of_Use.txt');
+      isMoneroOnly
+      ? 'assets/text/Monerocom_Terms_of_Use.txt'
+      : 'assets/text/Terms_of_Use.txt' );
     setState(() {});
   }
 
@@ -51,7 +64,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
     return WillPopScope(
         onWillPop: () async => widget.isReadOnly,
         child: Container(
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).colorScheme.background,
           child: Column(
             children: <Widget>[
               SizedBox(height: 10.0),
@@ -68,10 +81,10 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                               child: Text(
                                 'Terms and conditions',
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                                style: TextStyle(
                                     fontSize: 20.0,
                                     fontWeight: FontWeight.bold,
-                                    color: Theme.of(context).colorScheme.onSurface),
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             )
                           ],
@@ -85,9 +98,10 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                               child: Text(
                                 'Legal Disclaimer\nAnd\nTerms of Use',
                                 textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                      fontWeight: FontWeight.bold,
-                                    ),
+                                style: TextStyle(
+                                    fontSize: 12.0,
+                                    fontWeight: FontWeight.bold,
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                               ),
                             )
                           ],
@@ -100,7 +114,10 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                             Expanded(
                                 child: Text(
                               _fileText,
-                              style: Theme.of(context).textTheme.bodySmall,
+                              style: TextStyle(
+                                  fontSize: 12.0,
+                                  fontWeight: FontWeight.normal,
+                                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                             ))
                           ],
                         ),
@@ -121,8 +138,11 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                             decoration: BoxDecoration(
                               gradient: LinearGradient(
                                 colors: [
-                                  Theme.of(context).colorScheme.surface.withOpacity(0.0),
-                                  Theme.of(context).colorScheme.surface,
+                                  Theme.of(context)
+                                      .colorScheme
+                                      .background
+                                      .withOpacity(0.0),
+                                  Theme.of(context).colorScheme.background,
                                 ],
                                 begin: FractionalOffset.topCenter,
                                 end: FractionalOffset.bottomCenter,
@@ -140,8 +160,8 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                   children: <Widget>[
                     Expanded(
                       child: Container(
-                          padding:
-                              EdgeInsets.only(left: 24.0, top: 10.0, right: 24.0, bottom: 10.0),
+                          padding: EdgeInsets.only(
+                              left: 24.0, top: 10.0, right: 24.0, bottom: 10.0),
                           child: InkWell(
                             key: ValueKey('disclaimer_check_key'),
                             onTap: () {
@@ -160,23 +180,26 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                                   ),
                                   decoration: BoxDecoration(
                                       border: Border.all(
-                                          color: Theme.of(context).colorScheme.outline, width: 1.0),
-                                      borderRadius: BorderRadius.all(Radius.circular(8.0)),
-                                      color: Theme.of(context).colorScheme.surface),
+                                          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                                          width: 1.0),
+                                      borderRadius: BorderRadius.all(
+                                          Radius.circular(8.0)),
+                                      color: Theme.of(context).colorScheme.background),
                                   child: _checked
                                       ? Icon(
                                           key: ValueKey('disclaimer_check_icon_key'),
                                           Icons.check,
-                                          color: Theme.of(context).colorScheme.primary,
+                                          color: Colors.blue,
                                           size: 20.0,
                                         )
                                       : null,
                                 ),
                                 Text(
                                   'I agree to Terms of Use',
-                                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                        fontWeight: FontWeight.bold,
-                                      ),
+                                  style: TextStyle(
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 14.0,
+                                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                                 )
                               ],
                             ),
@@ -185,15 +208,17 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
                   ],
                 ),
                 Container(
-                  padding: EdgeInsets.only(left: 24.0, right: 24.0, bottom: 24.0),
+                  padding:
+                      EdgeInsets.only(left: 24.0, right: 24.0, bottom: 24.0),
                   child: PrimaryButton(
                       key: ValueKey('disclaimer_accept_button_key'),
                       onPressed: _checked
-                          ? () => Navigator.of(context).popAndPushNamed(Routes.welcome)
+                          ? () => Navigator.of(context)
+                              .popAndPushNamed(Routes.welcome)
                           : null,
                       text: 'Accept',
-                      color: Theme.of(context).colorScheme.primary,
-                      textColor: Theme.of(context).colorScheme.onPrimary),
+                      color: Theme.of(context).extension<WalletListTheme>()!.createNewWalletButtonBackgroundColor,
+                      textColor: Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor),
                 ),
               ],
             ],
diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart
index b9b3defa6..e5027198b 100644
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@@ -1,12 +1,15 @@
 import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/exchange/provider/chainflip_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/desktop_exchange_cards_section.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/mobile_exchange_cards_section.dart';
 import 'package:cake_wallet/src/widgets/add_template_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/debounce.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -94,44 +97,37 @@ class ExchangePage extends BasePage {
         }
       };
 
-  bool get _shouldWaitTillSynced =>
-      [CryptoCurrency.xmr, CryptoCurrency.btc, CryptoCurrency.ltc]
-          .contains(exchangeViewModel.depositCurrency) &&
-      !(exchangeViewModel.status is SyncedSyncStatus);
-
   @override
   Widget middle(BuildContext context) => Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           Padding(
-            padding: const EdgeInsets.only(right: 6.0),
-            child: Observer(
-              builder: (_) =>
-                  SyncIndicatorIcon(isSynced: exchangeViewModel.status is SyncedSyncStatus),
-            ),
-          ),
+              padding: const EdgeInsets.only(right: 6.0),
+              child: Observer(
+                builder: (_) =>
+                    SyncIndicatorIcon(isSynced: exchangeViewModel.status is SyncedSyncStatus),
+              )),
           PresentProviderPicker(exchangeViewModel: exchangeViewModel)
         ],
       );
 
   @override
   Widget trailing(BuildContext context) => TrailButton(
-        caption: S.of(context).reset,
-        onPressed: () {
-          _formKey.currentState?.reset();
-          exchangeViewModel.reset();
-        },
-      );
+      caption: S.of(context).reset,
+      onPressed: () {
+        _formKey.currentState?.reset();
+        exchangeViewModel.reset();
+      });
 
   @override
   Widget? leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).colorScheme.primary,
+      color: titleColor(context),
       size: 16,
     );
     final _closeButton =
-        currentTheme.isDark ? closeButtonImageDarkTheme : closeButtonImage;
+        currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
     bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
 
@@ -145,7 +141,7 @@ class ExchangePage extends BasePage {
             label: !isMobileView ? S.of(context).close : S.of(context).seed_alert_back,
             child: TextButton(
               style: ButtonStyle(
-                overlayColor: WidgetStateColor.resolveWith((states) => Colors.transparent),
+                overlayColor: MaterialStateColor.resolveWith((states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
               child: !isMobileView ? _closeButton : _backButton,
@@ -161,59 +157,55 @@ class ExchangePage extends BasePage {
     WidgetsBinding.instance.addPostFrameCallback((_) => _setReactions(context, exchangeViewModel));
 
     return KeyboardActions(
-      disableScroll: true,
-      config: KeyboardActionsConfig(
-        keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-        keyboardBarColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-        nextFocus: false,
-        actions: [
-          KeyboardActionsItem(
-              focusNode: _depositAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]),
-          KeyboardActionsItem(
-              focusNode: _receiveAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()])
-        ],
-      ),
-      child: Container(
-        color: Theme.of(context).colorScheme.surface,
-        child: Form(
-          key: _formKey,
-          child: ScrollableWithBottomSection(
-            contentPadding: EdgeInsets.only(bottom: 24),
-            content: Observer(
-              builder: (_) => Column(
-                children: <Widget>[
-                  _exchangeCardsSection(context),
-                  Padding(
-                    padding: EdgeInsets.only(top: 12, left: 24),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
-                        StandardCheckbox(
-                          value: exchangeViewModel.isFixedRateMode,
-                          caption: S.of(context).fixed_rate,
-                          onChanged: (value) {
-                            if (value) {
-                              exchangeViewModel.enableFixedRateMode();
-                            } else {
-                              exchangeViewModel.isFixedRateMode = false;
-                            }
-                          },
-                        ),
-                      ],
-                    ),
+        disableScroll: true,
+        config: KeyboardActionsConfig(
+            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
+            nextFocus: false,
+            actions: [
+              KeyboardActionsItem(
+                  focusNode: _depositAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]),
+              KeyboardActionsItem(
+                  focusNode: _receiveAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()])
+            ]),
+        child: Container(
+          color: Theme.of(context).colorScheme.background,
+          child: Form(
+              key: _formKey,
+              child: ScrollableWithBottomSection(
+                contentPadding: EdgeInsets.only(bottom: 24),
+                content: Observer(
+                  builder: (_) => Column(
+                    children: <Widget>[
+                      _exchangeCardsSection(context),
+                      Padding(
+                          padding: EdgeInsets.only(top: 12, left: 24),
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            children: [
+                              StandardCheckbox(
+                                value: exchangeViewModel.isFixedRateMode,
+                                caption: S.of(context).fixed_rate,
+                                onChanged: (value) {
+                                  if (value) {
+                                    exchangeViewModel.enableFixedRateMode();
+                                  } else {
+                                    exchangeViewModel.isFixedRateMode = false;
+                                  }
+                                },
+                              ),
+                            ],
+                          )),
+                      SizedBox(height: 30),
+                      _buildTemplateSection(context)
+                    ],
                   ),
-                  SizedBox(height: 30),
-                  _buildTemplateSection(context)
-                ],
-              ),
-            ),
-            bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-            bottomSection: Column(
-              children: <Widget>[
-                Padding(
-                  padding: EdgeInsets.only(bottom: 15),
-                  child: Observer(
-                    builder: (_) {
+                ),
+                bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+                bottomSection: Column(children: <Widget>[
+                  Padding(
+                    padding: EdgeInsets.only(bottom: 15),
+                    child: Observer(builder: (_) {
                       final description = exchangeViewModel.isFixedRateMode
                           ? exchangeViewModel.isAvailableInSelected
                               ? S.of(context).amount_is_guaranteed
@@ -223,14 +215,15 @@ class ExchangePage extends BasePage {
                               : S.of(context).this_pair_is_not_supported_warning;
                       return Row(
                         children: [
-                          if (description == S.of(context).this_pair_is_not_supported_warning)
+                          if(description == S.of(context).this_pair_is_not_supported_warning)
                             Expanded(
-                              child: Container(
-                                alignment: Alignment.centerRight,
-                                child: Icon(Icons.warning_amber_rounded,
-                                    color: Theme.of(context).colorScheme.error, size: 26),
-                              ),
+                            child: Container(
+                              alignment: Alignment.centerRight,
+                              child: Icon(Icons.warning_amber_rounded,
+                                color: Theme.of(context).extension<ExchangePageTheme>()!.receiveAmountColor,
+                                size: 26),
                             ),
+                          ),
                           Expanded(
                             flex: 8,
                             child: Text(
@@ -239,41 +232,39 @@ class ExchangePage extends BasePage {
                               softWrap: true,
                               overflow: TextOverflow.ellipsis,
                               maxLines: 3,
-                              style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    fontWeight: FontWeight.w500,
-                                  ),
+                              style: TextStyle(
+                                color: Theme.of(context)
+                                    .extension<ExchangePageTheme>()!
+                                    .receiveAmountColor,
+                                fontWeight: FontWeight.w500,
+                                fontSize: 12,
+                              ),
                             ),
                           ),
                         ],
                       );
-                    },
+                    }),
                   ),
-                ),
-                Observer(
-                  builder: (_) => LoadingPrimaryButton(
-                    key: ValueKey('exchange_page_exchange_button_key'),
-                    text: exchangeViewModel.isAvailableInSelected
-                        ? S.of(context).swap
-                        : S.of(context).change_selected_exchanges,
-                    onPressed: exchangeViewModel.isAvailableInSelected
-                        ? () {
+                  Observer(
+                      builder: (_) => LoadingPrimaryButton(
+                          key: ValueKey('exchange_page_exchange_button_key'),
+                          text: exchangeViewModel.isAvailableInSelected ? S.of(context).swap : S.of(context).change_selected_exchanges,
+                          onPressed: exchangeViewModel.isAvailableInSelected ? () {
                             FocusScope.of(context).unfocus();
 
                             if (_formKey.currentState != null &&
                                 _formKey.currentState!.validate()) {
-                              if (_shouldWaitTillSynced) {
+                              if ((exchangeViewModel.depositCurrency == CryptoCurrency.xmr) &&
+                                  (!(exchangeViewModel.status is SyncedSyncStatus))) {
                                 showPopUp<void>(
-                                  context: context,
-                                  builder: (BuildContext context) {
-                                    return AlertWithOneAction(
-                                      alertTitle: S.of(context).exchange,
-                                      alertContent: S.of(context).exchange_sync_alert_content,
-                                      buttonText: S.of(context).ok,
-                                      buttonAction: () => Navigator.of(context).pop(),
-                                    );
-                                  },
-                                );
+                                    context: context,
+                                    builder: (BuildContext context) {
+                                      return AlertWithOneAction(
+                                          alertTitle: S.of(context).exchange,
+                                          alertContent: S.of(context).exchange_sync_alert_content,
+                                          buttonText: S.of(context).ok,
+                                          buttonAction: () => Navigator.of(context).pop());
+                                    });
                               } else {
                                 final check = exchangeViewModel.shouldDisplayTOTP();
                                 authService.authenticateAction(
@@ -287,21 +278,14 @@ class ExchangePage extends BasePage {
                                 );
                               }
                             }
-                          }
-                        : () => PresentProviderPicker(exchangeViewModel: exchangeViewModel)
-                            .presentProviderPicker(context),
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
-                    isDisabled: exchangeViewModel.selectedProviders.isEmpty,
-                    isLoading: exchangeViewModel.tradeState is TradeIsCreating,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
+                          } : () => PresentProviderPicker(exchangeViewModel: exchangeViewModel).presentProviderPicker(context),
+                          color: Theme.of(context).primaryColor,
+                          textColor: Colors.white,
+                          isDisabled: exchangeViewModel.selectedProviders.isEmpty,
+                          isLoading: exchangeViewModel.tradeState is TradeIsCreating)),
+                ]),
+              )),
+        ));
   }
 
   Widget _buildTemplateSection(BuildContext context) {
@@ -339,22 +323,20 @@ class ExchangePage extends BasePage {
                       },
                       onRemove: () {
                         showPopUp<void>(
-                          context: context,
-                          builder: (dialogContext) {
-                            return AlertWithTwoActions(
-                              alertTitle: S.of(context).template,
-                              alertContent: S.of(context).confirm_delete_template,
-                              rightButtonText: S.of(context).delete,
-                              leftButtonText: S.of(context).cancel,
-                              actionRightButton: () {
-                                Navigator.of(dialogContext).pop();
-                                exchangeViewModel.removeTemplate(template: template);
-                                exchangeViewModel.updateTemplate();
-                              },
-                              actionLeftButton: () => Navigator.of(dialogContext).pop(),
-                            );
-                          },
-                        );
+                            context: context,
+                            builder: (dialogContext) {
+                              return AlertWithTwoActions(
+                                  alertTitle: S.of(context).template,
+                                  alertContent: S.of(context).confirm_delete_template,
+                                  rightButtonText: S.of(context).delete,
+                                  leftButtonText: S.of(context).cancel,
+                                  actionRightButton: () {
+                                    Navigator.of(dialogContext).pop();
+                                    exchangeViewModel.removeTemplate(template: template);
+                                    exchangeViewModel.updateTemplate();
+                                  },
+                                  actionLeftButton: () => Navigator.of(dialogContext).pop());
+                            });
                       },
                     );
                   },
@@ -482,8 +464,7 @@ class ExchangePage extends BasePage {
       if (state is TradeIsCreatedSuccessfully) {
         exchangeViewModel.reset();
         (exchangeViewModel.tradesStore.trade?.provider == ExchangeProviderDescription.thorChain ||
-                exchangeViewModel.tradesStore.trade?.provider ==
-                    ExchangeProviderDescription.chainflip)
+         exchangeViewModel.tradesStore.trade?.provider == ExchangeProviderDescription.chainflip)
             ? Navigator.of(context).pushReplacementNamed(Routes.exchangeTrade)
             : Navigator.of(context).pushReplacementNamed(Routes.exchangeConfirm);
       }
@@ -618,8 +599,7 @@ class ExchangePage extends BasePage {
     key.currentState!.changeWalletName(isCurrentTypeWallet ? exchangeViewModel.wallet.name : '');
 
     key.currentState!.changeAddress(
-        address:
-            isCurrentTypeWallet ? exchangeViewModel.wallet.walletAddresses.addressForExchange : '');
+        address: isCurrentTypeWallet ? exchangeViewModel.wallet.walletAddresses.addressForExchange : '');
 
     key.currentState!.changeAmount(amount: '');
   }
@@ -630,8 +610,7 @@ class ExchangePage extends BasePage {
 
     if (isCurrentTypeWallet) {
       key.currentState!.changeWalletName(exchangeViewModel.wallet.name);
-      key.currentState!.addressController.text =
-          exchangeViewModel.wallet.walletAddresses.addressForExchange;
+      key.currentState!.addressController.text = exchangeViewModel.wallet.walletAddresses.addressForExchange;
     } else if (key.currentState!.addressController.text ==
         exchangeViewModel.wallet.walletAddresses.addressForExchange) {
       key.currentState!.changeWalletName('');
@@ -661,7 +640,7 @@ class ExchangePage extends BasePage {
             }) ??
         false;
     if (confirmed) {
-      exchangeViewModel.feesViewModel.setDefaultTransactionPriority();
+      exchangeViewModel.feesViewModel .setDefaultTransactionPriority();
     }
   }
 
@@ -669,130 +648,132 @@ class ExchangePage extends BasePage {
 
   Widget _exchangeCardsSection(BuildContext context) {
     final firstExchangeCard = Observer(
-      builder: (_) => ExchangeCard(
-        cardInstanceName: 'deposit_exchange_card',
-        onDispose: disposeBestRateSync,
-        hasAllAmount: exchangeViewModel.hasAllAmount,
-        allAmount:
-            exchangeViewModel.hasAllAmount ? () => exchangeViewModel.enableSendAllAmount() : null,
-        isAllAmountEnabled: exchangeViewModel.isSendAllEnabled,
-        amountFocusNode: _depositAmountFocus,
-        addressFocusNode: _depositAddressFocus,
-        key: depositKey,
-        title: S.of(context).you_will_send,
-        initialCurrency: exchangeViewModel.depositCurrency,
-        initialWalletName: depositWalletName ?? '',
-        initialAddress: exchangeViewModel.depositCurrency == exchangeViewModel.wallet.currency
-            ? exchangeViewModel.wallet.walletAddresses.addressForExchange
-            : exchangeViewModel.depositAddress,
-        initialIsAmountEditable: true,
-        initialIsAddressEditable: exchangeViewModel.isDepositAddressEnabled,
-        isAmountEstimated: false,
-        hasRefundAddress: true,
-        isMoneroWallet: exchangeViewModel.isMoneroWallet,
-        currencies: exchangeViewModel.depositCurrencies,
-        onCurrencySelected: (currency) {
-          // FIXME: need to move it into view model
-          if (currency == CryptoCurrency.xmr &&
-              exchangeViewModel.wallet.type != WalletType.monero) {
-            showPopUp<void>(
-                context: context,
-                builder: (dialogContext) {
-                  return AlertWithOneAction(
-                    alertTitle: S.of(context).error,
-                    alertContent: S.of(context).exchange_incorrect_current_wallet_for_xmr,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(dialogContext).pop(),
-                  );
-                });
-            return;
-          }
+        builder: (_) => ExchangeCard(
+              cardInstanceName: 'deposit_exchange_card',
+              onDispose: disposeBestRateSync,
+              hasAllAmount: exchangeViewModel.hasAllAmount,
+              allAmount: exchangeViewModel.hasAllAmount
+                  ? () => exchangeViewModel.enableSendAllAmount()
+                  : null,
+              isAllAmountEnabled: exchangeViewModel.isSendAllEnabled,
+              amountFocusNode: _depositAmountFocus,
+              addressFocusNode: _depositAddressFocus,
+              key: depositKey,
+              title: S.of(context).you_will_send,
+              initialCurrency: exchangeViewModel.depositCurrency,
+              initialWalletName: depositWalletName ?? '',
+              initialAddress: exchangeViewModel.depositCurrency == exchangeViewModel.wallet.currency
+                  ? exchangeViewModel.wallet.walletAddresses.addressForExchange
+                  : exchangeViewModel.depositAddress,
+              initialIsAmountEditable: true,
+              initialIsAddressEditable: exchangeViewModel.isDepositAddressEnabled,
+              isAmountEstimated: false,
+              hasRefundAddress: true,
+              isMoneroWallet: exchangeViewModel.isMoneroWallet,
+              currencies: exchangeViewModel.depositCurrencies,
+              onCurrencySelected: (currency) {
+                // FIXME: need to move it into view model
+                if (currency == CryptoCurrency.xmr &&
+                    exchangeViewModel.wallet.type != WalletType.monero) {
+                  showPopUp<void>(
+                      context: context,
+                      builder: (dialogContext) {
+                        return AlertWithOneAction(
+                            alertTitle: S.of(context).error,
+                            alertContent: S.of(context).exchange_incorrect_current_wallet_for_xmr,
+                            buttonText: S.of(context).ok,
+                            buttonAction: () => Navigator.of(dialogContext).pop());
+                      });
+                  return;
+                }
 
-          exchangeViewModel.changeDepositCurrency(currency: currency);
-        },
-        currencyButtonColor: Colors.transparent,
-        addressButtonsColor: Colors.transparent,
-        borderColor: Theme.of(context).colorScheme.outlineVariant,
-        fillColor: Theme.of(context).colorScheme.surfaceContainer,
-        currencyValueValidator: (value) {
-          return !exchangeViewModel.isFixedRateMode && value != S.of(context).all
-              ? AmountValidator(
-                  isAutovalidate: true,
-                  currency: exchangeViewModel.depositCurrency,
-                  minValue: exchangeViewModel.limits.min.toString(),
-                  maxValue: exchangeViewModel.limits.max.toString(),
-                ).call(value)
-              : null;
-        },
-        addressTextFieldValidator: AddressValidator(type: exchangeViewModel.depositCurrency),
-        onPushPasteButton: (context) async {
-          final domain = exchangeViewModel.depositAddress;
-          exchangeViewModel.depositAddress =
-              await fetchParsedAddress(context, domain, exchangeViewModel.depositCurrency);
-        },
-        onPushAddressBookButton: (context) async {
-          final domain = exchangeViewModel.depositAddress;
-          exchangeViewModel.depositAddress =
-              await fetchParsedAddress(context, domain, exchangeViewModel.depositCurrency);
-        },
-      ),
-    );
+                exchangeViewModel.changeDepositCurrency(currency: currency);
+              },
+              currencyButtonColor: Colors.transparent,
+              addressButtonsColor:
+                  Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
+              borderColor:
+                  Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
+              currencyValueValidator: (value) {
+                return !exchangeViewModel.isFixedRateMode && value != S.of(context).all
+                    ? AmountValidator(
+                        isAutovalidate: true,
+                        currency: exchangeViewModel.depositCurrency,
+                        minValue: exchangeViewModel.limits.min.toString(),
+                        maxValue: exchangeViewModel.limits.max.toString(),
+                      ).call(value)
+                    : null;
+              },
+              addressTextFieldValidator: AddressValidator(type: exchangeViewModel.depositCurrency),
+              onPushPasteButton: (context) async {
+                final domain = exchangeViewModel.depositAddress;
+                exchangeViewModel.depositAddress =
+                    await fetchParsedAddress(context, domain, exchangeViewModel.depositCurrency);
+              },
+              onPushAddressBookButton: (context) async {
+                final domain = exchangeViewModel.depositAddress;
+                exchangeViewModel.depositAddress =
+                    await fetchParsedAddress(context, domain, exchangeViewModel.depositCurrency);
+              },
+            ));
 
     final secondExchangeCard = Observer(
-      builder: (_) => ExchangeCard(
-        cardInstanceName: 'receive_exchange_card',
-        onDispose: disposeBestRateSync,
-        amountFocusNode: _receiveAmountFocus,
-        addressFocusNode: _receiveAddressFocus,
-        key: receiveKey,
-        title: S.of(context).you_will_get,
-        initialCurrency: exchangeViewModel.receiveCurrency,
-        initialWalletName: receiveWalletName ?? '',
-        initialAddress: exchangeViewModel.receiveCurrency == exchangeViewModel.wallet.currency
-            ? exchangeViewModel.wallet.walletAddresses.addressForExchange
-            : exchangeViewModel.receiveAddress,
-        initialIsAmountEditable: exchangeViewModel.isReceiveAmountEditable,
-        isAmountEstimated: true,
-        isMoneroWallet: exchangeViewModel.isMoneroWallet,
-        currencies: exchangeViewModel.receiveCurrencies,
-        onCurrencySelected: (currency) =>
-            exchangeViewModel.changeReceiveCurrency(currency: currency),
-        currencyButtonColor: Colors.transparent,
-        addressButtonsColor: Colors.transparent,
-        borderColor: Theme.of(context).colorScheme.outlineVariant,
-        fillColor: Theme.of(context).colorScheme.surfaceContainerLow,
-        currencyValueValidator: (value) {
-          return exchangeViewModel.isFixedRateMode
-              ? AmountValidator(
-                  isAutovalidate: true,
-                  currency: exchangeViewModel.receiveCurrency,
-                  minValue: exchangeViewModel.limits.min.toString(),
-                  maxValue: exchangeViewModel.limits.max.toString(),
-                ).call(value)
-              : null;
-        },
-        addressTextFieldValidator: AddressValidator(type: exchangeViewModel.receiveCurrency),
-        onPushPasteButton: (context) async {
-          final domain = exchangeViewModel.receiveAddress;
-          exchangeViewModel.receiveAddress =
-              await fetchParsedAddress(context, domain, exchangeViewModel.receiveCurrency);
-        },
-        onPushAddressBookButton: (context) async {
-          final domain = exchangeViewModel.receiveAddress;
-          exchangeViewModel.receiveAddress =
-              await fetchParsedAddress(context, domain, exchangeViewModel.receiveCurrency);
-        },
-      ),
-    );
+        builder: (_) => ExchangeCard(
+              cardInstanceName: 'receive_exchange_card',
+              onDispose: disposeBestRateSync,
+              amountFocusNode: _receiveAmountFocus,
+              addressFocusNode: _receiveAddressFocus,
+              key: receiveKey,
+              title: S.of(context).you_will_get,
+              initialCurrency: exchangeViewModel.receiveCurrency,
+              initialWalletName: receiveWalletName ?? '',
+              initialAddress: exchangeViewModel.receiveCurrency == exchangeViewModel.wallet.currency
+                  ? exchangeViewModel.wallet.walletAddresses.addressForExchange
+                  : exchangeViewModel.receiveAddress,
+              initialIsAmountEditable: exchangeViewModel.isReceiveAmountEditable,
+              isAmountEstimated: true,
+              isMoneroWallet: exchangeViewModel.isMoneroWallet,
+              currencies: exchangeViewModel.receiveCurrencies,
+              onCurrencySelected: (currency) =>
+                  exchangeViewModel.changeReceiveCurrency(currency: currency),
+              currencyButtonColor: Colors.transparent,
+              addressButtonsColor:
+                  Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
+              borderColor:
+                  Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderBottomPanelColor,
+              currencyValueValidator: (value) {
+                return exchangeViewModel.isFixedRateMode
+                    ? AmountValidator(
+                        isAutovalidate: true,
+                        currency: exchangeViewModel.receiveCurrency,
+                        minValue: exchangeViewModel.limits.min.toString(),
+                        maxValue: exchangeViewModel.limits.max.toString(),
+                      ).call(value)
+                    : null;
+              },
+              addressTextFieldValidator: AddressValidator(type: exchangeViewModel.receiveCurrency),
+              onPushPasteButton: (context) async {
+                final domain = exchangeViewModel.receiveAddress;
+                exchangeViewModel.receiveAddress =
+                    await fetchParsedAddress(context, domain, exchangeViewModel.receiveCurrency);
+              },
+              onPushAddressBookButton: (context) async {
+                final domain = exchangeViewModel.receiveAddress;
+                exchangeViewModel.receiveAddress =
+                    await fetchParsedAddress(context, domain, exchangeViewModel.receiveCurrency);
+              },
+            ));
 
-    return responsiveLayoutUtil.shouldRenderMobileUI
-        ? MobileExchangeCardsSection(
-            firstExchangeCard: firstExchangeCard,
-            secondExchangeCard: secondExchangeCard,
-          )
-        : DesktopExchangeCardsSection(
-            firstExchangeCard: firstExchangeCard,
-            secondExchangeCard: secondExchangeCard,
-          );
+    if (responsiveLayoutUtil.shouldRenderMobileUI) {
+      return MobileExchangeCardsSection(
+        firstExchangeCard: firstExchangeCard,
+        secondExchangeCard: secondExchangeCard,
+      );
+    }
+
+    return DesktopExchangeCardsSection(
+      firstExchangeCard: firstExchangeCard,
+      secondExchangeCard: secondExchangeCard,
+    );
   }
 }
diff --git a/lib/src/screens/exchange/exchange_template_page.dart b/lib/src/screens/exchange/exchange_template_page.dart
index 0af011435..f82318ca2 100644
--- a/lib/src/screens/exchange/exchange_template_page.dart
+++ b/lib/src/screens/exchange/exchange_template_page.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
@@ -45,12 +47,12 @@ class ExchangeTemplatePage extends BasePage {
   Widget body(BuildContext context) {
     final arrowBottomPurple = Image.asset(
       'assets/images/arrow_bottom_purple_icon.png',
-      color: Theme.of(context).colorScheme.primary,
+      color: Colors.white,
       height: 8,
     );
     final arrowBottomCakeGreen = Image.asset(
       'assets/images/arrow_bottom_cake_green.png',
-      color: Theme.of(context).colorScheme.primary,
+      color: Colors.white,
       height: 8,
     );
 
@@ -66,18 +68,17 @@ class ExchangeTemplatePage extends BasePage {
     return KeyboardActions(
         disableScroll: true,
         config: KeyboardActionsConfig(
-          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).colorScheme.surfaceVariant,
-          nextFocus: false,
-          actions: [
-            KeyboardActionsItem(
-                focusNode: _depositAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]),
-            KeyboardActionsItem(
-                focusNode: _receiveAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()])
-          ],
-        ),
+            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
+            nextFocus: false,
+            actions: [
+              KeyboardActionsItem(
+                  focusNode: _depositAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]),
+              KeyboardActionsItem(
+                  focusNode: _receiveAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()])
+            ]),
         child: Container(
-            color: Theme.of(context).colorScheme.surface,
+            color: Theme.of(context).colorScheme.background,
             child: Form(
                 key: _formKey,
                 child: ScrollableWithBottomSection(
@@ -86,10 +87,18 @@ class ExchangeTemplatePage extends BasePage {
                     padding: EdgeInsets.only(bottom: 32),
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.only(
-                        bottomLeft: Radius.circular(24),
-                        bottomRight: Radius.circular(24),
-                      ),
-                      color: Theme.of(context).colorScheme.surfaceContainer,
+                          bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
+                      gradient: LinearGradient(colors: [
+                        Theme.of(context)
+                            .extension<ExchangePageTheme>()!
+                            .firstGradientBottomPanelColor,
+                        Theme.of(context)
+                            .extension<ExchangePageTheme>()!
+                            .secondGradientBottomPanelColor,
+                      ], stops: [
+                        0.35,
+                        1.0
+                      ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                     ),
                     child: FocusTraversalGroup(
                       policy: OrderedTraversalPolicy(),
@@ -100,7 +109,14 @@ class ExchangeTemplatePage extends BasePage {
                               borderRadius: BorderRadius.only(
                                   bottomLeft: Radius.circular(24),
                                   bottomRight: Radius.circular(24)),
-                              color: Theme.of(context).colorScheme.surfaceContainerLow,
+                              gradient: LinearGradient(colors: [
+                                Theme.of(context)
+                                    .extension<ExchangePageTheme>()!
+                                    .firstGradientTopPanelColor,
+                                Theme.of(context)
+                                    .extension<ExchangePageTheme>()!
+                                    .secondGradientTopPanelColor,
+                              ], begin: Alignment.topLeft, end: Alignment.bottomRight),
                             ),
                             padding: EdgeInsets.fromLTRB(24, 100, 24, 32),
                             child: Observer(
@@ -125,45 +141,52 @@ class ExchangeTemplatePage extends BasePage {
                                     exchangeViewModel.changeDepositCurrency(currency: currency),
                                 imageArrow: arrowBottomPurple,
                                 currencyButtonColor: Colors.transparent,
-                                addressButtonsColor:
-                                    Theme.of(context).colorScheme.surfaceContainerHighest,
-                                borderColor: Theme.of(context).colorScheme.outlineVariant,
-                                fillColor: Theme.of(context).colorScheme.surfaceContainer,
+                                addressButtonsColor: Theme.of(context)
+                                    .extension<ExchangePageTheme>()!
+                                    .textFieldButtonColor,
+                                borderColor: Theme.of(context)
+                                    .extension<ExchangePageTheme>()!
+                                    .textFieldBorderBottomPanelColor,
                                 currencyValueValidator:
                                     AmountValidator(currency: exchangeViewModel.depositCurrency),
+                                //addressTextFieldValidator: AddressValidator(
+                                //    type: exchangeViewModel.depositCurrency),
                               ),
                             ),
                           ),
                           Padding(
                             padding: EdgeInsets.only(top: 29, left: 24, right: 24),
                             child: Observer(
-                              builder: (_) => ExchangeCard(
-                                cardInstanceName: 'receive_exchange_template_card',
-                                amountFocusNode: _receiveAmountFocus,
-                                key: receiveKey,
-                                title: S.of(context).you_will_get,
-                                initialCurrency: exchangeViewModel.receiveCurrency,
-                                initialWalletName: receiveWalletName ?? '',
-                                initialAddress: exchangeViewModel.receiveCurrency ==
-                                        exchangeViewModel.wallet.currency
-                                    ? exchangeViewModel.wallet.walletAddresses.addressForExchange
-                                    : exchangeViewModel.receiveAddress,
-                                initialIsAmountEditable: false,
-                                isAmountEstimated: true,
-                                isMoneroWallet: exchangeViewModel.isMoneroWallet,
-                                currencies: exchangeViewModel.receiveCurrencies,
-                                onCurrencySelected: (currency) =>
-                                    exchangeViewModel.changeReceiveCurrency(currency: currency),
-                                imageArrow: arrowBottomCakeGreen,
-                                currencyButtonColor: Colors.transparent,
-                                addressButtonsColor:
-                                    Theme.of(context).colorScheme.surfaceContainerHighest,
-                                borderColor: Theme.of(context).colorScheme.outlineVariant,
-                                fillColor: Theme.of(context).colorScheme.surfaceContainerLow,
-                                currencyValueValidator:
-                                    AmountValidator(currency: exchangeViewModel.receiveCurrency),
-                              ),
-                            ),
+                                builder: (_) => ExchangeCard(
+                                      cardInstanceName: 'receive_exchange_template_card',
+                                      amountFocusNode: _receiveAmountFocus,
+                                      key: receiveKey,
+                                      title: S.of(context).you_will_get,
+                                      initialCurrency: exchangeViewModel.receiveCurrency,
+                                      initialWalletName: receiveWalletName ?? '',
+                                      initialAddress: exchangeViewModel.receiveCurrency ==
+                                              exchangeViewModel.wallet.currency
+                                          ? exchangeViewModel.wallet.walletAddresses.addressForExchange
+                                          : exchangeViewModel.receiveAddress,
+                                      initialIsAmountEditable: false,
+                                      isAmountEstimated: true,
+                                      isMoneroWallet: exchangeViewModel.isMoneroWallet,
+                                      currencies: exchangeViewModel.receiveCurrencies,
+                                      onCurrencySelected: (currency) => exchangeViewModel
+                                          .changeReceiveCurrency(currency: currency),
+                                      imageArrow: arrowBottomCakeGreen,
+                                      currencyButtonColor: Colors.transparent,
+                                      addressButtonsColor: Theme.of(context)
+                                          .extension<ExchangePageTheme>()!
+                                          .textFieldButtonColor,
+                                      borderColor: Theme.of(context)
+                                          .extension<ExchangePageTheme>()!
+                                          .textFieldBorderBottomPanelColor,
+                                      currencyValueValidator: AmountValidator(
+                                          currency: exchangeViewModel.receiveCurrency),
+                                      //addressTextFieldValidator: AddressValidator(
+                                      //    type: exchangeViewModel.receiveCurrency),
+                                    )),
                           )
                         ],
                       ),
@@ -178,10 +201,13 @@ class ExchangeTemplatePage extends BasePage {
                           child: Text(
                             S.of(context).amount_is_estimate,
                             textAlign: TextAlign.center,
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                            style: TextStyle(
+                              color: Theme.of(context)
+                                  .extension<ExchangePageTheme>()!
+                                  .receiveAmountColor,
+                              fontWeight: FontWeight.w500,
+                              fontSize: 12,
+                            ),
                           ),
                         ),
                       ),
@@ -205,8 +231,8 @@ class ExchangeTemplatePage extends BasePage {
                           }
                         },
                         text: S.of(context).save,
-                        color: Theme.of(context).colorScheme.primary,
-                        textColor: Theme.of(context).colorScheme.onPrimary),
+                        color: Theme.of(context).primaryColor,
+                        textColor: Colors.white),
                   ]),
                 ))));
   }
diff --git a/lib/src/screens/exchange/widgets/currency_picker.dart b/lib/src/screens/exchange/widgets/currency_picker.dart
index 56cf80c11..8c6f5e214 100644
--- a/lib/src/screens/exchange/widgets/currency_picker.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker.dart
@@ -31,12 +31,18 @@ class CurrencyPickerState extends State<CurrencyPicker> {
   CurrencyPickerState(this.items)
       : isSearchBarActive = false,
         textFieldValue = '',
+        appBarTextStyle = TextStyle(
+            fontSize: 20,
+            fontFamily: 'Lato',
+            backgroundColor: Colors.transparent,
+            color: Colors.white),
         pickerItemsList = <PickerItem<CryptoCurrency>>[];
 
   List<PickerItem<Currency>> pickerItemsList;
   List<Currency> items;
   bool isSearchBarActive;
   String textFieldValue;
+  TextStyle appBarTextStyle;
 
   bool currencySearchBySubstring(Currency currency, String subString) {
     return currency.name.toLowerCase().contains(subString.toLowerCase()) ||
diff --git a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
index 6a0bb7405..03c6fdd47 100644
--- a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
@@ -1,8 +1,15 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
 class PickerItemWidget extends StatelessWidget {
-  const PickerItemWidget(
-      {required this.title, this.iconPath, this.isSelected = false, this.tag, this.onTap});
+  const PickerItemWidget({
+    required this.title,
+    this.iconPath,
+    this.isSelected = false,
+    this.tag,
+    this.onTap});
 
   final String? iconPath;
   final String title;
@@ -15,7 +22,7 @@ class PickerItemWidget extends StatelessWidget {
     return GestureDetector(
       onTap: onTap,
       child: Container(
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24),
           child: Row(
@@ -33,13 +40,14 @@ class PickerItemWidget extends StatelessWidget {
                   children: [
                     Text(
                       title.toUpperCase(),
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            color: isSelected
-                                ? Theme.of(context).colorScheme.primary
-                                : Theme.of(context).colorScheme.onSurface,
-                            fontSize: isSelected ? 16 : 14.0,
-                            fontWeight: FontWeight.w600,
-                          ),
+                      style: TextStyle(
+                        color: isSelected
+                            ? Palette.blueCraiola
+                            : Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        fontSize: isSelected ? 16 : 14.0,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w600,
+                      ),
                     ),
                     if (tag != null)
                       Align(
@@ -50,14 +58,16 @@ class PickerItemWidget extends StatelessWidget {
                           child: Center(
                             child: Text(
                               tag!,
-                              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: 7.0, color: Theme.of(context).colorScheme.primary),
+                              style: TextStyle(
+                                  fontSize: 7.0,
+                                  fontFamily: 'Lato',
+                                  color: Theme.of(context).extension<CakeScrollbarTheme>()!.thumbColor),
                             ),
                           ),
                           decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(6.0),
                             //border: Border.all(color: ),
-                            color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                            color: Theme.of(context).extension<CakeScrollbarTheme>()!.trackColor,
                           ),
                         ),
                       ),
@@ -65,10 +75,8 @@ class PickerItemWidget extends StatelessWidget {
                 ),
               ),
               if (isSelected)
-                Icon(
-                  Icons.check,
-                  color: Theme.of(context).colorScheme.primary,
-                ),
+                Icon(Icons.check_circle,
+                    color: Theme.of(context).primaryColor)
             ],
           ),
         ),
diff --git a/lib/src/screens/exchange/widgets/currency_picker_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_widget.dart
index 77526260e..35d0198f2 100644
--- a/lib/src/screens/exchange/widgets/currency_picker_widget.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 import 'package:cw_core/currency.dart';
 import 'package:flutter/material.dart';
 import 'currency_picker_item_widget.dart';
@@ -20,7 +21,7 @@ class CurrencyPickerWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: Theme.of(context).colorScheme.outlineVariant,
+      color: Theme.of(context).extension<PickerTheme>()!.dividerColor,
       child: Scrollbar(
         controller: _scrollController,
         child: GridView.builder(
diff --git a/lib/src/screens/exchange/widgets/desktop_exchange_cards_section.dart b/lib/src/screens/exchange/widgets/desktop_exchange_cards_section.dart
index 5bc07091b..0a97d7bad 100644
--- a/lib/src/screens/exchange/widgets/desktop_exchange_cards_section.dart
+++ b/lib/src/screens/exchange/widgets/desktop_exchange_cards_section.dart
@@ -1,22 +1,15 @@
-import 'package:cake_wallet/src/screens/exchange/widgets/mobile_exchange_cards_section.dart';
 import 'package:flutter/material.dart';
 
 class DesktopExchangeCardsSection extends StatelessWidget {
+  final Widget firstExchangeCard;
+  final Widget secondExchangeCard;
+
   const DesktopExchangeCardsSection({
     Key? key,
     required this.firstExchangeCard,
     required this.secondExchangeCard,
-    this.isBuySellOption = false,
-    this.onBuyTap,
-    this.onSellTap,
   }) : super(key: key);
 
-  final Widget firstExchangeCard;
-  final Widget secondExchangeCard;
-  final bool isBuySellOption;
-  final VoidCallback? onBuyTap;
-  final VoidCallback? onSellTap;
-
   @override
   Widget build(BuildContext context) {
     return FocusTraversalGroup(
@@ -25,18 +18,7 @@ class DesktopExchangeCardsSection extends StatelessWidget {
         children: <Widget>[
           Padding(
             padding: EdgeInsets.only(top: 55, left: 24, right: 24),
-            child: Column(
-              children: [
-                if (isBuySellOption)
-                  Column(
-                    children: [
-                      const SizedBox(height: 16),
-                      BuySellOptionButtons(onBuyTap: onBuyTap, onSellTap: onSellTap),
-                    ],
-                  ),
-                firstExchangeCard,
-              ],
-            ),
+            child: firstExchangeCard,
           ),
           Padding(
             padding: EdgeInsets.only(top: 29, left: 24, right: 24),
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 94dd3c928..a73c7fb66 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -1,8 +1,10 @@
 import 'package:cake_wallet/core/amount_validator.dart';
 import 'package:cake_wallet/entities/contact_base.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/currency_input_field.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
@@ -10,9 +12,11 @@ import 'package:cw_core/currency.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 
 class ExchangeCard<T extends Currency> extends StatefulWidget {
   ExchangeCard({
@@ -24,7 +28,6 @@ class ExchangeCard<T extends Currency> extends StatefulWidget {
     required this.isAmountEstimated,
     required this.currencies,
     required this.onCurrencySelected,
-    required this.fillColor,
     this.imageArrow,
     this.currencyValueValidator,
     this.addressTextFieldValidator,
@@ -81,7 +84,6 @@ class ExchangeCard<T extends Currency> extends StatefulWidget {
   final void Function(BuildContext context)? onPushAddressBookButton;
   final Function()? onDispose;
   final String cardInstanceName;
-  final Color fillColor;
 
   @override
   ExchangeCardState<T> createState() => ExchangeCardState<T>();
@@ -182,264 +184,226 @@ class ExchangeCardState<T extends Currency> extends State<ExchangeCard<T>> {
       });
     }
 
-    final copyImage = Image.asset(
-      'assets/images/copy_content.png',
-      height: 16,
-      width: 16,
-      color: Theme.of(context).colorScheme.onSurface,
-    );
+    final copyImage = Image.asset('assets/images/copy_content.png',
+        height: 16,
+        width: 16,
+        color: Theme.of(context).extension<SendPageTheme>()!.estimatedFeeColor);
 
     return Container(
       width: double.infinity,
       color: Colors.transparent,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          SizedBox(height: 10),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: <Widget>[
-              SizedBox(height: 40),
-              Text(
-                key: ValueKey('${_cardInstanceName}_title_key'),
-                _title,
-                style: Theme.of(context).textTheme.titleLarge!.copyWith(
-                      fontSize: 18,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant
-                    ),
-              )
-            ],
-          ),
-          CurrencyAmountTextField(
-            hasUnderlineBorder: true,
-            borderWidth: 0.0,
-            padding: EdgeInsets.zero,
-            currencyPickerButtonKey: ValueKey('${_cardInstanceName}_currency_picker_button_key'),
-            selectedCurrencyTextKey: ValueKey('${_cardInstanceName}_selected_currency_text_key'),
-            selectedCurrencyTagTextKey:
-                ValueKey('${_cardInstanceName}_selected_currency_tag_text_key'),
-            amountTextfieldKey: ValueKey('${_cardInstanceName}_amount_textfield_key'),
-            sendAllButtonKey: ValueKey('${_cardInstanceName}_send_all_button_key'),
-            currencyAmountTextFieldWidgetKey:
-                ValueKey('${_cardInstanceName}_currency_amount_textfield_widget_key'),
-            imageArrow: widget.imageArrow,
-            selectedCurrency: _selectedCurrency.toString(),
-            amountFocusNode: widget.amountFocusNode,
-            amountController: amountController,
-            onTapPicker: () => _presentPicker(context),
-            isAmountEditable: _isAmountEditable,
-            isPickerEnable: true,
-            allAmountButton: widget.hasAllAmount,
-            currencyValueValidator: widget.currencyValueValidator,
-            tag: _selectedCurrency.tag,
-            allAmountCallback: widget.allAmount,
-            fillColor: widget.fillColor,
-          ),
-          Divider(height: 1, color: Theme.of(context).colorScheme.outlineVariant),
-          Padding(
-            padding: EdgeInsets.only(top: 5),
-            child: widget.showLimitsField
-                ? Container(
-                    height: 15,
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.start,
-                      children: <Widget>[
-                        _min != null
-                            ? Text(
-                                key: ValueKey('${_cardInstanceName}_min_limit_text_key'),
-                                S.of(context).min_value(_min ?? '', _selectedCurrency.toString()),
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      fontSize: 10,
-                                      height: 1.2,
-                                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    ),
-                              )
-                            : Offstage(),
-                        _min != null ? SizedBox(width: 10) : Offstage(),
-                        _max != null
-                            ? Text(
-                                key: ValueKey('${_cardInstanceName}_max_limit_text_key'),
-                                S.of(context).max_value(_max ?? '', _selectedCurrency.toString()),
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      fontSize: 10,
-                                      height: 1.2,
-                                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    ),
-                              )
-                            : Offstage(),
-                      ],
-                    ),
-                  )
-                : Offstage(),
-          ),
-          !_isAddressEditable && widget.hasRefundAddress
-              ? Padding(
-                  padding: EdgeInsets.only(top: 20),
-                  child: Text(
-                    S.of(context).refund_address,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          fontWeight: FontWeight.w500,
-                          color: Theme.of(context).colorScheme.onSurfaceVariant
+      child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
+        SizedBox(height: 10),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: <Widget>[
+            SizedBox(height: 40),
+            Text(
+              key: ValueKey('${_cardInstanceName}_title_key'),
+              _title,
+              style: TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.w600,
+                  color: Theme.of(context).extension<QRCodeTheme>()!.qrCodeColor),
+            )
+          ],
+        ),
+        CurrencyAmountTextField(
+          padding: EdgeInsets.zero,
+          currencyPickerButtonKey: ValueKey('${_cardInstanceName}_currency_picker_button_key'),
+          selectedCurrencyTextKey: ValueKey('${_cardInstanceName}_selected_currency_text_key'),
+          selectedCurrencyTagTextKey:
+              ValueKey('${_cardInstanceName}_selected_currency_tag_text_key'),
+          amountTextfieldKey: ValueKey('${_cardInstanceName}_amount_textfield_key'),
+          sendAllButtonKey: ValueKey('${_cardInstanceName}_send_all_button_key'),
+          currencyAmountTextFieldWidgetKey:
+              ValueKey('${_cardInstanceName}_currency_amount_textfield_widget_key'),
+          imageArrow: widget.imageArrow,
+          selectedCurrency: _selectedCurrency.toString(),
+          amountFocusNode: widget.amountFocusNode,
+          amountController: amountController,
+          onTapPicker: () => _presentPicker(context),
+          isAmountEditable: _isAmountEditable,
+          isPickerEnable: true,
+          allAmountButton: widget.hasAllAmount,
+          currencyValueValidator: widget.currencyValueValidator,
+          tag: _selectedCurrency.tag,
+          allAmountCallback: widget.allAmount,
+        ),
+        Divider(height: 1, color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor),
+        Padding(
+          padding: EdgeInsets.only(top: 5),
+          child: widget.showLimitsField ? Container(
+              height: 15,
+              child: Row(mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
+                _min != null
+                    ? Text(
+                        key: ValueKey('${_cardInstanceName}_min_limit_text_key'),
+                        S.of(context).min_value(_min ?? '', _selectedCurrency.toString()),
+                        style: TextStyle(
+                            fontSize: 10,
+                            height: 1.2,
+                            color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor),
+                      )
+                    : Offstage(),
+                _min != null ? SizedBox(width: 10) : Offstage(),
+                _max != null
+                    ? Text(
+                        key: ValueKey('${_cardInstanceName}_max_limit_text_key'),
+                        S.of(context).max_value(_max ?? '', _selectedCurrency.toString()),
+                        style: TextStyle(
+                          fontSize: 10,
+                          height: 1.2,
+                          color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor,
                         ),
-                  ),
-                )
-              : Offstage(),
-          _isAddressEditable
-              ? widget.showAddressField
-                  ? FocusTraversalOrder(
-                      order: NumericFocusOrder(2),
-                      child: Padding(
-                        padding: widget.addressRowPadding ?? EdgeInsets.only(top: 12),
-                        child: AddressTextField(
-                          hasUnderlineBorder: true,
-                          borderWidth: 0.0,
-                          addressKey:
-                              ValueKey('${_cardInstanceName}_editable_address_textfield_key'),
-                          focusNode: widget.addressFocusNode,
-                          controller: addressController,
-                          onURIScanned: (uri) {
-                            final paymentRequest = PaymentRequest.fromUri(uri);
-                            addressController.text = paymentRequest.address;
+                      )
+                    : Offstage(),
+              ])) : Offstage(),
+        ),
+        !_isAddressEditable && widget.hasRefundAddress
+            ? Padding(
+                padding: EdgeInsets.only(top: 20),
+                child: Text(
+                  S.of(context).refund_address,
+                  style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor),
+                ))
+            : Offstage(),
+        _isAddressEditable
+            ? widget.showAddressField
+            ? FocusTraversalOrder(
+                order: NumericFocusOrder(2),
+                child: Padding(
+                  padding: widget.addressRowPadding ?? EdgeInsets.only(top: 12),
+                  child: AddressTextField(
+                      addressKey: ValueKey('${_cardInstanceName}_editable_address_textfield_key'),
+                      focusNode: widget.addressFocusNode,
+                      controller: addressController,
+                      onURIScanned: (uri) {
+                        final paymentRequest = PaymentRequest.fromUri(uri);
+                        addressController.text = paymentRequest.address;
 
-                            if (amountController.text.isNotEmpty &&
-                                paymentRequest.amount.isNotEmpty) {
-                              _showAmountPopup(context, paymentRequest);
-                              return;
-                            }
-                            widget.amountFocusNode?.requestFocus();
-                            amountController.text = paymentRequest.amount;
-                          },
-                          placeholder:
-                              widget.hasRefundAddress ? S.of(context).refund_address : null,
-                          options: [
-                            AddressTextFieldOption.paste,
-                            AddressTextFieldOption.qrCode,
-                            AddressTextFieldOption.addressBook,
-                          ],
-                          textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 16,
-                                fontWeight: FontWeight.w600,
-                                color: Theme.of(context).colorScheme.onSurface,
-                              ),
-                          hintStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 16,
-                                fontWeight: FontWeight.w600,
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
-                          buttonColor: widget.addressButtonsColor,
-                          validator: widget.addressTextFieldValidator,
-                          onPushPasteButton: widget.onPushPasteButton,
-                          onPushAddressBookButton: widget.onPushAddressBookButton,
-                          selectedCurrency: _selectedCurrency,
-                          fillColor: widget.fillColor,
-                          iconColor: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
-                      ),
-                    )
-                  : Offstage()
-              : Padding(
-                  padding: EdgeInsets.only(top: 0),
-                  child: Builder(
-                    builder: (context) => Stack(
-                      children: <Widget>[
-                        FocusTraversalOrder(
-                          order: NumericFocusOrder(3),
-                          child: BaseTextFormField(
-                            hasUnderlineBorder: true,
-                            borderWidth: 0.0,
-                            key:
-                                ValueKey('${_cardInstanceName}_non_editable_address_textfield_key'),
-                            controller: addressController,
-                            suffixIcon: SizedBox(width: _isMoneroWallet ? 80 : 36),
-                            textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w600,
-                                ),
-                            validator: widget.addressTextFieldValidator,
-                            fillColor: widget.fillColor,
-                          ),
-                        ),
-                        Positioned(
-                          top: 2,
-                          right: 0,
-                          child: SizedBox(
-                            width: _isMoneroWallet ? 80 : 36,
-                            child: Row(
-                              children: <Widget>[
-                                if (_isMoneroWallet)
-                                  Padding(
-                                    padding: EdgeInsets.only(left: 10),
-                                    child: Container(
-                                      width: 34,
-                                      height: 34,
-                                      padding: EdgeInsets.only(top: 0),
-                                      child: Semantics(
-                                        label: S.of(context).address_book,
-                                        child: InkWell(
-                                          key: ValueKey(
-                                              '${_cardInstanceName}_address_book_button_key'),
-                                          onTap: () async {
-                                            final contact = await Navigator.of(context).pushNamed(
-                                              Routes.pickerAddressBook,
-                                              arguments: widget.initialCurrency,
-                                            );
-
-                                            if (contact is ContactBase) {
-                                              setState(
-                                                  () => addressController.text = contact.address);
-                                              widget.onPushAddressBookButton?.call(context);
-                                            }
-                                          },
-                                          child: Container(
-                                            padding: EdgeInsets.all(8),
-                                            decoration: BoxDecoration(
-                                                color: widget.addressButtonsColor,
-                                                borderRadius: BorderRadius.all(Radius.circular(6))),
-                                            child: Image.asset(
-                                              'assets/images/open_book.png',
-                                              color: Theme.of(context).colorScheme.onSurface,
-                                            ),
-                                          ),
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                Padding(
-                                  padding: EdgeInsets.only(left: 2),
-                                  child: Container(
-                                    width: 34,
-                                    height: 34,
-                                    padding: EdgeInsets.only(top: 0),
-                                    child: Semantics(
-                                      label: S.of(context).copy_address,
-                                      child: InkWell(
-                                        key: ValueKey(
-                                            '${_cardInstanceName}_copy_refund_address_button_key'),
-                                        onTap: () {
-                                          Clipboard.setData(
-                                              ClipboardData(text: addressController.text));
-                                          showBar<void>(context, S.of(context).copied_to_clipboard);
-                                        },
-                                        child: Container(
-                                          padding: EdgeInsets.fromLTRB(8, 8, 0, 8),
-                                          color: Colors.transparent,
-                                          child: copyImage,
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                )
-                              ],
-                            ),
-                          ),
-                        )
+                        if (amountController.text.isNotEmpty) {
+                          _showAmountPopup(context, paymentRequest);
+                          return;
+                        }
+                        widget.amountFocusNode?.requestFocus();
+                        amountController.text = paymentRequest.amount;
+                      },
+                      placeholder:
+                      widget.hasRefundAddress ? S.of(context).refund_address : null,
+                      options: [
+                        AddressTextFieldOption.paste,
+                        AddressTextFieldOption.qrCode,
+                        AddressTextFieldOption.addressBook,
                       ],
-                    ),
-                  ),
+                      isBorderExist: false,
+                      textStyle: TextStyle(
+                          fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
+                      hintStyle: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w600,
+                          color:
+                          Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor),
+                      buttonColor: widget.addressButtonsColor,
+                      validator: widget.addressTextFieldValidator,
+                      onPushPasteButton: widget.onPushPasteButton,
+                      onPushAddressBookButton: widget.onPushAddressBookButton,
+                      selectedCurrency: _selectedCurrency),
                 ),
-        ],
-      ),
+        )
+            : Offstage()
+            : Padding(
+                padding: EdgeInsets.only(top: 0),
+                child: Builder(
+                    builder: (context) => Stack(children: <Widget>[
+                          FocusTraversalOrder(
+                            order: NumericFocusOrder(3),
+                            child: BaseTextFormField(
+                                key: ValueKey(
+                                    '${_cardInstanceName}_non_editable_address_textfield_key'),
+                                controller: addressController,
+                                borderColor: Colors.transparent,
+                                suffixIcon: SizedBox(width: _isMoneroWallet ? 80 : 36),
+                                textStyle: TextStyle(
+                                    fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
+                                validator: widget.addressTextFieldValidator),
+                          ),
+                          Positioned(
+                              top: 2,
+                              right: 0,
+                              child: SizedBox(
+                                  width: _isMoneroWallet ? 80 : 36,
+                                  child: Row(children: <Widget>[
+                                    if (_isMoneroWallet)
+                                      Padding(
+                                        padding: EdgeInsets.only(left: 10),
+                                        child: Container(
+                                            width: 34,
+                                            height: 34,
+                                            padding: EdgeInsets.only(top: 0),
+                                            child: Semantics(
+                                              label: S.of(context).address_book,
+                                              child: InkWell(
+                                                key: ValueKey(
+                                                    '${_cardInstanceName}_address_book_button_key'),
+                                                onTap: () async {
+                                                  final contact =
+                                                      await Navigator.of(context).pushNamed(
+                                                    Routes.pickerAddressBook,
+                                                    arguments: widget.initialCurrency,
+                                                  );
+
+                                                  if (contact is ContactBase) {
+                                                    setState(() =>
+                                                        addressController.text = contact.address);
+                                                    widget.onPushAddressBookButton?.call(context);
+                                                  }
+                                                },
+                                                child: Container(
+                                                    padding: EdgeInsets.all(8),
+                                                    decoration: BoxDecoration(
+                                                        color: widget.addressButtonsColor,
+                                                        borderRadius:
+                                                            BorderRadius.all(Radius.circular(6))),
+                                                    child: Image.asset(
+                                                      'assets/images/open_book.png',
+                                                      color: Theme.of(context)
+                                                          .extension<SendPageTheme>()!
+                                                          .textFieldButtonIconColor,
+                                                    )),
+                                              ),
+                                            )),
+                                      ),
+                                    Padding(
+                                        padding: EdgeInsets.only(left: 2),
+                                        child: Container(
+                                            width: 34,
+                                            height: 34,
+                                            padding: EdgeInsets.only(top: 0),
+                                            child: Semantics(
+                                              label: S.of(context).copy_address,
+                                              child: InkWell(
+                                                key: ValueKey(
+                                                    '${_cardInstanceName}_copy_refund_address_button_key'),
+                                                onTap: () {
+                                                  Clipboard.setData(
+                                                      ClipboardData(text: addressController.text));
+                                                  showBar<void>(
+                                                      context, S.of(context).copied_to_clipboard);
+                                                },
+                                                child: Container(
+                                                    padding: EdgeInsets.fromLTRB(8, 8, 0, 8),
+                                                    color: Colors.transparent,
+                                                    child: copyImage),
+                                              ),
+                                            )))
+                                  ])))
+                        ])),
+              ),
+      ]),
     );
   }
 
@@ -481,3 +445,4 @@ class ExchangeCardState<T extends Currency> extends State<ExchangeCard<T>> {
     return address;
   }
 }
+
diff --git a/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart b/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart
index 4606b21d5..80f8bd72d 100644
--- a/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart
+++ b/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart
@@ -1,5 +1,7 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:flutter/material.dart';
 
 class MobileExchangeCardsSection extends StatelessWidget {
@@ -27,28 +29,40 @@ class MobileExchangeCardsSection extends StatelessWidget {
           bottomLeft: Radius.circular(24),
           bottomRight: Radius.circular(24),
         ),
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        gradient: LinearGradient(
+          colors: [
+            Theme.of(context).extension<ExchangePageTheme>()!.firstGradientBottomPanelColor,
+            Theme.of(context).extension<ExchangePageTheme>()!.secondGradientBottomPanelColor,
+          ],
+          stops: [0.35, 1.0],
+          begin: Alignment.topLeft,
+          end: Alignment.bottomRight,
+        ),
       ),
       child: Column(
         children: <Widget>[
           Container(
             decoration: BoxDecoration(
               borderRadius: BorderRadius.only(
-                bottomLeft: Radius.circular(24),
-                bottomRight: Radius.circular(24),
+                  bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
+              gradient: LinearGradient(
+                colors: [
+                  Theme.of(context).extension<ExchangePageTheme>()!.firstGradientTopPanelColor,
+                  Theme.of(context).extension<ExchangePageTheme>()!.secondGradientTopPanelColor,
+                ],
+                begin: Alignment.topLeft,
+                end: Alignment.bottomRight,
               ),
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
             ),
-            padding: EdgeInsets.fromLTRB(24, 105, 24, 24),
+            padding: EdgeInsets.fromLTRB(24, 90, 24, isBuySellOption ? 24 : 16),
             child: Column(
               children: [
-                if (isBuySellOption)
-                  Column(
-                    children: [
-                      const SizedBox(height: 16),
-                      BuySellOptionButtons(onBuyTap: onBuyTap, onSellTap: onSellTap),
-                    ],
-                  ),
+                if (isBuySellOption) Column(
+                  children: [
+                    const SizedBox(height: 16),
+                    BuySellOptionButtons(onBuyTap: onBuyTap, onSellTap: onSellTap),
+                  ],
+                ),
                 firstExchangeCard,
               ],
             ),
@@ -90,13 +104,12 @@ class _BuySellOptionButtonsState extends State<BuySellOptionButtons> {
               text: S.of(context).buy,
               isSelected: isBuySelected,
               showTrailingIcon: false,
-              textColor: isBuySelected
-                  ? Theme.of(context).colorScheme.onPrimary
-                  : Theme.of(context).colorScheme.onSecondaryContainer,
-              padding: EdgeInsets.only(left: 50, right: 30),
+              textColor: Colors.white,
+              image: Image.asset('assets/images/buy.png', height: 25, width: 25),
+              padding: EdgeInsets.only(left: 10, right: 30),
               color: isBuySelected
-                  ? Theme.of(context).colorScheme.primary
-                  : Theme.of(context).colorScheme.surfaceContainer,
+                  ? null
+                  : Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
               onTap: () {
                 setState(() => isBuySelected = true);
                 if (widget.onBuyTap != null) widget.onBuyTap!();
@@ -111,13 +124,12 @@ class _BuySellOptionButtonsState extends State<BuySellOptionButtons> {
               text: S.of(context).sell,
               isSelected: !isBuySelected,
               showTrailingIcon: false,
-              textColor: !isBuySelected
-                  ? Theme.of(context).colorScheme.onPrimary
-                  : Theme.of(context).colorScheme.onSecondaryContainer,
-              padding: EdgeInsets.only(left: 50, right: 30),
+              textColor: Colors.white,
+              image: Image.asset('assets/images/sell.png', height: 25, width: 25),
+              padding: EdgeInsets.only(left: 10, right: 30),
               color: !isBuySelected
-                  ? Theme.of(context).colorScheme.primary
-                  : Theme.of(context).colorScheme.surfaceContainer,
+                  ? null
+                  : Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
               onTap: () {
                 setState(() => isBuySelected = false);
                 if (widget.onSellTap != null) widget.onSellTap!();
diff --git a/lib/src/screens/exchange/widgets/present_provider_picker.dart b/lib/src/screens/exchange/widgets/present_provider_picker.dart
index 3a0ec5e19..e496796d0 100644
--- a/lib/src/screens/exchange/widgets/present_provider_picker.dart
+++ b/lib/src/screens/exchange/widgets/present_provider_picker.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
 import 'package:cake_wallet/src/widgets/check_box_picker.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
@@ -14,93 +15,83 @@ class PresentProviderPicker extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final arrowBottom = Image.asset(
-      'assets/images/arrow_bottom_purple_icon.png',
-      color: Theme.of(context).colorScheme.onSurface,
-      height: 6,
-    );
+        'assets/images/arrow_bottom_purple_icon.png',
+        color: Colors.white,
+        height: 6);
 
     return TextButton(
-      onPressed: () => presentProviderPicker(context),
-      style: ButtonStyle(
-        padding: WidgetStateProperty.all(EdgeInsets.zero),
-        splashFactory: NoSplash.splashFactory,
-        foregroundColor: WidgetStateProperty.all(Colors.transparent),
-        overlayColor: WidgetStateProperty.all(Colors.transparent),
-      ),
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisSize: MainAxisSize.min,
-            children: <Widget>[
-              Text(
-                S.of(context).swap,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontSize: 16.0,
-                      fontWeight: FontWeight.w600,
-                    ),
-              ),
-              Observer(
-                builder: (_) => Text(
-                  exchangeViewModel.selectedProviders.isEmpty
-                      ? S.of(context).choose_one
-                      : exchangeViewModel.selectedProviders.length > 1
-                          ? S.of(context).automatic
-                          : exchangeViewModel.selectedProviders.first.title,
-                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                        fontSize: 10.0,
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
-                ),
-              )
-            ],
-          ),
-          SizedBox(width: 5),
-          Padding(
-            padding: EdgeInsets.only(top: 12),
-            child: arrowBottom,
-          )
-        ],
-      ),
-    );
+        onPressed: () => presentProviderPicker(context),
+        style: ButtonStyle(
+          padding: MaterialStateProperty.all(EdgeInsets.zero),
+          splashFactory: NoSplash.splashFactory,
+          foregroundColor: MaterialStateProperty.all(Colors.transparent),
+          overlayColor: MaterialStateProperty.all(Colors.transparent),
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                Text(S.of(context).swap,
+                    style: TextStyle(
+                        fontSize: 16.0,
+                        fontWeight: FontWeight.w600,
+                      
+                        color: Colors.white)),
+                Observer(
+                    builder: (_) => Text(
+                        exchangeViewModel.selectedProviders.isEmpty
+                            ? S.of(context).choose_one
+                            : exchangeViewModel.selectedProviders.length > 1
+                              ? S.of(context).automatic
+                              : exchangeViewModel.selectedProviders.first.title,
+                            style: TextStyle(
+                                fontSize: 10.0,
+                                fontWeight: FontWeight.w500,
+                                color: Theme.of(context).extension<QRCodeTheme>()!.qrCodeColor)))
+              ],
+            ),
+            SizedBox(width: 5),
+            Padding(
+              padding: EdgeInsets.only(top: 12),
+              child: arrowBottom,
+            )
+          ],
+        ));
   }
 
   void presentProviderPicker(BuildContext context) async {
     await showPopUp<void>(
-      builder: (BuildContext popUpContext) => CheckBoxPicker(
-        items: exchangeViewModel.providerList
-            .map(
-              (e) => CheckBoxItem(
-                e.title,
-                exchangeViewModel.selectedProviders.contains(e),
-                isDisabled: !exchangeViewModel.providersForCurrentPair().contains(e),
-              ),
-            )
-            .toList(),
-        title: S.of(context).change_exchange_provider,
-        onChanged: (int index, bool value) {
-          if (!exchangeViewModel.providerList[index].isAvailable) {
-            showPopUp<void>(
-                builder: (BuildContext popUpContext) => AlertWithOneAction(
-                    alertTitle: 'Error',
-                    alertContent: 'The exchange is blocked in your region.',
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(context).pop()),
-                context: context);
-            return;
-          }
-          if (value) {
-            exchangeViewModel.addExchangeProvider(exchangeViewModel.providerList[index]);
-          } else {
-            exchangeViewModel.removeExchangeProvider(exchangeViewModel.providerList[index]);
-          }
-        },
-      ),
-      context: context,
-    );
+        builder: (BuildContext popUpContext) => CheckBoxPicker(
+            items: exchangeViewModel.providerList
+                .map((e) => CheckBoxItem(
+                      e.title,
+                      exchangeViewModel.selectedProviders.contains(e),
+                      isDisabled: !exchangeViewModel.providersForCurrentPair().contains(e),
+                    ))
+                .toList(),
+            title: S.of(context).change_exchange_provider,
+            onChanged: (int index, bool value) {
+              if (!exchangeViewModel.providerList[index].isAvailable) {
+                showPopUp<void>(
+                    builder: (BuildContext popUpContext) => AlertWithOneAction(
+                        alertTitle: 'Error',
+                        alertContent: 'The exchange is blocked in your region.',
+                        buttonText: S.of(context).ok,
+                        buttonAction: () => Navigator.of(context).pop()),
+                    context: context);
+                return;
+              }
+              if (value) {
+                exchangeViewModel.addExchangeProvider(exchangeViewModel.providerList[index]);
+              } else {
+                exchangeViewModel.removeExchangeProvider(exchangeViewModel.providerList[index]);
+              }
+            }),
+        context: context);
 
     exchangeViewModel.saveSelectedProviders();
   }
diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
index 948dac49d..60b534c6e 100644
--- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart
@@ -1,14 +1,18 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/utils/image_utill.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class ExchangeConfirmPage extends BasePage {
   ExchangeConfirmPage({required this.tradesStore}) : trade = tradesStore.trade!;
@@ -26,123 +30,117 @@ class ExchangeConfirmPage extends BasePage {
       child: Column(
         children: <Widget>[
           Expanded(
-            child: Column(
-              children: <Widget>[
-                Flexible(
+              child: Column(
+            children: <Widget>[
+              Flexible(
                   child: Center(
-                    child: Text(
-                      S.of(context).exchange_result_write_down_trade_id,
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                            fontSize: 18.0,
-                            fontWeight: FontWeight.w500,
-                          ),
-                    ),
-                  ),
+                child: Text(
+                  S.of(context).exchange_result_write_down_trade_id,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                      fontSize: 18.0,
+                      fontWeight: FontWeight.w500,
+                      color:  Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
                 ),
-                Container(
-                  height: 178,
-                  decoration: BoxDecoration(
+              )),
+              Container(
+                height: 178,
+                decoration: BoxDecoration(
                     borderRadius: BorderRadius.all(Radius.circular(30)),
                     border: Border.all(
-                      width: 0.0,
-                      color: Theme.of(context).colorScheme.outlineVariant,
-                    ),
-                    color: Theme.of(context).colorScheme.surfaceContainer,
-                  ),
-                  child: Column(
-                    children: <Widget>[
-                      Expanded(
+                        width: 1,
+                        color: Theme.of(context).cardColor),
+                    color: Theme.of(context).dialogTheme.backgroundColor),
+                child: Column(
+                  children: <Widget>[
+                    Expanded(
                         child: Padding(
-                          padding: EdgeInsets.all(24),
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            children: <Widget>[
-                              Text(
-                                "${trade.provider.title} ${S.of(context).trade_id}",
-                                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                      fontWeight: FontWeight.w500,
-                                    ),
-                              ),
-                              Text(
-                                trade.id,
-                                maxLines: 1,
-                                overflow: TextOverflow.ellipsis,
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                      fontSize: 20,
-                                      fontWeight: FontWeight.w600,
-                                      color: Theme.of(context).colorScheme.onSurface,
-                                    ),
-                              ),
-                            ],
+                      padding: EdgeInsets.all(24),
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: <Widget>[
+                          Text(
+                            "${trade.provider.title} ${S.of(context).trade_id}",
+                            style: TextStyle(
+                                fontSize: 12.0,
+                                fontWeight: FontWeight.w500,
+                                color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
                           ),
-                        ),
+                          Text(
+                            trade.id,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                                fontSize: 20,
+                                fontWeight: FontWeight.w600,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+                          ),
+                        ],
                       ),
-                      Padding(
-                        padding: EdgeInsets.fromLTRB(10, 0, 10, 10),
-                        child: Builder(
-                          builder: (context) => PrimaryButton(
-                            key: ValueKey('exchange_confirm_page_copy_to_clipboard_button_key'),
+                    )),
+                    Padding(
+                      padding: EdgeInsets.fromLTRB(10, 0, 10, 10),
+                      child: Builder(
+                        builder: (context) => PrimaryButton(
+                          key: ValueKey('exchange_confirm_page_copy_to_clipboard_button_key'),
                             onPressed: () {
                               Clipboard.setData(ClipboardData(text: trade.id));
-                              showBar<void>(context, S.of(context).copied_to_clipboard);
+                              showBar<void>(
+                                  context, S.of(context).copied_to_clipboard);
                             },
                             text: S.of(context).copy_id,
-                            color: Theme.of(context).colorScheme.surfaceContainerLow,
-                            textColor: Theme.of(context).colorScheme.onSurface,
-                            borderRadius: BorderRadius.circular(30.0),
-                          ),
-                        ),
-                      )
-                    ],
-                  ),
+                            color: Theme.of(context).extension<ExchangePageTheme>()!.buttonBackgroundColor,
+                            textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+                      ),
+                    )
+                  ],
                 ),
-                Expanded(
-                  child: Column(
-                    children: [
-                      if (trade.provider == ExchangeProviderDescription.trocador)
-                        Padding(
-                          padding: const EdgeInsets.only(top: 8.0),
-                          child: Text(
-                            S.of(context).selected_trocador_provider + ':${trade.providerName}',
-                            textAlign: TextAlign.center,
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  fontWeight: FontWeight.w500,
-                                ),
-                          ),
-                        ),
-                      Flexible(
-                        child: Center(
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              (trade.provider.image.isNotEmpty)
-                                  ? ImageUtil.getImageFromPath(
-                                      imagePath: trade.provider.image, height: 50, width: 50)
-                                  : const SizedBox(),
-                              if (!trade.provider.horizontalLogo)
-                                Padding(
-                                  padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                                  child: Text(trade.provider.title),
-                                ),
-                            ],
-                          ),
+              ),
+              Expanded(
+                child: Column(
+                  children: [
+                    if (trade.provider == ExchangeProviderDescription.trocador)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Text(
+                       S.of(context).selected_trocador_provider +':${trade.providerName}',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                            fontSize: 12.0,
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
+                      ),
+                    ),
+                    Flexible(
+                      child: Center(
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            (trade.provider.image?.isNotEmpty ?? false)
+                                ? Image.asset(trade.provider.image, height: 50)
+                                : const SizedBox(),
+                            if (!trade.provider.horizontalLogo)
+                              Padding(
+                                padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                                child: Text(trade.provider.title),
+                              ),
+                          ],
                         ),
                       ),
-                    ],
-                  ),
+                    ),
+                  ],
                 ),
-              ],
-            ),
-          ),
+              ),
+            ],
+          )),
           PrimaryButton(
             key: ValueKey('exchange_confirm_page_saved_id_button_key'),
-            onPressed: () => Navigator.of(context).pushReplacementNamed(Routes.exchangeTrade),
-            text: S.of(context).saved_the_trade_id,
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
-          )
+              onPressed: () => Navigator.of(context)
+                  .pushReplacementNamed(Routes.exchangeTrade),
+              text: S.of(context).saved_the_trade_id,
+              color: Theme.of(context).primaryColor,
+              textColor: Colors.white)
         ],
       ),
     );
diff --git a/lib/src/screens/exchange_trade/exchange_trade_external_send_page.dart b/lib/src/screens/exchange_trade/exchange_trade_external_send_page.dart
index c6b26e7bd..5ed82e71c 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_external_send_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_external_send_page.dart
@@ -1,5 +1,7 @@
 import 'package:cake_wallet/src/screens/exchange_trade/widgets/exchange_trade_card_item_widget.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -17,6 +19,9 @@ class ExchangeTradeExternalSendPage extends BasePage {
   @override
   String get title => S.current.swap;
 
+  @override
+  bool get gradientBackground => true;
+
   @override
   bool get gradientAll => true;
 
@@ -37,11 +42,11 @@ class ExchangeTradeExternalSendPage extends BasePage {
       'assets/images/copy_content.png',
       height: 16,
       width: 16,
-      color: Theme.of(context).colorScheme.primary,
+      color: Theme.of(context).extension<SendPageTheme>()!.estimatedFeeColor,
     );
     return Container(
       child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(bottom: 24),
+        contentPadding: EdgeInsets.only(top: 36, bottom: 24),
         content: Observer(
           builder: (_) {
             return Column(
@@ -50,7 +55,14 @@ class ExchangeTradeExternalSendPage extends BasePage {
                   decoration: BoxDecoration(
                     borderRadius: BorderRadius.only(
                         bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
-                    color: Theme.of(context).colorScheme.surfaceContainerLow,
+                    gradient: LinearGradient(
+                      colors: [
+                        Theme.of(context).extension<SendPageTheme>()!.firstGradientColor,
+                        Theme.of(context).extension<SendPageTheme>()!.secondGradientColor,
+                      ],
+                      begin: Alignment.topLeft,
+                      end: Alignment.bottomRight,
+                    ),
                   ),
                   padding: EdgeInsets.fromLTRB(24, 110, 24, 32),
                   child: Column(
@@ -69,7 +81,9 @@ class ExchangeTradeExternalSendPage extends BasePage {
                                   decoration: BoxDecoration(
                                     border: Border.all(
                                       width: 3,
-                                      color: Theme.of(context).colorScheme.primary,
+                                      color: Theme.of(context)
+                                          .extension<ExchangePageTheme>()!
+                                          .qrCodeColor,
                                     ),
                                   ),
                                   child: QrImage(
@@ -117,8 +131,8 @@ class ExchangeTradeExternalSendPage extends BasePage {
                       Navigator.of(context).popUntil((route) => route.isFirst);
                     },
                     text: S.current.continue_text,
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
+                    color: Theme.of(context).primaryColor,
+                    textColor: Colors.white,
                   )
                 : Offstage();
           },
diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart
index cd118f945..97d9a34bb 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart
@@ -5,7 +5,9 @@ import 'package:cake_wallet/src/screens/exchange/widgets/mobile_exchange_cards_s
 import 'package:cake_wallet/src/screens/exchange_trade/widgets/exchange_trade_card_item_widget.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'dart:ui';
 import 'package:cake_wallet/utils/request_review_handler.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:mobx/mobx.dart';
@@ -22,24 +24,25 @@ import 'package:cake_wallet/src/screens/exchange_trade/widgets/timer_widget.dart
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
-void showInformation(ExchangeTradeViewModel exchangeTradeViewModel, BuildContext context) {
+void showInformation(
+    ExchangeTradeViewModel exchangeTradeViewModel, BuildContext context) {
   final trade = exchangeTradeViewModel.trade;
   final walletName = exchangeTradeViewModel.wallet.name;
 
   final information = exchangeTradeViewModel.isSendable
       ? S.current.exchange_trade_result_confirm(trade.amount, trade.from.toString(), walletName) +
-          exchangeTradeViewModel.extraInfo
-      : S.current.exchange_result_description(trade.amount, trade.from.toString()) +
-          exchangeTradeViewModel.extraInfo;
+        exchangeTradeViewModel.extraInfo
+      : S.current.exchange_result_description(
+          trade.amount, trade.from.toString()) +
+        exchangeTradeViewModel.extraInfo;
 
   showPopUp<void>(
-    context: context,
-    builder: (_) => InformationPage(
-      key: ValueKey('information_page_dialog_key'),
-      information: information,
-    ),
-  );
+      context: context,
+      builder: (_) => InformationPage(
+        key: ValueKey('information_page_dialog_key'),
+        information: information));
 }
 
 class ExchangeTradePage extends BasePage {
@@ -50,6 +53,9 @@ class ExchangeTradePage extends BasePage {
   @override
   String get title => S.current.swap;
 
+  @override
+  bool get gradientBackground => true;
+
   @override
   bool get gradientAll => true;
 
@@ -65,7 +71,7 @@ class ExchangeTradePage extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     final questionImage = Image.asset('assets/images/question_mark.png',
-        color: Theme.of(context).colorScheme.onSurface);
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
     return SizedBox(
       height: 20.0,
@@ -97,7 +103,7 @@ class ExchangeTradeForm extends StatefulWidget {
   );
 
   final ExchangeTradeViewModel exchangeTradeViewModel;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   @override
   ExchangeTradeState createState() => ExchangeTradeState();
@@ -135,7 +141,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
 
     return Container(
       child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(bottom: 16),
+        contentPadding: EdgeInsets.only(top: 10, bottom: 16),
         content: Observer(builder: (_) {
           final trade = widget.exchangeTradeViewModel.trade;
 
@@ -148,13 +154,16 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                       children: <Widget>[
                           Text(
                             S.of(context).offer_expires_in,
-                            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                  fontWeight: FontWeight.w500,
-                                ),
+                            style: TextStyle(
+                                fontSize: 14.0,
+                                fontWeight: FontWeight.w500,
+                                color: Theme.of(context)
+                                    .extension<TransactionTradeTheme>()!
+                                    .detailsTitlesColor),
                           ),
                           if (trade.expiredAt != null)
                             TimerWidget(trade.expiredAt!,
-                                color: Theme.of(context).colorScheme.onSurface)
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)
                         ])
                   : Offstage(),
               _ExchangeTradeItemsCardSection(
@@ -173,8 +182,8 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
               onPressed: () async {
                 Navigator.of(context).pushNamed(Routes.exchangeTradeExternalSendPage);
               },
-              color: Theme.of(context).colorScheme.surfaceContainer,
-              textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+              color: Theme.of(context).cardColor,
+              textColor: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
             ),
             SizedBox(height: 16),
             Observer(
@@ -189,9 +198,9 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
                         isDisabled: trade.inputAddress == null || trade.inputAddress!.isEmpty,
                         isLoading: sendingState is IsExecutingState,
                         onPressed: () => widget.exchangeTradeViewModel.confirmSending(),
-                        text: S.current.send_from_cake_wallet,
-                        color: Theme.of(context).colorScheme.primary,
-                        textColor: Theme.of(context).colorScheme.onPrimary,
+                        text:S.current.send_from_cake_wallet,
+                        color: Theme.of(context).primaryColor,
+                        textColor: Colors.white,
                       )
                     : Offstage();
               },
@@ -202,7 +211,6 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
     );
   }
 
-  BuildContext? dialogContext;
   BuildContext? loadingBottomSheetContext;
 
   void _setEffects() {
@@ -210,135 +218,114 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
       return;
     }
 
-    _exchangeStateReaction = reaction(
-      (_) => this.widget.exchangeTradeViewModel.sendViewModel.state,
-      (ExecutionState state) async {
-        if (dialogContext != null && dialogContext?.mounted == true) {
-          Navigator.of(dialogContext!).pop();
-        }
+    _exchangeStateReaction = reaction((_) => this.widget.exchangeTradeViewModel.sendViewModel.state,
+        (ExecutionState state) {
 
-        if (state is! IsExecutingState &&
-            loadingBottomSheetContext != null &&
-            loadingBottomSheetContext!.mounted) {
-          Navigator.of(loadingBottomSheetContext!).pop();
-        }
+          if (state is! IsExecutingState &&
+              loadingBottomSheetContext != null &&
+              loadingBottomSheetContext!.mounted) {
+            Navigator.of(loadingBottomSheetContext!).pop();
+          }
 
-        if (state is FailureState) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            showPopUp<void>(
-                context: context,
-                builder: (BuildContext popupContext) {
-                  return AlertWithOneAction(
-                      key: ValueKey('exchange_trade_page_send_failure_dialog_key'),
-                      buttonKey: ValueKey('exchange_trade_page_send_failure_dialog_button_key'),
-                      alertTitle: S.of(popupContext).error,
-                      alertContent: state.error,
-                      buttonText: S.of(popupContext).ok,
-                      buttonAction: () => Navigator.of(popupContext).pop());
-                });
-          });
-        }
+      if (state is FailureState) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          showPopUp<void>(
+              context: context,
+              builder: (BuildContext popupContext) {
+                return AlertWithOneAction(
+                    key: ValueKey('exchange_trade_page_send_failure_dialog_key'),
+                    buttonKey: ValueKey('exchange_trade_page_send_failure_dialog_button_key'),
+                    alertTitle: S.of(popupContext).error,
+                    alertContent: state.error,
+                    buttonText: S.of(popupContext).ok,
+                    buttonAction: () => Navigator.of(popupContext).pop());
+              });
+        });
+      }
 
-        if (state is IsExecutingState) {
-          // wait a bit to avoid showing the loading dialog if transaction is failed
-          await Future.delayed(const Duration(milliseconds: 300));
-          final currentState = widget.exchangeTradeViewModel.sendViewModel.state;
-          if (currentState is ExecutedSuccessfullyState || currentState is FailureState) {
+      if (state is IsExecutingState) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (context.mounted) {
+            showModalBottomSheet<void>(
+              context: context,
+              isDismissible: false,
+              builder: (BuildContext context) {
+                loadingBottomSheetContext = context;
+                return LoadingBottomSheet(
+                  titleText: S.of(context).generating_transaction,
+                );
+              },
+            );
+          }
+        });
+      }
+
+      if (state is ExecutedSuccessfullyState) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (context.mounted) {
+            showModalBottomSheet<void>(
+              context: context,
+              isDismissible: false,
+              isScrollControlled: true,
+              builder: (BuildContext bottomSheetContext) {
+                return ConfirmSendingBottomSheet(
+                  key: ValueKey('exchange_trade_page_confirm_sending_bottom_sheet_key'),
+                  currentTheme: widget.currentTheme,
+                  titleText: S.of(bottomSheetContext).confirm_transaction,
+                  titleIconPath: widget.exchangeTradeViewModel.sendViewModel.selectedCryptoCurrency.iconPath,
+                  currency: widget.exchangeTradeViewModel.sendViewModel.selectedCryptoCurrency,
+                  amount: S.of(bottomSheetContext).send_amount,
+                  amountValue: widget.exchangeTradeViewModel.sendViewModel.pendingTransaction!.amountFormatted,
+                  fiatAmountValue: widget.exchangeTradeViewModel.sendViewModel.pendingTransactionFiatAmountFormatted,
+                  fee: isEVMCompatibleChain(widget.exchangeTradeViewModel.sendViewModel.walletType)
+                      ? S.of(bottomSheetContext).send_estimated_fee
+                      : S.of(bottomSheetContext).send_fee,
+                  feeValue: widget.exchangeTradeViewModel.sendViewModel.pendingTransaction!.feeFormatted,
+                  feeFiatAmount: widget.exchangeTradeViewModel.sendViewModel.pendingTransactionFeeFiatAmountFormatted,
+                  outputs: widget.exchangeTradeViewModel.sendViewModel.outputs,
+                  onSlideComplete: () async {
+                    Navigator.of(bottomSheetContext).pop();
+                    widget.exchangeTradeViewModel.sendViewModel.commitTransaction(context);
+                  },
+                );
+              },
+            );
+          }
+        });
+      }
+
+      if (state is TransactionCommitted) {
+        WidgetsBinding.instance.addPostFrameCallback((_) async {
+          if (!context.mounted) {
             return;
           }
 
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            if (context.mounted) {
-              showModalBottomSheet<void>(
-                context: context,
-                isDismissible: false,
-                builder: (BuildContext context) {
-                  loadingBottomSheetContext = context;
-                  return LoadingBottomSheet(
-                    titleText: S.of(context).generating_transaction,
-                  );
-                },
-              );
-            }
-          });
-        }
 
-        if (state is ExecutedSuccessfullyState) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            if (context.mounted) {
-              showModalBottomSheet<void>(
-                context: context,
-                isDismissible: false,
-                isScrollControlled: true,
-                builder: (BuildContext bottomSheetContext) {
-                  return ConfirmSendingBottomSheet(
-                    key: ValueKey('exchange_trade_page_confirm_sending_bottom_sheet_key'),
-                    currentTheme: widget.currentTheme,
-                    walletType: widget.exchangeTradeViewModel.sendViewModel.walletType,
-                    titleText: S.of(bottomSheetContext).confirm_transaction,
-                    titleIconPath:
-                        widget.exchangeTradeViewModel.sendViewModel.selectedCryptoCurrency.iconPath,
-                    currency: widget.exchangeTradeViewModel.sendViewModel.selectedCryptoCurrency,
-                    amount: S.of(bottomSheetContext).send_amount,
-                    amountValue: widget
-                        .exchangeTradeViewModel.sendViewModel.pendingTransaction!.amountFormatted,
-                    fiatAmountValue: widget
-                        .exchangeTradeViewModel.sendViewModel.pendingTransactionFiatAmountFormatted,
-                    fee:
-                        isEVMCompatibleChain(widget.exchangeTradeViewModel.sendViewModel.walletType)
-                            ? S.of(bottomSheetContext).send_estimated_fee
-                            : S.of(bottomSheetContext).send_fee,
-                    feeValue: widget
-                        .exchangeTradeViewModel.sendViewModel.pendingTransaction!.feeFormatted,
-                    feeFiatAmount: widget.exchangeTradeViewModel.sendViewModel
-                        .pendingTransactionFeeFiatAmountFormatted,
-                    outputs: widget.exchangeTradeViewModel.sendViewModel.outputs,
-                    onSlideComplete: () async {
-                      if (bottomSheetContext.mounted) {
-                        Navigator.of(bottomSheetContext).pop();
-                      }
-                      widget.exchangeTradeViewModel.sendViewModel.commitTransaction(context);
-                    },
-                  );
-                },
-              );
-            }
-          });
-        }
-
-        if (state is TransactionCommitted) {
-          WidgetsBinding.instance.addPostFrameCallback(
-            (_) async {
-              if (!mounted) return;
-
-              await showModalBottomSheet<void>(
-                context: context,
-                isScrollControlled: true,
-                builder: (BuildContext bottomSheetContext) {
-                  return InfoBottomSheet(
-                    currentTheme: widget.currentTheme,
-                    titleText: S.of(bottomSheetContext).transaction_sent,
-                    contentImage: 'assets/images/birthday_cake.png',
-                    actionButtonText: S.of(bottomSheetContext).close,
-                    actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'),
-                    actionButton: () {
-                      Navigator.of(bottomSheetContext).pop();
-                      if (mounted) {
-                        Navigator.of(context).pushNamedAndRemoveUntil(
-                          Routes.dashboard,
-                          (route) => false,
-                        );
-                      }
-                      RequestReviewHandler.requestReview();
-                    },
-                  );
-                },
-              );
+          await showModalBottomSheet<void>(
+            context: context,
+            isScrollControlled: true,
+            builder: (BuildContext bottomSheetContext) {
+              return InfoBottomSheet(
+                  currentTheme: widget.currentTheme,
+                  titleText: S.of(bottomSheetContext).transaction_sent,
+                  contentImage: 'assets/images/birthday_cake.svg',
+                  actionButtonText: S.of(bottomSheetContext).close,
+                  actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'),
+                  actionButton: () {
+                    Navigator.of(bottomSheetContext).pop();
+                    Navigator.of(context).pushNamedAndRemoveUntil(
+                      Routes.dashboard,
+                      (route) => false,
+                    );
+                    RequestReviewHandler.requestReview();
+                  });
             },
           );
-        }
-      },
-    );
+
+        });
+      }
+
+    });
 
     _effectsInstalled = true;
   }
@@ -351,7 +338,7 @@ class _ExchangeTradeItemsCardSection extends StatelessWidget {
   });
 
   final ExchangeTradeViewModel viewModel;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/src/screens/exchange_trade/information_page.dart b/lib/src/screens/exchange_trade/information_page.dart
index ebd2b3379..114a4824d 100644
--- a/lib/src/screens/exchange_trade/information_page.dart
+++ b/lib/src/screens/exchange_trade/information_page.dart
@@ -1,7 +1,13 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'dart:ui';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/info_theme.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
 
 class InformationPage extends StatelessWidget {
   InformationPage({required this.information, super.key});
@@ -11,37 +17,47 @@ class InformationPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AlertBackground(
-        child: Center(
-      child: Container(
-        margin: EdgeInsets.only(left: 24, right: 24),
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(30)),
-          color: Theme.of(context).colorScheme.surface,
-        ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            Container(
-              padding: EdgeInsets.fromLTRB(24, 28, 24, 24),
-              child: Text(
-                information,
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium,
+      child: Center(
+        child: Container(
+          margin: EdgeInsets.only(
+            left: 24,
+            right: 24
+          ),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.all(Radius.circular(30)),
+            color: Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              Container(
+                padding: EdgeInsets.fromLTRB(24, 28, 24, 24),
+                child: Text(
+                  information,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    fontFamily: 'Lato',
+                    decoration: TextDecoration.none,
+                    color: Theme.of(context).extension<InfoTheme>()!.textColor
+                  ),
+                ),
               ),
-            ),
-            Padding(
-              padding: EdgeInsets.fromLTRB(10, 0, 10, 10),
-              child: PrimaryButton(
-                key: ValueKey('information_page_got_it_button_key'),
-                onPressed: () => Navigator.of(context).pop(),
-                text: S.of(context).got_it,
-                color: Theme.of(context).colorScheme.surfaceContainer,
-                textColor: Theme.of(context).colorScheme.onSurface,
-              ),
-            )
-          ],
+              Padding(
+                padding: EdgeInsets.fromLTRB(10, 0, 10, 10),
+                child: PrimaryButton(
+                  key: ValueKey('information_page_got_it_button_key'),
+                  onPressed: () => Navigator.of(context).pop(),
+                  text: S.of(context).got_it,
+                  color: Theme.of(context).extension<ExchangePageTheme>()!.buttonBackgroundColor,
+                  textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor
+                ),
+              )
+            ],
+          ),
         ),
-      ),
-    ));
+      )
+    );
   }
 }
diff --git a/lib/src/screens/exchange_trade/widgets/exchange_trade_card_item_widget.dart b/lib/src/screens/exchange_trade/widgets/exchange_trade_card_item_widget.dart
index 1075b2df1..9b07023c2 100644
--- a/lib/src/screens/exchange_trade/widgets/exchange_trade_card_item_widget.dart
+++ b/lib/src/screens/exchange_trade/widgets/exchange_trade_card_item_widget.dart
@@ -4,7 +4,6 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/list_row.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
@@ -13,8 +12,12 @@ import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import '../../../../themes/extensions/cake_text_theme.dart';
+import '../../../../themes/extensions/transaction_trade_theme.dart';
+import '../../../../themes/theme_base.dart';
 
 class ExchangeTradeCardItemWidget extends StatelessWidget {
   ExchangeTradeCardItemWidget({
@@ -29,7 +32,7 @@ class ExchangeTradeCardItemWidget extends StatelessWidget {
   final bool isReceiveDetailsCard;
   final FeesViewModel feesViewModel;
   final ExchangeTradeViewModel exchangeTradeViewModel;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   @override
   Widget build(BuildContext context) {
@@ -37,7 +40,7 @@ class ExchangeTradeCardItemWidget extends StatelessWidget {
       'assets/images/copy_content.png',
       height: 16,
       width: 16,
-      color: Theme.of(context).colorScheme.onSurfaceVariant,
+      color: Theme.of(context).extension<SendPageTheme>()!.estimatedFeeColor,
     );
 
     return Container(
@@ -151,7 +154,7 @@ class TradeItemRowWidget extends StatelessWidget {
   final String value;
   final bool isCopied;
   final Image copyImage;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   const TradeItemRowWidget({
     required this.title,
@@ -163,6 +166,15 @@ class TradeItemRowWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+
+    final hintTextColor = currentTheme == ThemeType.bright
+        ? Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor
+        : Colors.white.withAlpha(175);
+
+    final mainTextColor = currentTheme == ThemeType.bright
+        ? Theme.of(context).extension<CakeTextTheme>()!.titleColor
+        : Colors.white;
+
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 8),
       child: GestureDetector(
@@ -177,8 +189,8 @@ class TradeItemRowWidget extends StatelessWidget {
           value: value,
           image: isCopied ? copyImage : null,
           color: Colors.transparent,
-          hintTextColor: Theme.of(context).colorScheme.onSurfaceVariant,
-          mainTextColor: Theme.of(context).colorScheme.onSurface,
+          hintTextColor: hintTextColor,
+          mainTextColor: mainTextColor,
         ),
       ),
     );
@@ -210,10 +222,11 @@ class FeeSelectionWidget extends StatelessWidget {
             children: <Widget>[
               Text(
                 S.of(context).send_estimated_fee,
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w500,
+                  color: Colors.white,
+                ),
               ),
               Row(
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -223,20 +236,23 @@ class FeeSelectionWidget extends StatelessWidget {
                     children: [
                       Text(
                         '${output.estimatedFee} ${feesViewModel.currency}',
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                              fontWeight: FontWeight.w600,
-                              color: Theme.of(context).colorScheme.onSurface,
-                            ),
+                        style: TextStyle(
+                          fontSize: 12,
+                          fontWeight: FontWeight.w600,
+                          color: Colors.white,
+                        ),
                       ),
                       if (!feesViewModel.isFiatDisabled)
                         Padding(
                           padding: EdgeInsets.only(top: 5),
                           child: Text(
                             '${output.estimatedFeeFiatAmount} ${feesViewModel.fiat.title}',
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  fontWeight: FontWeight.w600,
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                ),
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.w600,
+                              color:
+                                  Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor,
+                            ),
                           ),
                         ),
                     ],
@@ -246,7 +262,7 @@ class FeeSelectionWidget extends StatelessWidget {
                     child: Icon(
                       Icons.arrow_forward_ios,
                       size: 12,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      color: Colors.white,
                     ),
                   ),
                 ],
@@ -277,15 +293,16 @@ class CoinControlWidget extends StatelessWidget {
           children: [
             Text(
               S.of(context).coin_control,
-              style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                    fontWeight: FontWeight.w600,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
+              style: TextStyle(
+                fontSize: 12,
+                fontWeight: FontWeight.w600,
+                color: Colors.white,
+              ),
             ),
             Icon(
               Icons.arrow_forward_ios,
               size: 12,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
+              color: Colors.white,
             ),
           ],
         ),
diff --git a/lib/src/screens/exchange_trade/widgets/timer_widget.dart b/lib/src/screens/exchange_trade/widgets/timer_widget.dart
index a674cd5d4..482dd4093 100644
--- a/lib/src/screens/exchange_trade/widgets/timer_widget.dart
+++ b/lib/src/screens/exchange_trade/widgets/timer_widget.dart
@@ -14,10 +14,10 @@ class TimerWidget extends StatefulWidget {
 
 class TimerWidgetState extends State<TimerWidget> {
   TimerWidgetState()
-      : _leftSeconds = 0,
-        _minutes = 0,
-        _seconds = 0,
-        _isExpired = false;
+    : _leftSeconds = 0,
+    _minutes = 0,
+    _seconds = 0,
+    _isExpired = false;
 
   int _leftSeconds;
   int _minutes;
@@ -56,19 +56,17 @@ class TimerWidgetState extends State<TimerWidget> {
   @override
   Widget build(BuildContext context) {
     return _isExpired
-        ? Text(
-            S.of(context).expired,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontWeight: FontWeight.w500,
-              color: Theme.of(context).colorScheme.errorContainer,
-            ),
-          )
+        ? Text(S.of(context).expired,
+            style: TextStyle(
+                fontSize: 14.0,
+                fontWeight: FontWeight.w500,
+                color: Colors.red))
         : Text(
             S.of(context).time(_minutes.toString(), _seconds.toString()),
-            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: widget.color,
-                ),
+            style: TextStyle(
+                fontSize: 14.0,
+                fontWeight: FontWeight.w500,
+                color: widget.color),
           );
   }
 
diff --git a/lib/src/screens/faq/faq_item.dart b/lib/src/screens/faq/faq_item.dart
index 47a4042db..9ed346ef4 100644
--- a/lib/src/screens/faq/faq_item.dart
+++ b/lib/src/screens/faq/faq_item.dart
@@ -1,4 +1,6 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
 class FAQItem extends StatefulWidget {
   FAQItem(this.title, this.text);
@@ -11,7 +13,8 @@ class FAQItem extends StatefulWidget {
 }
 
 class FAQItemState extends State<FAQItem> {
-  FAQItemState() : isActive = false;
+  FAQItemState()
+    : isActive = false;
 
   bool isActive;
 
@@ -23,41 +26,39 @@ class FAQItemState extends State<FAQItem> {
 
   @override
   Widget build(BuildContext context) {
-    final addIcon = Icon(Icons.add, color: Theme.of(context).colorScheme.onSurface);
-    final removeIcon = Icon(Icons.remove, color: Theme.of(context).colorScheme.primary);
+    final addIcon = Icon(Icons.add,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
+    final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola);
     final icon = isActive ? removeIcon : addIcon;
-    final color =
-        isActive ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onSurface;
+    final color = isActive
+        ? Palette.blueCraiola
+        : Theme.of(context).extension<CakeTextTheme>()!.titleColor;
 
     return ListTileTheme(
       contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6),
       child: ExpansionTile(
-        title: Text(
-          widget.title,
-          style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                fontWeight: FontWeight.w500,
-                color: color,
-              ),
-        ),
+        title: Text(widget.title,
+            style: TextStyle(
+                fontSize: 14, fontWeight: FontWeight.w500, color: color)),
         trailing: icon,
         onExpansionChanged: (value) => setState(() => isActive = value),
         children: <Widget>[
-          Row(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: <Widget>[
-              Expanded(
+          Row(mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
+            Expanded(
                 child: Container(
-                  padding: EdgeInsets.only(
-                    right: 24.0,
-                  ),
-                  child: Text(
-                    widget.text,
-                    style: Theme.of(context).textTheme.bodyMedium,
-                  ),
-                ),
-              )
-            ],
-          ),
+              padding: EdgeInsets.only(
+                right: 24.0,
+              ),
+              child: Text(
+                widget.text,
+                style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    color:
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+              ),
+            ))
+          ])
         ],
       ),
     );
diff --git a/lib/src/screens/integrations/deuro/savings_page.dart b/lib/src/screens/integrations/deuro/savings_page.dart
deleted file mode 100644
index 0b0f4941a..000000000
--- a/lib/src/screens/integrations/deuro/savings_page.dart
+++ /dev/null
@@ -1,217 +0,0 @@
-import 'package:cake_wallet/core/execution_state.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/integrations/deuro/widgets/interest_card_widget.dart';
-import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_card_widget.dart';
-import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart';
-import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart';
-import 'package:cake_wallet/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
-import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart';
-import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/pending_transaction.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:mobx/mobx.dart';
-
-class DEuroSavingsPage extends BasePage {
-  final DEuroViewModel _dEuroViewModel;
-
-  DEuroSavingsPage(this._dEuroViewModel);
-
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-      (context, scaffold) => GradientBackground(scaffold: scaffold);
-
-  @override
-  String get title => S.current.deuro_savings;
-
-  Widget trailing(BuildContext context) => MergeSemantics(
-        child: SizedBox(
-          height: 37,
-          width: 37,
-          child: ButtonTheme(
-            minWidth: double.minPositive,
-            child: Semantics(
-              label: "Refresh",
-              child: TextButton(
-                style: TextButton.styleFrom(
-                  foregroundColor: Theme.of(context).colorScheme.onSurface,
-                  overlayColor: WidgetStateColor.resolveWith(
-                      (states) => Colors.transparent),
-                ),
-                onPressed: _dEuroViewModel.reloadSavingsUserData,
-                child: Icon(
-                  Icons.refresh,
-                  color: pageIconColor(context),
-                  size: 20,
-                ),
-              ),
-            ),
-          ),
-        ),
-      );
-
-  @override
-  Widget body(BuildContext context) {
-    WidgetsBinding.instance
-        .addPostFrameCallback((_) => _setReactions(context, _dEuroViewModel));
-
-    return Container(
-      width: double.infinity,
-      child: Column(
-        children: <Widget>[
-          Observer(
-            builder: (_) => SavingsCard(
-              isDarkTheme: currentTheme.isDark,
-              interestRate: "${_dEuroViewModel.interestRate}%",
-              savingsBalance: _dEuroViewModel.savingsBalance,
-              currency: CryptoCurrency.deuro,
-              onAddSavingsPressed: () => _onSavingsAdd(context),
-              onRemoveSavingsPressed: () => _onSavingsRemove(context),
-              onApproveSavingsPressed: _dEuroViewModel.prepareApproval,
-              isEnabled: _dEuroViewModel.isEnabled,
-            ),
-          ),
-          Observer(
-            builder: (_) => InterestCardWidget(
-              isDarkTheme: currentTheme.isDark,
-              title: S.of(context).deuro_savings_collect_interest,
-              collectedInterest: _dEuroViewModel.accruedInterest,
-              onCollectInterest: _dEuroViewModel.prepareCollectInterest,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> _onSavingsAdd(BuildContext context) async {
-    final amount = await Navigator.of(context).push(MaterialPageRoute<String>(
-        builder: (BuildContext context) => SavingEditPage(isAdding: true)));
-    if (amount != null) _dEuroViewModel.prepareSavingsEdit(amount, true);
-  }
-
-  Future<void> _onSavingsRemove(BuildContext context) async {
-    final amount = await Navigator.of(context).push(MaterialPageRoute<String>(
-        builder: (BuildContext context) => SavingEditPage(isAdding: false)));
-    if (amount != null) _dEuroViewModel.prepareSavingsEdit(amount, false);
-  }
-
-  bool _isReactionsSet = false;
-
-  void _setReactions(BuildContext context, DEuroViewModel dEuroViewModel) {
-    if (_isReactionsSet) return;
-
-    reaction((_) => dEuroViewModel.transaction, (PendingTransaction? tx) async {
-      if (tx == null) return;
-      final result = await showModalBottomSheet<bool>(
-        context: context,
-        isDismissible: false,
-        isScrollControlled: true,
-        builder: (BuildContext bottomSheetContext) => ConfirmSendingBottomSheet(
-          key: ValueKey('savings_page_confirm_sending_dialog_key'),
-          titleText: S.of(bottomSheetContext).confirm_transaction,
-          currentTheme: currentTheme,
-          walletType: WalletType.ethereum,
-          titleIconPath: CryptoCurrency.deuro.iconPath,
-          currency: CryptoCurrency.deuro,
-          amount: S.of(bottomSheetContext).send_amount,
-          amountValue: tx.amountFormatted,
-          fiatAmountValue: "",
-          fee: S.of(bottomSheetContext).send_estimated_fee,
-          feeValue: tx.feeFormatted,
-          feeFiatAmount: "",
-          outputs: [],
-          onSlideComplete: () async {
-            Navigator.of(bottomSheetContext).pop(true);
-            dEuroViewModel.commitTransaction();
-          },
-          change: tx.change,
-        ),
-      );
-
-      if (result == null) dEuroViewModel.dismissTransaction();
-    });
-
-    reaction((_) => dEuroViewModel.approvalTransaction, (PendingTransaction? tx) async {
-      if (tx == null) return;
-      final result = await showModalBottomSheet<bool>(
-        context: context,
-        isDismissible: false,
-        isScrollControlled: true,
-        builder: (BuildContext bottomSheetContext) => ConfirmSendingBottomSheet(
-          key: ValueKey('savings_page_confirm_approval_dialog_key'),
-          titleText: S.of(bottomSheetContext).approve_tokens,
-          currentTheme: currentTheme,
-          walletType: WalletType.ethereum,
-          titleIconPath: CryptoCurrency.deuro.iconPath,
-          currency: CryptoCurrency.deuro,
-          amount: S.of(bottomSheetContext).send_amount,
-          amountValue: tx.amountFormatted,
-          fiatAmountValue: "",
-          fee: S.of(bottomSheetContext).send_estimated_fee,
-          feeValue: tx.feeFormatted,
-          feeFiatAmount: "",
-          outputs: [],
-          onSlideComplete: () {
-            Navigator.of(bottomSheetContext).pop(true);
-            dEuroViewModel.commitApprovalTransaction();
-          },
-          change: tx.change,
-        ),
-      );
-
-      if (result == null) dEuroViewModel.dismissTransaction();
-    });
-
-    reaction((_) => dEuroViewModel.state, (ExecutionState state) async {
-      if (state is TransactionCommitted) {
-        WidgetsBinding.instance.addPostFrameCallback((_) async {
-          if (!context.mounted) return;
-
-          await showModalBottomSheet<void>(
-            context: context,
-            isDismissible: false,
-            builder: (BuildContext bottomSheetContext) => InfoBottomSheet(
-              currentTheme: currentTheme,
-              titleText: S.of(bottomSheetContext).transaction_sent,
-              contentImage: 'assets/images/birthday_cake.png',
-              content: S.of(bottomSheetContext).deuro_tx_commited_content,
-              actionButtonText: S.of(bottomSheetContext).close,
-              actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'),
-              actionButton: () => Navigator.of(bottomSheetContext).pop(),
-            ),
-          );
-        });
-      }
-
-      if (state is FailureState) {
-        WidgetsBinding.instance.addPostFrameCallback((_) async {
-          if (!context.mounted) return;
-
-          await showPopUp<void>(
-            context: context,
-            builder: (BuildContext popupContext) {
-              return AlertWithOneAction(
-                alertTitle: S.of(popupContext).error,
-                alertContent: state.error,
-                buttonText: S.of(popupContext).ok,
-                buttonAction: () => Navigator.of(popupContext).pop(),
-              );
-            },
-          );
-        });
-      }
-    });
-
-    _isReactionsSet = true;
-  }
-}
diff --git a/lib/src/screens/integrations/deuro/widgets/interest_card_widget.dart b/lib/src/screens/integrations/deuro/widgets/interest_card_widget.dart
deleted file mode 100644
index 03dd174f6..000000000
--- a/lib/src/screens/integrations/deuro/widgets/interest_card_widget.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_card_widget.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:flutter/material.dart';
-
-class InterestCardWidget extends StatelessWidget {
-  InterestCardWidget({
-    required this.title,
-    required this.collectedInterest,
-    super.key,
-    required this.isDarkTheme,
-    required this.onCollectInterest,
-  });
-
-  final String title;
-  final String collectedInterest;
-  final bool isDarkTheme;
-  final VoidCallback onCollectInterest;
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(children: [
-      Container(
-        margin: EdgeInsets.symmetric(horizontal: 16),
-        width: double.infinity,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(15),
-          gradient: LinearGradient(
-            colors: [
-              isDarkTheme
-                  ? CustomThemeColors.cardGradientColorPrimaryDark
-                  : CustomThemeColors.cardGradientColorPrimaryLight,
-              isDarkTheme
-                  ? CustomThemeColors.cardGradientColorSecondaryDark
-                  : CustomThemeColors.cardGradientColorSecondaryLight,
-            ],
-            begin: Alignment.topCenter,
-            end: Alignment.bottomCenter,
-          ),
-        ),
-        child: Padding(
-          padding: EdgeInsets.all(20),
-          child: Column(
-            children: [
-              SavingsCard.getAssetBalanceRow(
-                context,
-                title: title,
-                subtitle: collectedInterest,
-                currency: CryptoCurrency.deuro,
-                hideSymbol: true,
-              ),
-              SizedBox(height: 10),
-              SavingsCard.getButton(
-                context,
-                label: S.of(context).deuro_collect_interest,
-                onPressed: onCollectInterest,
-                backgroundColor: Theme.of(context).colorScheme.primary,
-                color: Theme.of(context).colorScheme.onPrimary,
-              ),
-            ],
-          ),
-        ),
-      ),
-    ]);
-  }
-}
diff --git a/lib/src/screens/integrations/deuro/widgets/numpad.dart b/lib/src/screens/integrations/deuro/widgets/numpad.dart
deleted file mode 100644
index 17914376c..000000000
--- a/lib/src/screens/integrations/deuro/widgets/numpad.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-class NumberPad extends StatelessWidget {
-  final VoidCallback? onDecimalPressed;
-  final VoidCallback onDeletePressed;
-  final void Function(int index) onNumberPressed;
-  final FocusNode focusNode;
-
-  const NumberPad({
-    super.key,
-    required this.onNumberPressed,
-    required this.onDeletePressed,
-    required this.focusNode,
-    this.onDecimalPressed,
-  });
-
-  @override
-  Widget build(BuildContext context) => KeyboardListener(
-        focusNode: focusNode,
-        onKeyEvent: (keyEvent) {
-          if (keyEvent is KeyDownEvent) {
-            if (keyEvent.logicalKey.keyLabel == "Backspace") {
-              return onDeletePressed();
-            }
-
-            if ([".", ","].contains(keyEvent.logicalKey.keyLabel) &&
-                onDecimalPressed != null) {
-              return onDecimalPressed!();
-            }
-
-            int? number = int.tryParse(keyEvent.character ?? '');
-            if (number != null) return onNumberPressed(number);
-          }
-        },
-        child: SizedBox(
-          height: 300,
-          child: GridView.count(
-            childAspectRatio: 2,
-            shrinkWrap: true,
-            crossAxisCount: 3,
-            physics: const NeverScrollableScrollPhysics(),
-            children: List.generate(12, (index) {
-              if (index == 9) {
-                if (onDecimalPressed == null) return Container();
-                return InkWell(
-                  onTap: onDecimalPressed,
-                  child: Center(
-                    child: Text(
-                      '.',
-                      style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                        fontWeight: FontWeight.w600,
-                        fontSize: 30,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
-                      textAlign: TextAlign.center,
-                    ),
-                  ),
-                );
-              } else if (index == 10) {
-                index = 0;
-              } else if (index == 11) {
-                return MergeSemantics(
-                  child: Container(
-                    child: Semantics(
-                      label: S.of(context).delete,
-                      button: true,
-                      onTap: onDeletePressed,
-                      child: TextButton(
-                        onPressed: onDeletePressed,
-                        style: TextButton.styleFrom(
-                          backgroundColor:
-                              Colors.transparent,
-                          shape: CircleBorder(),
-                        ),
-                        child: Image.asset(
-                          'assets/images/delete_icon.png',
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
-                      ),
-                    ),
-                  ),
-                );
-              } else {
-                index++;
-              }
-
-              return InkWell(
-                onTap: () => onNumberPressed(index),
-                child: Center(
-                  child: Text(
-                    '$index',
-                    style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                          fontWeight: FontWeight.w600,
-                          fontSize: 30,
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-              );
-            }),
-          ),
-        ),
-      );
-}
diff --git a/lib/src/screens/integrations/deuro/widgets/savings_card_widget.dart b/lib/src/screens/integrations/deuro/widgets/savings_card_widget.dart
deleted file mode 100644
index 9196929c4..000000000
--- a/lib/src/screens/integrations/deuro/widgets/savings_card_widget.dart
+++ /dev/null
@@ -1,263 +0,0 @@
-import 'dart:math';
-
-import 'package:auto_size_text/auto_size_text.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:flutter/material.dart';
-
-class SavingsCard extends StatelessWidget {
-  final bool isDarkTheme;
-  final bool isEnabled;
-  final String interestRate;
-  final String savingsBalance;
-  final CryptoCurrency currency;
-  final VoidCallback onAddSavingsPressed;
-  final VoidCallback onRemoveSavingsPressed;
-  final VoidCallback onApproveSavingsPressed;
-
-  const SavingsCard({
-    super.key,
-    required this.isDarkTheme,
-    required this.interestRate,
-    required this.savingsBalance,
-    required this.currency,
-    required this.onAddSavingsPressed,
-    required this.onRemoveSavingsPressed,
-    required this.onApproveSavingsPressed,
-    this.isEnabled = true,
-  });
-
-  @override
-  Widget build(BuildContext context) => Container(
-      margin: const EdgeInsets.all(15),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(15),
-        gradient: LinearGradient(
-          colors: [
-            isDarkTheme
-                ? CustomThemeColors.cardGradientColorPrimaryDark
-                : CustomThemeColors.cardGradientColorPrimaryLight,
-            isDarkTheme
-                ? CustomThemeColors.cardGradientColorSecondaryDark
-                : CustomThemeColors.cardGradientColorSecondaryLight,
-          ],
-          begin: Alignment.topCenter,
-          end: Alignment.bottomCenter,
-        ),
-      ),
-      child: Container(
-        padding: const EdgeInsets.all(20),
-        child: Column(
-          children: [
-            getAssetBalanceRow(context,
-                title: S.of(context).deuro_savings_balance,
-                subtitle: savingsBalance,
-                currency: currency),
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 10),
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Text(
-                      'Current APR',
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            color:
-                                Theme.of(context).colorScheme.onSurfaceVariant,
-                            fontWeight: FontWeight.w500,
-                          ),
-                      softWrap: true,
-                    ),
-                  ),
-                  Text(
-                    interestRate,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          fontWeight: FontWeight.w500,
-                        ),
-                    softWrap: true,
-                  ),
-                ],
-              ),
-            ),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: isEnabled
-                  ? [
-                      Expanded(
-                        child: getButton(
-                          context,
-                          label: S.of(context).deuro_savings_add,
-                          imagePath: 'assets/images/received.png',
-                          onPressed: onAddSavingsPressed,
-                          backgroundColor:
-                              Theme.of(context).colorScheme.primary,
-                          color: Theme.of(context).colorScheme.onPrimary,
-                        ),
-                      ),
-                      SizedBox(width: 12),
-                      Expanded(
-                        child: getButton(
-                          context,
-                          label: S.of(context).deuro_savings_remove,
-                          imagePath: 'assets/images/upload.png',
-                          onPressed: onRemoveSavingsPressed,
-                          backgroundColor:
-                              Theme.of(context).colorScheme.surface,
-                          color: Theme.of(context)
-                              .colorScheme
-                              .onSecondaryContainer,
-                        ),
-                      ),
-                    ]
-                  : [
-                      Expanded(
-                        child: getButton(
-                          context,
-                          label: S.of(context).deuro_savings_set_approval,
-                          onPressed: onApproveSavingsPressed,
-                          backgroundColor:
-                              Theme.of(context).colorScheme.primary,
-                          color: Theme.of(context).colorScheme.onPrimary,
-                        ),
-                      )
-                    ],
-            ),
-          ],
-        ),
-      ));
-
-  static Widget getButton(
-    BuildContext context, {
-    required String label,
-    String? imagePath,
-    required VoidCallback onPressed,
-    required Color backgroundColor,
-    required Color color,
-  }) =>
-      Semantics(
-        label: label,
-        child: OutlinedButton(
-          onPressed: onPressed,
-          style: OutlinedButton.styleFrom(
-            backgroundColor: backgroundColor,
-            side: BorderSide(
-              color: Theme.of(context).colorScheme.outlineVariant.withAlpha(0),
-              width: 0,
-            ),
-            shape:
-                RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
-          ),
-          child: Container(
-            padding: const EdgeInsets.symmetric(vertical: 12),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                if (imagePath != null) ...[
-                  Image.asset(
-                    imagePath,
-                    height: 30,
-                    width: 30,
-                    color: color,
-                  ),
-                  const SizedBox(width: 8),
-                ],
-                Text(
-                  label,
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        color: color,
-                        fontWeight: FontWeight.w700,
-                      ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      );
-
-  static Widget getAssetBalanceRow(
-    BuildContext context, {
-    required String title,
-    required String subtitle,
-    required CryptoCurrency currency,
-    bool hideSymbol = true,
-  }) =>
-      Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                title,
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      height: 1,
-                    ),
-              ),
-              SizedBox(height: 6),
-              AutoSizeText(
-                subtitle,
-                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurface,
-                      fontWeight: FontWeight.w900,
-                      fontSize: 24,
-                      height: 1,
-                    ),
-                maxLines: 1,
-                textAlign: TextAlign.start,
-              ),
-            ],
-          ),
-          SizedBox(
-            //width: min(MediaQuery.of(context).size.width * 0.2, 100),
-            child: Center(
-              child: Column(
-                children: [
-                  CakeImageWidget(
-                    imageUrl: currency.iconPath,
-                    height: 40,
-                    width: 40,
-                    errorWidget: Container(
-                      height: 30.0,
-                      width: 30.0,
-                      child: Center(
-                        child: Text(
-                          currency.title
-                              .substring(0, min(currency.title.length, 2)),
-                          style:
-                              Theme.of(context).textTheme.bodySmall?.copyWith(
-                                    fontSize: 11,
-                                    color: Theme.of(context)
-                                        .colorScheme
-                                        .onSurfaceVariant,
-                                  ),
-                        ),
-                      ),
-                      decoration: BoxDecoration(
-                        shape: BoxShape.circle,
-                        color: Theme.of(context).colorScheme.surfaceContainer,
-                      ),
-                    ),
-                  ),
-                  if (!hideSymbol) ...[
-                    const SizedBox(height: 10),
-                    Text(
-                      currency.title,
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w700,
-                            color: Theme.of(context).colorScheme.onSurface,
-                            height: 1,
-                          ),
-                    ),
-                  ]
-                ],
-              ),
-            ),
-          ),
-        ],
-      );
-}
diff --git a/lib/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart b/lib/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart
deleted file mode 100644
index bb1733fb5..000000000
--- a/lib/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart
+++ /dev/null
@@ -1,90 +0,0 @@
-import 'package:auto_size_text/auto_size_text.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/integrations/deuro/widgets/numpad.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:flutter/material.dart';
-
-class SavingEditPage extends BasePage {
-  final bool isAdding;
-
-  SavingEditPage({required this.isAdding});
-
-  String get title =>
-      isAdding ? S.current.deuro_savings_add : S.current.deuro_savings_remove;
-
-  @override
-  Widget body(BuildContext context) => _SavingsEditBody();
-}
-
-class _SavingsEditBody extends StatefulWidget {
-  const _SavingsEditBody();
-
-  @override
-  State<StatefulWidget> createState() => _SavingsEditBodyState();
-}
-
-class _SavingsEditBodyState extends State<_SavingsEditBody> {
-  @override
-  void initState() {
-    WidgetsBinding.instance
-        .addPostFrameCallback((_) => _numpadFocusNode.requestFocus());
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _numpadFocusNode.dispose();
-    super.dispose();
-  }
-
-  String amount = '0';
-  final FocusNode _numpadFocusNode = FocusNode();
-
-  @override
-  Widget build(BuildContext context) => SafeArea(
-        child: Column(children: [
-          Expanded(
-              child: Center(
-            child: Padding(
-              padding: const EdgeInsets.only(left: 26, right: 26, top: 10),
-              child: AutoSizeText(
-                "${amount.toString()} dEuro",
-                maxLines: 1,
-                maxFontSize: 60,
-                style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                      fontWeight: FontWeight.w600,
-                      fontSize: 60,
-                      color: Theme.of(context).colorScheme.onSurface,
-                    ),
-                textAlign: TextAlign.center,
-              ),
-            ),
-          )),
-          NumberPad(
-            focusNode: _numpadFocusNode,
-            onNumberPressed: (i) => setState(
-              () => amount = amount == '0' ? i.toString() : '${amount}${i}',
-            ),
-            onDeletePressed: () => setState(
-              () => amount = amount.length > 1
-                  ? amount.substring(0, amount.length - 1)
-                  : '0',
-            ),
-            onDecimalPressed: () =>
-                setState(() => amount = '${amount.replaceAll('.', '')}.'),
-          ),
-          Padding(
-            padding: const EdgeInsets.fromLTRB(16, 12, 16, 34),
-            child: LoadingPrimaryButton(
-              onPressed: () => Navigator.pop(context, amount),
-              text: S.of(context).confirm,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
-              isLoading: false,
-              isDisabled: false,
-            ),
-          )
-        ]),
-      );
-}
diff --git a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
index 5687a7753..2c9918d74 100644
--- a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/monero_account_label_validator.dart';
@@ -12,7 +13,8 @@ class MoneroAccountEditOrCreatePage extends BasePage {
   MoneroAccountEditOrCreatePage({required this.moneroAccountCreationViewModel})
       : _formKey = GlobalKey<FormState>(),
         _textController = TextEditingController() {
-    _textController.addListener(() => moneroAccountCreationViewModel.label = _textController.text);
+    _textController.addListener(
+            () => moneroAccountCreationViewModel.label = _textController.text);
     _textController.text = moneroAccountCreationViewModel.label;
   }
 
@@ -25,45 +27,46 @@ class MoneroAccountEditOrCreatePage extends BasePage {
   final TextEditingController _textController;
 
   @override
-  Widget body(BuildContext context) => Form(
+  Widget body(BuildContext context) =>
+      Form(
         key: _formKey,
         child: Container(
           padding: EdgeInsets.all(24.0),
           child: Column(
             children: <Widget>[
               Expanded(
-                child: Center(
-                  child: BaseTextFormField(
-                    controller: _textController,
-                    hintText: S.of(context).account,
-                    validator: MoneroLabelValidator(),
-                  ),
-                ),
-              ),
+                  child: Center(
+                      child: BaseTextFormField(
+                        controller: _textController,
+                        hintText: S.of(context).account,
+                        validator: MoneroLabelValidator(),
+                      ))),
               Observer(
-                builder: (_) => LoadingPrimaryButton(
-                  onPressed: () async {
-                    if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
-                      return;
-                    }
+                  builder: (_) =>
+                      LoadingPrimaryButton(
+                        onPressed: () async {
+                          if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
+                            return;
+                          }
 
-                    await moneroAccountCreationViewModel.save();
+                          await moneroAccountCreationViewModel.save();
 
-                    if (context.mounted) {
-                      Navigator.of(context).pop(_textController.text);
-                    }
-                  },
-                  text: moneroAccountCreationViewModel.isEdit
-                      ? S.of(context).rename
-                      : S.of(context).add,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
-                  isLoading: moneroAccountCreationViewModel.state is IsExecutingState,
-                  isDisabled: moneroAccountCreationViewModel.label?.isEmpty ?? true,
-                ),
-              )
+                          if (context.mounted) {
+                            Navigator.of(context).pop(_textController.text);
+                          }
+                        },
+                        text: moneroAccountCreationViewModel.isEdit
+                            ? S.of(context).rename
+                            : S.of(context).add,
+                        color: Theme.of(context).primaryColor,
+                        textColor: Colors.white,
+                        isLoading: moneroAccountCreationViewModel.state
+                        is IsExecutingState,
+                        isDisabled:
+                        moneroAccountCreationViewModel.label?.isEmpty ?? true,
+                      ))
             ],
           ),
         ),
       );
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart
index 85e00b369..38055854b 100644
--- a/lib/src/screens/monero_accounts/monero_account_list_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart
@@ -37,31 +37,29 @@ class MoneroAccountListPage extends StatelessWidget {
                 final account = accounts[index];
 
                 return AccountTile(
-                  isCurrent: account.isSelected,
-                  accountName: account.label,
-                  accountBalance: account.balance ?? '0.00',
-                  currency: accountListViewModel.currency.toString(),
-                  onTap: () {
-                    if (account.isSelected) {
-                      return;
-                    }
+                    isCurrent: account.isSelected,
+                    accountName: account.label,
+                    accountBalance: account.balance ?? '0.00',
+                    currency: accountListViewModel.currency.toString(),
+                    onTap: () {
+                      if (account.isSelected) {
+                        return;
+                      }
 
-                    accountListViewModel.select(account);
-                    Navigator.of(context).pop();
-                  },
-                  onEdit: () async => await Navigator.of(context).pushNamed(
-                    Routes.accountCreation,
-                    arguments: account,
-                  ),
-                );
+                      accountListViewModel.select(account);
+                      Navigator.of(context).pop();
+                    },
+                    onEdit: () async => await Navigator.of(context)
+                        .pushNamed(Routes.accountCreation, arguments: account));
               },
             ),
           )),
           GestureDetector(
-            onTap: () async => await Navigator.of(context).pushNamed(Routes.accountCreation),
+            onTap: () async =>
+                await Navigator.of(context).pushNamed(Routes.accountCreation),
             child: Container(
               height: buttonHeight,
-              color: Theme.of(context).colorScheme.primary,
+              color: Theme.of(context).primaryColor,
               padding: EdgeInsets.symmetric(horizontal: 24),
               child: Center(
                 child: Row(
@@ -69,18 +67,19 @@ class MoneroAccountListPage extends StatelessWidget {
                   children: <Widget>[
                     Icon(
                       Icons.add,
-                      color: Theme.of(context).colorScheme.onPrimary,
+                      color: Colors.white,
                     ),
                     Padding(
                       padding: EdgeInsets.only(left: 5),
                       child: Text(
                         S.of(context).create_new_account,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 15,
-                              fontWeight: FontWeight.w600,
-                              color: Theme.of(context).colorScheme.onPrimary,
-                              decoration: TextDecoration.none,
-                            ),
+                        style: TextStyle(
+                          fontSize: 15,
+                          fontWeight: FontWeight.w600,
+                          fontFamily: 'Lato',
+                          color: Colors.white,
+                          decoration: TextDecoration.none,
+                        ),
                       ),
                     )
                   ],
diff --git a/lib/src/screens/monero_accounts/widgets/account_tile.dart b/lib/src/screens/monero_accounts/widgets/account_tile.dart
index f0af39e42..97d328214 100644
--- a/lib/src/screens/monero_accounts/widgets/account_tile.dart
+++ b/lib/src/screens/monero_accounts/widgets/account_tile.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -22,11 +23,11 @@ class AccountTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final color = isCurrent
-        ? Theme.of(context).colorScheme.surfaceContainer
-        : Theme.of(context).colorScheme.surfaceContainerHighest;
+        ? Theme.of(context).extension<AccountListTheme>()!.currentAccountBackgroundColor
+        : Theme.of(context).extension<AccountListTheme>()!.tilesBackgroundColor;
     final textColor = isCurrent
-        ? Theme.of(context).colorScheme.onSurface
-        : Theme.of(context).colorScheme.onSurfaceVariant;
+        ? Theme.of(context).extension<AccountListTheme>()!.currentAccountTextColor
+        : Theme.of(context).extension<AccountListTheme>()!.tilesTextColor;
 
     final Widget cell = GestureDetector(
       onTap: onTap,
@@ -44,12 +45,13 @@ class AccountTile extends StatelessWidget {
             Container(
               child: Text(
                 accountName,
-                style: Theme.of(context).textTheme.titleMedium!.copyWith(
-                      fontSize: 18,
-                      fontWeight: FontWeight.w600,
-                      color: textColor,
-                      decoration: TextDecoration.none,
-                    ),
+                style: TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.w600,
+                  fontFamily: 'Lato',
+                  color: textColor,
+                  decoration: TextDecoration.none,
+                ),
               ),
             ),
             if (accountBalance != null)
@@ -57,13 +59,14 @@ class AccountTile extends StatelessWidget {
                 child: Text(
                   '${accountBalance.toString()} $currency',
                   textAlign: TextAlign.end,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 15,
-                        fontWeight: FontWeight.w600,
-                        color: isCurrent
-                            ? Theme.of(context).colorScheme.onSurface
-                            : Theme.of(context).colorScheme.onSurfaceVariant,
-                        decoration: TextDecoration.none,
+                  style: TextStyle(
+                    fontSize: 15,
+                    fontWeight: FontWeight.w600,
+                    fontFamily: 'Lato',
+                    color: isCurrent
+                        ? Theme.of(context).extension<AccountListTheme>()!.currentAccountAmountColor
+                        : Theme.of(context).extension<AccountListTheme>()!.tilesAmountColor,
+                    decoration: TextDecoration.none,
                   ),
                 ),
               ),
@@ -73,11 +76,7 @@ class AccountTile extends StatelessWidget {
     );
 
     // return cell;
-    return Slidable(
-      key: Key(accountName),
-      child: cell,
-      endActionPane: _actionPane(context),
-    );
+    return Slidable(key: Key(accountName), child: cell, endActionPane: _actionPane(context));
   }
 
   ActionPane _actionPane(BuildContext context) => ActionPane(
@@ -86,8 +85,8 @@ class AccountTile extends StatelessWidget {
         children: [
           SlidableAction(
             onPressed: (_) => onEdit.call(),
-            backgroundColor: Theme.of(context).colorScheme.primaryContainer,
-            foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
+            backgroundColor: Colors.blue,
+            foregroundColor: Colors.white,
             icon: Icons.edit,
             label: S.of(context).edit,
           ),
diff --git a/lib/src/screens/nano/nano_change_rep_page.dart b/lib/src/screens/nano/nano_change_rep_page.dart
index ae67cdfcd..60207b507 100644
--- a/lib/src/screens/nano/nano_change_rep_page.dart
+++ b/lib/src/screens/nano/nano_change_rep_page.dart
@@ -4,6 +4,8 @@ import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -74,7 +76,8 @@ class NanoChangeRepPage extends BasePage {
                             AddressTextFieldOption.paste,
                             AddressTextFieldOption.qrCode,
                           ],
-                          buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
+                          buttonColor:
+                              Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
                           validator: AddressValidator(type: CryptoCurrency.nano),
                         ),
                       )
@@ -86,10 +89,10 @@ class NanoChangeRepPage extends BasePage {
                         margin: EdgeInsets.only(top: 12),
                         child: Text(
                           S.current.nano_current_rep,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 16,
-                                fontWeight: FontWeight.w700,
-                              ),
+                          style: TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.w700,
+                          ),
                         ),
                       ),
                       _buildSingleRepresentative(
@@ -104,10 +107,10 @@ class NanoChangeRepPage extends BasePage {
                           margin: EdgeInsets.only(top: 12),
                           child: Text(
                             S.current.nano_pick_new_rep,
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w700,
-                                ),
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w700,
+                            ),
                           ),
                         ),
                         Divider(height: 20),
@@ -135,8 +138,8 @@ class NanoChangeRepPage extends BasePage {
                             child: LoadingPrimaryButton(
                               onPressed: () => _onSubmit(context),
                               text: S.of(context).change,
-                              color: Theme.of(context).colorScheme.primary,
-                              textColor: Theme.of(context).colorScheme.onPrimary,
+                              color: Theme.of(context).primaryColor,
+                              textColor: Colors.white,
                             ),
                           )),
                         ],
@@ -247,21 +250,23 @@ class NanoChangeRepPage extends BasePage {
                     children: <Widget>[
                       Text(
                         rep.alias ?? rep.account!,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: Theme.of(context).colorScheme.onSurface,
-                              fontWeight: FontWeight.w700,
-                              fontSize: rep.alias == null ? 14 : 18,
-                            ),
+                        style: TextStyle(
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                          fontWeight: FontWeight.w700,
+                          fontSize: rep.alias == null ? 14 : 18,
+                        ),
                       ),
                       Container(
                         margin: const EdgeInsets.only(top: 7),
                         child: RichText(
                           text: TextSpan(
                             text: "${S.current.voting_weight}: ${rep.weight.toString()}%",
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                  fontWeight: FontWeight.w700,
-                                ),
+                            style: TextStyle(
+                              color:
+                                  Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                              fontWeight: FontWeight.w700,
+                              fontSize: 14.0,
+                            ),
                           ),
                         ),
                       ),
@@ -273,17 +278,23 @@ class NanoChangeRepPage extends BasePage {
                             children: [
                               TextSpan(
                                 text: "${S.current.uptime}: ",
-                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                      fontWeight: FontWeight.w700,
-                                    ),
+                                style: TextStyle(
+                                  color: Theme.of(context)
+                                      .extension<CakeTextTheme>()!
+                                      .secondaryTextColor,
+                                  fontWeight: FontWeight.w700,
+                                  fontSize: 14,
+                                ),
                               ),
                               TextSpan(
                                 text: rep.uptime,
-                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                      fontWeight: FontWeight.w900,
-                                    ),
+                                style: TextStyle(
+                                  color: Theme.of(context)
+                                      .extension<CakeTextTheme>()!
+                                      .secondaryTextColor,
+                                  fontWeight: FontWeight.w900,
+                                  fontSize: 14,
+                                ),
                               ),
                             ],
                           ),
@@ -298,13 +309,13 @@ class NanoChangeRepPage extends BasePage {
                     children: <Widget>[
                       Icon(
                         Icons.verified,
-                        color: Theme.of(context).colorScheme.primary,
+                        color: Theme.of(context).primaryColor,
                         size: 50,
                       ),
                       Positioned.fill(
                         child: Container(
                           margin: EdgeInsets.all(13),
-                          color: Theme.of(context).colorScheme.primary,
+                          color: Theme.of(context).primaryColor,
                         ),
                       ),
                       Container(
@@ -314,9 +325,11 @@ class NanoChangeRepPage extends BasePage {
                         child: Text(
                           (rep.score).toString(),
                           textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontWeight: FontWeight.w800,
-                              ),
+                          style: TextStyle(
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                            fontSize: 13,
+                            fontWeight: FontWeight.w800,
+                          ),
                         ),
                       ),
                     ],
diff --git a/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart b/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart
index ad5ff3cc8..3ece15a82 100644
--- a/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart
+++ b/lib/src/screens/nano_accounts/nano_account_edit_or_create_page.dart
@@ -34,34 +34,31 @@ class NanoAccountEditOrCreatePage extends BasePage {
           child: Column(
             children: <Widget>[
               Expanded(
-                child: Center(
-                  child: BaseTextFormField(
-                    controller: _textController,
-                    hintText: S.of(context).account,
-                    validator: MoneroLabelValidator(),
-                  ),
-                ),
-              ),
+                  child: Center(
+                      child: BaseTextFormField(
+                controller: _textController,
+                hintText: S.of(context).account,
+                validator: MoneroLabelValidator(),
+              ))),
               Observer(
-                builder: (_) => LoadingPrimaryButton(
-                  onPressed: () async {
-                    if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
-                      return;
-                    }
+                  builder: (_) => LoadingPrimaryButton(
+                        onPressed: () async {
+                          if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
+                            return;
+                          }
 
-                    await nanoAccountCreationViewModel.save();
+                          await nanoAccountCreationViewModel.save();
 
-                    Navigator.of(context).pop(_textController.text);
-                  },
-                  text: nanoAccountCreationViewModel.isEdit
-                      ? S.of(context).rename
-                      : S.of(context).add,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
-                  isLoading: nanoAccountCreationViewModel.state is IsExecutingState,
-                  isDisabled: nanoAccountCreationViewModel.label?.isEmpty ?? true,
-                ),
-              ),
+                          Navigator.of(context).pop(_textController.text);
+                        },
+                        text: nanoAccountCreationViewModel.isEdit
+                            ? S.of(context).rename
+                            : S.of(context).add,
+                        color: Theme.of(context).primaryColor,
+                        textColor: Colors.white,
+                        isLoading: nanoAccountCreationViewModel.state is IsExecutingState,
+                        isDisabled: nanoAccountCreationViewModel.label?.isEmpty ?? true,
+                      ))
             ],
           ),
         ),
diff --git a/lib/src/screens/nano_accounts/nano_account_list_page.dart b/lib/src/screens/nano_accounts/nano_account_list_page.dart
index c70dc89dd..b5c7e1186 100644
--- a/lib/src/screens/nano_accounts/nano_account_list_page.dart
+++ b/lib/src/screens/nano_accounts/nano_account_list_page.dart
@@ -36,21 +36,20 @@ class NanoAccountListPage extends StatelessWidget {
                 final account = accounts[index];
 
                 return AccountTile(
-                  isCurrent: account.isSelected,
-                  accountName: account.label,
-                  accountBalance: account.balance ?? '0.00',
-                  currency: accountListViewModel.currency.toString(),
-                  onTap: () {
-                    if (account.isSelected) {
-                      return;
-                    }
+                    isCurrent: account.isSelected,
+                    accountName: account.label,
+                    accountBalance: account.balance ?? '0.00',
+                    currency: accountListViewModel.currency.toString(),
+                    onTap: () {
+                      if (account.isSelected) {
+                        return;
+                      }
 
-                    accountListViewModel.select(account);
-                    Navigator.of(context).pop();
-                  },
-                  onEdit: () async => await Navigator.of(context)
-                      .pushNamed(Routes.nanoAccountCreation, arguments: account),
-                );
+                      accountListViewModel.select(account);
+                      Navigator.of(context).pop();
+                    },
+                    onEdit: () async => await Navigator.of(context)
+                        .pushNamed(Routes.nanoAccountCreation, arguments: account));
               },
             ),
           )),
@@ -58,7 +57,7 @@ class NanoAccountListPage extends StatelessWidget {
             onTap: () async => await Navigator.of(context).pushNamed(Routes.nanoAccountCreation),
             child: Container(
               height: buttonHeight,
-              color: Theme.of(context).colorScheme.primary,
+              color: Theme.of(context).cardColor,
               padding: EdgeInsets.symmetric(horizontal: 24),
               child: Center(
                 child: Row(
@@ -66,18 +65,19 @@ class NanoAccountListPage extends StatelessWidget {
                   children: <Widget>[
                     Icon(
                       Icons.add,
-                      color: Theme.of(context).colorScheme.onPrimary,
+                      color: Colors.white,
                     ),
                     Padding(
                       padding: EdgeInsets.only(left: 5),
                       child: Text(
                         S.of(context).create_new_account,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: Theme.of(context).colorScheme.onPrimary,
-                              fontSize: 15,
-                              fontWeight: FontWeight.w600,
-                              decoration: TextDecoration.none,
-                            ),
+                        style: TextStyle(
+                          fontSize: 15,
+                          fontWeight: FontWeight.w600,
+                          fontFamily: 'Lato',
+                          color: Colors.white,
+                          decoration: TextDecoration.none,
+                        ),
                       ),
                     )
                   ],
diff --git a/lib/src/screens/nano_accounts/widgets/account_tile.dart b/lib/src/screens/nano_accounts/widgets/account_tile.dart
index da8080e70..0d4a59f75 100644
--- a/lib/src/screens/nano_accounts/widgets/account_tile.dart
+++ b/lib/src/screens/nano_accounts/widgets/account_tile.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:cake_wallet/generated/i18n.dart';
@@ -21,11 +22,11 @@ class AccountTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final color = isCurrent
-        ? Theme.of(context).colorScheme.primaryContainer
-        : Theme.of(context).colorScheme.surfaceContainerHighest;
+        ? Theme.of(context).extension<AccountListTheme>()!.currentAccountBackgroundColor
+        : Theme.of(context).extension<AccountListTheme>()!.tilesBackgroundColor;
     final textColor = isCurrent
-        ? Theme.of(context).colorScheme.onPrimaryContainer
-        : Theme.of(context).colorScheme.onSurfaceVariant;
+        ? Theme.of(context).extension<AccountListTheme>()!.currentAccountTextColor
+        : Theme.of(context).extension<AccountListTheme>()!.tilesTextColor;
 
     final Widget cell = GestureDetector(
       onTap: onTap,
@@ -43,12 +44,13 @@ class AccountTile extends StatelessWidget {
             Container(
               child: Text(
                 accountName,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      fontSize: 18,
-                      fontWeight: FontWeight.w600,
-                      color: textColor,
-                      decoration: TextDecoration.none,
-                    ),
+                style: TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.w600,
+                  fontFamily: 'Lato',
+                  color: textColor,
+                  decoration: TextDecoration.none,
+                ),
               ),
             ),
             if (accountBalance != null)
@@ -56,12 +58,13 @@ class AccountTile extends StatelessWidget {
                 child: Text(
                   '${accountBalance.toString()} $currency',
                   textAlign: TextAlign.end,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 15,
-                        fontWeight: FontWeight.w600,
-                        color: Theme.of(context).textTheme.headlineMedium!.color!,
-                        decoration: TextDecoration.none,
-                      ),
+                  style: TextStyle(
+                    fontSize: 15,
+                    fontWeight: FontWeight.w600,
+                    fontFamily: 'Lato',
+                    color: Theme.of(context).textTheme.headlineMedium!.color!,
+                    decoration: TextDecoration.none,
+                  ),
                 ),
               ),
           ],
@@ -70,20 +73,24 @@ class AccountTile extends StatelessWidget {
     );
 
     // return cell;
-    return Slidable(key: Key(accountName), child: cell, endActionPane: _actionPane(context));
+    return Slidable(
+        key: Key(accountName),
+        child: cell,
+        endActionPane: _actionPane(context)
+    );
   }
 
   ActionPane _actionPane(BuildContext context) => ActionPane(
-        motion: const ScrollMotion(),
-        extentRatio: 0.3,
-        children: [
-          SlidableAction(
-            onPressed: (_) => onEdit.call(),
-            backgroundColor: Theme.of(context).colorScheme.primaryContainer,
-            foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
-            icon: Icons.edit,
-            label: S.of(context).edit,
-          ),
-        ],
-      );
+    motion: const ScrollMotion(),
+    extentRatio: 0.3,
+    children: [
+      SlidableAction(
+        onPressed: (_) => onEdit.call(),
+        backgroundColor: Colors.blue,
+        foregroundColor: Colors.white,
+        icon: Icons.edit,
+        label: S.of(context).edit,
+      ),
+    ],
+  );
 }
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index bd03c17bd..f8901918f 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -13,6 +13,7 @@ import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
@@ -135,7 +136,7 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
             Observer(builder: (_) {
               return SettingsChoicesCell(
                 ChoicesListItem<ExchangeApiMode>(
-                  title: S.current.swap,
+                  title: S.current.exchange,
                   items: ExchangeApiMode.all,
                   selectedItem: widget.privacySettingsViewModel.exchangeStatus,
                   onItemSelected: (ExchangeApiMode mode) =>
@@ -143,8 +144,7 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                 ),
               );
             }),
-            if (widget.privacySettingsViewModel.isMoneroSeedTypeOptionsEnabled &&
-                !widget.isChildWallet)
+            if (widget.privacySettingsViewModel.isMoneroSeedTypeOptionsEnabled)
               Observer(builder: (_) {
                 return SettingsChoicesCell(
                   ChoicesListItem<MoneroSeedType>(
@@ -152,7 +152,6 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                     items: MoneroSeedType.all,
                     selectedItem: widget.seedTypeViewModel.moneroSeedType,
                     onItemSelected: widget.seedTypeViewModel.setMoneroSeedType,
-                    displayItem: (seedType) => seedType.shortTitle ?? seedType.toString(),
                   ),
                 );
               }),
@@ -203,7 +202,7 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                   );
                 return Container();
               }),
-            if (widget.privacySettingsViewModel.hasPassphraseOption && !widget.isFromRestore)
+            if (widget.privacySettingsViewModel.hasPassphraseOption)
               Padding(
                 padding: EdgeInsets.all(24),
                 child: Form(
@@ -220,6 +219,7 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                           }),
                           child: Icon(
                             Icons.remove_red_eye,
+                            // color: obscurePassphrase ? Colors.black54 : Colors.black26,
                           ),
                         ),
                       ),
@@ -241,6 +241,7 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                           }),
                           child: Icon(
                             Icons.remove_red_eye,
+                            // color: obscurePassphrase ? Colors.black54 : Colors.black26,
                           ),
                         ),
                       ),
@@ -252,12 +253,11 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
               return Column(
                 children: [
                   SettingsSwitcherCell(
-                    title: S.current.disable_bulletin,
-                    value: widget.privacySettingsViewModel.disableBulletin,
-                    onValueChange: (BuildContext _, bool value) {
-                      widget.privacySettingsViewModel.setDisableBulletin(value);
-                    },
-                  ),
+                      title: S.current.disable_bulletin,
+                      value: widget.privacySettingsViewModel.disableBulletin,
+                      onValueChange: (BuildContext _, bool value) {
+                        widget.privacySettingsViewModel.setDisableBulletin(value);
+                      }),
                   SettingsSwitcherCell(
                     title: S.current.add_custom_node,
                     value: widget.privacySettingsViewModel.addCustomNode,
@@ -293,20 +293,6 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
         bottomSectionPadding: EdgeInsets.all(24),
         bottomSection: Column(
           children: [
-            const SizedBox(height: 24),
-            LayoutBuilder(
-              builder: (_, constraints) => SizedBox(
-                width: constraints.maxWidth * 0.8,
-                child: Text(
-                  S.of(context).settings_can_be_changed_later,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 24),
             LoadingPrimaryButton(
               onPressed: () {
                 if (widget.privacySettingsViewModel.addCustomNode) {
@@ -317,7 +303,8 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                   widget.nodeViewModel.save();
                 }
                 if (testnetValue == true &&
-                    widget.privacySettingsViewModel.type == WalletType.bitcoin) {
+                    widget.privacySettingsViewModel.type ==
+                        WalletType.bitcoin) {
                   // TODO: add type (mainnet/testnet) to Node class so when switching wallets the node can be switched to a matching type
                   // Currently this is so you can create a working testnet wallet but you need to keep switching back the node if you use multiple wallets at once
                   widget.nodeViewModel.address = publicBitcoinTestnetElectrumAddress;
@@ -337,10 +324,22 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                 Navigator.pop(context);
               },
               text: S.of(context).continue_text,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
+              color: Theme.of(context).primaryColor,
+              textColor: Colors.white,
             ),
-            SizedBox(height: 16),
+            const SizedBox(height: 25),
+            LayoutBuilder(
+              builder: (_, constraints) => SizedBox(
+                width: constraints.maxWidth * 0.8,
+                child: Text(
+                  S.of(context).settings_can_be_changed_later,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                  ),
+                ),
+              ),
+            )
           ],
         ),
       ),
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 5a793009f..368b3440d 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -8,19 +8,19 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/select_button.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/seed_language_picker.dart';
 import 'package:cake_wallet/src/widgets/seed_language_selector.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/seed_settings_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
@@ -36,15 +36,9 @@ class NewWalletPage extends BasePage {
   final SeedSettingsViewModel _seedSettingsViewModel;
   final bool isChildWallet;
 
-  final welcomeImageLight = 'assets/images/wallet_type_wallet_light.png';
-  final welcomeImageDark = 'assets/images/wallet_type_wallet_dark.png';
+  final walletNameImage = Image.asset('assets/images/wallet_name.png');
 
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-          (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
+  final walletNameLightImage = Image.asset('assets/images/wallet_name_light.png');
 
   @override
   String get title => S.current.new_wallet;
@@ -60,7 +54,7 @@ class NewWalletPage extends BasePage {
   @override
   Widget body(BuildContext context) => WalletNameForm(
         _walletNewVM,
-        currentTheme.isDark ? welcomeImageDark : welcomeImageLight,
+        currentTheme.type == ThemeType.dark ? walletNameImage : walletNameLightImage,
         _seedSettingsViewModel,
         isChildWallet,
       );
@@ -76,7 +70,7 @@ class WalletNameForm extends StatefulWidget {
 
   final WalletNewVM _walletNewVM;
   final bool isChildWallet;
-  final String walletImage;
+  final Image walletImage;
   final SeedSettingsViewModel _seedSettingsViewModel;
 
   @override
@@ -92,7 +86,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
         _repeatedPasswordController =
             _walletNewVM.hasWalletPassword ? TextEditingController() : null;
 
-  static const aspectRatioImage = 1.5;
+  static const aspectRatioImage = 1.22;
   bool _formProcessing = false;
 
   final GlobalKey<FormState> _formKey;
@@ -109,9 +103,11 @@ class _WalletNameFormState extends State<WalletNameForm> {
       if (state is ExecutedSuccessfullyState) {
         if (widget.isChildWallet) {
           Navigator.of(navigatorKey.currentContext ?? context)
-              .pushNamed(Routes.walletGroupExistingSeedDescriptionPage);
+              .pushNamed(Routes.walletGroupExistingSeedDescriptionPage,
+              arguments: _walletNewVM.seedPhraseWordsLength);
         } else {
-          Navigator.of(navigatorKey.currentContext ?? context).pushNamed(Routes.preSeedPage);
+          Navigator.of(navigatorKey.currentContext ?? context)
+              .pushNamed(Routes.preSeedPage, arguments: _walletNewVM.seedPhraseWordsLength);
         }
       }
 
@@ -144,202 +140,243 @@ class _WalletNameFormState extends State<WalletNameForm> {
     return Padding(
       padding: EdgeInsets.only(top: 24),
       child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-        content: Center(
-          child: ConstrainedBox(
-            constraints:
-                BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                Padding(
-                  padding: EdgeInsets.only(left: 24, right: 12),
-                  child: AspectRatio(
-                    aspectRatio: aspectRatioImage,
-                    child: FittedBox(
-                      child: CakeImageWidget(imageUrl: widget.walletImage),
-                      fit: BoxFit.contain,
-                    ),
+          contentPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+          content: Center(
+            child: ConstrainedBox(
+              constraints:
+                  BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Padding(
+                    padding: EdgeInsets.only(left: 12, right: 12),
+                    child: AspectRatio(
+                        aspectRatio: aspectRatioImage,
+                        child: FittedBox(child: widget.walletImage, fit: BoxFit.fill)),
                   ),
-                ),
-                SizedBox(height: 48),
-                Padding(
-                  padding: EdgeInsets.only(top: 24),
-                  child: Form(
-                    key: _formKey,
-                    child: Column(
-                      children: [
-                        BaseTextFormField(
-                          key: ValueKey('new_wallet_page_wallet_name_textformfield_key'),
-                          onChanged: (value) => _walletNewVM.name = value,
-                          controller: _nameController,
-                          textStyle: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                color: Theme.of(context).colorScheme.onSurface,
+                  Padding(
+                    padding: EdgeInsets.only(top: 24),
+                    child: Form(
+                      key: _formKey,
+                      child: Column(
+                        children: [
+                          TextFormField(
+                            key: ValueKey('new_wallet_page_wallet_name_textformfield_key'),
+                            onChanged: (value) => _walletNewVM.name = value,
+                            controller: _nameController,
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                                fontSize: 20.0,
+                                fontWeight: FontWeight.w600,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+                            decoration: InputDecoration(
+                              hintStyle: TextStyle(
+                                  fontSize: 18.0,
+                                  fontWeight: FontWeight.w500,
+                                  color:
+                                      Theme.of(context).extension<NewWalletTheme>()!.hintTextColor),
+                              hintText: S.of(context).wallet_name,
+                              focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                      color: Theme.of(context)
+                                          .extension<NewWalletTheme>()!
+                                          .underlineColor,
+                                      width: 1.0)),
+                              enabledBorder: UnderlineInputBorder(
+                                borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0),
                               ),
-                          placeholderTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                height: 1.4,
-                                fontSize: 16.0,
-                              ),
-                          hintText: S.of(context).wallet_name,
-                          suffixIcon: Semantics(
-                            label: S.of(context).generate_name,
-                            child: IconButton(
-                              key: ValueKey(
-                                'new_wallet_page_wallet_name_textformfield_generate_name_button_key',
-                              ),
-                              onPressed: () async {
-                                final rName = await generateName();
-                                FocusManager.instance.primaryFocus?.unfocus();
+                              suffixIcon: Semantics(
+                                label: S.of(context).generate_name,
+                                child: IconButton(
+                                  key: ValueKey(
+                                      'new_wallet_page_wallet_name_textformfield_generate_name_button_key'),
+                                  onPressed: () async {
+                                    final rName = await generateName();
+                                    FocusManager.instance.primaryFocus?.unfocus();
 
-                                setState(() {
-                                  _nameController.text = rName;
-                                  _walletNewVM.name = rName;
-                                  _nameController.selection = TextSelection.fromPosition(
-                                    TextPosition(offset: _nameController.text.length),
-                                  );
-                                });
-                              },
-                              icon: Container(
-                                padding: const EdgeInsets.all(8),
-                                decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(6.0),
-                                  color: Theme.of(context).colorScheme.surface,
+                                    setState(() {
+                                      _nameController.text = rName;
+                                      _walletNewVM.name = rName;
+                                      _nameController.selection = TextSelection.fromPosition(
+                                          TextPosition(offset: _nameController.text.length));
+                                    });
+                                  },
+                                  icon: Container(
+                                    padding: const EdgeInsets.all(8),
+                                    decoration: BoxDecoration(
+                                      borderRadius: BorderRadius.circular(6.0),
+                                      color: Theme.of(context).hintColor,
+                                    ),
+                                    width: 34,
+                                    height: 34,
+                                    child: Image.asset(
+                                      'assets/images/refresh_icon.png',
+                                      color: Theme.of(context)
+                                          .extension<SendPageTheme>()!
+                                          .textFieldButtonIconColor,
+                                    ),
+                                  ),
                                 ),
-                                width: 34,
-                                height: 34,
-                                child: Image.asset('assets/images/refresh_icon.png',
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant),
                               ),
                             ),
+                            validator: WalletNameValidator(),
                           ),
-                          validator: WalletNameValidator(),
-                        ),
-                        if (_walletNewVM.hasWalletPassword) ...[
-                          BaseTextFormField(
-                            key: ValueKey('password'),
-                            onChanged: (value) => _walletNewVM.walletPassword = value,
-                            controller: _passwordController,
-                            textAlign: TextAlign.center,
-                            obscureText: true,
-                            textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: 20.0,
-                                  fontWeight: FontWeight.w600,
-                                  color: Theme.of(context).colorScheme.onSurface,
+                          if (_walletNewVM.hasWalletPassword) ...[
+                            TextFormField(
+                              key: ValueKey('password'),
+                              onChanged: (value) => _walletNewVM.walletPassword = value,
+                              controller: _passwordController,
+                              textAlign: TextAlign.center,
+                              obscureText: true,
+                              style: TextStyle(
+                                fontSize: 20.0,
+                                fontWeight: FontWeight.w600,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              ),
+                              decoration: InputDecoration(
+                                hintStyle: TextStyle(
+                                  fontSize: 18.0,
+                                  fontWeight: FontWeight.w500,
+                                  color:
+                                      Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
                                 ),
-                            placeholderTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    height: 1.4,
-                                    fontSize: 18.0,
-                                    fontWeight: FontWeight.w500,
+                                hintText: S.of(context).password,
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
                                   ),
-                            hintText: S.of(context).password,
-                          ),
-                          BaseTextFormField(
-                            key: ValueKey('repeat_wallet_password'),
-                            onChanged: (value) => _walletNewVM.repeatedWalletPassword = value,
-                            controller: _repeatedPasswordController,
-                            textAlign: TextAlign.center,
-                            obscureText: true,
-                            textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: 20.0,
-                                  fontWeight: FontWeight.w600,
-                                  color: Theme.of(context).colorScheme.onSurface,
                                 ),
-                            placeholderTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    height: 1.4,
-                                    fontSize: 18.0,
-                                    fontWeight: FontWeight.w500,
+                                enabledBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
                                   ),
-                            hintText: S.of(context).repeat_wallet_password,
-                          ),
+                                ),
+                              ),
+                            ),
+                            TextFormField(
+                              key: ValueKey('repeat_wallet_password'),
+                              onChanged: (value) => _walletNewVM.repeatedWalletPassword = value,
+                              controller: _repeatedPasswordController,
+                              textAlign: TextAlign.center,
+                              obscureText: true,
+                              style: TextStyle(
+                                fontSize: 20.0,
+                                fontWeight: FontWeight.w600,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              ),
+                              decoration: InputDecoration(
+                                hintStyle: TextStyle(
+                                  fontSize: 18.0,
+                                  fontWeight: FontWeight.w500,
+                                  color:
+                                      Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                                ),
+                                hintText: S.of(context).repeat_wallet_password,
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
+                                  ),
+                                ),
+                                enabledBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
                         ],
-                      ],
+                      ),
                     ),
                   ),
-                ),
-                if (_walletNewVM.showLanguageSelector) ...[
-                  if (_walletNewVM.hasSeedType) ...[
-                    Observer(
-                      builder: (BuildContext build) => Padding(
-                        padding: EdgeInsets.only(top: 24),
-                        child: SelectButton(
-                          key: ValueKey('new_wallet_page_monero_seed_type_button_key'),
-                          text: widget._seedSettingsViewModel.moneroSeedType.title,
-                          borderRadius: BorderRadius.circular(10),
-                          onTap: () async {
-                            await showPopUp<void>(
-                              context: context,
-                              builder: (_) => Picker(
-                                items: MoneroSeedType.all
-                                    .where((e) => // exclude bip39 in case of Wownero
-                                        widget._walletNewVM.type != WalletType.wownero ||
-                                        e.raw != MoneroSeedType.bip39.raw)
-                                    .toList(),
-                                selectedAtIndex: isPolyseed ? 1 : 0,
-                                onItemSelected: _setSeedType,
-                                isSeparated: false,
-                              ),
-                            );
-                          },
+                  if (_walletNewVM.hasLanguageSelector) ...[
+                    if (_walletNewVM.hasSeedType) ...[
+                      Observer(
+                        builder: (BuildContext build) => Padding(
+                          padding: EdgeInsets.only(top: 24),
+                          child: SelectButton(
+                            key: ValueKey('new_wallet_page_monero_seed_type_button_key'),
+                            text: widget._seedSettingsViewModel.moneroSeedType.title,
+                            onTap: () async {
+                              await showPopUp<void>(
+                                context: context,
+                                builder: (_) => Picker(
+                                  items: MoneroSeedType.all,
+                                  selectedAtIndex: isPolyseed ? 1 : 0,
+                                  onItemSelected: _setSeedType,
+                                  isSeparated: false,
+                                ),
+                              );
+                            },
+                          ),
                         ),
                       ),
-                    ),
-                  ],
-                  Observer(
-                    builder: (BuildContext build) => Padding(
-                      padding: EdgeInsets.only(top: 10),
-                      child: SeedLanguageSelector(
-                        borderRadius: BorderRadius.circular(10),
-                        key: _languageSelectorKey,
-                        buttonKey: ValueKey('new_wallet_page_seed_language_selector_button_key'),
-                        initialSelected: defaultSeedLanguage,
-                        seedType: _walletNewVM.hasSeedType
-                            ? widget._seedSettingsViewModel.moneroSeedType
-                            : MoneroSeedType.legacy,
+                    ],
+                    Observer(
+                      builder: (BuildContext build) => Padding(
+                        padding: EdgeInsets.only(top: 10),
+                        child: SeedLanguageSelector(
+                          key: _languageSelectorKey,
+                          buttonKey: ValueKey('new_wallet_page_seed_language_selector_button_key'),
+                          initialSelected: defaultSeedLanguage,
+                          seedType: _walletNewVM.hasSeedType
+                              ? widget._seedSettingsViewModel.moneroSeedType
+                              : MoneroSeedType.legacy,
+                        ),
                       ),
-                    ),
-                  )
+                    )
+                  ],
                 ],
-              ],
+              ),
             ),
           ),
-        ),
-        bottomSectionPadding: EdgeInsets.all(24),
-        bottomSection: Column(
-          children: [
-            PrimaryButton(
-              key: ValueKey('new_wallet_page_advanced_settings_button_key'),
-              onPressed: () {
-                Navigator.of(context).pushNamed(Routes.advancedPrivacySettings, arguments: {
-                  "type": _walletNewVM.type,
-                  "useTestnet": _walletNewVM.useTestnet,
-                  "toggleTestnet": _walletNewVM.toggleUseTestnet,
-                  "isChildWallet": widget.isChildWallet,
-                });
-              },
-              text: S.of(context).advanced_settings,
-              color: Theme.of(context).colorScheme.surfaceContainer,
-              textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-            ),
-            const SizedBox(height: 12),
-            Observer(
-              builder: (context) {
-                return LoadingPrimaryButton(
-                  key: ValueKey('new_wallet_page_confirm_button_key'),
-                  onPressed: _confirmForm,
-                  text: S.of(context).seed_language_next,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
-                  isLoading: _walletNewVM.state is IsExecutingState,
-                  isDisabled: _walletNewVM.name.isEmpty,
-                );
-              },
-            ),
-          ],
-        ),
-      ),
+          bottomSectionPadding: EdgeInsets.all(24),
+          bottomSection: Column(
+            children: [
+              Observer(
+                builder: (context) {
+                  return LoadingPrimaryButton(
+                    key: ValueKey('new_wallet_page_confirm_button_key'),
+                    onPressed: _confirmForm,
+                    text: S.of(context).seed_language_next,
+                    color: Theme.of(context).primaryColor,
+                    textColor: Colors.white,
+                    isLoading: _walletNewVM.state is IsExecutingState,
+                    isDisabled: _walletNewVM.name.isEmpty,
+                  );
+                },
+              ),
+              const SizedBox(height: 25),
+              GestureDetector(
+                key: ValueKey('new_wallet_page_advanced_settings_button_key'),
+                onTap: () {
+                  Navigator.of(context).pushNamed(Routes.advancedPrivacySettings, arguments: {
+                    "type": _walletNewVM.type,
+                    "useTestnet": _walletNewVM.useTestnet,
+                    "toggleTestnet": _walletNewVM.toggleUseTestnet,
+                    "isChildWallet": widget.isChildWallet,
+                  });
+                },
+                child: Text(S.of(context).advanced_settings),
+              ),
+            ],
+          )),
     );
   }
 
@@ -364,10 +401,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
       } else {
         await _walletNewVM.create(
             options: _walletNewVM.hasLanguageSelector
-                ? [
-                    _languageSelectorKey.currentState?.selected ?? defaultSeedLanguage,
-                    widget._seedSettingsViewModel.moneroSeedType
-                  ]
+                ? [_languageSelectorKey.currentState!.selected, isPolyseed]
                 : null);
       }
     } catch (e) {
diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart
index 558ffd123..6cf21ae58 100644
--- a/lib/src/screens/new_wallet/new_wallet_type_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart
@@ -11,7 +11,8 @@ import 'package:cake_wallet/src/screens/setup_2fa/widgets/popup_cancellable_aler
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/search_bar_widget.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/new_wallet_type_view_model.dart';
@@ -39,15 +40,15 @@ class NewWalletTypePage extends BasePage {
 
   @override
   Function(BuildContext)? get pushToNextWidget => (context) {
-        FocusScopeNode currentFocus = FocusScope.of(context);
-        if (!currentFocus.hasPrimaryFocus) {
-          currentFocus.focusedChild?.unfocus();
-        }
-      };
+    FocusScopeNode currentFocus = FocusScope.of(context);
+    if (!currentFocus.hasPrimaryFocus) {
+      currentFocus.focusedChild?.unfocus();
+    }
+  };
 
   @override
   Widget body(BuildContext context) => WalletTypeForm(
-        walletImage: currentTheme.isDark ? walletTypeImage : walletTypeLightImage,
+        walletImage: currentTheme.type == ThemeType.dark ? walletTypeImage : walletTypeLightImage,
         isCreate: newWalletTypeArguments.isCreate,
         newWalletTypeViewModel: newWalletTypeViewModel,
         onTypeSelected: newWalletTypeArguments.onTypeSelected,
@@ -116,14 +117,16 @@ class WalletTypeFormState extends State<WalletTypeForm> {
               child: Text(
                 S.of(context).choose_wallet_currency,
                 textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.w500,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                ),
               ),
             ),
             Padding(
               padding: EdgeInsets.fromLTRB(24, 24, 24, 12),
-              child: SearchBarWidget(searchController: searchController),
+              child: SearchBarWidget(searchController: searchController, borderRadius: 24),
             ),
             Expanded(
               child: ScrollableWithBottomSection(
@@ -160,8 +163,8 @@ class WalletTypeFormState extends State<WalletTypeForm> {
                   key: ValueKey('new_wallet_type_next_button_key'),
                   onPressed: () => onTypeSelected(),
                   text: S.of(context).seed_language_next,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
+                  color: Theme.of(context).primaryColor,
+                  textColor: Colors.white,
                   isDisabled: selected == null,
                 ),
               ),
diff --git a/lib/src/screens/new_wallet/wallet_group_description_page.dart b/lib/src/screens/new_wallet/wallet_group_description_page.dart
index aff7b7c5d..b566d0422 100644
--- a/lib/src/screens/new_wallet/wallet_group_description_page.dart
+++ b/lib/src/screens/new_wallet/wallet_group_description_page.dart
@@ -1,87 +1,65 @@
 import 'package:cake_wallet/core/new_wallet_arguments.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/themes/extensions/theme_type_images.dart';
 
 class WalletGroupDescriptionPage extends BasePage {
   WalletGroupDescriptionPage({required this.selectedWalletType});
 
   final WalletType selectedWalletType;
 
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-          (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
-
   @override
   String get title => S.current.wallet_group;
 
+
   @override
   Widget body(BuildContext context) {
+
     return Container(
       alignment: Alignment.center,
-      padding: EdgeInsets.symmetric(horizontal: 20),
+      padding: EdgeInsets.all(24),
       child: Column(
         children: [
-          SizedBox(height: 48),
-          CakeImageWidget(
-            imageUrl: currentTheme.isDark
-                ? 'assets/images/wallet_group_options_dark.png'
-                : 'assets/images/wallet_group_options_light.png',
-            height: 200,
-          ),
-          SizedBox(height: 40),
+          Image.asset(currentTheme.type.walletGroupImage, height: 200),
+          SizedBox(height: 32),
           Expanded(
-            child: Scrollbar(
-              child: SingleChildScrollView(
-                child: Text.rich(
+            child: Text.rich(
+              TextSpan(
+                children: [
+                  TextSpan(text: '${S.of(context).wallet_group_description_one} '),
                   TextSpan(
-                    children: [
-                      TextSpan(text: '${S.of(context).wallet_group_description_one} '),
-                      TextSpan(
-                        text: '${S.of(context).wallet_group.toLowerCase()} ',
-                        style: Theme.of(context)
-                            .textTheme
-                            .bodyMedium!
-                            .copyWith(fontWeight: FontWeight.w700),
-                      ),
-                      TextSpan(
-                        text: '${S.of(context).wallet_group_description_two} ',
-                      ),
-                      TextSpan(
-                        text: '${S.of(context).choose_wallet_group} ',
-                        style: Theme.of(context)
-                            .textTheme
-                            .bodyMedium!
-                            .copyWith(fontWeight: FontWeight.w700),
-                      ),
-                      TextSpan(
-                        text: '${S.of(context).wallet_group_description_three} ',
-                      ),
-                      TextSpan(
-                        text: '${S.of(context).create_new_seed} ',
-                        style: Theme.of(context)
-                            .textTheme
-                            .bodyMedium!
-                            .copyWith(fontWeight: FontWeight.w700),
-                      ),
-                      TextSpan(text: S.of(context).wallet_group_description_four),
-                    ],
+                    text: '${S.of(context).wallet_group.toLowerCase()} ',
+                    style: TextStyle(fontWeight: FontWeight.w700),
                   ),
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        height: 1.5,
-                        fontSize: 16,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
-                ),
+                  TextSpan(
+                    text: '${S.of(context).wallet_group_description_two} ',
+                  ),
+                  TextSpan(
+                    text: '${S.of(context).choose_wallet_group} ',
+                    style: TextStyle(fontWeight: FontWeight.w700),
+                  ),
+                  TextSpan(
+                    text: '${S.of(context).wallet_group_description_three} ',
+                  ),
+                  TextSpan(
+                    text: '${S.of(context).create_new_seed} ',
+                    style: TextStyle(fontWeight: FontWeight.w700),
+                  ),
+                  TextSpan(text: S.of(context).wallet_group_description_four),
+                ],
+              ),
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                height: 1.5,
+                fontSize: 16,
+                fontWeight: FontWeight.w400,
+                color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
               ),
             ),
           ),
@@ -92,8 +70,8 @@ class WalletGroupDescriptionPage extends BasePage {
               arguments: NewWalletArguments(type: selectedWalletType),
             ),
             text: S.of(context).create_new_seed,
-            color: Theme.of(context).colorScheme.surfaceContainer,
-            textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+            color: Theme.of(context).cardColor,
+            textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
           ),
           SizedBox(height: 12),
           PrimaryButton(
@@ -103,10 +81,10 @@ class WalletGroupDescriptionPage extends BasePage {
               arguments: selectedWalletType,
             ),
             text: S.of(context).choose_wallet_group,
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
+            color: Theme.of(context).primaryColor,
+            textColor: Colors.white,
           ),
-          SizedBox(height: 24),
+          SizedBox(height: 32),
         ],
       ),
     );
diff --git a/lib/src/screens/new_wallet/wallet_group_display_page.dart b/lib/src/screens/new_wallet/wallet_group_display_page.dart
index b3edc132f..cd64353e2 100644
--- a/lib/src/screens/new_wallet/wallet_group_display_page.dart
+++ b/lib/src/screens/new_wallet/wallet_group_display_page.dart
@@ -3,9 +3,10 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/theme_type_images.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/view_model/wallet_groups_display_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
@@ -33,13 +34,13 @@ class WalletGroupsDisplayBody extends StatelessWidget {
   });
 
   final WalletGroupsDisplayViewModel walletGroupsDisplayViewModel;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   @override
   Widget build(BuildContext context) {
     return Center(
       child: Padding(
-        padding: EdgeInsets.symmetric(horizontal: 20),
+        padding: EdgeInsets.all(24),
         child: Column(
           children: [
             Expanded(
@@ -48,9 +49,7 @@ class WalletGroupsDisplayBody extends StatelessWidget {
                   builder: (context) {
                     return Column(
                       children: [
-                        SizedBox(height: 48),
                         if (walletGroupsDisplayViewModel.hasNoFilteredWallet) ...{
-                          SizedBox(height: 16),
                           WalletGroupEmptyStateWidget(
                             currentTheme: currentTheme,
                           ),
@@ -128,8 +127,8 @@ class WalletGroupsDisplayBody extends StatelessWidget {
                   text: walletGroupsDisplayViewModel.hasNoFilteredWallet
                       ? S.of(context).create_new_seed
                       : S.of(context).seed_language_next,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
+                  color: Theme.of(context).primaryColor,
+                  textColor: Colors.white,
                   isDisabled: !walletGroupsDisplayViewModel.hasNoFilteredWallet
                       ? (walletGroupsDisplayViewModel.selectedWalletGroup == null &&
                           walletGroupsDisplayViewModel.selectedSingleWallet == null)
@@ -137,7 +136,7 @@ class WalletGroupsDisplayBody extends StatelessWidget {
                 );
               },
             ),
-            SizedBox(height: 24),
+            SizedBox(height: 32),
           ],
         ),
       ),
@@ -160,19 +159,14 @@ class WalletGroupsDisplayBody extends StatelessWidget {
 class WalletGroupEmptyStateWidget extends StatelessWidget {
   const WalletGroupEmptyStateWidget({required this.currentTheme, super.key});
 
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   @override
   Widget build(BuildContext context) {
     return Column(
       children: [
-        CakeImageWidget(
-          imageUrl: currentTheme.isDark
-              ? 'assets/images/wallet_group_empty_dark.png'
-              : 'assets/images/wallet_group_empty_light.png',
-          height: 200,
-        ),
-        SizedBox(height: 60),
+        Image.asset(currentTheme.type.walletGroupImage, scale: 1.8),
+        SizedBox(height: 32),
         Text.rich(
           TextSpan(
             children: [
@@ -181,18 +175,18 @@ class WalletGroupEmptyStateWidget extends StatelessWidget {
               ),
               TextSpan(
                 text: '${S.of(context).create_new_seed} ',
-                style:
-                    Theme.of(context).textTheme.bodyMedium!.copyWith(fontWeight: FontWeight.w700),
+                style: TextStyle(fontWeight: FontWeight.w700),
               ),
               TextSpan(text: S.of(context).wallet_group_empty_state_text_two),
             ],
           ),
           textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                height: 1.5,
-                fontSize: 16,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
+          style: TextStyle(
+            height: 1.5,
+            fontSize: 16,
+            fontWeight: FontWeight.w400,
+            color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+          ),
         ),
       ],
     );
diff --git a/lib/src/screens/new_wallet/wallet_group_existing_seed_description_page.dart b/lib/src/screens/new_wallet/wallet_group_existing_seed_description_page.dart
index 013f53fd2..4eab8fcec 100644
--- a/lib/src/screens/new_wallet/wallet_group_existing_seed_description_page.dart
+++ b/lib/src/screens/new_wallet/wallet_group_existing_seed_description_page.dart
@@ -1,68 +1,59 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/theme_type_images.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 
 class WalletGroupExistingSeedDescriptionPage extends BasePage {
-  WalletGroupExistingSeedDescriptionPage();
+  WalletGroupExistingSeedDescriptionPage({required this.seedPhraseWordsLength});
 
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-          (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
+  final int seedPhraseWordsLength;
 
   @override
   String get title => S.current.wallet_group;
 
-  final walletGroupConfirmedImageLight = 'assets/images/wallet_group_confirmed_light.png';
-  final walletGroupConfirmedImageDark = 'assets/images/wallet_group_confirmed_dark.png';
-
   @override
   Widget body(BuildContext context) {
-    final textStyle = Theme.of(context).textTheme.bodyLarge?.copyWith(
-          color: Theme.of(context).colorScheme.onSurfaceVariant,
-        );
+    final textStyle = TextStyle(
+      fontSize: 16,
+      fontWeight: FontWeight.w400,
+      color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+    );
 
     return Container(
       alignment: Alignment.center,
       padding: EdgeInsets.all(24),
       child: Column(
         children: [
-          Image.asset(
-            currentTheme.isDark ? walletGroupConfirmedImageDark : walletGroupConfirmedImageLight,
-            height: 200
-          ),
+          Image.asset(currentTheme.type.walletGroupImage, height: 200),
           SizedBox(height: 32),
           Expanded(
-            child: SingleChildScrollView(
-              child: RichText(
-                text: TextSpan(
-                  children: [
-                    TextSpan(
-                        text: S.current.wallet_group_description_existing_seed + '\n\n',
-                        style: textStyle),
-                    TextSpan(
-                        text: S.current.wallet_group_description_open_wallet + '\n\n',
-                        style: textStyle),
-                    TextSpan(
-                        text: S.current.wallet_group_description_view_seed + '\n',
-                        style: textStyle),
-                    TextSpan(
-                      text: S.current.seed_display_path,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w800,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
+            child: RichText(
+              text: TextSpan(
+                children: [
+                  TextSpan(
+                      text: S.current.wallet_group_description_existing_seed + '\n\n',
+                      style: textStyle),
+                  TextSpan(
+                      text: S.current.wallet_group_description_open_wallet + '\n\n',
+                      style: textStyle),
+                  TextSpan(
+                      text: S.current.wallet_group_description_view_seed + '\n', style: textStyle),
+                  TextSpan(
+                    text: S.current.seed_display_path,
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w800,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
                     ),
-                  ],
-                ),
-                textAlign: TextAlign.center,
+                  ),
+                ],
               ),
+              textAlign: TextAlign.center,
             ),
           ),
           Column(
@@ -76,28 +67,33 @@ class WalletGroupExistingSeedDescriptionPage extends BasePage {
                       child: PrimaryButton(
                         key: ValueKey(
                             'wallet_group_existing_seed_description_page_verify_seed_button_key'),
-                        onPressed: () => Navigator.pushNamed(context, Routes.preSeedPage),
+                        onPressed: () => Navigator.pushNamed(context, Routes.preSeedPage,
+                            arguments: seedPhraseWordsLength),
                         text: S.current.verify_seed,
-                        color: Theme.of(context).colorScheme.surfaceContainer,
-                        textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+                        color: Theme.of(context).cardColor,
+                        textColor: currentTheme.type == ThemeType.dark
+                            ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                            : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
                       ),
                     ),
                   ),
                   Flexible(
                     child: Container(
                       padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                      child: PrimaryButton(
-                        key: ValueKey(
-                            'wallet_group_existing_seed_description_page_open_wallet_button_key'),
-                        onPressed: () {
-                          Navigator.of(context).popUntil((route) => route.isFirst);
-                        },
-                        text: S.current.open_wallet,
-                        color: Theme.of(context).colorScheme.primary,
-                        textColor: Theme.of(context).colorScheme.onPrimary,
+                      child: Builder(
+                        builder: (context) => PrimaryButton(
+                          key: ValueKey(
+                              'wallet_group_existing_seed_description_page_open_wallet_button_key'),
+                          onPressed: () {
+                            Navigator.of(context).popUntil((route) => route.isFirst);
+                          },
+                          text: S.current.open_wallet,
+                          color: Theme.of(context).primaryColor,
+                          textColor: Colors.white,
+                        ),
                       ),
                     ),
-                  ),
+                  )
                 ],
               ),
               SizedBox(height: 12),
diff --git a/lib/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart b/lib/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart
index 3d420d751..74057cc87 100644
--- a/lib/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart
+++ b/lib/src/screens/new_wallet/widgets/grouped_wallet_expansion_tile.dart
@@ -1,6 +1,9 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 
 class GroupedWalletExpansionTile extends StatelessWidget {
   GroupedWalletExpansionTile({
@@ -51,16 +54,16 @@ class GroupedWalletExpansionTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final backgroundColor = color ?? (isSelected ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.surfaceContainer);
+    final backgroundColor = color ?? (isSelected ? Colors.green : Theme.of(context).cardColor);
     final effectiveTextColor = textColor ??
         (isSelected
-            ? Theme.of(context).colorScheme.onPrimary
-            : Theme.of(context).colorScheme.onSecondaryContainer);
+            ? Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor
+            : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor);
 
     final effectiveArrowColor = arrowColor ??
         (isSelected
-            ? Theme.of(context).colorScheme.onPrimary
-            : Theme.of(context).colorScheme.onSecondaryContainer);
+            ? Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor
+            : Theme.of(context).extension<FilterTheme>()!.titlesColor);
     return Container(
       decoration: BoxDecoration(
         borderRadius: borderRadius ?? BorderRadius.all(Radius.circular(30)),
@@ -88,7 +91,7 @@ class GroupedWalletExpansionTile extends StatelessWidget {
             onTap: onTitleTapped,
             child: Text(
               title,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+              style: TextStyle(
                 fontSize: 18,
                 fontWeight: FontWeight.w500,
                 color: effectiveTextColor,
@@ -99,8 +102,10 @@ class GroupedWalletExpansionTile extends StatelessWidget {
           children: childWallets.map(
             (item) {
               final currentColor = item.isCurrent
-                  ? Theme.of(context).colorScheme.primary
-                  : Theme.of(context).colorScheme.surface;
+                  ? Theme.of(context)
+                      .extension<WalletListTheme>()!
+                      .createNewWalletButtonBackgroundColor
+                  : Theme.of(context).colorScheme.background;
               final walletTypeToCrypto = walletTypeToCryptoCurrency(item.type);
               return ListTile(
                 contentPadding: EdgeInsets.zero,
@@ -136,7 +141,7 @@ class GroupedWalletExpansionTile extends StatelessWidget {
                 title: Text(
                   item.name,
                   maxLines: 2,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  style: TextStyle(
                     fontSize: 18,
                     fontWeight: FontWeight.w500,
                     color: effectiveTextColor,
diff --git a/lib/src/screens/new_wallet/widgets/select_button.dart b/lib/src/screens/new_wallet/widgets/select_button.dart
index b3bfb5616..6cca53cf5 100644
--- a/lib/src/screens/new_wallet/widgets/select_button.dart
+++ b/lib/src/screens/new_wallet/widgets/select_button.dart
@@ -1,3 +1,6 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:cw_core/hardware/device_connection_type.dart';
 import 'package:flutter/material.dart';
 
@@ -37,15 +40,15 @@ class SelectButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final backgroundColor = color ?? (isSelected ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.surfaceContainer);
+    final backgroundColor = color ?? (isSelected ? Theme.of(context).primaryColor : Theme.of(context).cardColor);
     final effectiveTextColor = textColor ??
         (isSelected
-            ? Theme.of(context).colorScheme.onPrimary
-            : Theme.of(context).colorScheme.onSurface);
+            ? Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor
+            : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor);
     final effectiveArrowColor = arrowColor ??
         (isSelected
-            ? Theme.of(context).colorScheme.onPrimary
-            : Theme.of(context).colorScheme.onSurface);
+            ? Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor
+            : Theme.of(context).extension<FilterTheme>()!.titlesColor);
 
     final trailingIcons = <Image>[];
     final selectArrowImage =
@@ -67,9 +70,9 @@ class SelectButton extends StatelessWidget {
         padding: padding ?? EdgeInsets.only(left: 30, right: 30),
         alignment: Alignment.center,
         decoration: BoxDecoration(
-          borderRadius: borderRadius ?? BorderRadius.all(Radius.circular(15)),
+          borderRadius: borderRadius ?? BorderRadius.all(Radius.circular(30)),
           color: backgroundColor,
-          border: borderColor != null ? Border.all(color: borderColor!, width: 2) : null,
+          border: borderColor != null ? Border.all(color: borderColor!) : null,
         ),
         child: Row(
           mainAxisSize: MainAxisSize.max,
@@ -86,7 +89,7 @@ class SelectButton extends StatelessWidget {
                     padding: image != null ? EdgeInsets.only(left: 15) : EdgeInsets.only(left: 0),
                     child: Text(
                       text,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      style: TextStyle(
                         fontSize: textSize,
                         fontWeight: FontWeight.w500,
                         color: effectiveTextColor,
diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart
index db8a92a81..fc6ac07e0 100644
--- a/lib/src/screens/nodes/node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/node_create_or_edit_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
@@ -15,8 +16,7 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 
 class NodeCreateOrEditPage extends BasePage {
-  NodeCreateOrEditPage(
-      {required this.nodeCreateOrEditViewModel, this.editingNode, this.isSelected, this.type})
+  NodeCreateOrEditPage({required this.nodeCreateOrEditViewModel,this.editingNode, this.isSelected, this.type})
       : _formKey = GlobalKey<FormState>(),
         _addressController = TextEditingController(),
         _pathController = TextEditingController(),
@@ -49,13 +49,16 @@ class NodeCreateOrEditPage extends BasePage {
       });
     }
 
-    _addressController
-        .addListener(() => nodeCreateOrEditViewModel.address = _addressController.text);
-    _pathController.addListener(() => nodeCreateOrEditViewModel.path = _pathController.text);
-    _portController.addListener(() => nodeCreateOrEditViewModel.port = _portController.text);
-    _loginController.addListener(() => nodeCreateOrEditViewModel.login = _loginController.text);
-    _passwordController
-        .addListener(() => nodeCreateOrEditViewModel.password = _passwordController.text);
+    _addressController.addListener(
+        () => nodeCreateOrEditViewModel.address = _addressController.text);
+    _pathController.addListener(
+        () => nodeCreateOrEditViewModel.path = _pathController.text);
+    _portController.addListener(
+        () => nodeCreateOrEditViewModel.port = _portController.text);
+    _loginController.addListener(
+        () => nodeCreateOrEditViewModel.login = _loginController.text);
+    _passwordController.addListener(
+        () => nodeCreateOrEditViewModel.password = _passwordController.text);
   }
 
   final GlobalKey<FormState> _formKey;
@@ -88,51 +91,43 @@ class NodeCreateOrEditPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    reaction(
-      (_) => nodeCreateOrEditViewModel.connectionState,
-      (ExecutionState state) {
-        if (state is ExecutedSuccessfullyState) {
-          WidgetsBinding.instance.addPostFrameCallback(
-            (_) {
-              showPopUp<void>(
-                context: context,
-                builder: (BuildContext context) => AlertWithOneAction(
-                  alertTitle: S.of(context).new_node_testing,
-                  alertContent: state.payload as bool
-                      ? S.of(context).node_connection_successful
-                      : S.of(context).node_connection_failed,
-                  buttonText: S.of(context).ok,
-                  buttonAction: () => Navigator.of(context).pop(),
-                ),
-              );
-            },
-          );
-        }
 
-        if (state is FailureState) {
-          WidgetsBinding.instance.addPostFrameCallback(
-            (_) {
+    reaction((_) => nodeCreateOrEditViewModel.connectionState,
+            (ExecutionState state) {
+          if (state is ExecutedSuccessfullyState) {
+            WidgetsBinding.instance.addPostFrameCallback((_) {
               showPopUp<void>(
-                context: context,
-                builder: (BuildContext context) {
-                  return AlertWithOneAction(
-                    alertTitle: S.of(context).error,
-                    alertContent: state.error,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(context).pop(),
-                  );
-                },
-              );
-            },
-          );
-        }
-      },
-    );
+                  context: context,
+                  builder: (BuildContext context) =>
+                      AlertWithOneAction(
+                          alertTitle: S.of(context).new_node_testing,
+                          alertContent: state.payload as bool
+                              ? S.of(context).node_connection_successful
+                              : S.of(context).node_connection_failed,
+                          buttonText: S.of(context).ok,
+                          buttonAction: () => Navigator.of(context).pop()));
+            });
+          }
+
+          if (state is FailureState) {
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              showPopUp<void>(
+                  context: context,
+                  builder: (BuildContext context) {
+                    return AlertWithOneAction(
+                        alertTitle: S.of(context).error,
+                        alertContent: state.error,
+                        buttonText: S.of(context).ok,
+                        buttonAction: () => Navigator.of(context).pop());
+                  });
+            });
+          }
+        });
 
     return Container(
         padding: EdgeInsets.only(left: 24, right: 24),
         child: ScrollableWithBottomSection(
-          contentPadding: EdgeInsets.only(bottom: 24.0, top: 8),
+          contentPadding: EdgeInsets.only(bottom: 24.0),
           content: NodeForm(
             formKey: _formKey,
             nodeViewModel: nodeCreateOrEditViewModel,
@@ -150,18 +145,16 @@ class NodeCreateOrEditPage extends BasePage {
                           child: LoadingPrimaryButton(
                             onPressed: () async {
                               final confirmed = await showPopUp<bool>(
-                                    context: context,
-                                    builder: (BuildContext context) {
-                                      return AlertWithTwoActions(
-                                        alertTitle: S.of(context).remove_node,
-                                        alertContent: S.of(context).remove_node_message,
-                                        rightButtonText: S.of(context).remove,
-                                        leftButtonText: S.of(context).cancel,
-                                        actionRightButton: () => Navigator.pop(context, true),
-                                        actionLeftButton: () => Navigator.pop(context, false),
-                                      );
-                                    },
-                                  ) ??
+                                      context: context,
+                                      builder: (BuildContext context) {
+                                        return AlertWithTwoActions(
+                                            alertTitle: S.of(context).remove_node,
+                                            alertContent: S.of(context).remove_node_message,
+                                            rightButtonText: S.of(context).remove,
+                                            leftButtonText: S.of(context).cancel,
+                                            actionRightButton: () => Navigator.pop(context, true),
+                                            actionLeftButton: () => Navigator.pop(context, false));
+                                      }) ??
                                   false;
 
                               if (confirmed) {
@@ -173,8 +166,8 @@ class NodeCreateOrEditPage extends BasePage {
                             isDisabled: editingNode == null ||
                                 !nodeCreateOrEditViewModel.isReady ||
                                 (isSelected ?? false),
-                            color: Theme.of(context).colorScheme.errorContainer,
-                            textColor: Theme.of(context).colorScheme.onErrorContainer,
+                            color: Palette.red,
+                            textColor: Colors.white,
                           ),
                         ),
                       ),
@@ -183,22 +176,20 @@ class NodeCreateOrEditPage extends BasePage {
                         padding: EdgeInsets.only(left: 8.0),
                         child: PrimaryButton(
                           onPressed: () async {
-                            if (_formKey.currentState != null &&
-                                !_formKey.currentState!.validate()) {
+                            if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
                               return;
                             }
 
                             await nodeCreateOrEditViewModel.save(
                                 editingNode: editingNode, saveAsCurrent: isSelected ?? false);
-                            if (context.mounted) {
-                              Navigator.of(context).pop();
-                            }
+                            Navigator.of(context).pop();
                           },
                           text: S.of(context).save,
-                          color: Theme.of(context).colorScheme.primary,
-                          textColor: Theme.of(context).colorScheme.onPrimary,
-                          isDisabled: (!nodeCreateOrEditViewModel.isReady) ||
-                              (nodeCreateOrEditViewModel.connectionState is IsExecutingState),
+                          color: Theme.of(context).primaryColor,
+                          textColor: Colors.white,
+                          isDisabled: (!nodeCreateOrEditViewModel.isReady)||
+                              (nodeCreateOrEditViewModel
+                              .connectionState is IsExecutingState),
                         ),
                       )),
                     ],
diff --git a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
index 2fc58a960..e91791881 100644
--- a/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/pow_node_create_or_edit_page.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
@@ -14,8 +15,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 
 class PowNodeCreateOrEditPage extends BasePage {
-  PowNodeCreateOrEditPage(
-      {required this.nodeCreateOrEditViewModel, this.editingNode, this.isSelected})
+  PowNodeCreateOrEditPage({required this.nodeCreateOrEditViewModel,this.editingNode, this.isSelected})
       : _formKey = GlobalKey<FormState>(),
         _addressController = TextEditingController(),
         _portController = TextEditingController(),
@@ -47,12 +47,14 @@ class PowNodeCreateOrEditPage extends BasePage {
       });
     }
 
-    _addressController
-        .addListener(() => nodeCreateOrEditViewModel.address = _addressController.text);
-    _portController.addListener(() => nodeCreateOrEditViewModel.port = _portController.text);
-    _loginController.addListener(() => nodeCreateOrEditViewModel.login = _loginController.text);
-    _passwordController
-        .addListener(() => nodeCreateOrEditViewModel.password = _passwordController.text);
+    _addressController.addListener(
+        () => nodeCreateOrEditViewModel.address = _addressController.text);
+    _portController.addListener(
+        () => nodeCreateOrEditViewModel.port = _portController.text);
+    _loginController.addListener(
+        () => nodeCreateOrEditViewModel.login = _loginController.text);
+    _passwordController.addListener(
+        () => nodeCreateOrEditViewModel.password = _passwordController.text);
   }
 
   final GlobalKey<FormState> _formKey;
@@ -76,47 +78,50 @@ class PowNodeCreateOrEditPage extends BasePage {
           'assets/images/qr_code_icon.png',
         ),
       );
-
+      
   final NodeCreateOrEditViewModel nodeCreateOrEditViewModel;
   final Node? editingNode;
   final bool? isSelected;
 
   @override
   Widget body(BuildContext context) {
-    reaction((_) => nodeCreateOrEditViewModel.connectionState, (ExecutionState state) {
-      if (state is ExecutedSuccessfullyState) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          showPopUp<void>(
-              context: context,
-              builder: (BuildContext context) => AlertWithOneAction(
-                  alertTitle: S.of(context).new_node_testing,
-                  alertContent: state.payload as bool
-                      ? S.of(context).node_connection_successful
-                      : S.of(context).node_connection_failed,
-                  buttonText: S.of(context).ok,
-                  buttonAction: () => Navigator.of(context).pop()));
-        });
-      }
 
-      if (state is FailureState) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          showPopUp<void>(
-              context: context,
-              builder: (BuildContext context) {
-                return AlertWithOneAction(
-                    alertTitle: S.of(context).error,
-                    alertContent: state.error,
-                    buttonText: S.of(context).ok,
-                    buttonAction: () => Navigator.of(context).pop());
-              });
+    reaction((_) => nodeCreateOrEditViewModel.connectionState,
+            (ExecutionState state) {
+          if (state is ExecutedSuccessfullyState) {
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              showPopUp<void>(
+                  context: context,
+                  builder: (BuildContext context) =>
+                      AlertWithOneAction(
+                          alertTitle: S.of(context).new_node_testing,
+                          alertContent: state.payload as bool
+                              ? S.of(context).node_connection_successful
+                              : S.of(context).node_connection_failed,
+                          buttonText: S.of(context).ok,
+                          buttonAction: () => Navigator.of(context).pop()));
+            });
+          }
+
+          if (state is FailureState) {
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              showPopUp<void>(
+                  context: context,
+                  builder: (BuildContext context) {
+                    return AlertWithOneAction(
+                        alertTitle: S.of(context).error,
+                        alertContent: state.error,
+                        buttonText: S.of(context).ok,
+                        buttonAction: () => Navigator.of(context).pop());
+                  });
+            });
+          }
         });
-      }
-    });
 
     return Container(
         padding: EdgeInsets.only(left: 24, right: 24),
         child: ScrollableWithBottomSection(
-          contentPadding: EdgeInsets.only(bottom: 24.0, top: 8),
+          contentPadding: EdgeInsets.only(bottom: 24.0),
           content: NodeForm(
             formKey: _formKey,
             nodeViewModel: nodeCreateOrEditViewModel,
@@ -128,20 +133,27 @@ class PowNodeCreateOrEditPage extends BasePage {
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: <Widget>[
                       Flexible(
-                        child: Container(
-                          padding: EdgeInsets.only(right: 8.0),
-                          child: LoadingPrimaryButton(
+                          child: Container(
+                        padding: EdgeInsets.only(right: 8.0),
+                        child: LoadingPrimaryButton(
                             onPressed: () async {
                               final confirmed = await showPopUp<bool>(
                                       context: context,
                                       builder: (BuildContext context) {
                                         return AlertWithTwoActions(
-                                            alertTitle: S.of(context).remove_node,
-                                            alertContent: S.of(context).remove_node_message,
-                                            rightButtonText: S.of(context).remove,
-                                            leftButtonText: S.of(context).cancel,
-                                            actionRightButton: () => Navigator.pop(context, true),
-                                            actionLeftButton: () => Navigator.pop(context, false));
+                                            alertTitle:
+                                                S.of(context).remove_node,
+                                            alertContent: S
+                                                .of(context)
+                                                .remove_node_message,
+                                            rightButtonText:
+                                                S.of(context).remove,
+                                            leftButtonText:
+                                                S.of(context).cancel,
+                                            actionRightButton: () =>
+                                                Navigator.pop(context, true),
+                                            actionLeftButton: () =>
+                                                Navigator.pop(context, false));
                                       }) ??
                                   false;
 
@@ -151,19 +163,17 @@ class PowNodeCreateOrEditPage extends BasePage {
                               }
                             },
                             text: S.of(context).delete,
-                            isDisabled: !nodeCreateOrEditViewModel.isReady || (isSelected ?? false),
-                            color: Theme.of(context).colorScheme.errorContainer,
-                            textColor: Theme.of(context).colorScheme.onPrimary,
-                          ),
-                        ),
-                      ),
+                            isDisabled: !nodeCreateOrEditViewModel.isReady ||
+                                (isSelected ?? false),
+                            color: Palette.red,
+                            textColor: Colors.white),
+                      )),
                       Flexible(
                           child: Container(
                         padding: EdgeInsets.only(left: 8.0),
                         child: PrimaryButton(
                           onPressed: () async {
-                            if (_formKey.currentState != null &&
-                                !_formKey.currentState!.validate()) {
+                            if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
                               return;
                             }
 
@@ -172,14 +182,15 @@ class PowNodeCreateOrEditPage extends BasePage {
                             Navigator.of(context).pop();
                           },
                           text: S.of(context).save,
-                          color: Theme.of(context).colorScheme.primary,
-                          textColor: Theme.of(context).colorScheme.onPrimary,
-                          isDisabled: (!nodeCreateOrEditViewModel.isReady) ||
-                              (nodeCreateOrEditViewModel.connectionState is IsExecutingState),
+                          color: Theme.of(context).primaryColor,
+                          textColor: Colors.white,
+                          isDisabled: (!nodeCreateOrEditViewModel.isReady)||
+                              (nodeCreateOrEditViewModel
+                              .connectionState is IsExecutingState),
                         ),
                       )),
                     ],
                   )),
         ));
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/nodes/widgets/node_form.dart b/lib/src/screens/nodes/widgets/node_form.dart
index 11bfea20a..eeda073af 100644
--- a/lib/src/screens/nodes/widgets/node_form.dart
+++ b/lib/src/screens/nodes/widgets/node_form.dart
@@ -99,9 +99,7 @@ class NodeForm extends StatelessWidget {
                 child: BaseTextFormField(
                   controller: _addressController,
                   hintText: S.of(context).node_address,
-                  validator: type == WalletType.decred
-                      ? NodeAddressValidatorDecredBlankException()
-                      : NodeAddressValidator(),
+                  validator: type == WalletType.decred ? NodeAddressValidatorDecredBlankException() : NodeAddressValidator(),
                 ),
               )
             ],
@@ -124,13 +122,12 @@ class NodeForm extends StatelessWidget {
           Row(
             children: <Widget>[
               Expanded(
-                child: BaseTextFormField(
-                  controller: _portController,
-                  hintText: S.of(context).node_port,
-                  keyboardType: TextInputType.numberWithOptions(signed: false, decimal: false),
-                  validator: NodePortValidator(),
-                ),
-              )
+                  child: BaseTextFormField(
+                controller: _portController,
+                hintText: S.of(context).node_port,
+                keyboardType: TextInputType.numberWithOptions(signed: false, decimal: false),
+                validator: NodePortValidator(),
+              ))
             ],
           ),
           SizedBox(height: 10.0),
@@ -143,8 +140,9 @@ class NodeForm extends StatelessWidget {
                 Observer(
                   builder: (_) => StandardCheckbox(
                     value: nodeViewModel.useSSL,
-                    borderColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                    iconColor: Theme.of(context).colorScheme.primary,
+                    gradientBackground: true,
+                    borderColor: Theme.of(context).dividerColor,
+                    iconColor: Colors.white,
                     onChanged: (value) => nodeViewModel.useSSL = value,
                     caption: S.of(context).use_ssl,
                   ),
@@ -157,22 +155,20 @@ class NodeForm extends StatelessWidget {
             Row(
               children: <Widget>[
                 Expanded(
-                  child: BaseTextFormField(
-                    controller: _loginController,
-                    hintText: S.of(context).login,
-                  ),
-                )
+                    child: BaseTextFormField(
+                  controller: _loginController,
+                  hintText: S.of(context).login,
+                ))
               ],
             ),
             SizedBox(height: 10.0),
             Row(
               children: <Widget>[
                 Expanded(
-                  child: BaseTextFormField(
-                    controller: _passwordController,
-                    hintText: S.of(context).password,
-                  ),
-                )
+                    child: BaseTextFormField(
+                  controller: _passwordController,
+                  hintText: S.of(context).password,
+                ))
               ],
             ),
             Padding(
@@ -184,8 +180,9 @@ class NodeForm extends StatelessWidget {
                   Observer(
                     builder: (_) => StandardCheckbox(
                       value: nodeViewModel.trusted,
-                      borderColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                      iconColor: Theme.of(context).colorScheme.primary,
+                      gradientBackground: true,
+                      borderColor: Theme.of(context).dividerColor,
+                      iconColor: Colors.white,
                       onChanged: (value) => nodeViewModel.trusted = value,
                       caption: S.of(context).trusted,
                     ),
@@ -196,35 +193,17 @@ class NodeForm extends StatelessWidget {
             Observer(
                 builder: (_) => Column(
                       children: [
-                        if (nodeViewModel.usesEmbeddedProxy) ...[
-                          Padding(
-                            padding: EdgeInsets.only(top: 10),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.start,
-                              mainAxisSize: MainAxisSize.max,
-                              children: [
-                                StandardCheckbox(
-                                  value: nodeViewModel.usesEmbeddedProxy,
-                                  gradientBackground: false,
-                                  borderColor: Theme.of(context).dividerColor,
-                                  iconColor: Theme.of(context).colorScheme.primary,
-                                  onChanged: null,
-                                  caption: 'Embedded Tor SOCKS Proxy',
-                                ),
-                              ],
-                            ),
-                          ),
-                        ],
                         Padding(
-                          padding: EdgeInsets.only(top: 10),
+                          padding: EdgeInsets.only(top: 20),
                           child: Row(
                             mainAxisAlignment: MainAxisAlignment.start,
                             mainAxisSize: MainAxisSize.max,
                             children: [
                               StandardCheckbox(
                                 value: nodeViewModel.useSocksProxy,
-                                borderColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                                iconColor: Theme.of(context).colorScheme.primary,
+                                gradientBackground: true,
+                                borderColor: Theme.of(context).dividerColor,
+                                iconColor: Colors.white,
                                 onChanged: (value) {
                                   if (!value) {
                                     _socksAddressController.text = '';
diff --git a/lib/src/screens/nodes/widgets/node_indicator.dart b/lib/src/screens/nodes/widgets/node_indicator.dart
index aa5458df2..47a89f551 100644
--- a/lib/src/screens/nodes/widgets/node_indicator.dart
+++ b/lib/src/screens/nodes/widgets/node_indicator.dart
@@ -1,5 +1,5 @@
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
 class NodeIndicator extends StatelessWidget {
   NodeIndicator({this.isLive = false});
@@ -12,9 +12,7 @@ class NodeIndicator extends StatelessWidget {
       width: 12.0,
       height: 12.0,
       decoration: BoxDecoration(
-        shape: BoxShape.circle,
-        color: isLive ? CustomThemeColors.syncGreen : Theme.of(context).colorScheme.errorContainer,
-      ),
+          shape: BoxShape.circle, color: isLive ? Palette.green : Palette.red),
     );
   }
 }
diff --git a/lib/src/screens/nodes/widgets/node_list_row.dart b/lib/src/screens/nodes/widgets/node_list_row.dart
index 4f442a471..935a6f713 100644
--- a/lib/src/screens/nodes/widgets/node_list_row.dart
+++ b/lib/src/screens/nodes/widgets/node_list_row.dart
@@ -1,8 +1,10 @@
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/nodes/widgets/node_indicator.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
 import 'package:cw_core/node.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 
 class NodeListRow extends StandardListRow {
   NodeListRow(
@@ -24,20 +26,23 @@ class NodeListRow extends StandardListRow {
       height: 56,
       padding: EdgeInsets.only(left: 12, right: 12, top: 2, bottom: 2),
       margin: EdgeInsets.only(top: 2, bottom: 2),
-      child: FilledButton(
+      child: TextButton(
         onPressed: () => onTap?.call(context),
-        style: FilledButton.styleFrom(
-          backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(Radius.circular(10)),
+        style: ButtonStyle(
+          backgroundColor: MaterialStateProperty.all(Theme.of(context).cardColor),
+          shape: MaterialStateProperty.all(
+            RoundedRectangleBorder(
+              borderRadius: BorderRadius.all(Radius.circular(10)
+              ),
+            ),
           ),
         ),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
-            leading,
-            buildCenter(context, hasLeftOffset: true),
-            trailing,
+            if (leading != null) leading,
+            buildCenter(context, hasLeftOffset: leading != null),
+            if (trailing != null) trailing,
           ],
         ),
       ),
@@ -51,7 +56,7 @@ class NodeListRow extends StandardListRow {
         builder: (context, snapshot) {
           switch (snapshot.connectionState) {
             case ConnectionState.done:
-              return NodeIndicator(isLive: snapshot.data ?? false);
+              return NodeIndicator(isLive: (snapshot.data as bool?) ?? false);
             default:
               return NodeIndicator(isLive: false);
           }
@@ -61,23 +66,20 @@ class NodeListRow extends StandardListRow {
   @override
   Widget buildTrailing(BuildContext context) {
     return GestureDetector(
-      onTap: () => Navigator.of(context).pushNamed(
-        isPow ? Routes.newPowNode : Routes.newNode,
-        arguments: {'editingNode': node, 'isSelected': isSelected},
-      ),
-      child: Container(
-        padding: EdgeInsets.all(10),
-        decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          color: Theme.of(context).colorScheme.surface,
-        ),
-        child: Icon(
-          Icons.edit,
-          size: 14,
-          color: Theme.of(context).colorScheme.onSurfaceVariant,
-        ),
-      ),
-    );
+        onTap: () => Navigator.of(context).pushNamed(isPow ? Routes.newPowNode : Routes.newNode,
+            arguments: {'editingNode': node, 'isSelected': isSelected}),
+        child: Container(
+            padding: EdgeInsets.all(10),
+            decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: Theme.of(context)
+                                  .extension<ReceivePageTheme>()!
+                                  .iconsBackgroundColor),
+            child: Icon(Icons.edit,
+                size: 14,
+                color: Theme.of(context)
+                                  .extension<ReceivePageTheme>()!
+                                  .iconsColor)));
   }
 }
 
@@ -95,10 +97,11 @@ class NodeHeaderListRow extends StandardListRow {
       child: TextButton(
         onPressed: () => onTap?.call(context),
         style: ButtonStyle(
-          backgroundColor: WidgetStateProperty.all(Theme.of(context).colorScheme.surface),
-          shape: WidgetStateProperty.all(
+          backgroundColor: MaterialStateProperty.all(Theme.of(context).cardColor),
+          shape: MaterialStateProperty.all(
             RoundedRectangleBorder(
-              borderRadius: BorderRadius.all(Radius.circular(10)),
+              borderRadius: BorderRadius.all(Radius.circular(10)
+              ),
             ),
           ),
         ),
@@ -107,7 +110,7 @@ class NodeHeaderListRow extends StandardListRow {
           children: <Widget>[
             if (leading != null) leading,
             buildCenter(context, hasLeftOffset: leading != null),
-            trailing,
+            if (trailing != null) trailing,
           ],
         ),
       ),
@@ -119,7 +122,7 @@ class NodeHeaderListRow extends StandardListRow {
     return SizedBox(
       width: 20,
       child: Icon(Icons.add,
-          color: Theme.of(context).colorScheme.onSurfaceVariant, size: 24.0),
+          color: Theme.of(context).extension<FilterTheme>()!.titlesColor,size: 24.0),
     );
   }
 }
diff --git a/lib/src/screens/payjoin_details/payjoin_details_page.dart b/lib/src/screens/payjoin_details/payjoin_details_page.dart
deleted file mode 100644
index 9f3eebad9..000000000
--- a/lib/src/screens/payjoin_details/payjoin_details_page.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.dart';
-import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
-import 'package:cake_wallet/src/widgets/list_row.dart';
-import 'package:cake_wallet/src/widgets/standard_list.dart';
-import 'package:cake_wallet/src/widgets/standard_list_card.dart';
-import 'package:cake_wallet/src/widgets/standard_list_status_row.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/utils/show_bar.dart';
-import 'package:cake_wallet/view_model/payjoin_details_view_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-class PayjoinDetailsPage extends BasePage {
-  PayjoinDetailsPage({required this.payjoinDetailsViewModel});
-
-  @override
-  String get title => S.current.payjoin_details;
-
-  final PayjoinDetailsViewModel payjoinDetailsViewModel;
-
-  @override
-  Widget body(BuildContext context) =>
-      PayjoinDetailsPageBody(payjoinDetailsViewModel, currentTheme);
-}
-
-class PayjoinDetailsPageBody extends StatefulWidget {
-  PayjoinDetailsPageBody(this.payjoinDetailsViewModel, this.currentTheme);
-
-  final PayjoinDetailsViewModel payjoinDetailsViewModel;
-  final MaterialThemeBase currentTheme;
-
-  @override
-  State<PayjoinDetailsPageBody> createState() => _PayjoinDetailsPageBodyState();
-}
-
-class _PayjoinDetailsPageBodyState extends State<PayjoinDetailsPageBody> {
-  @override
-  void dispose() {
-    super.dispose();
-    widget.payjoinDetailsViewModel.listener.cancel();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SectionStandardList(
-        sectionCount: 1,
-        itemCounter: (int _) => widget.payjoinDetailsViewModel.items.length,
-        itemBuilder: (__, index) {
-          final item = widget.payjoinDetailsViewModel.items[index];
-
-          if (item is DetailsListStatusItem) {
-            return StandardListStatusRow(
-              title: item.title,
-              value: item.value,
-              status: item.status,
-            );
-          }
-
-          if (item is TradeDetailsListCardItem) {
-            return TradeDetailsStandardListCard(
-              id: item.id,
-              create: item.createdAt,
-              pair: item.pair,
-              currentTheme: widget.currentTheme.type,
-              onTap: item.onTap,
-            );
-          }
-
-          return GestureDetector(
-            onTap: () {
-              Clipboard.setData(ClipboardData(text: item.value));
-              showBar<void>(context, S.of(context).transaction_details_copied(item.title));
-            },
-            child: ListRow(title: '${item.title}:', value: item.value),
-          );
-        });
-  }
-}
diff --git a/lib/src/screens/pin_code/pin_code_widget.dart b/lib/src/screens/pin_code/pin_code_widget.dart
index d89fe3d99..f6249576d 100644
--- a/lib/src/screens/pin_code/pin_code_widget.dart
+++ b/lib/src/screens/pin_code/pin_code_widget.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:another_flushbar/flushbar.dart';
@@ -36,7 +38,6 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
   static const fourPinLength = 4;
   final _gridViewKey = GlobalKey();
   final _key = GlobalKey<ScaffoldState>();
-  late final FocusNode _focusNode;
 
   int pinLength;
   String pin;
@@ -53,17 +54,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
     pin = '';
     title = S.current.enter_your_pin;
     _aspectRatio = 0;
-    _focusNode = FocusNode();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _focusNode.requestFocus();
-      _afterLayout(_);
-    });
-  }
-
-  @override
-  void dispose() {
-    _focusNode.dispose();
-    super.dispose();
+    WidgetsBinding.instance.addPostFrameCallback(_afterLayout);
   }
 
   void setTitle(String title) => setState(() => this.title = title);
@@ -101,7 +92,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
 
   void changeProcessText(String text) {
     hideProgressText();
-    _progressBar = createBar<void>(text, context, duration: null)..show(_key.currentContext!);
+    _progressBar = createBar<void>(text, duration: null)..show(_key.currentContext!);
   }
 
   void close() {
@@ -121,12 +112,16 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
   Widget body(BuildContext context) {
     final deleteIconImage = Image.asset(
       'assets/images/delete_icon.png',
-      color: Theme.of(context).colorScheme.primary,
+      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+    );
+    final faceImage = Image.asset(
+      'assets/images/face.png',
+      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
     );
 
     return KeyboardListener(
-      focusNode: _focusNode,
-      autofocus: false,
+      focusNode: FocusNode(),
+      autofocus: true,
       onKeyEvent: (keyEvent) {
         if (keyEvent is KeyDownEvent) {
           if (keyEvent.logicalKey.keyLabel == "Backspace") {
@@ -140,20 +135,18 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
         }
       },
       child: Container(
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).colorScheme.background,
         padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 60.0),
         child: Column(
           children: <Widget>[
             Spacer(flex: 2),
-            Text(
-              title,
-              style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                    fontWeight: FontWeight.w500,
+            Text(title,
+                style: TextStyle(
                     fontSize: 20,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
-            ),
-            Spacer(flex: 3),
+                    fontWeight: FontWeight.w500,
+                    color:
+                        Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
+            Spacer(flex: 8),
             Container(
               width: 180,
               child: Row(
@@ -168,8 +161,9 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                       decoration: BoxDecoration(
                         shape: BoxShape.circle,
                         color: isFilled
-                            ? Theme.of(context).colorScheme.primary
-                            : Theme.of(context).colorScheme.primary.withValues(alpha: 0.25),
+                            ? Theme.of(context).extension<CakeTextTheme>()!.titleColor
+                            : Theme.of(context).extension<PinCodeTheme>()!.indicatorsColor
+                                .withOpacity(0.25),
                       ));
                 }),
               ),
@@ -184,9 +178,10 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                 },
                 child: Text(
                   _changePinLengthText(),
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        color: Theme.of(context).colorScheme.secondary,
-                      ),
+                  style: TextStyle(
+                      fontSize: 14.0,
+                      fontWeight: FontWeight.normal,
+                      color: Theme.of(context).extension<PinCodeTheme>()!.switchColor),
                 ),
               )
             ],
@@ -230,7 +225,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                                         child: TextButton(
                                           onPressed: () => _pop(),
                                           style: TextButton.styleFrom(
-                                            backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
+                                            backgroundColor: Theme.of(context).colorScheme.background,
                                             shape: CircleBorder(),
                                           ),
                                           child: deleteIconImage,
@@ -248,15 +243,14 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                                     key: ValueKey('pin_code_button_${index}_key'),
                                     onPressed: () => _push(index),
                                     style: TextButton.styleFrom(
-                                      backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
+                                      backgroundColor: Theme.of(context).cardColor,
                                       shape: CircleBorder(),
                                     ),
                                     child: Text('$index',
-                                        style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                                              fontWeight: FontWeight.w600,
-                                              fontSize: 30,
-                                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                            )),
+                                        style: TextStyle(
+                                            fontSize: 25.0,
+                                            fontWeight: FontWeight.w600,
+                                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
                                   ),
                                 );
                               }),
diff --git a/lib/src/screens/receive/address_list_page.dart b/lib/src/screens/receive/address_list_page.dart
index b2af4389c..5f6794715 100644
--- a/lib/src/screens/receive/address_list_page.dart
+++ b/lib/src/screens/receive/address_list_page.dart
@@ -20,7 +20,6 @@ class AddressListPage extends BasePage {
         children: <Widget>[
           AddressList(
             addressListViewModel: addressListViewModel,
-            currentTheme: currentTheme,
             onSelect: (String address) async {
               Navigator.of(context).pop(address);
             },
diff --git a/lib/src/screens/receive/anonpay_invoice_page.dart b/lib/src/screens/receive/anonpay_invoice_page.dart
index 2aba0f207..2c66b95db 100644
--- a/lib/src/screens/receive/anonpay_invoice_page.dart
+++ b/lib/src/screens/receive/anonpay_invoice_page.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/anonpay/anonpay_donation_link_info.dart';
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/di.dart';
@@ -82,28 +84,36 @@ class AnonPayInvoicePage extends BasePage {
       child: KeyboardActions(
         disableScroll: true,
         config: KeyboardActionsConfig(
-          keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-          keyboardBarColor: Theme.of(context).colorScheme.surfaceVariant,
-          nextFocus: false,
-          actions: [
-            KeyboardActionsItem(
-              focusNode: _amountFocusNode,
-              toolbarButtons: [(_) => KeyboardDoneButton()],
-            ),
-          ],
-        ),
+            keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
+            nextFocus: false,
+            actions: [
+              KeyboardActionsItem(
+                focusNode: _amountFocusNode,
+                toolbarButtons: [(_) => KeyboardDoneButton()],
+              ),
+            ]),
         child: Container(
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).colorScheme.background,
           child: ScrollableWithBottomSection(
             contentPadding: EdgeInsets.only(bottom: 24),
             content: Container(
               decoration: responsiveLayoutUtil.shouldRenderMobileUI
                   ? BoxDecoration(
                       borderRadius: BorderRadius.only(
-                        bottomLeft: Radius.circular(24),
-                        bottomRight: Radius.circular(24),
+                          bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
+                      gradient: LinearGradient(
+                        colors: [
+                          Theme.of(context)
+                              .extension<ExchangePageTheme>()!
+                              .firstGradientTopPanelColor,
+                          Theme.of(context)
+                              .extension<ExchangePageTheme>()!
+                              .secondGradientTopPanelColor,
+                        ],
+                        begin: Alignment.topLeft,
+                        end: Alignment.bottomRight,
                       ),
-                      color: Theme.of(context).colorScheme.surfaceContainerLow,
                     )
                   : null,
               child: Observer(builder: (_) {
@@ -137,10 +147,12 @@ class AnonPayInvoicePage extends BasePage {
                             ? S.of(context).anonpay_description("an invoice", "pay")
                             : S.of(context).anonpay_description("a donation link", "donate"),
                         textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              fontWeight: FontWeight.w500,
-                            ),
+                        style: TextStyle(
+                            color: Theme.of(context)
+                                .extension<ExchangePageTheme>()!
+                                .receiveAmountColor,
+                            fontWeight: FontWeight.w500,
+                            fontSize: 12),
                       ),
                     ),
                   ),
@@ -167,8 +179,8 @@ class AnonPayInvoicePage extends BasePage {
                         anonInvoicePageViewModel.generateDonationLink();
                       }
                     },
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
+                    color: Theme.of(context).primaryColor,
+                    textColor: Colors.white,
                     isLoading: anonInvoicePageViewModel.state is IsExecutingState,
                   ),
                 ],
diff --git a/lib/src/screens/receive/anonpay_receive_page.dart b/lib/src/screens/receive/anonpay_receive_page.dart
index c37f78e81..7d71e3a22 100644
--- a/lib/src/screens/receive/anonpay_receive_page.dart
+++ b/lib/src/screens/receive/anonpay_receive_page.dart
@@ -9,9 +9,11 @@ import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/anonpay_status_section.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/copy_link_item.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
 import 'package:cake_wallet/utils/brightness_util.dart';
 import 'package:flutter/material.dart';
 import 'package:qr_flutter/qr_flutter.dart' as qr;
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class AnonPayReceivePage extends BasePage {
   final AnonpayInfoBase invoiceInfo;
@@ -36,21 +38,20 @@ class AnonPayReceivePage extends BasePage {
       children: [
         Text(
           title,
-          style: Theme.of(context).textTheme.bodyLarge!.copyWith(
-                fontSize: 18.0,
-                fontWeight: FontWeight.bold,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
+          style: TextStyle(
+              fontSize: 18.0,
+              fontWeight: FontWeight.bold,
+              fontFamily: 'Lato',
+              color: titleColor(context)),
         ),
         Text(
           invoiceInfo is AnonpayInvoiceInfo
               ? ReceivePageOption.anonPayInvoice.toString()
               : ReceivePageOption.anonPayDonationLink.toString(),
-          style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                fontSize: 10.0,
-                fontWeight: FontWeight.w500,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
+          style: TextStyle(
+              fontSize: 10.0,
+              fontWeight: FontWeight.w500,
+              color: Theme.of(context).extension<QRCodeTheme>()!.qrCodeColor),
         )
       ],
     );
@@ -117,7 +118,7 @@ class AnonPayReceivePage extends BasePage {
                         decoration: BoxDecoration(
                           border: Border.all(
                             width: 3,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
+                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
                           ),
                         ),
                         child: QrImage(
diff --git a/lib/src/screens/receive/fullscreen_qr_page.dart b/lib/src/screens/receive/fullscreen_qr_page.dart
index daea4f5fb..d11722ccf 100644
--- a/lib/src/screens/receive/fullscreen_qr_page.dart
+++ b/lib/src/screens/receive/fullscreen_qr_page.dart
@@ -3,6 +3,7 @@ import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class FullscreenQRPage extends BasePage {
   FullscreenQRPage({required this.qrViewData});
@@ -19,7 +20,7 @@ class FullscreenQRPage extends BasePage {
   Widget leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).colorScheme.onSurface,
+      color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
       size: 16,
     );
 
@@ -42,7 +43,8 @@ class FullscreenQRPage extends BasePage {
 
   @override
   Widget Function(BuildContext, Widget) get rootWrapper =>
-      (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
+      (BuildContext context, Widget scaffold) =>
+          GradientBackground(scaffold: scaffold);
 
   @override
   Widget body(BuildContext context) {
@@ -56,22 +58,13 @@ class FullscreenQRPage extends BasePage {
             child: Container(
               padding: EdgeInsets.all(10),
               decoration: BoxDecoration(
-                border: Border.all(
-                  width: 3,
-                  color: Theme.of(context).colorScheme.primary,
-                ),
-                borderRadius: BorderRadius.circular(16),
-                color: Theme.of(context).colorScheme.surface,
-              ),
-              child: Container(
-                decoration: BoxDecoration(
                   border: Border.all(
-                    width: 3,
-                    color: Theme.of(context).colorScheme.surface,
-                  ),
-                ),
-                child: QrImage(data: qrViewData.data, version: qrViewData.version),
-              ),
+                      width: 3,
+                      color: Theme.of(context).extension<DashboardPageTheme>()!.textColor)),
+              child: Container(
+                  decoration: BoxDecoration(
+                      border: Border.all(width: 3, color: Colors.white)),
+                  child: QrImage(data: qrViewData.data, version: qrViewData.version)),
             ),
           ),
         ),
diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart
index deb583895..7e3c2b555 100644
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@@ -1,12 +1,29 @@
+import 'package:cake_wallet/src/screens/nano_accounts/nano_account_list_page.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/address_list.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/src/widgets/gradient_background.dart';
+import 'package:cake_wallet/src/widgets/section_divider.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/share_util.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/receive/widgets/qr_widget.dart';
+import 'package:cake_wallet/src/screens/monero_accounts/monero_account_list_page.dart';
+import 'package:cake_wallet/src/screens/receive/widgets/header_tile.dart';
+import 'package:cake_wallet/src/screens/receive/widgets/address_cell.dart';
+import 'package:cake_wallet/view_model/wallet_address_list/wallet_account_list_header.dart';
+import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_header.dart';
+import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
+import 'package:cake_wallet/src/screens/receive/widgets/qr_widget.dart';
 import 'package:keyboard_actions/keyboard_actions.dart';
 
 class ReceivePage extends BasePage {
@@ -41,11 +58,11 @@ class ReceivePage extends BasePage {
   Widget middle(BuildContext context) {
     return Text(
       title,
-      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-            fontSize: 18.0,
-            fontWeight: FontWeight.bold,
-            color: pageIconColor(context),
-          ),
+      style: TextStyle(
+          fontSize: 18.0,
+          fontWeight: FontWeight.bold,
+          fontFamily: 'Lato',
+          color: pageIconColor(context)),
     );
   }
 
@@ -56,34 +73,36 @@ class ReceivePage extends BasePage {
   @override
   Widget trailing(BuildContext context) {
     return Material(
-      color: Colors.transparent,
-      child: Semantics(
-        label: S.of(context).share,
-        child: IconButton(
-          padding: EdgeInsets.zero,
-          constraints: BoxConstraints(),
-          highlightColor: Colors.transparent,
-          splashColor: Colors.transparent,
-          iconSize: 25,
-          onPressed: () => ShareUtil.share(
-            text: addressListViewModel.uri.toString(),
-            context: context,
+        color: Colors.transparent,
+        child: Semantics(
+          label: S.of(context).share,
+          child: IconButton(
+            padding: EdgeInsets.zero,
+            constraints: BoxConstraints(),
+            highlightColor: Colors.transparent,
+            splashColor: Colors.transparent,
+            iconSize: 25,
+            onPressed: () {
+              ShareUtil.share(
+                text: addressListViewModel.uri.toString(),
+                context: context,
+              );
+            },
+            icon: Icon(
+              Icons.share,
+              size: 20,
+              color: pageIconColor(context),
+            ),
           ),
-          icon: Icon(
-            Icons.share,
-            size: 20,
-            color: pageIconColor(context),
-          ),
-        ),
-      ),
-    );
+        ));
   }
 
   @override
-  Widget body(BuildContext context) => KeyboardActions(
+  Widget body(BuildContext context) {
+    return KeyboardActions(
         config: KeyboardActionsConfig(
             keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-            keyboardBarColor: Theme.of(context).colorScheme.surface,
+            keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
             nextFocus: false,
             actions: [
               KeyboardActionsItem(
@@ -97,30 +116,28 @@ class ReceivePage extends BasePage {
               Padding(
                 padding: EdgeInsets.fromLTRB(24, 50, 24, 24),
                 child: QRWidget(
-                  addressListViewModel: addressListViewModel,
-                  formKey: _formKey,
-                  heroTag: _heroTag,
-                  amountTextFieldFocusNode: _cryptoAmountFocus,
-                  amountController: _amountController,
-                  currentTheme: currentTheme,
-                ),
+                    addressListViewModel: addressListViewModel,
+                    formKey: _formKey,
+                    heroTag: _heroTag,
+                    amountTextFieldFocusNode: _cryptoAmountFocus,
+                    amountController: _amountController,
+                    isLight: currentTheme.type == ThemeType.light,
+                  ),
               ),
-              AddressList(addressListViewModel: addressListViewModel, currentTheme: currentTheme),
+              AddressList(addressListViewModel: addressListViewModel),
               Padding(
                 padding: EdgeInsets.fromLTRB(24, 24, 24, 32),
                 child: Text(
-                  addressListViewModel.isSilentPayments
-                      ? S.of(context).silent_payments_disclaimer
-                      : S.of(context).electrum_address_disclaimer,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    addressListViewModel.isSilentPayments
+                        ? S.of(context).silent_payments_disclaimer
+                        : S.of(context).electrum_address_disclaimer,
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
                         fontSize: 15,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
-                ),
+                        color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor)),
               ),
             ],
           ),
-        ),
-      );
+        ));
+  }
 }
diff --git a/lib/src/screens/receive/widgets/address_cell.dart b/lib/src/screens/receive/widgets/address_cell.dart
index ad28e71d4..beef7c762 100644
--- a/lib/src/screens/receive/widgets/address_cell.dart
+++ b/lib/src/screens/receive/widgets/address_cell.dart
@@ -1,41 +1,35 @@
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/utils/address_formatter.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 
 class AddressCell extends StatelessWidget {
-  AddressCell({
-    required this.address,
-    required this.name,
-    required this.isCurrent,
-    required this.isPrimary,
-    required this.backgroundColor,
-    required this.textColor,
-    required this.walletType,
-    required this.currentTheme,
-    this.onTap,
-    this.onEdit,
-    this.onHide,
-    this.isHidden = false,
-    this.onDelete,
-    this.txCount,
-    this.balance,
-    this.isChange = false,
-    this.hasBalance = false,
-    this.hasReceived = false,
-  });
+  AddressCell(
+      {required this.address,
+      required this.name,
+      required this.isCurrent,
+      required this.isPrimary,
+      required this.backgroundColor,
+      required this.textColor,
+      this.onTap,
+      this.onEdit,
+      this.onHide,
+      this.isHidden = false,
+      this.onDelete,
+      this.txCount,
+      this.balance,
+      this.isChange = false,
+      this.hasBalance = false,
+      this.hasReceived = false});
 
   factory AddressCell.fromItem(
     WalletAddressListItem item, {
     required bool isCurrent,
     required Color backgroundColor,
     required Color textColor,
-    required WalletType walletType,
-    required MaterialThemeBase currentTheme,
     Function(String)? onTap,
     bool hasBalance = false,
     bool hasReceived = false,
@@ -45,25 +39,22 @@ class AddressCell extends StatelessWidget {
     Function()? onDelete,
   }) =>
       AddressCell(
-        address: item.address,
-        name: item.name ?? '',
-        isCurrent: isCurrent,
-        isPrimary: item.isPrimary,
-        backgroundColor: backgroundColor,
-        textColor: textColor,
-        walletType: walletType,
-        currentTheme: currentTheme,
-        onTap: onTap,
-        onEdit: onEdit,
-        onHide: onHide,
-        isHidden: isHidden,
-        onDelete: onDelete,
-        txCount: item.txCount,
-        balance: item.balance,
-        isChange: item.isChange,
-        hasBalance: hasBalance,
-        hasReceived: hasReceived,
-      );
+          address: item.address,
+          name: item.name ?? '',
+          isCurrent: isCurrent,
+          isPrimary: item.isPrimary,
+          backgroundColor: backgroundColor,
+          textColor: textColor,
+          onTap: onTap,
+          onEdit: onEdit,
+          onHide: onHide,
+          isHidden: isHidden,
+          onDelete: onDelete,
+          txCount: item.txCount,
+          balance: item.balance,
+          isChange: item.isChange,
+          hasBalance: hasBalance,
+          hasReceived: hasReceived,);
 
   final String address;
   final String name;
@@ -71,8 +62,6 @@ class AddressCell extends StatelessWidget {
   final bool isPrimary;
   final Color backgroundColor;
   final Color textColor;
-  final WalletType walletType;
-  final MaterialThemeBase currentTheme;
   final Function(String)? onTap;
   final Function()? onEdit;
   final Function()? onHide;
@@ -84,6 +73,21 @@ class AddressCell extends StatelessWidget {
   final bool hasBalance;
   final bool hasReceived;
 
+  static const int addressPreviewLength = 8;
+
+  String get formattedAddress {
+    final formatIfCashAddr = address.replaceAll('bitcoincash:', '');
+
+    if (formatIfCashAddr.length <= (name.isNotEmpty ? 16 : 43)) {
+      return formatIfCashAddr;
+    } else {
+      return formatIfCashAddr.substring(0, addressPreviewLength) +
+          '...' +
+          formatIfCashAddr.substring(
+              formatIfCashAddr.length - addressPreviewLength, formatIfCashAddr.length);
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final Widget cell = InkWell(
@@ -98,9 +102,7 @@ class AddressCell extends StatelessWidget {
                 child: Column(
                   children: [
                     Row(
-                      mainAxisAlignment: name.isNotEmpty
-                          ? MainAxisAlignment.spaceBetween
-                          : MainAxisAlignment.center,
+                      mainAxisAlignment: name.isNotEmpty ? MainAxisAlignment.spaceBetween : MainAxisAlignment.center,
                       mainAxisSize: MainAxisSize.max,
                       children: [
                         Row(
@@ -112,39 +114,39 @@ class AddressCell extends StatelessWidget {
                                   height: 20,
                                   padding: EdgeInsets.all(4),
                                   decoration: BoxDecoration(
-                                    borderRadius: BorderRadius.all(Radius.circular(8.5)),
-                                    color: textColor,
-                                  ),
+                                      borderRadius: BorderRadius.all(Radius.circular(8.5)),
+                                      color: textColor),
                                   alignment: Alignment.center,
                                   child: Text(
                                     S.of(context).unspent_change,
-                                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                          color: backgroundColor,
-                                          fontSize: 10,
-                                          fontWeight: FontWeight.w600,
-                                        ),
+                                    style: TextStyle(
+                                      color: backgroundColor,
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.w600,
+                                    ),
                                   ),
                                 ),
                               ),
                             if (name.isNotEmpty)
                               Text(
                                 '$name',
-                                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                      fontWeight: FontWeight.w600,
-                                      color: textColor,
-                                    ),
+                                style: TextStyle(
+                                  fontSize: 14,
+                                  fontWeight: FontWeight.w600,
+                                  color: textColor,
+                                ),
                               ),
                           ],
                         ),
                         Flexible(
-                          child: AddressFormatter.buildSegmentedAddress(
-                            address: address,
-                            walletType: walletType,
-                            shouldTruncate: name.isNotEmpty || address.length > 43,
-                            evenTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: isChange ? 10 : 14,
-                                  color: textColor,
-                                ),
+                          child: AutoSizeText(
+                            responsiveLayoutUtil.shouldRenderTabletUI ? address : formattedAddress,
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontSize: isChange ? 10 : 14,
+                              color: textColor,
+                            ),
                           ),
                         ),
                       ],
@@ -158,19 +160,19 @@ class AddressCell extends StatelessWidget {
                           children: [
                             Text(
                               '${hasReceived ? S.of(context).received : S.of(context).balance}: $balance',
-                              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.w600,
-                                    color: textColor,
-                                  ),
+                              style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                                color: textColor,
+                              ),
                             ),
                             Text(
                               '${S.of(context).transactions.toLowerCase()}: $txCount',
-                              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.w600,
-                                    color: textColor,
-                                  ),
+                              style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                                color: textColor,
+                              ),
                             ),
                           ],
                         ),
@@ -202,10 +204,8 @@ class AddressCell extends StatelessWidget {
         children: [
           SlidableAction(
             onPressed: (_) => onHide?.call(),
-            backgroundColor: isHidden
-                ? Theme.of(context).colorScheme.primaryContainer
-                : Theme.of(context).colorScheme.errorContainer,
-            foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
+            backgroundColor: isHidden ? Colors.green : Colors.red,
+            foregroundColor: Colors.white,
             icon: isHidden ? CupertinoIcons.arrow_left : CupertinoIcons.arrow_right,
             label: isHidden ? S.of(context).show : S.of(context).hide,
           ),
@@ -218,16 +218,16 @@ class AddressCell extends StatelessWidget {
         children: [
           SlidableAction(
             onPressed: (_) => onEdit?.call(),
-            backgroundColor: Theme.of(context).colorScheme.primaryContainer,
-            foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
+            backgroundColor: Colors.blue,
+            foregroundColor: Colors.white,
             icon: Icons.edit,
             label: S.of(context).edit,
           ),
           if (onDelete != null)
             SlidableAction(
               onPressed: (_) => onDelete!.call(),
-              backgroundColor: Theme.of(context).colorScheme.errorContainer,
-              foregroundColor: Theme.of(context).colorScheme.onErrorContainer,
+              backgroundColor: Colors.red,
+              foregroundColor: Colors.white,
               icon: Icons.delete,
               label: S.of(context).delete,
             ),
diff --git a/lib/src/screens/receive/widgets/address_list.dart b/lib/src/screens/receive/widgets/address_list.dart
index 79b508f70..8d22d81ef 100644
--- a/lib/src/screens/receive/widgets/address_list.dart
+++ b/lib/src/screens/receive/widgets/address_list.dart
@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
@@ -6,7 +8,7 @@ import 'package:cake_wallet/src/screens/nano_accounts/nano_account_list_page.dar
 import 'package:cake_wallet/src/screens/receive/widgets/address_cell.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/header_tile.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
 import 'package:cake_wallet/utils/list_item.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_account_list_header.dart';
@@ -15,19 +17,19 @@ import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_h
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:mobx/mobx.dart';
 
 class AddressList extends StatefulWidget {
   const AddressList({
     super.key,
     required this.addressListViewModel,
-    required this.currentTheme,
     this.onSelect,
   });
 
   final WalletAddressListViewModel addressListViewModel;
-  final MaterialThemeBase currentTheme;
   final Function(String)? onSelect;
 
   @override
@@ -85,66 +87,59 @@ class _AddressListState extends State<AddressList> {
 
         if (item is WalletAccountListHeader) {
           cell = HeaderTile(
-            showTrailingButton: true,
-            walletAddressListViewModel: widget.addressListViewModel,
-            trailingButtonTap: () async {
-              if (widget.addressListViewModel.type == WalletType.monero ||
-                  widget.addressListViewModel.type == WalletType.wownero ||
-                  widget.addressListViewModel.type == WalletType.haven) {
-                await showPopUp<void>(
-                  context: context,
-                  builder: (_) => getIt.get<MoneroAccountListPage>(),
-                );
-                updateItems();
-              } else {
-                await showPopUp<void>(
-                  context: context,
-                  builder: (_) => getIt.get<NanoAccountListPage>(),
-                );
-                updateItems();
-              }
-            },
-            title: S.of(context).accounts,
-            trailingIcon: Icon(
-              Icons.arrow_forward_ios,
-              size: 14,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-            ),
-          );
+              showTrailingButton: true,
+              walletAddressListViewModel: widget.addressListViewModel,
+              trailingButtonTap: () async {
+                if (widget.addressListViewModel.type == WalletType.monero ||
+                    widget.addressListViewModel.type == WalletType.wownero ||
+                    widget.addressListViewModel.type == WalletType.haven) {
+                  await showPopUp<void>(
+                      context: context, builder: (_) => getIt.get<MoneroAccountListPage>());
+                  updateItems();
+                } else {
+                  await showPopUp<void>(
+                      context: context, builder: (_) => getIt.get<NanoAccountListPage>());
+                  updateItems();
+                }
+              },
+              title: S.of(context).accounts,
+              trailingIcon: Icon(
+                Icons.arrow_forward_ios,
+                size: 14,
+                color: Theme.of(context).extension<ReceivePageTheme>()!.iconsColor,
+              ));
         }
 
         if (item is WalletAddressHiddenListHeader) {
           cell = HeaderTile(
-            title: S.of(context).hidden_addresses,
-            walletAddressListViewModel: widget.addressListViewModel,
-            showTrailingButton: true,
-            showSearchButton: false,
-            trailingButtonTap: _toggleHiddenAddresses,
-            trailingIcon: Icon(
-              showHiddenAddresses ? Icons.toggle_on : Icons.toggle_off,
-              size: 20,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-            ),
-          );
+              title: S.of(context).hidden_addresses,
+              walletAddressListViewModel: widget.addressListViewModel,
+              showTrailingButton: true,
+              showSearchButton: false,
+              trailingButtonTap: _toggleHiddenAddresses,
+              trailingIcon: Icon(
+                showHiddenAddresses ? Icons.toggle_on : Icons.toggle_off,
+                size: 20,
+                color: Theme.of(context).extension<ReceivePageTheme>()!.iconsColor,
+              ));
         }
 
         if (item is WalletAddressListHeader) {
           cell = HeaderTile(
-            title: S.of(context).addresses,
-            walletAddressListViewModel: widget.addressListViewModel,
-            showTrailingButton: widget.addressListViewModel.showAddManualAddresses,
-            showSearchButton: true,
-            onSearchCallback: updateItems,
-            trailingButtonTap: () =>
-                Navigator.of(context).pushNamed(Routes.newSubaddress).then((value) {
-              updateItems(); // refresh the new address
-            }),
-            trailingIcon: Icon(
-              Icons.add,
-              size: 20,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-            ),
-          );
+              title: S.of(context).addresses,
+              walletAddressListViewModel: widget.addressListViewModel,
+              showTrailingButton: widget.addressListViewModel.showAddManualAddresses,
+              showSearchButton: true,
+              onSearchCallback: updateItems,
+              trailingButtonTap: () =>
+                  Navigator.of(context).pushNamed(Routes.newSubaddress).then((value) {
+                    updateItems(); // refresh the new address
+                  }),
+              trailingIcon: Icon(
+                Icons.add,
+                size: 20,
+                color: Theme.of(context).extension<ReceivePageTheme>()!.iconsColor,
+              ));
         }
 
         if (item is WalletAddressListItem) {
@@ -153,56 +148,54 @@ class _AddressListState extends State<AddressList> {
           } else if (!item.isHidden && showHiddenAddresses) {
             cell = Container();
           } else {
-            cell = Observer(
-              builder: (_) {
-                final isCurrent =
-                    item.address == widget.addressListViewModel.address.address && editable;
-                final backgroundColor = isCurrent
-                    ? Theme.of(context).colorScheme.primary
-                    : Theme.of(context).colorScheme.surface;
-                final textColor = isCurrent
-                    ? Theme.of(context).colorScheme.onPrimary
-                    : Theme.of(context).colorScheme.onSurface;
+            cell = Observer(builder: (_) {
+              final isCurrent =
+                  item.address == widget.addressListViewModel.address.address && editable;
+              final backgroundColor = isCurrent
+                  ? Theme.of(context).extension<ReceivePageTheme>()!.currentTileBackgroundColor
+                  : Theme.of(context).extension<ReceivePageTheme>()!.tilesBackgroundColor;
+              final textColor = isCurrent
+                  ? Theme.of(context).extension<ReceivePageTheme>()!.currentTileTextColor
+                  : Theme.of(context).extension<ReceivePageTheme>()!.tilesTextColor;
 
-                return AddressCell.fromItem(
-                  item,
-                  isCurrent: isCurrent,
-                  currentTheme: widget.currentTheme,
-                  walletType: widget.addressListViewModel.type,
-                  hasBalance: widget.addressListViewModel.isBalanceAvailable,
-                  hasReceived: widget.addressListViewModel.isReceivedAvailable,
-                  // hasReceived:
-                  backgroundColor: backgroundColor,
-                  textColor: textColor,
-                  onTap: (_) {
-                    if (widget.onSelect != null) {
-                      widget.onSelect!(item.address);
-                      return;
-                    }
-                    widget.addressListViewModel.setAddress(item);
-                  },
-                  onEdit: editable
-                      ? () => Navigator.of(context)
-                              .pushNamed(Routes.newSubaddress, arguments: item)
-                              .then((value) {
-                            updateItems(); // refresh the new address
-                          })
-                      : null,
-                  isHidden: item.isHidden,
-                  onHide: () => _hideAddress(item),
-                );
-              },
-            );
+              return AddressCell.fromItem(
+                item,
+                isCurrent: isCurrent,
+                hasBalance: widget.addressListViewModel.isBalanceAvailable,
+                hasReceived: widget.addressListViewModel.isReceivedAvailable,
+                // hasReceived:
+                backgroundColor: (kDebugMode && item.isHidden)
+                    ? Theme.of(context).colorScheme.error
+                    : (kDebugMode && item.isManual)
+                        ? Theme.of(context).colorScheme.error.withBlue(255)
+                        : backgroundColor,
+                textColor: textColor,
+                onTap: (_) {
+                  if (widget.onSelect != null) {
+                    widget.onSelect!(item.address);
+                    return;
+                  }
+                  widget.addressListViewModel.setAddress(item);
+                },
+                onEdit: editable
+                    ? () => Navigator.of(context)
+                            .pushNamed(Routes.newSubaddress, arguments: item)
+                            .then((value) {
+                          updateItems(); // refresh the new address
+                        })
+                    : null,
+                isHidden: item.isHidden,
+                onHide: () => _hideAddress(item),
+              );
+            });
           }
         }
 
         return index != 0
             ? cell
             : ClipRRect(
-                borderRadius: BorderRadius.only(
-                  topLeft: Radius.circular(30),
-                  topRight: Radius.circular(30),
-                ),
+                borderRadius:
+                    BorderRadius.only(topLeft: Radius.circular(30), topRight: Radius.circular(30)),
                 child: cell,
               );
       },
diff --git a/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart b/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart
index d4840c2b6..be39ac3bb 100644
--- a/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart
+++ b/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart
@@ -1,8 +1,10 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cw_core/currency.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 
 class AnonpayCurrencyInputField extends StatelessWidget {
   const AnonpayCurrencyInputField(
@@ -19,115 +21,111 @@ class AnonpayCurrencyInputField extends StatelessWidget {
   final TextEditingController controller;
   final String minAmount;
   final String maxAmount;
-
   @override
   Widget build(BuildContext context) {
     final arrowBottomPurple = Image.asset(
       'assets/images/arrow_bottom_purple_icon.png',
-      color: Theme.of(context).colorScheme.primary,
+      color: Colors.white,
       height: 8,
     );
-
     return Column(
       children: [
         Container(
-          child: Padding(
-            padding: EdgeInsets.only(top: 20),
-            child: Row(
-              children: [
-                Container(
-                  padding: EdgeInsets.only(right: 8),
-                  height: 32,
-                  child: InkWell(
-                    onTap: onTapPicker,
+            decoration: BoxDecoration(
+              border: Border(
+                  bottom: BorderSide(
+                      color:
+                          Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderBottomPanelColor,
+                      width: 1)),
+            ),
+            child: Padding(
+              padding: EdgeInsets.only(top: 20),
+              child: Row(
+                children: [
+                  Container(
+                    padding: EdgeInsets.only(right: 8),
+                    height: 32,
+                    child: InkWell(
+                      onTap: onTapPicker,
+                      child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          mainAxisSize: MainAxisSize.min,
+                          children: <Widget>[
+                            Padding(
+                              padding: EdgeInsets.only(right: 5),
+                              child: arrowBottomPurple,
+                            ),
+                            Text(selectedCurrency.name.toUpperCase(),
+                                style: TextStyle(
+                                    fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white))
+                          ]),
+                    ),
+                  ),
+                  selectedCurrency.tag != null
+                      ? Padding(
+                          padding: const EdgeInsets.only(right: 3.0),
+                          child: Container(
+                            height: 32,
+                            decoration: BoxDecoration(
+                                color: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
+                                borderRadius: BorderRadius.all(Radius.circular(6))),
+                            child: Center(
+                              child: Padding(
+                                padding: const EdgeInsets.all(6.0),
+                                child: Text(
+                                  selectedCurrency.tag!,
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    fontWeight: FontWeight.bold,
+                                    color: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ),
+                        )
+                      : Container(),
+                  Padding(
+                    padding: const EdgeInsets.only(right: 4.0),
+                    child: Text(':',
+                        style: TextStyle(
+                            fontWeight: FontWeight.w600, fontSize: 16, color: Colors.white)),
+                  ),
+                  Expanded(
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      mainAxisSize: MainAxisSize.min,
-                      children: <Widget>[
-                        Padding(
-                          padding: EdgeInsets.only(right: 5),
-                          child: arrowBottomPurple,
-                        ),
-                        Text(
-                          selectedCurrency.name.toUpperCase(),
-                          style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                fontWeight: FontWeight.w600,
-                                color: Theme.of(context).colorScheme.onSurface,
-                              ),
+                      children: [
+                        Flexible(
+                          child: BaseTextFormField(
+                            focusNode: focusNode,
+                            controller: controller,
+                            textInputAction: TextInputAction.next,
+                            enabled: true,
+                            textAlign: TextAlign.left,
+                            keyboardType:
+                                TextInputType.numberWithOptions(signed: false, decimal: true),
+                            inputFormatters: [
+                              FilteringTextInputFormatter.deny(RegExp('[\\-|\\ ]'))
+                            ],
+                            hintText: '0.0000',
+                            borderColor: Colors.transparent,
+                            //widget.borderColor,
+                            textStyle: TextStyle(
+                                fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
+                            placeholderTextStyle: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w600,
+                              color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor,
+                            ),
+                            validator: null,
+                          ),
                         ),
                       ],
                     ),
                   ),
-                ),
-                if (selectedCurrency.tag != null)
-                  Padding(
-                    padding: const EdgeInsets.only(right: 3.0),
-                    child: Container(
-                      height: 32,
-                      decoration: BoxDecoration(
-                        color: Theme.of(context).colorScheme.secondaryContainer,
-                        borderRadius: BorderRadius.all(Radius.circular(6)),
-                      ),
-                      child: Center(
-                        child: Padding(
-                          padding: const EdgeInsets.all(6.0),
-                          child: Text(
-                            selectedCurrency.tag!,
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  fontWeight: FontWeight.bold,
-                                  color: Theme.of(context).colorScheme.onSecondaryContainer,
-                                ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                Padding(
-                  padding: const EdgeInsets.only(right: 4.0),
-                  child: Text(
-                    ':',
-                    style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                          fontWeight: FontWeight.w600,
-                          color: Theme.of(context).colorScheme.onSurface,
-                        ),
-                  ),
-                ),
-                Expanded(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Flexible(
-                        child: BaseTextFormField(
-                          hasUnderlineBorder: true,
-                          borderWidth: 0.0,
-                          focusNode: focusNode,
-                          controller: controller,
-                          textInputAction: TextInputAction.next,
-                          enabled: true,
-                          textAlign: TextAlign.left,
-                          keyboardType:
-                              TextInputType.numberWithOptions(signed: false, decimal: true),
-                          inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\\-|\\ ]'))],
-                          hintText: '0.0000',
-                          textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                fontWeight: FontWeight.w600,
-                                color: Theme.of(context).colorScheme.onSurface,
-                              ),
-                          placeholderTextStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                fontWeight: FontWeight.w600,
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
-                          validator: null,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        Divider(height: 1, color: Theme.of(context).colorScheme.outlineVariant),
+                ],
+              ),
+            )),
         Container(
           height: 15,
           child: Row(
@@ -135,22 +133,20 @@ class AnonpayCurrencyInputField extends StatelessWidget {
             children: <Widget>[
               Text(
                 S.of(context).min_value(minAmount, selectedCurrency.toString()),
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      height: 1.2,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                    fontSize: 10,
+                    height: 1.2,
+                    color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor),
               ),
               SizedBox(width: 10),
-              Text(
-                S.of(context).max_value(maxAmount, selectedCurrency.toString()),
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+              Text(S.of(context).max_value(maxAmount, selectedCurrency.toString()),
+                  style: TextStyle(
+                      fontSize: 10,
                       height: 1.2,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
-              ),
+                      color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor)),
             ],
           ),
-        ),
+        )
       ],
     );
   }
diff --git a/lib/src/screens/receive/widgets/anonpay_input_form.dart b/lib/src/screens/receive/widgets/anonpay_input_form.dart
index 9e0ba76f9..6dc30d177 100644
--- a/lib/src/screens/receive/widgets/anonpay_input_form.dart
+++ b/lib/src/screens/receive/widgets/anonpay_input_form.dart
@@ -3,6 +3,8 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/anonpay_currency_input_field.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/anon_invoice_page_view_model.dart';
 import 'package:flutter/material.dart';
@@ -21,12 +23,12 @@ class AnonInvoiceForm extends StatelessWidget {
     required this.depositAmountFocus,
   })  : _nameFocusNode = FocusNode(),
         _emailFocusNode = FocusNode(),
-        _descriptionFocusNode = FocusNode() {
-    amountController.text = anonInvoicePageViewModel.amount;
-    nameController.text = anonInvoicePageViewModel.receipientName;
-    descriptionController.text = anonInvoicePageViewModel.description;
-    emailController.text = anonInvoicePageViewModel.receipientEmail;
-  }
+        _descriptionFocusNode = FocusNode(){
+          amountController.text = anonInvoicePageViewModel.amount;
+          nameController.text = anonInvoicePageViewModel.receipientName;
+          descriptionController.text = anonInvoicePageViewModel.description;
+          emailController.text = anonInvoicePageViewModel.receipientEmail;
+        }
 
   final TextEditingController amountController;
   final TextEditingController nameController;
@@ -43,19 +45,16 @@ class AnonInvoiceForm extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Form(
-      key: formKey,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          Text(
-            isInvoice ? S.of(context).invoice_details : S.of(context).donation_link_details,
-            style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                  fontWeight: FontWeight.w600,
-                ),
-          ),
-          if (isInvoice)
-            Observer(
-              builder: (_) {
+        key: formKey,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: <Widget>[
+            Text(
+              isInvoice ? S.of(context).invoice_details : S.of(context).donation_link_details,
+              style: textMediumSemiBold(),
+            ),
+            if (isInvoice)
+              Observer(builder: (_) {
                 return AnonpayCurrencyInputField(
                   onTapPicker: () => _presentPicker(context),
                   controller: amountController,
@@ -64,67 +63,65 @@ class AnonInvoiceForm extends StatelessWidget {
                   minAmount: anonInvoicePageViewModel.minimum?.toString() ?? '...',
                   selectedCurrency: anonInvoicePageViewModel.selectedCurrency,
                 );
-              },
+              }),
+            SizedBox(
+              height: 24,
             ),
-          SizedBox(height: 24),
-          BaseTextFormField(
-            hasUnderlineBorder: true,
-            controller: nameController,
-            focusNode: _nameFocusNode,
-            suffixIcon: SizedBox(width: 36),
-            hintText: S.of(context).optional_name,
-            textInputAction: TextInputAction.next,
-            placeholderTextStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-            textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-            validator: null,
-          ),
-          SizedBox(height: 24),
-          BaseTextFormField(
-            hasUnderlineBorder: true,
-            controller: descriptionController,
-            focusNode: _descriptionFocusNode,
-            textInputAction: TextInputAction.next,
-            suffixIcon: SizedBox(width: 36),
-            hintText: S.of(context).optional_description,
-            placeholderTextStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-            textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-            validator: null,
-          ),
-          SizedBox(height: 24),
-          BaseTextFormField(
-            hasUnderlineBorder: true,
-            controller: emailController,
-            textInputAction: TextInputAction.next,
-            focusNode: _emailFocusNode,
-            suffixIcon: SizedBox(width: 36),
-            keyboardType: TextInputType.emailAddress,
-            hintText: S.of(context).optional_email_hint,
-            placeholderTextStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-            textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-            validator: EmailValidator(),
-          ),
-          SizedBox(height: 52),
-        ],
-      ),
-    );
+            BaseTextFormField(
+              controller: nameController,
+              focusNode: _nameFocusNode,
+              borderColor: Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
+              suffixIcon: SizedBox(width: 36),
+              hintText: S.of(context).optional_name,
+              textInputAction: TextInputAction.next,
+              placeholderTextStyle: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor,
+              ),
+              textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
+              validator: null,
+            ),
+            SizedBox(
+              height: 24,
+            ),
+            BaseTextFormField(
+              controller: descriptionController,
+              focusNode: _descriptionFocusNode,
+              textInputAction: TextInputAction.next,
+              borderColor: Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
+              suffixIcon: SizedBox(width: 36),
+              hintText: S.of(context).optional_description,
+              placeholderTextStyle: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor,
+              ),
+              textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
+              validator: null,
+            ),
+            SizedBox(height: 24),
+            BaseTextFormField(
+              controller: emailController,
+              textInputAction: TextInputAction.next,
+              focusNode: _emailFocusNode,
+              borderColor: Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
+              suffixIcon: SizedBox(width: 36),
+              keyboardType: TextInputType.emailAddress,
+              hintText: S.of(context).optional_email_hint,
+              placeholderTextStyle: TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor,
+              ),
+              textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
+              validator: EmailValidator(),
+            ),
+            SizedBox(
+              height: 52,
+            ),
+          ],
+        ));
   }
 
   void _presentPicker(BuildContext context) {
diff --git a/lib/src/screens/receive/widgets/anonpay_status_section.dart b/lib/src/screens/receive/widgets/anonpay_status_section.dart
index 5685a6ada..f92186aa4 100644
--- a/lib/src/screens/receive/widgets/anonpay_status_section.dart
+++ b/lib/src/screens/receive/widgets/anonpay_status_section.dart
@@ -1,6 +1,10 @@
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:flutter/material.dart';
 
 class AnonInvoiceStatusSection extends StatelessWidget {
@@ -17,7 +21,7 @@ class AnonInvoiceStatusSection extends StatelessWidget {
       width: 200,
       padding: EdgeInsets.all(19),
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).colorScheme.background,
         borderRadius: BorderRadius.circular(30),
       ),
       child: Column(
@@ -27,15 +31,16 @@ class AnonInvoiceStatusSection extends StatelessWidget {
             children: [
               Text(
                 S.current.status,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                style: TextStyle(
+                  fontSize: 14,
                   fontWeight: FontWeight.w500,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  color: Theme.of(context).extension<ExchangePageTheme>()!.receiveAmountColor,
                 ),
               ),
               Container(
                 padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
                 decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.secondaryContainer,
+                  color: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
                   borderRadius: BorderRadius.circular(10),
                 ),
                 child: Row(
@@ -43,20 +48,19 @@ class AnonInvoiceStatusSection extends StatelessWidget {
                   children: [
                     SyncIndicatorIcon(
                       boolMode: false,
-                      value: invoiceInfo.status,
+                      value: invoiceInfo.status ?? '',
                       size: 6,
                     ),
                     SizedBox(width: 5),
                     Text(
-                      invoiceInfo.status,
-                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                        fontWeight: FontWeight.w600,
-                        color: Theme.of(context).colorScheme.onSecondaryContainer,
+                      invoiceInfo.status ?? '',
+                      style: textSmallSemiBold(
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                       ),
-                    ),
+                    )
                   ],
                 ),
-              ),
+              )
             ],
           ),
           SizedBox(height: 27),
@@ -65,16 +69,16 @@ class AnonInvoiceStatusSection extends StatelessWidget {
             children: [
               Text(
                 'ID',
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                style: TextStyle(
+                  fontSize: 14,
                   fontWeight: FontWeight.w500,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  color: Theme.of(context).extension<ExchangePageTheme>()!.receiveAmountColor,
                 ),
               ),
               Text(
-                invoiceInfo.invoiceId,
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurface,
+                invoiceInfo.invoiceId ?? '',
+                style: textSmallSemiBold(
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
               ),
             ],
diff --git a/lib/src/screens/receive/widgets/copy_link_item.dart b/lib/src/screens/receive/widgets/copy_link_item.dart
index 47b6dddd2..7c1ffa874 100644
--- a/lib/src/screens/receive/widgets/copy_link_item.dart
+++ b/lib/src/screens/receive/widgets/copy_link_item.dart
@@ -1,8 +1,11 @@
+
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class CopyLinkItem extends StatelessWidget {
   const CopyLinkItem({super.key, required this.url, required this.title});
@@ -12,15 +15,15 @@ class CopyLinkItem extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final copyImage = Image.asset('assets/images/copy_address.png',
-        color: Theme.of(context).colorScheme.onSurface);
+        color: Theme.of(context).extension<DashboardPageTheme>()!.textColor);
 
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         Text(
           title,
-          style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-            color: Theme.of(context).colorScheme.onSurface,
+          style: textMedium(
+            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
           ),
         ),
         SizedBox(width: 50),
@@ -43,7 +46,7 @@ class CopyLinkItem extends StatelessWidget {
               onPressed: () => Share.share(url),
               icon: Icon(
                 Icons.share,
-                color: Theme.of(context).colorScheme.primary,
+                color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
               ),
             )
           ],
diff --git a/lib/src/screens/receive/widgets/currency_input_field.dart b/lib/src/screens/receive/widgets/currency_input_field.dart
index c487753d9..382c53f9d 100644
--- a/lib/src/screens/receive/widgets/currency_input_field.dart
+++ b/lib/src/screens/receive/widgets/currency_input_field.dart
@@ -1,6 +1,8 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -13,7 +15,7 @@ class CurrencyAmountTextField extends StatelessWidget {
     this.allAmountButton = false,
     this.isPickerEnable = false,
     this.isSelected = false,
-    this.currentThemeType = ThemeType.dark,
+    this.currentTheme = ThemeType.dark,
     this.onTapPicker,
     this.padding,
     this.imageArrow,
@@ -28,10 +30,6 @@ class CurrencyAmountTextField extends StatelessWidget {
     this.selectedCurrencyTextKey,
     this.selectedCurrencyTagTextKey,
     this.currencyAmountTextFieldWidgetKey,
-    this.fillColor,
-    this.borderColor,
-    this.hasUnderlineBorder = false,
-    this.borderWidth = 1.0,
   }) : super(key: currencyAmountTextFieldWidgetKey);
 
   final Key? sendAllButtonKey;
@@ -51,19 +49,17 @@ class CurrencyAmountTextField extends StatelessWidget {
   final bool isAmountEditable;
   final FormFieldValidator<String>? currencyValueValidator;
   final bool isPickerEnable;
-  final ThemeType currentThemeType;
+  final ThemeType currentTheme;
   final bool isSelected;
   final bool allAmountButton;
   final VoidCallback? allAmountCallback;
   final VoidCallback? onTapPicker;
-  final Color? fillColor;
-  final Color? borderColor;
-  final bool hasUnderlineBorder;
-  final double borderWidth;
 
   @override
   Widget build(BuildContext context) {
-    final textColor = Theme.of(context).colorScheme.onSurface;
+    final textColor = currentTheme == ThemeType.light
+        ? Theme.of(context).appBarTheme.titleTextStyle!.color!
+        : Colors.white;
     final _prefixContent = Row(
       children: [
         isPickerEnable
@@ -77,22 +73,18 @@ class CurrencyAmountTextField extends StatelessWidget {
                     mainAxisSize: MainAxisSize.min,
                     children: <Widget>[
                       Padding(
-                        padding: const EdgeInsets.only(right: 5),
-                        child: imageArrow ??
-                            Image.asset(
-                              'assets/images/arrow_bottom_purple_icon.png',
-                              color: textColor,
-                              height: 8,
-                            ),
-                      ),
+                          padding: const EdgeInsets.only(right: 5),
+                          child: imageArrow ??
+                              Image.asset('assets/images/arrow_bottom_purple_icon.png',
+                                  color: textColor, height: 8)),
                       Text(
                         key: selectedCurrencyTextKey,
                         selectedCurrency,
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                              fontWeight: FontWeight.w600,
-                              fontSize: 16,
-                              color: textColor,
-                            ),
+                        style: TextStyle(
+                          fontWeight: FontWeight.w600,
+                          fontSize: 16,
+                          color: textColor,
+                        ),
                       ),
                     ],
                   ),
@@ -101,11 +93,11 @@ class CurrencyAmountTextField extends StatelessWidget {
             : Text(
                 key: selectedCurrencyTextKey,
                 selectedCurrency,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontWeight: FontWeight.w600,
-                      fontSize: 16,
-                      color: textColor,
-                    ),
+                style: TextStyle(
+                  fontWeight: FontWeight.w600,
+                  fontSize: 16,
+                  color: textColor,
+                ),
               ),
         if (tag != null)
           Padding(
@@ -113,7 +105,8 @@ class CurrencyAmountTextField extends StatelessWidget {
             child: Container(
               height: 32,
               decoration: BoxDecoration(
-                color: tagBackgroundColor ?? Theme.of(context).colorScheme.surfaceContainerHighest,
+                color: tagBackgroundColor ??
+                    Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
                 borderRadius: const BorderRadius.all(Radius.circular(6)),
               ),
               child: Center(
@@ -122,10 +115,11 @@ class CurrencyAmountTextField extends StatelessWidget {
                   child: Text(
                     key: selectedCurrencyTagTextKey,
                     tag!,
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                          fontWeight: FontWeight.bold,
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontWeight: FontWeight.bold,
+                      color: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
+                    ),
                   ),
                 ),
               ),
@@ -135,11 +129,11 @@ class CurrencyAmountTextField extends StatelessWidget {
           padding: EdgeInsets.only(right: 4.0),
           child: Text(
             ':',
-            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  fontSize: 16,
-                  color: textColor,
-                ),
+            style: TextStyle(
+              fontWeight: FontWeight.w600,
+              fontSize: 16,
+              color: textColor,
+            ),
           ),
         ),
       ],
@@ -152,15 +146,13 @@ class CurrencyAmountTextField extends StatelessWidget {
               ? Container(
                   child: _prefixContent,
                   padding: EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-                  margin: const EdgeInsets.only(right: 8),
+                  margin: const EdgeInsets.only(right: 3),
                   decoration: BoxDecoration(
-                    border: Border.all(
-                      color: textColor,
-                    ),
-                    borderRadius: BorderRadius.circular(10),
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-                )
+                      border: Border.all(
+                        color: textColor,
+                      ),
+                      borderRadius: BorderRadius.circular(26),
+                      color: Theme.of(context).primaryColor))
               : _prefixContent,
           Expanded(
             child: Row(
@@ -170,8 +162,6 @@ class CurrencyAmountTextField extends StatelessWidget {
                   child: FocusTraversalOrder(
                     order: NumericFocusOrder(1),
                     child: BaseTextFormField(
-                      hasUnderlineBorder: hasUnderlineBorder,
-                      borderWidth: borderWidth,
                       key: amountTextfieldKey,
                       focusNode: amountFocusNode,
                       controller: amountController,
@@ -185,17 +175,19 @@ class CurrencyAmountTextField extends StatelessWidget {
                         FilteringTextInputFormatter.deny(RegExp('[\\-|\\ ]')),
                       ],
                       hintText: hintText ?? '0.0000',
-                      fillColor: fillColor,
-                      textStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                            color: textColor,
-                          ),
-                      placeholderTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
+                      borderColor: Colors.transparent,
+                      textStyle: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w600,
+                        color: textColor,
+                      ),
+                      placeholderTextStyle: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w600,
+                        color: currentTheme == ThemeType.light
+                            ? Theme.of(context).appBarTheme.titleTextStyle!.color!
+                            : Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor,
+                      ),
                       validator: isAmountEditable ? currencyValueValidator : null,
                     ),
                   ),
@@ -205,7 +197,7 @@ class CurrencyAmountTextField extends StatelessWidget {
                     height: 32,
                     width: 32,
                     decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surface,
+                      color: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
                       borderRadius: const BorderRadius.all(Radius.circular(6)),
                     ),
                     child: InkWell(
@@ -215,10 +207,13 @@ class CurrencyAmountTextField extends StatelessWidget {
                         child: Text(
                           S.of(context).all,
                           textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                fontWeight: FontWeight.bold,
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
+                          style: TextStyle(
+                            fontSize: 12,
+                            fontWeight: FontWeight.bold,
+                            color: Theme.of(context)
+                                .extension<SendPageTheme>()!
+                                .textFieldButtonIconColor,
+                          ),
                         ),
                       ),
                     ),
diff --git a/lib/src/screens/receive/widgets/header_tile.dart b/lib/src/screens/receive/widgets/header_tile.dart
index 24918ad50..68148bbee 100644
--- a/lib/src/screens/receive/widgets/header_tile.dart
+++ b/lib/src/screens/receive/widgets/header_tile.dart
@@ -1,5 +1,5 @@
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
 import 'package:flutter/material.dart';
 
@@ -31,60 +31,72 @@ class _HeaderTileState extends State<HeaderTile> {
 
   @override
   Widget build(BuildContext context) {
-    final searchIcon = Icon(Icons.search, color: Theme.of(context).colorScheme.primary);
+    final searchIcon = Icon( Icons.search,
+        color: Theme.of(context).extension<ReceivePageTheme>()!.iconsColor);
 
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 24, vertical: 12),
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).extension<ReceivePageTheme>()!.tilesBackgroundColor,
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: <Widget>[
           _isSearchActive
               ? Expanded(
-                  child: BaseTextFormField(
+                  child: TextField(
                     onChanged: (value) {
                       widget.walletAddressListViewModel.updateSearchText(value);
                       widget.onSearchCallback?.call();
                     },
-                    cursorColor: Theme.of(context).colorScheme.onSurface,
+                    cursorColor: Theme.of(context).extension<ReceivePageTheme>()!.tilesTextColor,
                     cursorWidth: 0.5,
-                    isDense: true,
-                    hintText: '${S.of(context).search}...',
-                    contentPadding: EdgeInsets.all(4),
-                    placeholderTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    decoration: InputDecoration(
+                      hintText: '${S.of(context).search}...',
+                      isDense: true,
+                      contentPadding: EdgeInsets.zero,
+                      hintStyle: TextStyle(
                           fontSize: 16,
                           fontWeight: FontWeight.w600,
-                        ),
+                          color: Theme.of(context).extension<ReceivePageTheme>()!.tilesTextColor),
+                      border: UnderlineInputBorder(
+                        borderSide: BorderSide(color: Theme.of(context).dividerColor),
+                      ),
+                      focusedBorder: UnderlineInputBorder(
+                        borderSide: BorderSide(color: Theme.of(context).dividerColor),
+                      ),
+                      enabledBorder: UnderlineInputBorder(
+                        borderSide: BorderSide(color: Theme.of(context).dividerColor),
+                      ),
+                    ),
                     autofocus: true,
                   ),
                 )
               : Text(
                   widget.title,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                      ),
+                  style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).extension<ReceivePageTheme>()!.tilesTextColor),
                 ),
           Row(
             children: [
               if (widget.showSearchButton)
                 GestureDetector(
-                  onTap: () {
-                    setState(() {
-                      _isSearchActive = !_isSearchActive;
-                      widget.walletAddressListViewModel.updateSearchText('');
-                    });
-                  },
-                  child: Container(
-                    height: 32,
-                    width: 32,
-                    decoration: BoxDecoration(
-                      shape: BoxShape.circle,
-                      color: Theme.of(context).colorScheme.secondaryContainer,
-                    ),
-                    child: searchIcon,
-                  ),
-                ),
+                    onTap: () {
+                      setState(() {
+                        _isSearchActive = !_isSearchActive;
+                        widget.walletAddressListViewModel.updateSearchText('');
+                      });
+                    },
+                    child: Container(
+                      height: 32,
+                      width: 32,
+                      decoration: BoxDecoration(
+                          shape: BoxShape.circle,
+                          color: Theme.of(context)
+                              .extension<ReceivePageTheme>()!
+                              .iconsBackgroundColor),
+                      child: searchIcon,
+                    )),
               const SizedBox(width: 8),
               if (widget.showTrailingButton)
                 GestureDetector(
@@ -93,9 +105,9 @@ class _HeaderTileState extends State<HeaderTile> {
                     height: 32,
                     width: 32,
                     decoration: BoxDecoration(
-                      shape: BoxShape.circle,
-                      color: Theme.of(context).colorScheme.secondaryContainer,
-                    ),
+                        shape: BoxShape.circle,
+                        color:
+                            Theme.of(context).extension<ReceivePageTheme>()!.iconsBackgroundColor),
                     child: widget.trailingIcon,
                   ),
                 ),
diff --git a/lib/src/screens/receive/widgets/qr_image.dart b/lib/src/screens/receive/widgets/qr_image.dart
index 51c0c7431..043958ef4 100644
--- a/lib/src/screens/receive/widgets/qr_image.dart
+++ b/lib/src/screens/receive/widgets/qr_image.dart
@@ -1,4 +1,3 @@
-import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:qr_flutter/qr_flutter.dart' as qr;
 
@@ -9,7 +8,7 @@ class QrImage extends StatelessWidget {
     this.backgroundColor = Colors.white,
     this.size = 100.0,
     this.version,
-    this.errorCorrectionLevel = qr.QrErrorCorrectLevel.H,
+    this.errorCorrectionLevel = qr.QrErrorCorrectLevel.L,
   });
 
   final double size;
@@ -29,7 +28,6 @@ class QrImage extends StatelessWidget {
       foregroundColor: foregroundColor,
       backgroundColor: backgroundColor,
       padding: const EdgeInsets.all(8.0),
-      embeddedImage: AssetImage('assets/images/qr-cake.png'),
     );
   }
 }
diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart
index a4591e092..9d09e57a1 100644
--- a/lib/src/screens/receive/widgets/qr_widget.dart
+++ b/lib/src/screens/receive/widgets/qr_widget.dart
@@ -1,28 +1,27 @@
 import 'package:cake_wallet/entities/qr_view_data.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/currency_input_field.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
-import 'package:cake_wallet/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart';
-import 'package:cake_wallet/utils/address_formatter.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/brightness_util.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
+import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 
 class QRWidget extends StatelessWidget {
   QRWidget({
     required this.addressListViewModel,
-    required this.currentTheme,
+    required this.isLight,
     this.qrVersion,
     this.heroTag,
     required this.amountController,
@@ -34,7 +33,7 @@ class QRWidget extends StatelessWidget {
   final TextEditingController amountController;
   final FocusNode? amountTextFieldFocusNode;
   final GlobalKey<FormState> formKey;
-  final MaterialThemeBase currentTheme;
+  final bool isLight;
   final int? qrVersion;
   final String? heroTag;
 
@@ -44,10 +43,8 @@ class QRWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final copyImage = Image.asset(
-      'assets/images/copy_address.png',
-      color: Theme.of(context).colorScheme.onSurfaceVariant,
-    );
+    final copyImage = Image.asset('assets/images/copy_address.png',
+        color: Theme.of(context).extension<QRCodeTheme>()!.qrWidgetCopyButtonColor);
 
     // This magic number for wider screen sets the text input focus at center of the inputfield
     final _width =
@@ -66,9 +63,10 @@ class QRWidget extends StatelessWidget {
                   padding: const EdgeInsets.only(bottom: 12),
                   child: Text(
                     S.of(context).qr_fullscreen,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          fontWeight: FontWeight.w500,
-                        ),
+                    style: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).extension<DashboardPageTheme>()!.textColor),
                   ),
                 ),
                 Row(
@@ -81,112 +79,37 @@ class QRWidget extends StatelessWidget {
                           onTap: () {
                             BrightnessUtil.changeBrightnessForFunction(
                               () async {
-                                await Navigator.pushNamed(
-                                  context,
-                                  Routes.fullscreenQR,
-                                  arguments: QrViewData(
-                                    data: addressUri.toString(),
-                                    heroTag: heroTag,
-                                  ),
-                                );
+                                await Navigator.pushNamed(context, Routes.fullscreenQR,
+                                    arguments: QrViewData(
+                                      data: addressUri.toString(),
+                                      heroTag: heroTag,
+                                    ));
                               },
                             );
                           },
                           child: Hero(
                             tag: Key(heroTag ?? addressUri.toString()),
                             child: Center(
-                              child: Container(
-                                padding: EdgeInsets.zero,
-                                decoration: BoxDecoration(
-                                  border: Border(top: BorderSide.none),
-                                  borderRadius: BorderRadius.all(Radius.circular(5)),
-                                  color: Theme.of(context).colorScheme.surface,
-                                ),
-                                child: Column(
-                                  children: [
-                                    Container(
-                                      padding: EdgeInsets.all(3),
-                                      child: AspectRatio(
-                                        aspectRatio: 1.0,
-                                        child: QrImage(
-                                          data: addressUri.toString(),
-                                        ),
-                                      ),
+                              child: AspectRatio(
+                                aspectRatio: 1.0,
+                                child: Container(
+                                  padding: EdgeInsets.all(5),
+                                  decoration: BoxDecoration(
+                                    border: Border.all(
+                                      width: 3,
+                                      color: Theme.of(context)
+                                          .extension<DashboardPageTheme>()!
+                                          .textColor,
                                     ),
-                                    if (addressListViewModel.isPayjoinUnavailable &&
-                                        !addressListViewModel.isSilentPayments) ...[
-                                      GestureDetector(
-                                        onTap: () => _onPayjoinInactivePressed(context),
-                                        child: Row(
-                                          mainAxisAlignment: MainAxisAlignment.center,
-                                          children: [
-                                            Padding(
-                                              padding: EdgeInsets.only(
-                                                top: 4,
-                                                bottom: 4,
-                                                right: 4,
-                                              ),
-                                              child: Image.asset(
-                                                'assets/images/payjoin.png',
-                                                width: 20,
-                                              ),
-                                            ),
-                                            Text(
-                                              S.of(context).payjoin_unavailable,
-                                              style:
-                                                  Theme.of(context).textTheme.bodySmall?.copyWith(
-                                                        fontWeight: FontWeight.w600,
-                                                        color: Theme.of(context)
-                                                            .colorScheme
-                                                            .onSurfaceVariant,
-                                                      ),
-                                            ),
-                                            Padding(
-                                              padding: EdgeInsets.only(
-                                                top: 4,
-                                                bottom: 4,
-                                                left: 4,
-                                              ),
-                                              child: CircleAvatar(
-                                                radius: 7,
-                                                backgroundColor: Colors.black,
-                                                child: Icon(
-                                                  Icons.question_mark,
-                                                  size: 10,
-                                                  color: Colors.white,
-                                                ),
-                                              ),
-                                            ),
-                                          ],
+                                  ),
+                                  child: Container(
+                                      decoration: BoxDecoration(
+                                        border: Border.all(
+                                          width: 3,
+                                          color: Colors.white,
                                         ),
                                       ),
-                                    ],
-                                    if (addressListViewModel.payjoinEndpoint.isNotEmpty &&
-                                        !addressListViewModel.isSilentPayments) ...[
-                                      Row(
-                                        mainAxisAlignment: MainAxisAlignment.center,
-                                        children: [
-                                          Padding(
-                                            padding: EdgeInsets.only(
-                                              top: 4,
-                                              bottom: 4,
-                                              right: 4,
-                                            ),
-                                            child: Image.asset(
-                                              'assets/images/payjoin.png',
-                                              width: 20,
-                                            ),
-                                          ),
-                                          Text(
-                                            S.of(context).payjoin_enabled,
-                                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                                  fontWeight: FontWeight.w600,
-                                                ),
-                                          ),
-                                        ],
-                                      ),
-                                    ]
-                                  ],
+                                      child: QrImage(data: addressUri.toString())),
                                 ),
                               ),
                             ),
@@ -199,35 +122,32 @@ class QRWidget extends StatelessWidget {
                 ),
               ],
             ),
-            Observer(
-                builder: (_) => Padding(
-                      padding: EdgeInsets.only(top: 10),
-                      child: Row(
-                        children: <Widget>[
-                          Expanded(
-                            child: Form(
-                              key: formKey,
-                              child: CurrencyAmountTextField(
-                                hasUnderlineBorder: true,
-                                borderWidth: 0.0,
-                                selectedCurrency: _currencyName,
-                                amountFocusNode: amountTextFieldFocusNode,
-                                amountController: amountController,
-                                padding: EdgeInsets.only(top: 20, left: _width / 4),
-                                currentThemeType: currentTheme.type,
-                                isAmountEditable: true,
-                                tag: addressListViewModel.selectedCurrency.tag,
-                                onTapPicker: () => _presentPicker(context),
-                                isPickerEnable: true,
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    )),
-            Divider(height: 1, color: Theme.of(context).colorScheme.outlineVariant),
+            Observer(builder: (_) {
+              return Padding(
+                padding: EdgeInsets.only(top: 10),
+                child: Row(
+                  children: <Widget>[
+                    Expanded(
+                      child: Form(
+                          key: formKey,
+                          child: CurrencyAmountTextField(
+                              selectedCurrency: _currencyName,
+                              amountFocusNode: amountTextFieldFocusNode,
+                              amountController: amountController,
+                              padding: EdgeInsets.only(top: 20, left: _width / 4),
+                              currentTheme: isLight ? ThemeType.light : ThemeType.dark,
+                              isAmountEditable: true,
+                              tag: addressListViewModel.selectedCurrency.tag,
+                              onTapPicker: () => _presentPicker(context),
+                              isPickerEnable: true)),
+                    ),
+                  ],
+                ),
+              );
+            }),
+            Divider(height: 1, color: Theme.of(context).extension<PickerTheme>()!.dividerColor),
             Padding(
-              padding: EdgeInsets.only(top: 12, bottom: 8),
+              padding: EdgeInsets.only(top: 20, bottom: 8),
               child: Builder(
                 builder: (context) => Observer(
                   builder: (context) => GestureDetector(
@@ -240,15 +160,14 @@ class QRWidget extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: <Widget>[
                         Expanded(
-                          child: AddressFormatter.buildSegmentedAddress(
-                            address: addressUri.address,
-                            walletType: addressListViewModel.type,
+                          child: Text(
+                            addressUri.address,
                             textAlign: TextAlign.center,
-                            evenTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                  fontSize: 15,
-                                  fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).colorScheme.onSurface,
-                                ),
+                            style: TextStyle(
+                                fontSize: 15,
+                                fontWeight: FontWeight.w500,
+                                color:
+                                    Theme.of(context).extension<DashboardPageTheme>()!.textColor),
                           ),
                         ),
                         Padding(
@@ -260,29 +179,7 @@ class QRWidget extends StatelessWidget {
                   ),
                 ),
               ),
-            ),
-            Observer(
-              builder: (_) => Offstage(
-                offstage: addressListViewModel.payjoinEndpoint.isEmpty ||
-                    addressListViewModel.isSilentPayments,
-                child: Padding(
-                  padding: EdgeInsets.only(top: 12),
-                  child: PrimaryImageButton(
-                    onPressed: () {
-                      Clipboard.setData(ClipboardData(text: addressUri.toString()));
-                      showBar<void>(context, S.of(context).copied_to_clipboard);
-                    },
-                    image: Image.asset(
-                      'assets/images/payjoin.png',
-                      width: 25,
-                    ),
-                    text: S.of(context).copy_payjoin_address,
-                    color: Theme.of(context).colorScheme.surfaceContainer,
-                    textColor: Theme.of(context).colorScheme.onSurface,
-                  ),
-                ),
-              ),
-            ),
+            )
           ],
         ),
       ),
@@ -309,23 +206,4 @@ class QRWidget extends StatelessWidget {
     // update amount if currency changed
     addressListViewModel.changeAmount(amountController.text);
   }
-
-  void _onPayjoinInactivePressed(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (context) => InfoBottomSheet(
-        titleText: S.of(context).payjoin_unavailable_sheet_title,
-        content: S.of(context).payjoin_unavailable_sheet_content,
-        currentTheme: currentTheme,
-        isTwoAction: true,
-        leftButtonText: S.of(context).learn_more,
-        actionLeftButton: () => launchUrl(
-          Uri.parse("https://docs.cakewallet.com/cryptos/bitcoin/#payjoin"),
-          mode: LaunchMode.externalApplication,
-        ),
-        rightButtonText: S.of(context).ok,
-        actionRightButton: () => Navigator.of(context).pop(),
-      ),
-    );
-  }
 }
diff --git a/lib/src/screens/release_notes/release_notes_screen.dart b/lib/src/screens/release_notes/release_notes_screen.dart
index 8fd37d9c0..999abc142 100644
--- a/lib/src/screens/release_notes/release_notes_screen.dart
+++ b/lib/src/screens/release_notes/release_notes_screen.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -33,9 +34,9 @@ class ReleaseNotesScreen extends StatelessWidget {
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(30.0),
                   gradient: LinearGradient(colors: [
-                    Theme.of(context).colorScheme.surface,
-                    Theme.of(context).colorScheme.surfaceContainer,
-                  ], begin: Alignment.topLeft, end: Alignment.bottomRight)),
+                    Theme.of(context).extension<DashboardPageTheme>()!.firstGradientBackgroundColor,
+                    Theme.of(context).extension<DashboardPageTheme>()!.secondGradientBackgroundColor,
+                  ], begin: Alignment.centerLeft, end: Alignment.centerRight)),
               child: Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 24.0),
                 child: Stack(
@@ -46,12 +47,12 @@ class ReleaseNotesScreen extends StatelessWidget {
                         child: Container(
                           alignment: Alignment.bottomCenter,
                           child: DefaultTextStyle(
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            style: TextStyle(
                               decoration: TextDecoration.none,
                               fontSize: 24.0,
                               fontWeight: FontWeight.bold,
-                        
-                              color: Theme.of(context).colorScheme.onSurface,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
                             ),
                             child: Text(title),
                           ),
@@ -114,11 +115,11 @@ class ReleaseNotesScreen extends StatelessWidget {
     return Column(
       children: [
         DefaultTextStyle(
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+            style: TextStyle(
               decoration: TextDecoration.none,
               fontSize: 16.0,
-               
-              color: Theme.of(context).colorScheme.onSurface,
+              fontFamily: 'Lato',
+              color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
             ),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/src/screens/rescan/rescan_page.dart b/lib/src/screens/rescan/rescan_page.dart
index 5c60a7d23..63f13c5df 100644
--- a/lib/src/screens/rescan/rescan_page.dart
+++ b/lib/src/screens/rescan/rescan_page.dart
@@ -16,8 +16,9 @@ class RescanPage extends BasePage {
       : _blockchainHeightWidgetKey = GlobalKey<BlockchainHeightState>();
 
   @override
-  String get title =>
-      _rescanViewModel.isSilentPaymentsScan ? S.current.silent_payments_scanning : S.current.rescan;
+  String get title => _rescanViewModel.isSilentPaymentsScan
+      ? S.current.silent_payments_scanning
+      : S.current.rescan;
   final GlobalKey<BlockchainHeightState> _blockchainHeightWidgetKey;
   final RescanViewModel _rescanViewModel;
 
@@ -27,69 +28,69 @@ class RescanPage extends BasePage {
     if (_rescanViewModel.wallet.type != WalletType.decred) {
       child = Padding(
         padding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Observer(
+        child:
+            Column(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
+          Observer(
               builder: (_) => BlockchainHeightWidget(
-                key: _blockchainHeightWidgetKey,
-                onHeightOrDateEntered: (value) => _rescanViewModel.isButtonEnabled = value,
-                isSilentPaymentsScan: _rescanViewModel.isSilentPaymentsScan,
-                isMwebScan: _rescanViewModel.isMwebScan,
-                doSingleScan: _rescanViewModel.doSingleScan,
-                hasDatePicker: !_rescanViewModel.isMwebScan, // disable date picker for mweb for now
-                toggleSingleScan: () =>
-                    _rescanViewModel.doSingleScan = !_rescanViewModel.doSingleScan,
-                walletType: _rescanViewModel.wallet.type,
-                bitcoinMempoolAPIEnabled: _rescanViewModel.isBitcoinMempoolAPIEnabled,
-              ),
-            ),
-            Observer(
+                    key: _blockchainHeightWidgetKey,
+                    onHeightOrDateEntered: (value) =>
+                        _rescanViewModel.isButtonEnabled = value,
+                    isSilentPaymentsScan: _rescanViewModel.isSilentPaymentsScan,
+                    isMwebScan: _rescanViewModel.isMwebScan,
+                    doSingleScan: _rescanViewModel.doSingleScan,
+                    hasDatePicker: !_rescanViewModel
+                        .isMwebScan, // disable date picker for mweb for now
+                    toggleSingleScan: () => _rescanViewModel.doSingleScan =
+                        !_rescanViewModel.doSingleScan,
+                    walletType: _rescanViewModel.wallet.type,
+                    bitcoinMempoolAPIEnabled:
+                        _rescanViewModel.isBitcoinMempoolAPIEnabled,
+                  )),
+          Observer(
               builder: (_) => LoadingPrimaryButton(
-                isLoading: _rescanViewModel.state == RescanWalletState.rescaning,
-                text: S.of(context).rescan,
-                onPressed: () async {
-                  if (_rescanViewModel.isSilentPaymentsScan) {
-                    return _toggleSilentPaymentsScanning(context);
-                  }
+                    isLoading:
+                        _rescanViewModel.state == RescanWalletState.rescaning,
+                    text: S.of(context).rescan,
+                    onPressed: () async {
+                      if (_rescanViewModel.isSilentPaymentsScan) {
+                        return _toggleSilentPaymentsScanning(context);
+                      }
 
-                  _rescanViewModel.rescanCurrentWallet(
-                      restoreHeight: _blockchainHeightWidgetKey.currentState!.height);
+                      _rescanViewModel.rescanCurrentWallet(
+                          restoreHeight:
+                              _blockchainHeightWidgetKey.currentState!.height);
 
-                  Navigator.of(context).pop();
-                },
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
-                isDisabled: !_rescanViewModel.isButtonEnabled,
-              ),
-            )
-          ],
-        ),
+                      Navigator.of(context).pop();
+                    },
+                    color: Theme.of(context).primaryColor,
+                    textColor: Colors.white,
+                    isDisabled: !_rescanViewModel.isButtonEnabled,
+                  ))
+        ]),
       );
     } else {
       child = Center(
-        child: Padding(
-          padding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-          child: Column(
+          child: Padding(
+        padding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+        child: Column(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Spacer(),
               Observer(
-                builder: (_) => LoadingPrimaryButton(
-                  isLoading: _rescanViewModel.state == RescanWalletState.rescaning,
-                  text: S.of(context).rescan,
-                  onPressed: () async {
-                    await _rescanViewModel.rescanCurrentWallet(restoreHeight: 0);
-                    Navigator.of(context).pop();
-                  },
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
-                ),
-              )
-            ],
-          ),
-        ),
-      );
+                  builder: (_) => LoadingPrimaryButton(
+                        isLoading: _rescanViewModel.state ==
+                            RescanWalletState.rescaning,
+                        text: S.of(context).rescan,
+                        onPressed: () async {
+                          await _rescanViewModel.rescanCurrentWallet(
+                              restoreHeight: 0);
+                          Navigator.of(context).pop();
+                        },
+                        color: Theme.of(context).primaryColor,
+                        textColor: Colors.white,
+                      ))
+            ]),
+      ));
     }
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
@@ -104,24 +105,25 @@ class RescanPage extends BasePage {
     Navigator.of(context).pop();
 
     final needsToSwitch =
-        await bitcoin!.getNodeIsElectrsSPEnabled(_rescanViewModel.wallet) == false;
+        await bitcoin!.getNodeIsElectrsSPEnabled(_rescanViewModel.wallet) ==
+            false;
 
     if (needsToSwitch) {
       return showPopUp<void>(
-        context: navigatorKey.currentState!.context,
-        builder: (BuildContext _dialogContext) => AlertWithTwoActions(
-          alertTitle: S.of(_dialogContext).change_current_node_title,
-          alertContent: S.of(_dialogContext).confirm_silent_payments_switch_node,
-          rightButtonText: S.of(_dialogContext).confirm,
-          leftButtonText: S.of(_dialogContext).cancel,
-          actionRightButton: () async {
-            Navigator.of(_dialogContext).pop();
+          context: navigatorKey.currentState!.context,
+          builder: (BuildContext _dialogContext) => AlertWithTwoActions(
+                alertTitle: S.of(_dialogContext).change_current_node_title,
+                alertContent:
+                    S.of(_dialogContext).confirm_silent_payments_switch_node,
+                rightButtonText: S.of(_dialogContext).confirm,
+                leftButtonText: S.of(_dialogContext).cancel,
+                actionRightButton: () async {
+                  Navigator.of(_dialogContext).pop();
 
-            _rescanViewModel.rescanCurrentWallet(restoreHeight: height);
-          },
-          actionLeftButton: () => Navigator.of(_dialogContext).pop(),
-        ),
-      );
+                  _rescanViewModel.rescanCurrentWallet(restoreHeight: height);
+                },
+                actionLeftButton: () => Navigator.of(_dialogContext).pop(),
+              ));
     }
 
     _rescanViewModel.rescanCurrentWallet(restoreHeight: height);
diff --git a/lib/src/screens/restore/restore_from_backup_page.dart b/lib/src/screens/restore/restore_from_backup_page.dart
index 0f5bdd324..c5bc2a163 100644
--- a/lib/src/screens/restore/restore_from_backup_page.dart
+++ b/lib/src/screens/restore/restore_from_backup_page.dart
@@ -1,7 +1,6 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
@@ -24,11 +23,11 @@ class RestoreFromBackupPage extends BasePage {
 
   @override
   Function(BuildContext)? get pushToNextWidget => (context) {
-        FocusScopeNode currentFocus = FocusScope.of(context);
-        if (!currentFocus.hasPrimaryFocus) {
-          currentFocus.focusedChild?.unfocus();
-        }
-      };
+    FocusScopeNode currentFocus = FocusScope.of(context);
+    if (!currentFocus.hasPrimaryFocus) {
+      currentFocus.focusedChild?.unfocus();
+    }
+  };
 
   @override
   Widget body(BuildContext context) {
@@ -53,7 +52,7 @@ class RestoreFromBackupPage extends BasePage {
       child: ConstrainedBox(
         constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
         child: Padding(
-          padding: EdgeInsets.only(bottom: 24, left: 8, right: 8),
+          padding: EdgeInsets.only(bottom: 24, left: 24, right: 24),
           child: Column(
             children: [
               Expanded(
@@ -62,17 +61,15 @@ class RestoreFromBackupPage extends BasePage {
                     child: Column(
                       mainAxisSize: MainAxisSize.min,
                       children: [
-                        BaseTextFormField(
+                        TextFormField(
                           obscureText: true,
                           enableSuggestions: false,
                           autocorrect: false,
-                          hintText: S.of(context).enter_backup_password,
+                          decoration:
+                              InputDecoration(hintText: S.of(context).enter_backup_password),
                           keyboardType: TextInputType.visiblePassword,
                           controller: textEditingController,
-                          textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                fontSize: 26,
-                                color: Theme.of(context).colorScheme.onSurface,
-                              ),
+                          style: TextStyle(fontSize: 26, color: Colors.black),
                         ),
                         Observer(
                           builder: (_) {
@@ -84,20 +81,22 @@ class RestoreFromBackupPage extends BasePage {
                                     children: [
                                       Text(
                                         "File Name: ",
-                                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                              fontSize: 18.0,
-                                              fontWeight: FontWeight.bold,
-                                              color: titleColor(context),
-                                            ),
+                                        style: TextStyle(
+                                          fontSize: 18.0,
+                                          fontWeight: FontWeight.bold,
+                                          fontFamily: 'Lato',
+                                          color: titleColor(context),
+                                        ),
                                       ),
                                       Expanded(
                                         child: Text(
                                           restoreFromBackupViewModel.filePath.split("/").last,
-                                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                                fontSize: 18.0,
-                                                fontWeight: FontWeight.bold,
-                                                color: titleColor(context),
-                                              ),
+                                          style: TextStyle(
+                                            fontSize: 18.0,
+                                            fontWeight: FontWeight.bold,
+                                            fontFamily: 'Lato',
+                                            color: titleColor(context),
+                                          ),
                                         ),
                                       ),
                                     ],
@@ -121,8 +120,8 @@ class RestoreFromBackupPage extends BasePage {
                       child: PrimaryButton(
                         onPressed: () => presentFilePicker(),
                         text: S.of(context).select_backup_file,
-                        color: Theme.of(context).colorScheme.error,
-                        textColor: Theme.of(context).colorScheme.onError,
+                        color: Colors.grey,
+                        textColor: Colors.white,
                       ),
                     ),
                     SizedBox(width: 20),
@@ -130,12 +129,11 @@ class RestoreFromBackupPage extends BasePage {
                       child: Observer(
                         builder: (_) {
                           return LoadingPrimaryButton(
-                            isLoading: restoreFromBackupViewModel.state is IsExecutingState,
-                            onPressed: () => onImportHandler(context),
-                            text: S.of(context).import,
-                            color: Theme.of(context).colorScheme.primary,
-                            textColor: Theme.of(context).colorScheme.onPrimary,
-                          );
+                              isLoading: restoreFromBackupViewModel.state is IsExecutingState,
+                              onPressed: () => onImportHandler(context),
+                              text: S.of(context).import,
+                              color: Theme.of(context).primaryColor,
+                              textColor: Colors.white);
                         },
                       ),
                     ),
@@ -173,19 +171,8 @@ class RestoreFromBackupPage extends BasePage {
 
       return;
     }
-    try {
-      await restoreFromBackupViewModel.import(textEditingController.text);
-    } catch (e) {
-      await showPopUp<void>(
-        context: context,
-        builder: (_) {
-          return AlertWithOneAction(
-              alertTitle: S.current.error,
-              alertContent: e.toString(),
-              buttonText: S.of(context).ok,
-              buttonAction: () => Navigator.of(context).pop());
-        });
-    }
+
+    await restoreFromBackupViewModel.import(textEditingController.text);
     textEditingController.text = '';
   }
 }
diff --git a/lib/src/screens/restore/restore_options_page.dart b/lib/src/screens/restore/restore_options_page.dart
index ee8347f25..ba1669fe5 100644
--- a/lib/src/screens/restore/restore_options_page.dart
+++ b/lib/src/screens/restore/restore_options_page.dart
@@ -15,7 +15,9 @@ import 'package:cw_core/hardware/device_connection_type.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/info_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 
 class RestoreOptionsPage extends BasePage {
   RestoreOptionsPage({required this.isNewInstall});
@@ -59,9 +61,10 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
 
   @override
   Widget build(BuildContext context) {
-    final imageColor = Theme.of(context).colorScheme.primary;
-    final imageLedger = Image.asset('assets/images/hardware_wallet/ledger_nano_x.png',
-        width: 40, color: imageColor);
+    final mainImageColor = Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor;
+    final brightImageColor = Theme.of(context).extension<InfoTheme>()!.textColor;
+    final imageColor = widget.themeType == ThemeType.bright ? brightImageColor : mainImageColor;
+    final imageLedger = Image.asset('assets/images/hardware_wallet/ledger_nano_x.png', width: 40, color: imageColor);
     final imageSeedKeys = Image.asset('assets/images/restore_wallet_image.png', color: imageColor);
     final imageBackup = Image.asset('assets/images/backup.png', color: imageColor);
 
@@ -75,7 +78,9 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
               children: <Widget>[
                 OptionTile(
                   key: ValueKey('restore_options_from_seeds_or_keys_button_key'),
-                  onPressed: () => Navigator.pushNamed(context, Routes.restoreWalletFromSeedKeys),
+                  onPressed: () => Navigator.pushNamed(
+                    context,
+                    Routes.restoreWalletFromSeedKeys),
                   image: imageSeedKeys,
                   title: S.of(context).restore_title_from_seed_keys,
                   description: S.of(context).restore_description_from_seed_keys,
@@ -96,27 +101,26 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
                     padding: EdgeInsets.only(top: 24),
                     child: OptionTile(
                       key: ValueKey('restore_options_from_hardware_wallet_button_key'),
-                      onPressed: () =>
-                          Navigator.pushNamed(context, Routes.restoreWalletFromHardwareWallet),
+                      onPressed: () => Navigator.pushNamed(
+                          context, Routes.restoreWalletFromHardwareWallet),
                       image: imageLedger,
                       title: S.of(context).restore_title_from_hardware_wallet,
                       description: S.of(context).restore_description_from_hardware_wallet,
                     ),
                   ),
-                if (DeviceInfo.instance.isMobile)
-                  Padding(
-                    padding: EdgeInsets.only(top: 24),
-                    child: OptionTile(
-                        key: ValueKey('restore_options_from_qr_button_key'),
-                        onPressed: () => _onScanQRCode(context),
-                        icon: Icon(
-                          Icons.qr_code_rounded,
-                          color: imageColor,
-                          size: 50,
-                        ),
-                        title: S.of(context).scan_qr_code,
-                        description: S.of(context).cold_or_recover_wallet),
-                  )
+                Padding(
+                  padding: EdgeInsets.only(top: 24),
+                  child: OptionTile(
+                      key: ValueKey('restore_options_from_qr_button_key'),
+                      onPressed: () => _onScanQRCode(context),
+                      icon: Icon(
+                        Icons.qr_code_rounded,
+                        color: imageColor,
+                        size: 50,
+                      ),
+                      title: S.of(context).scan_qr_code,
+                      description: S.of(context).cold_or_recover_wallet),
+                )
               ],
             ),
           )),
@@ -141,7 +145,7 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
 
   Future<void> _onScanQRCode(BuildContext context) async {
     final isCameraPermissionGranted =
-        await PermissionHandler.checkPermission(Permission.camera, context);
+    await PermissionHandler.checkPermission(Permission.camera, context);
 
     if (!isCameraPermissionGranted) return;
     try {
diff --git a/lib/src/screens/restore/sweeping_wallet_page.dart b/lib/src/screens/restore/sweeping_wallet_page.dart
index 56a383dec..75fccf638 100644
--- a/lib/src/screens/restore/sweeping_wallet_page.dart
+++ b/lib/src/screens/restore/sweeping_wallet_page.dart
@@ -1,7 +1,10 @@
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:flutter/scheduler.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
 
 class SweepingWalletPage extends BasePage {
   SweepingWalletPage();
@@ -10,17 +13,19 @@ class SweepingWalletPage extends BasePage {
   final welcomeImageLight = Image.asset('assets/images/welcome_light.png');
   final welcomeImageDark = Image.asset('assets/images/welcome.png');
 
+
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        backgroundColor: Theme.of(context).colorScheme.surface,
+        backgroundColor: Theme.of(context).colorScheme.background,
         resizeToAvoidBottomInset: false,
         body: body(context));
   }
 
   @override
   Widget body(BuildContext context) {
-    final welcomeImage = currentTheme.isDark ? welcomeImageDark : welcomeImageLight;
+    final welcomeImage = currentTheme.type == ThemeType.dark ? welcomeImageDark : welcomeImageLight;
 
     return SweepingWalletWidget(
       aspectRatioImage: aspectRatioImage,
@@ -45,7 +50,9 @@ class SweepingWalletWidget extends StatefulWidget {
 class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
   @override
   void initState() {
-    SchedulerBinding.instance.addPostFrameCallback((_) async {});
+    SchedulerBinding.instance.addPostFrameCallback((_) async {
+
+    });
     super.initState();
   }
 
@@ -74,11 +81,11 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
                               padding: EdgeInsets.only(top: 24),
                               child: Text(
                                 S.of(context).please_wait,
-                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                      fontSize: 18,
-                                      fontWeight: FontWeight.w500,
-                                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    ),
+                                style: TextStyle(
+                                  fontSize: 18,
+                                  fontWeight: FontWeight.w500,
+                                  color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                                ),
                                 textAlign: TextAlign.center,
                               ),
                             ),
@@ -86,11 +93,11 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
                               padding: EdgeInsets.only(top: 5),
                               child: Text(
                                 S.of(context).sweeping_wallet,
-                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                      fontSize: 36,
-                                      fontWeight: FontWeight.bold,
-                                      color: Theme.of(context).colorScheme.primary,
-                                    ),
+                                style: TextStyle(
+                                  fontSize: 36,
+                                  fontWeight: FontWeight.bold,
+                                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                ),
                                 textAlign: TextAlign.center,
                               ),
                             ),
@@ -98,11 +105,11 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
                               padding: EdgeInsets.only(top: 5),
                               child: Text(
                                 S.of(context).sweeping_wallet_alert,
-                                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.w500,
-                                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    ),
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.w500,
+                                  color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                                ),
                                 textAlign: TextAlign.center,
                               ),
                             ),
@@ -114,3 +121,5 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
             )));
   }
 }
+
+
diff --git a/lib/src/screens/restore/wallet_restore_choose_derivation.dart b/lib/src/screens/restore/wallet_restore_choose_derivation.dart
index 9da97f603..9a7d8eb67 100644
--- a/lib/src/screens/restore/wallet_restore_choose_derivation.dart
+++ b/lib/src/screens/restore/wallet_restore_choose_derivation.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/view_model/wallet_restore_choose_derivation_view_model.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:flutter/material.dart';
@@ -11,9 +12,11 @@ class WalletRestoreChooseDerivationPage extends BasePage {
   @override
   Widget middle(BuildContext context) => Text(
         S.current.choose_derivation,
-        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+        style: TextStyle(
+            fontSize: 18.0,
             fontWeight: FontWeight.bold,
-            color: Theme.of(context).colorScheme.primary),
+            fontFamily: 'Lato',
+            color: titleColor(context)),
       );
 
   final WalletRestoreChooseDerivationViewModel walletRestoreChooseDerivationViewModel;
@@ -56,10 +59,10 @@ class WalletRestoreChooseDerivationPage extends BasePage {
                       title: Center(
                         child: Text(
                           "${derivation.description ?? derivation.derivationType.toString().split('.').last}",
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                          style: Theme.of(context).primaryTextTheme.labelMedium!.copyWith(
                                 fontSize: 18,
                                 fontWeight: FontWeight.w800,
-                                color: Theme.of(context).colorScheme.primary,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                               ),
                         ),
                       ),
@@ -69,33 +72,42 @@ class WalletRestoreChooseDerivationPage extends BasePage {
                           if (derivation.derivationPath != null)
                             Text(
                               derivation.derivationPath!,
-                              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              style: Theme.of(context).primaryTextTheme.labelMedium!.copyWith(
+                                    fontSize: 14,
                                     fontWeight: FontWeight.w500,
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                    color: Theme.of(context)
+                                        .extension<CakeTextTheme>()!
+                                        .secondaryTextColor,
                                   ),
                             ),
                           Text(
                             derivation.address,
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            style: Theme.of(context).primaryTextTheme.labelMedium!.copyWith(
                                   fontSize: 16,
                                   fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                  color: Theme.of(context)
+                                      .extension<CakeTextTheme>()!
+                                      .secondaryTextColor,
                                 ),
                           ),
                           Text(
                             "${S.current.confirmed}: ${derivation.balance}",
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            style: Theme.of(context).primaryTextTheme.labelMedium!.copyWith(
                                   fontSize: 16,
                                   fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                  color: Theme.of(context)
+                                      .extension<CakeTextTheme>()!
+                                      .secondaryTextColor,
                                 ),
                           ),
                           Text(
                             "${S.current.transactions}: ${derivation.transactionsCount}",
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            style: Theme.of(context).primaryTextTheme.labelMedium!.copyWith(
                                   fontSize: 16,
                                   fontWeight: FontWeight.w500,
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                  color: Theme.of(context)
+                                      .extension<CakeTextTheme>()!
+                                      .secondaryTextColor,
                                 ),
                           ),
                         ],
diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart
index 9ca5c2508..b95fcb4c6 100644
--- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart
@@ -8,6 +8,7 @@ import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/core/wallet_name_validator.dart';
 import 'package:cake_wallet/entities/generate_name.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:flutter/services.dart';
 
 class WalletRestoreFromKeysForm extends StatefulWidget {
@@ -35,13 +36,12 @@ class WalletRestoreFromKeysForm extends StatefulWidget {
   final void Function(String)? onRepeatedPasswordChange;
 
   @override
-  WalletRestoreFromKeysFormState createState() => WalletRestoreFromKeysFormState(
-      displayWalletPassword: displayWalletPassword, restoredWallet: restoredWallet);
+  WalletRestoreFromKeysFormState createState() =>
+      WalletRestoreFromKeysFormState(displayWalletPassword: displayWalletPassword, restoredWallet: restoredWallet);
 }
 
 class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
-  WalletRestoreFromKeysFormState(
-      {required bool displayWalletPassword, RestoredWallet? restoredWallet})
+  WalletRestoreFromKeysFormState({required bool displayWalletPassword, RestoredWallet? restoredWallet})
       : formKey = GlobalKey<FormState>(),
         blockchainHeightKey = GlobalKey<BlockchainHeightState>(),
         nameController = TextEditingController(),
@@ -59,8 +59,7 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
             : TextEditingController(),
         nameTextEditingController = TextEditingController(),
         passwordTextEditingController = displayWalletPassword ? TextEditingController() : null,
-        repeatedPasswordTextEditingController =
-            displayWalletPassword ? TextEditingController() : null;
+        repeatedPasswordTextEditingController = displayWalletPassword ? TextEditingController() : null;
 
   final GlobalKey<FormState> formKey;
   final GlobalKey<BlockchainHeightState> blockchainHeightKey;
@@ -83,8 +82,7 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
     }
 
     if (repeatedPasswordTextEditingController != null) {
-      repeatedPasswordListener =
-          () => widget.onRepeatedPasswordChange?.call(repeatedPasswordTextEditingController!.text);
+      repeatedPasswordListener = () => widget.onRepeatedPasswordChange?.call(repeatedPasswordTextEditingController!.text);
       repeatedPasswordTextEditingController?.addListener(repeatedPasswordListener!);
     }
     super.initState();
@@ -98,8 +96,7 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (widget.restoredWallet?.height != null) {
-        blockchainHeightKey.currentState?.restoreHeightController.text =
-            widget.restoredWallet!.height.toString();
+        blockchainHeightKey.currentState?.restoreHeightController.text = widget.restoredWallet!.height.toString();
       }
     });
 
@@ -129,64 +126,64 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.symmetric(horizontal: 16),
+      padding: EdgeInsets.only(left: 24, right: 24),
       child: Form(
         key: formKey,
         child: Column(
           children: <Widget>[
-            SizedBox(height: 8),
-            BaseTextFormField(
-              key: ValueKey('wallet_restore_from_keys_wallet_name_textfield_key'),
-              controller: nameTextEditingController,
-              hintText: S.of(context).wallet_name,
-              validator: WalletNameValidator(),
-              suffixIcon: IconButton(
-                key: ValueKey('wallet_restore_from_keys_wallet_name_refresh_button_key'),
-                onPressed: () async {
-                  final rName = await generateName();
-                  FocusManager.instance.primaryFocus?.unfocus();
+            Stack(
+              alignment: Alignment.centerRight,
+              children: [
+                BaseTextFormField(
+                  key: ValueKey('wallet_restore_from_keys_wallet_name_textfield_key'),
+                  controller: nameTextEditingController,
+                  hintText: S.of(context).wallet_name,
+                  validator: WalletNameValidator(),
+                  suffixIcon: IconButton(
+                    key: ValueKey('wallet_restore_from_keys_wallet_name_refresh_button_key'),
+                    onPressed: () async {
+                      final rName = await generateName();
+                      FocusManager.instance.primaryFocus?.unfocus();
 
-                  setState(() {
-                    nameTextEditingController.text = rName;
-                    nameTextEditingController.selection = TextSelection.fromPosition(
-                        TextPosition(offset: nameTextEditingController.text.length));
-                  });
-                },
-                icon: Container(
-                  padding: const EdgeInsets.all(8),
-                  decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(6.0),
-                    color: Theme.of(context).colorScheme.surface,
-                  ),
-                  width: 34,
-                  height: 34,
-                  child: Image.asset(
-                    'assets/images/refresh_icon.png',
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      setState(() {
+                        nameTextEditingController.text = rName;
+                        nameTextEditingController.selection = TextSelection.fromPosition(
+                            TextPosition(offset: nameTextEditingController.text.length));
+                      });
+                    },
+                    icon: Container(
+                      padding: const EdgeInsets.all(8),
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.circular(6.0),
+                        color: Theme.of(context).hintColor,
+                      ),
+                      width: 34,
+                      height: 34,
+                      child: Image.asset(
+                        'assets/images/refresh_icon.png',
+                        color:
+                            Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
+                      ),
+                    ),
                   ),
                 ),
-              ),
+              ],
             ),
-            if (widget.displayWalletPassword) ...[
-              Container(
-                key: ValueKey('password'),
-                padding: EdgeInsets.only(top: 20.0),
-                child: BaseTextFormField(
-                  controller: passwordTextEditingController,
-                  hintText: S.of(context).password,
-                  obscureText: true,
-                ),
-              ),
-              Container(
-                key: ValueKey('repeat_wallet_password'),
-                padding: EdgeInsets.only(top: 20.0),
-                child: BaseTextFormField(
-                  controller: repeatedPasswordTextEditingController,
-                  hintText: S.of(context).repeat_wallet_password,
-                  obscureText: true,
-                ),
-              )
-            ],
+            if (widget.displayWalletPassword)
+              ...[Container(
+                  key: ValueKey('password'),
+                  padding: EdgeInsets.only(top: 20.0),
+                  child: BaseTextFormField(
+                    controller: passwordTextEditingController,
+                    hintText: S.of(context).password,
+                    obscureText: true)),
+                Container(
+                  key: ValueKey('repeat_wallet_password'),
+                  padding: EdgeInsets.only(top: 20.0),
+                  child: BaseTextFormField(
+                    controller: repeatedPasswordTextEditingController,
+                    hintText: S.of(context).repeat_wallet_password,
+                    obscureText: true))],
             Container(height: 20),
             _restoreFromKeysFormFields(),
           ],
@@ -205,8 +202,7 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
             controller: viewKeyController,
             hintText: S.of(context).view_key_public,
             maxLines: null,
-          )
-        ],
+        )],
       );
     }
 
@@ -223,6 +219,7 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
         controller: privateKeyController,
         placeholder: nanoBased ? S.of(context).seed_hex_form : S.of(context).private_key,
         options: [AddressTextFieldOption.paste],
+        buttonColor: Theme.of(context).hintColor,
         onPushPasteButton: (_) {
           _pasteText();
         },
diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
index 426ea662e..d089f8c1c 100644
--- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
@@ -7,18 +7,17 @@ import 'package:cake_wallet/src/widgets/blockchain_height_widget.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
 import 'package:cake_wallet/src/widgets/seed_language_picker.dart';
 import 'package:cake_wallet/src/widgets/seed_widget.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/restore/restore_wallet.dart';
 import 'package:cake_wallet/view_model/seed_settings_view_model.dart';
-import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:mobx/mobx.dart';
 import 'package:polyseed/polyseed.dart';
 
 class WalletRestoreFromSeedForm extends StatefulWidget {
-  WalletRestoreFromSeedForm({
-    Key? key,
+  WalletRestoreFromSeedForm({Key? key,
     required this.displayLanguageSelector,
     required this.displayBlockHeightSelector,
     required this.type,
@@ -59,9 +58,10 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
         languageController = TextEditingController(),
         nameTextEditingController = TextEditingController(),
         passwordTextEditingController = displayWalletPassword ? TextEditingController() : null,
-        repeatedPasswordTextEditingController =
-            displayWalletPassword ? TextEditingController() : null,
-        seedTypeController = TextEditingController();
+        repeatedPasswordTextEditingController = displayWalletPassword
+            ? TextEditingController()
+            : null,
+      seedTypeController = TextEditingController();
 
   final GlobalKey<SeedWidgetState> seedWidgetStateKey;
   final GlobalKey<BlockchainHeightState> blockchainHeightKey;
@@ -78,11 +78,8 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
 
   @override
   void initState() {
-    if (widget.type == WalletType.monero) {
-      _setSeedType(widget.seedSettingsViewModel.moneroSeedType);
-    } else {
-      _setSeedType(MoneroSeedType.defaultSeedType);
-    }
+    // _setSeedType(widget.seedTypeViewModel.moneroSeedType);
+    _setSeedType(MoneroSeedType.defaultSeedType);
     _setLanguageLabel(language);
 
     if (passwordTextEditingController != null) {
@@ -98,15 +95,15 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
 
     moneroSeedTypeReaction =
         reaction((_) => widget.seedSettingsViewModel.moneroSeedType, (MoneroSeedType item) {
-      _setSeedType(item);
-      _changeLanguage('English');
-    });
+          _setSeedType(item);
+          _changeLanguage('English');
+        });
 
     super.initState();
   }
 
   @override
-  void dispose() {
+  void dispose() {    
     moneroSeedTypeReaction();
 
     if (passwordListener != null) {
@@ -121,22 +118,16 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
   }
 
   void onSeedChange(String seed) {
-    if ([WalletType.monero, WalletType.wownero].contains(widget.type) &&
-        (seed.split(" ").length == 12 || Polyseed.isValidSeed(seed))) {
-      try {
-        final lang = PolyseedLang.getByPhrase(seed);
+    if ((widget.type == WalletType.monero || widget.type == WalletType.wownero) &&
+        Polyseed.isValidSeed(seed)) {
+      final lang = PolyseedLang.getByPhrase(seed);
 
-        if (widget.type == WalletType.monero && seed.split(" ").length == 12) {
-          _changeSeedType(MoneroSeedType.bip39);
-        } else {
-          _changeSeedType(MoneroSeedType.polyseed);
-        }
-        _changeLanguage(lang.nameEnglish, true);
-      } catch (e) {
-        printV(e);
-      }
+      _changeSeedType(MoneroSeedType.polyseed);
+      _changeLanguage(lang.nameEnglish);
     }
-    if (widget.type == WalletType.wownero && seed.split(" ").length == 14) {
+    if (widget.type == WalletType.wownero && seed
+        .split(" ")
+        .length == 14) {
       _changeSeedType(MoneroSeedType.wowneroSeed);
       _changeLanguage("English");
     }
@@ -146,43 +137,52 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: EdgeInsets.symmetric(horizontal: 16),
-      child: Column(
-        children: [
-          SizedBox(height: 8),
+        padding: EdgeInsets.only(left: 24, right: 24),
+        child: Column(children: [
           Form(
               key: formKey,
-              child: BaseTextFormField(
-                key: ValueKey('wallet_restore_from_seed_wallet_name_textfield_key'),
-                controller: nameTextEditingController,
-                hintText: S.of(context).wallet_name,
-                suffixIcon: IconButton(
-                  key: ValueKey('wallet_restore_from_seed_wallet_name_refresh_button_key'),
-                  onPressed: () async {
-                    final rName = await generateName();
-                    FocusManager.instance.primaryFocus?.unfocus();
-              
-                    setState(() {
-                      nameTextEditingController.text = rName;
-                      nameTextEditingController.selection = TextSelection.fromPosition(
-                          TextPosition(offset: nameTextEditingController.text.length));
-                    });
-                  },
-                  icon: Container(
-                    padding: const EdgeInsets.all(8),
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(6.0),
-                      color: Theme.of(context).colorScheme.surface,
-                    ),
-                    width: 34,
-                    height: 34,
-                    child: Image.asset(
-                      'assets/images/refresh_icon.png',
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+              child: Stack(
+                alignment: Alignment.centerRight,
+                children: [
+                  BaseTextFormField(
+                    key: ValueKey('wallet_restore_from_seed_wallet_name_textfield_key'),
+                    controller: nameTextEditingController,
+                    hintText: S
+                        .of(context)
+                        .wallet_name,
+                    suffixIcon: IconButton(
+                      key: ValueKey('wallet_restore_from_seed_wallet_name_refresh_button_key'),
+                      onPressed: () async {
+                        final rName = await generateName();
+                        FocusManager.instance.primaryFocus?.unfocus();
+
+                        setState(() {
+                          nameTextEditingController.text = rName;
+                          nameTextEditingController.selection = TextSelection.fromPosition(
+                              TextPosition(offset: nameTextEditingController.text.length));
+                        });
+                      },
+                      icon: Container(
+                        padding: const EdgeInsets.all(8),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(6.0),
+                          color: Theme
+                              .of(context)
+                              .hintColor,
+                        ),
+                        width: 34,
+                        height: 34,
+                        child: Image.asset(
+                          'assets/images/refresh_icon.png',
+                          color: Theme.of(context)
+                              .extension<SendPageTheme>()!
+                              .textFieldButtonIconColor,
+                        ),
+                      ),
                     ),
+                    validator: WalletNameValidator(),
                   ),
-                ),
-                validator: WalletNameValidator(),
+                ],
               )),
           Container(height: 20),
           SeedWidget(
@@ -194,26 +194,24 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
             seedTextFieldKey: ValueKey('wallet_restore_from_seed_wallet_seeds_textfield_key'),
             pasteButtonKey: ValueKey('wallet_restore_from_seed_wallet_seeds_paste_button_key'),
           ),
-          if ([WalletType.monero, WalletType.wownero].contains(widget.type))
+          if (widget.type == WalletType.monero || widget.type == WalletType.wownero)
             GestureDetector(
               key: ValueKey('wallet_restore_from_seed_seedtype_picker_button_key'),
               onTap: () async {
                 await showPopUp<void>(
-                  context: context,
-                  builder: (_) => Picker(
-                    items: _getItems(),
-                    selectedAtIndex: isPolyseed
-                        ? 1
-                        : (seedTypeController.value.text.contains("14") &&
-                                    widget.type == WalletType.wownero) ||
-                                isBip39
-                            ? 2
-                            : 0,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    onItemSelected: _changeSeedType,
-                    isSeparated: false,
-                  ),
-                );
+                    context: context,
+                    builder: (_) =>
+                        Picker(
+                          items: _getItems(),
+                          selectedAtIndex: isPolyseed
+                              ? 1
+                              : seedTypeController.value.text.contains("14") && widget.type == WalletType.wownero
+                                  ? 2
+                                  : 0,
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          onItemSelected: _changeSeedType,
+                          isSeparated: false,
+                        ));
               },
               child: Container(
                 color: Colors.transparent,
@@ -224,41 +222,38 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                     enableInteractiveSelection: false,
                     readOnly: true,
                     suffixIcon: expandIcon,
-                    textStyle: Theme.of(context).textTheme.labelLarge?.copyWith(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w600,
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
                   ),
                 ),
               ),
             ),
-          if (widget.displayWalletPassword) ...[
-            BaseTextFormField(
-              key: ValueKey('password'),
-              controller: passwordTextEditingController,
-              hintText: S.of(context).password,
-              obscureText: true,
-            ),
-            BaseTextFormField(
-              key: ValueKey('repeat_wallet_password'),
-              controller: repeatedPasswordTextEditingController,
-              hintText: S.of(context).repeat_wallet_password,
-              obscureText: true,
-            )
-          ],
+          if (widget.displayWalletPassword)
+            ...[BaseTextFormField(
+                key: ValueKey('password'),
+                controller: passwordTextEditingController,
+                hintText: S
+                    .of(context)
+                    .password,
+                obscureText: true),
+              BaseTextFormField(
+                  key: ValueKey('repeat_wallet_password'),
+                  controller: repeatedPasswordTextEditingController,
+                  hintText: S
+                      .of(context)
+                      .repeat_wallet_password,
+                  obscureText: true)
+            ],
           if (widget.displayLanguageSelector)
             if (!seedTypeController.value.text.contains("14") && widget.displayLanguageSelector)
               GestureDetector(
                 onTap: () async {
                   await showPopUp<void>(
-                    context: context,
-                    builder: (_) => SeedLanguagePicker(
-                      selected: language,
-                      onItemSelected: (lang) => _changeLanguage(lang, isPolyseed || isBip39),
-                      seedType: widget.seedSettingsViewModel.moneroSeedType,
-                    ),
-                  );
+                      context: context,
+                      builder: (_) =>
+                          SeedLanguagePicker(
+                            selected: language,
+                            onItemSelected: _changeLanguage,
+                            seedType: isPolyseed ? MoneroSeedType.polyseed : MoneroSeedType.legacy,
+                          ));
                 },
                 child: Container(
                   color: Colors.transparent,
@@ -269,11 +264,6 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                       enableInteractiveSelection: false,
                       readOnly: true,
                       suffixIcon: expandIcon,
-                      textStyle: Theme.of(context).textTheme.labelLarge?.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
                     ),
                   ),
                 ),
@@ -282,45 +272,38 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
             BlockchainHeightWidget(
               focusNode: widget.blockHeightFocusNode,
               key: blockchainHeightKey,
-              blockHeightTextFieldKey: ValueKey(
-                'wallet_restore_from_seed_blockheight_textfield_key',
-              ),
+              blockHeightTextFieldKey: ValueKey('wallet_restore_from_seed_blockheight_textfield_key'),
               onHeightOrDateEntered: widget.onHeightOrDateEntered,
-              hasDatePicker: [WalletType.monero, WalletType.wownero].contains(
-                widget.type,
-              ),
+              hasDatePicker: widget.type == WalletType.monero || widget.type == WalletType.wownero,
               walletType: widget.type,
             ),
-        ],
-      ),
-    );
+        ]));
   }
 
   bool get isPolyseed =>
       widget.seedSettingsViewModel.moneroSeedType == MoneroSeedType.polyseed &&
-      [WalletType.monero, WalletType.wownero].contains(widget.type);
+          (widget.type == WalletType.monero || widget.type == WalletType.wownero);
 
-  bool get isBip39 =>
-      widget.seedSettingsViewModel.moneroSeedType == MoneroSeedType.bip39 &&
-      WalletType.monero == widget.type;
-
-  Widget get expandIcon => Container(
+  Widget get expandIcon =>
+      Container(
         padding: EdgeInsets.all(18),
         width: 24,
         height: 24,
         child: Image.asset(
           'assets/images/arrow_bottom_purple_icon.png',
           height: 8,
-          color: Theme.of(context).colorScheme.onSurfaceVariant,
+          color: Theme
+              .of(context)
+              .hintColor,
         ),
       );
 
-  void _changeLanguage(String language, [bool useBip39Wordlist = false]) {
-    final setLang = useBip39Wordlist
+  void _changeLanguage(String language) {
+    final setLang = isPolyseed
         ? "POLYSEED_$language"
         : seedTypeController.value.text.contains("14")
-            ? "WOWSEED_" + language
-            : language;
+        ? "WOWSEED_" + language
+        : language;
     setState(() {
       this.language = setLang;
       seedWidgetStateKey.currentState!.changeSeedLanguage(setLang);
@@ -333,9 +316,9 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
       languageController.text = '${language.replaceAll("POLYSEED_", "")} (Seed language)';
 
   void _changeSeedType(MoneroSeedType item) {
-    widget.seedSettingsViewModel.setMoneroSeedType(item);
     _setSeedType(item);
-    _changeLanguage('English', isPolyseed || isBip39);
+    _changeLanguage('English');
+    widget.seedSettingsViewModel.setMoneroSeedType(item);
   }
 
   void _setSeedType(MoneroSeedType item) {
@@ -345,7 +328,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
   List<MoneroSeedType> _getItems() {
     switch (widget.type) {
       case WalletType.monero:
-        return [MoneroSeedType.legacy, MoneroSeedType.polyseed, MoneroSeedType.bip39];
+        return [MoneroSeedType.legacy, MoneroSeedType.polyseed];
       case WalletType.wownero:
         return [MoneroSeedType.legacy, MoneroSeedType.polyseed, MoneroSeedType.wowneroSeed];
       default:
diff --git a/lib/src/screens/restore/wallet_restore_page.dart b/lib/src/screens/restore/wallet_restore_page.dart
index dd4a284be..ce8595ba4 100644
--- a/lib/src/screens/restore/wallet_restore_page.dart
+++ b/lib/src/screens/restore/wallet_restore_page.dart
@@ -5,10 +5,11 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/restore/wallet_restore_from_keys_form.dart';
 import 'package:cake_wallet/src/screens/restore/wallet_restore_from_seed_form.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/bottom_sheet/add_passphrase_bottom_sheet_widget.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/restore/restore_mode.dart';
 import 'package:cake_wallet/view_model/seed_settings_view_model.dart';
@@ -36,22 +37,22 @@ class WalletRestorePage extends BasePage {
 
   @override
   Widget middle(BuildContext context) => Observer(
-        builder: (_) => Text(
-          walletRestoreViewModel.mode == WalletRestoreMode.seed
-              ? S.current.restore_title_from_seed
-              : S.current.restore_title_from_keys,
-          style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                fontSize: 18,
-                 
-                fontWeight: FontWeight.w600,
-              ),
-        ),
-      );
+      builder: (_) => Text(
+            walletRestoreViewModel.mode == WalletRestoreMode.seed
+                ? S.current.restore_title_from_seed
+                : S.current.restore_title_from_keys,
+            style: TextStyle(
+                fontSize: 18.0,
+                fontWeight: FontWeight.bold,
+                fontFamily: 'Lato',
+                color: titleColor(context)),
+          ));
 
   // DerivationType derivationType = DerivationType.unknown;
   // String? derivationPath = null;
   DerivationInfo? derivationInfo;
 
+
   @override
   Function(BuildContext)? get popWidget => (context) => seedSettingsViewModel.setPassphrase(null);
 
@@ -68,7 +69,7 @@ class WalletRestorePage extends BasePage {
     return KeyboardActions(
       config: KeyboardActionsConfig(
         keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
-        keyboardBarColor: Theme.of(context).colorScheme.surface,
+        keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
         nextFocus: false,
         actions: [
           KeyboardActionsItem(
@@ -79,119 +80,70 @@ class WalletRestorePage extends BasePage {
       ),
       child: Container(
         height: 0,
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).colorScheme.background,
         child: Center(
-          child: Column(
-            children: [
-              Expanded(
-                child: _WalletRestorePageBody(
-                  walletRestoreViewModel: walletRestoreViewModel,
-                  seedSettingsViewModel: seedSettingsViewModel,
-                  walletRestoreFromSeedFormKey: walletRestoreFromSeedFormKey,
-                  walletRestoreFromKeysFormKey: walletRestoreFromKeysFormKey,
-                  blockHeightFocusNode: _blockHeightFocusNode,
-                  derivationInfo: derivationInfo,
-                  onDerivationInfoChanged: (info) => derivationInfo = info,
+          child: ConstrainedBox(
+            constraints:
+                BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            child: Column(
+              children: [
+                Expanded(
+                  child: _WalletRestorePageBody(
+                    walletRestoreViewModel: walletRestoreViewModel,
+                    seedSettingsViewModel: seedSettingsViewModel,
+                    walletRestoreFromSeedFormKey: walletRestoreFromSeedFormKey,
+                    walletRestoreFromKeysFormKey: walletRestoreFromKeysFormKey,
+                    blockHeightFocusNode: _blockHeightFocusNode,
+                    derivationInfo: derivationInfo,
+                    onDerivationInfoChanged: (info) => derivationInfo = info,
+                  ),
                 ),
-              ),
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 16),
-                child: Column(
-                  children: [
-                    Observer(
-                      builder: (context) {
-                        return walletRestoreViewModel.mode == WalletRestoreMode.seed
-                            ? StandardCheckbox(
-                                captionColor: Theme.of(context).colorScheme.onSecondaryContainer,
-                                value: walletRestoreViewModel.hasPassphrase,
-                                caption: S.of(context).wallet_has_passphrase,
-                                onChanged: (value) {
-                                  walletRestoreViewModel.hasPassphrase = value;
-                                },
-                              )
-                            : SizedBox.shrink();
-                      },
-                    ),
-                    SizedBox(height: 16),
-                    PrimaryButton(
-                      key: ValueKey('wallet_restore_advanced_settings_button_key'),
-                      onPressed: () {
-                        Navigator.of(context).pushNamed(
-                          Routes.advancedPrivacySettings,
-                          arguments: {
+                Padding(
+                  padding: EdgeInsets.only(top: 20, bottom: 24, left: 24, right: 24),
+                  child: Column(
+                    children: [
+                      Observer(
+                        builder: (context) {
+                          return LoadingPrimaryButton(
+                            key: ValueKey('wallet_restore_seed_or_key_restore_button_key'),
+                            onPressed: () async => await _confirmForm(context),
+                            text: S.of(context).restore_recover,
+                            color: Theme.of(context)
+                                .extension<WalletListTheme>()!
+                                .createNewWalletButtonBackgroundColor,
+                            textColor: Theme.of(context)
+                                .extension<WalletListTheme>()!
+                                .restoreWalletButtonTextColor,
+                            isLoading: walletRestoreViewModel.state is IsExecutingState,
+                            isDisabled: !walletRestoreViewModel.isButtonEnabled,
+                          );
+                        },
+                      ),
+                      const SizedBox(height: 25),
+                      GestureDetector(
+                        key: ValueKey('wallet_restore_advanced_settings_button_key'),
+                        onTap: () {
+                          Navigator.of(context)
+                              .pushNamed(Routes.advancedPrivacySettings, arguments: {
                             'isFromRestore': true,
                             'type': walletRestoreViewModel.type,
                             'useTestnet': walletRestoreViewModel.useTestnet,
                             'toggleTestnet': walletRestoreViewModel.toggleUseTestnet
-                          },
-                        );
-                      },
-                      text: S.of(context).advanced_settings,
-                      color: Theme.of(context).colorScheme.surfaceContainer,
-                      textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-                    ),
-                    SizedBox(height: 8),
-                    Observer(
-                      builder: (context) {
-                        return LoadingPrimaryButton(
-                          key: ValueKey('wallet_restore_seed_or_key_restore_button_key'),
-                          onPressed: () async {
-                            if (walletRestoreViewModel.hasPassphrase) {
-                              await showModalBottomSheet<void>(
-                                context: context,
-                                isDismissible: false,
-                                isScrollControlled: true,
-                                builder: (BuildContext bottomSheetContext) {
-                                  return Padding(
-                                    padding: EdgeInsets.only(
-                                      bottom: MediaQuery.of(bottomSheetContext).viewInsets.bottom,
-                                    ),
-                                    child: AddPassphraseBottomSheet(
-                                      currentTheme: currentTheme,
-                                      titleText: S.of(context).add_passphrase,
-                                      onRestoreButtonPressed: (passphrase) async {
-                                        await _onPassphraseBottomSheetRestoreButtonPressed(
-                                          passphrase,
-                                          context,
-                                        );
-                                      },
-                                    ),
-                                  );
-                                },
-                              );
-                            } else {
-                              await _confirmForm(context);
-                            }
-                          },
-                          text: walletRestoreViewModel.hasPassphrase
-                              ? S.of(context).add_passphrase
-                              : S.of(context).restore_recover,
-                          color: Theme.of(context).colorScheme.primary,
-                          textColor: Theme.of(context).colorScheme.onPrimary,
-                          isLoading: walletRestoreViewModel.state is IsExecutingState,
-                          isDisabled: !walletRestoreViewModel.isButtonEnabled,
-                        );
-                      },
-                    ),
-                    const SizedBox(height: 24),
-                  ],
-                ),
-              )
-            ],
+                          });
+                        },
+                        child: Text(S.of(context).advanced_settings),
+                      ),
+                    ],
+                  ),
+                )
+              ],
+            ),
           ),
         ),
       ),
     );
   }
 
-  Future<void> _onPassphraseBottomSheetRestoreButtonPressed(
-    String passphrase,
-    BuildContext context,
-  ) async {
-    walletRestoreViewModel.seedSettingsViewModel.setPassphrase(passphrase);
-    await _confirmForm(context);
-  }
-
   Map<String, dynamic> _credentials() {
     final credentials = <String, dynamic>{};
 
@@ -220,10 +172,9 @@ class WalletRestorePage extends BasePage {
             walletRestoreFromKeysFormKey.currentState!.nameTextEditingController.text;
         credentials['viewKey'] = walletRestoreFromKeysFormKey.currentState!.viewKeyController.text;
         if (walletRestoreViewModel.type != WalletType.decred) {
-          credentials['address'] =
-              walletRestoreFromKeysFormKey.currentState!.addressController.text;
+          credentials['address'] = walletRestoreFromKeysFormKey.currentState!.addressController.text;
           credentials['spendKey'] =
-              walletRestoreFromKeysFormKey.currentState!.spendKeyController.text;
+             walletRestoreFromKeysFormKey.currentState!.spendKeyController.text;
           credentials['height'] =
               walletRestoreFromKeysFormKey.currentState!.blockchainHeightKey.currentState!.height;
         }
@@ -384,8 +335,8 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
     final initialIndex = walletRestoreViewModel.mode == WalletRestoreMode.seed
         ? 0
         : _hasKeysTab
-            ? 1
-            : 0;
+        ? 1
+        : 0;
 
     _tabController = TabController(length: tabCount, vsync: this, initialIndex: initialIndex);
 
@@ -459,18 +410,18 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
               splashFactory: NoSplash.splashFactory,
               indicatorSize: TabBarIndicatorSize.label,
               isScrollable: true,
-              labelStyle: Theme.of(context).textTheme.labelLarge?.copyWith(
-                    fontWeight: FontWeight.w600,
-                    fontSize: 16,
-                    color: Theme.of(context).colorScheme.primary,
-                  ),
-              unselectedLabelStyle: Theme.of(context).textTheme.labelLarge?.copyWith(
-                    fontWeight: FontWeight.w600,
-                    fontSize: 16,
-                    color: Theme.of(context).colorScheme.primary.withOpacity(0.5),
-                  ),
-              labelColor: Theme.of(context).colorScheme.primary,
-              indicatorColor: Theme.of(context).colorScheme.primary,
+              labelStyle: TextStyle(
+                  fontSize: 18,
+                  fontFamily: 'Lato',
+                  fontWeight: FontWeight.w600,
+                  color: Theme.of(context).appBarTheme.titleTextStyle!.color),
+              unselectedLabelStyle: TextStyle(
+                  fontSize: 18,
+                  fontFamily: 'Lato',
+                  fontWeight: FontWeight.w600,
+                  color: Theme.of(context).appBarTheme.titleTextStyle!.color?.withOpacity(0.5)),
+              labelColor: Theme.of(context).appBarTheme.titleTextStyle!.color,
+              indicatorColor: Theme.of(context).appBarTheme.titleTextStyle!.color,
               indicatorPadding: EdgeInsets.zero,
               labelPadding: const EdgeInsets.only(right: 24),
               tabAlignment: TabAlignment.start,
@@ -478,11 +429,11 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
               padding: EdgeInsets.zero,
               tabs: [
                 Tab(text: S.of(context).widgets_seed),
-                if (_hasKeysTab) Tab(text: S.of(context).keys),
+                if (_hasKeysTab)  Tab(text: S.of(context).keys),
               ],
             ),
           ),
-          const SizedBox(height: 12),
+          const SizedBox(height: 20),
           Expanded(
             child: TabBarView(
               controller: _tabController,
@@ -585,21 +536,16 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
     if (seedWords.length == 14 && walletRestoreViewModel.type == WalletType.wownero) return true;
     if (seedWords.length == 26 && walletRestoreViewModel.type == WalletType.zano) return true;
 
-    if (seedWords.length == 12 && walletRestoreViewModel.type == WalletType.monero) {
-      return walletRestoreFromSeedFormKey.currentState?.blockchainHeightKey.currentState
-              ?.restoreHeightController.text.isNotEmpty ==
-          true;
-    }
-
-    if ([WalletType.monero, WalletType.wownero, WalletType.haven]
-            .contains(walletRestoreViewModel.type) &&
-        seedWords.length == WalletRestoreViewModelBase.moneroSeedMnemonicLength) {
-      return true;
+    if ((walletRestoreViewModel.type == WalletType.monero ||
+            walletRestoreViewModel.type == WalletType.wownero ||
+            walletRestoreViewModel.type == WalletType.haven) &&
+        seedWords.length != WalletRestoreViewModelBase.moneroSeedMnemonicLength) {
+      return false;
     }
 
     // bip39:
     final validBip39SeedLengths = [12, 18, 24];
-    final nonBip39WalletTypes = [WalletType.wownero, WalletType.haven, WalletType.decred];
+    final nonBip39WalletTypes = [WalletType.monero, WalletType.wownero, WalletType.haven, WalletType.decred];
     // if it's a bip39 wallet and the length is not valid return false
     if (!nonBip39WalletTypes.contains(walletRestoreViewModel.type) &&
         !(validBip39SeedLengths.contains(seedWords.length))) {
@@ -607,7 +553,8 @@ class _WalletRestorePageBodyState extends State<_WalletRestorePageBody>
     }
 
     if ((walletRestoreViewModel.type == WalletType.decred) &&
-        seedWords.length != WalletRestoreViewModelBase.decredSeedMnemonicLength) {
+        seedWords.length !=
+            WalletRestoreViewModelBase.decredSeedMnemonicLength) {
       return false;
     }
 
diff --git a/lib/src/screens/root/root.dart b/lib/src/screens/root/root.dart
index 19e8cab5f..0e37c8570 100644
--- a/lib/src/screens/root/root.dart
+++ b/lib/src/screens/root/root.dart
@@ -1,9 +1,7 @@
 import 'dart:async';
 import 'dart:io';
-import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/core/totp_request_details.dart';
-import 'package:cake_wallet/core/trade_monitor.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/view_model/link_view_model.dart';
 import 'package:cw_core/utils/print_verbose.dart';
@@ -28,7 +26,6 @@ class Root extends StatefulWidget {
     required this.navigatorKey,
     required this.authService,
     required this.linkViewModel,
-    required this.tradeMonitor,
   }) : super(key: key);
 
   final AuthenticationStore authenticationStore;
@@ -37,7 +34,6 @@ class Root extends StatefulWidget {
   final AuthService authService;
   final Widget child;
   final LinkViewModel linkViewModel;
-  final TradeMonitor tradeMonitor;
 
   @override
   RootState createState() => RootState();
@@ -140,12 +136,6 @@ class RootState extends State<Root> with WidgetsBindingObserver {
           setState(() => _setInactive(true));
         }
 
-        if (widget.appStore.wallet?.type == WalletType.bitcoin) {
-          bitcoin!.stopPayjoinSessions(widget.appStore.wallet!);
-        }
-
-        widget.tradeMonitor.stopTradeMonitoring();
-
         break;
       case AppLifecycleState.resumed:
         widget.authService.requireAuth().then((value) {
@@ -155,30 +145,12 @@ class RootState extends State<Root> with WidgetsBindingObserver {
             });
           }
         });
-        if (widget.appStore.wallet?.type == WalletType.bitcoin &&
-            widget.appStore.settingsStore.usePayjoin) {
-          bitcoin!.resumePayjoinSessions(widget.appStore.wallet!);
-        }
-
-        widget.tradeMonitor.resumeTradeMonitoring();
         break;
       default:
         break;
     }
   }
 
-  @override
-  void didChangePlatformBrightness() {
-    if (widget.appStore.themeStore.themeMode == ThemeMode.system) {
-      Future.delayed(Duration(milliseconds: Platform.isIOS ? 500 : 0), () {
-        final systemTheme = widget.appStore.themeStore.getThemeFromSystem();
-        if (widget.appStore.themeStore.currentTheme != systemTheme) {
-          widget.appStore.themeStore.setTheme(systemTheme);
-        }
-      });
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     // this only happens when the app has been in the background for some time
diff --git a/lib/src/screens/seed/pre_seed_page.dart b/lib/src/screens/seed/pre_seed_page.dart
index 4ff9fceea..91a47fda5 100644
--- a/lib/src/screens/seed/pre_seed_page.dart
+++ b/lib/src/screens/seed/pre_seed_page.dart
@@ -4,11 +4,9 @@ import 'package:cake_wallet/src/screens/Info_page.dart';
 import 'package:flutter/cupertino.dart';
 
 class PreSeedPage extends InfoPage {
-  PreSeedPage()
-      : super(
-          imageLightPath: 'assets/images/seed_warning_light.svg',
-          imageDarkPath: 'assets/images/seed_warning_dark.svg',
-        );
+  PreSeedPage(this.seedPhraseLength);
+
+  final int seedPhraseLength;
 
   @override
   bool get onWillPop => false;
@@ -17,7 +15,7 @@ class PreSeedPage extends InfoPage {
   String get pageTitle => S.current.pre_seed_title;
 
   @override
-  String get pageDescription => S.current.pre_seed_description;
+  String get pageDescription => S.current.pre_seed_description(seedPhraseLength.toString());
 
   @override
   String get buttonText => S.current.pre_seed_button_text;
diff --git a/lib/src/screens/seed/seed_verification/seed_verification_page.dart b/lib/src/screens/seed/seed_verification/seed_verification_page.dart
index 123b9ecab..ac03768ca 100644
--- a/lib/src/screens/seed/seed_verification/seed_verification_page.dart
+++ b/lib/src/screens/seed/seed_verification/seed_verification_page.dart
@@ -2,7 +2,6 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/seed/seed_verification/seed_verification_step_view.dart';
 import 'package:cake_wallet/src/screens/seed/seed_verification/seed_verification_success_view.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -12,13 +11,6 @@ class SeedVerificationPage extends BasePage {
 
   SeedVerificationPage(this.walletSeedViewModel);
 
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-          (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
-
   @override
   String? get title => S.current.verify_seed;
 
@@ -31,7 +23,7 @@ class SeedVerificationPage extends BasePage {
           child: walletSeedViewModel.isVerificationComplete ||
                   walletSeedViewModel.verificationIndices.isEmpty
               ? SeedVerificationSuccessView(
-                  currentTheme: currentTheme,
+                  imageColor: titleColor(context),
                 )
               : SeedVerificationStepView(
                   walletSeedViewModel: walletSeedViewModel,
diff --git a/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart b/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart
index df54af71b..9fd70be05 100644
--- a/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart
+++ b/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 import 'package:flutter/material.dart';
@@ -31,24 +32,27 @@ class SeedVerificationStepView extends StatelessWidget {
                     children: [
                       TextSpan(
                         text: '${S.current.seed_position_question_one} ',
-                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                              fontWeight: FontWeight.w600,
-                              color: questionTextColor,
-                            ),
+                        style: TextStyle(
+                          fontSize: 20,
+                          fontWeight: FontWeight.w600,
+                          color: questionTextColor,
+                        ),
                       ),
                       TextSpan(
                         text: '${getOrdinal(walletSeedViewModel.currentWordIndex + 1)} ',
-                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                              fontWeight: FontWeight.w800,
-                              color: questionTextColor,
-                            ),
+                        style: TextStyle(
+                          fontSize: 20,
+                          fontWeight: FontWeight.w800,
+                          color: questionTextColor,
+                        ),
                       ),
                       TextSpan(
                         text: S.current.seed_position_question_two,
-                        style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                              fontWeight: FontWeight.w600,
-                              color: questionTextColor,
-                            ),
+                        style: TextStyle(
+                          fontSize: 20,
+                          fontWeight: FontWeight.w600,
+                          color: questionTextColor,
+                        ),
                       ),
                     ],
                   ),
@@ -89,15 +93,15 @@ class SeedVerificationStepView extends StatelessWidget {
                           padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
                           decoration: BoxDecoration(
                             borderRadius: BorderRadius.circular(16),
-                            color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                            color: Theme.of(context).cardColor,
                           ),
                           child: Text(
                             option,
-                            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                  height: 1.2,
-                                  fontWeight: FontWeight.w800,
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                ),
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w800,
+                              color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
+                            ),
                           ),
                         ),
                       );
diff --git a/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart b/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart
index fa0dc8e3b..7d73e7a9c 100644
--- a/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart
+++ b/lib/src/screens/seed/seed_verification/seed_verification_success_view.dart
@@ -1,38 +1,36 @@
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class SeedVerificationSuccessView extends StatelessWidget {
-  const SeedVerificationSuccessView({required this.currentTheme, super.key});
+  const SeedVerificationSuccessView({required this.imageColor, super.key});
 
-  final MaterialThemeBase currentTheme;
+  final Color imageColor;
 
   @override
   Widget build(BuildContext context) {
+    final image = Image.asset('assets/images/seed_verified.png', color: imageColor);
+
     return Center(
       child: Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           ConstrainedBox(
             constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.3),
-              child: CakeImageWidget(
-                height: 200,
-                imageUrl: currentTheme.isDark
-                    ? 'assets/images/seed_verified_dark.png'
-                    : 'assets/images/seed_verified_light.png',
-              ),
+            child: AspectRatio(
+              aspectRatio: 1.8,
+              child: image,
+            ),
           ),
-          SizedBox(height: 40),
+          SizedBox(height: 16),
           Text(
             S.current.seed_verified,
             textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurface,
-                  fontSize: 20,
-                  fontWeight: FontWeight.w600,
-                ),
+            style: TextStyle(
+              fontSize: 20,
+              fontWeight: FontWeight.w600,
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+            ),
           ),
           SizedBox(height: 48),
           RichText(
@@ -40,19 +38,19 @@ class SeedVerificationSuccessView extends StatelessWidget {
               children: [
                 TextSpan(
                   text: '${S.current.seed_verified_subtext} ',
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        fontSize: 16,
-                      ),
+                  style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w400,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                  ),
                 ),
                 TextSpan(
                   text: S.current.seed_display_path,
-                  style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        fontWeight: FontWeight.w700,
-                        fontSize: 16,
-                      ),
+                  style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w800,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                  ),
                 ),
               ],
             ),
@@ -65,8 +63,8 @@ class SeedVerificationSuccessView extends StatelessWidget {
               Navigator.of(context).popUntil((route) => route.isFirst);
             },
             text: S.current.open_wallet,
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
+            color: Theme.of(context).primaryColor,
+            textColor: Colors.white,
           ),
           SizedBox(height: 16),
         ],
diff --git a/lib/src/screens/seed/wallet_seed_page.dart b/lib/src/screens/seed/wallet_seed_page.dart
index 8b343e4cc..d40e7671d 100644
--- a/lib/src/screens/seed/wallet_seed_page.dart
+++ b/lib/src/screens/seed/wallet_seed_page.dart
@@ -1,8 +1,12 @@
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/seedphrase_grid_widget.dart';
 import 'package:cake_wallet/src/widgets/warning_box_widget.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/clipboard_util.dart';
 import 'package:cake_wallet/utils/share_util.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -23,6 +27,13 @@ class WalletSeedPage extends BasePage {
 
   @override
   Widget trailing(BuildContext context) {
+    final copyImage = Image.asset(
+      'assets/images/copy_address.png',
+      color: Theme.of(context)
+          .extension<CakeTextTheme>()!
+          .buttonTextColor
+    );
+
     return isNewWalletCreated
         ? GestureDetector(
             key: ValueKey('wallet_seed_page_copy_seeds_button_key'),
@@ -39,12 +50,9 @@ class WalletSeedPage extends BasePage {
               margin: EdgeInsets.only(left: 10),
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.all(Radius.circular(8)),
-                color: Theme.of(context).colorScheme.surfaceContainerHighest,
-              ),
-              child: Image.asset(
-                'assets/images/copy_address.png',
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
+                color: Theme.of(context).cardColor,
               ),
+              child: copyImage,
             ),
           )
         : Offstage();
@@ -52,52 +60,51 @@ class WalletSeedPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    return PopScope(
-      canPop: false,
+    return WillPopScope(
+      onWillPop: () async => false,
       child: Container(
         alignment: Alignment.center,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: <Widget>[
-            Observer(
-              builder: (_) {
-                return Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16),
+        child: ConstrainedBox(
+          constraints:
+              BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: <Widget>[
+              Observer(
+                builder: (_) {
+                  return Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 22, right: 22),
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: <Widget>[
-                        SizedBox(height: 16),
                         WarningBox(
-                          content: S.current.cake_seeds_save_disclaimer,
-                          currentTheme: currentTheme,
-                        ),
-                        SizedBox(height: 36),
+                            content: S.current.cake_seeds_save_disclaimer,
+                            currentTheme: currentTheme),
+                        SizedBox(height: 20),
                         Text(
                           key: ValueKey('wallet_seed_page_wallet_name_text_key'),
                           walletSeedViewModel.name,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                          style: TextStyle(
                             fontSize: 18,
                             fontWeight: FontWeight.w600,
-                            color: Theme.of(context).colorScheme.onSurface,
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                           ),
                         ),
-                        SizedBox(height: 24),
+                        SizedBox(height: 20),
                         Expanded(
-                          child: SeedPhraseGridWidget(
-                            list: walletSeedViewModel.seedSplit,
-                          ),
+                          child: SeedPhraseGridWidget(list: walletSeedViewModel.seedSplit),
                         ),
                       ],
                     ),
                   ),
-                );
-              },
-            ),
-            Column(
-              children: <Widget>[
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 14, vertical: 8),
+                  );
+                },
+              ),
+              Column(
+                children: <Widget>[
+                  Padding(
+                    padding: EdgeInsets.symmetric(horizontal: 14, vertical: 8),
                   child: Row(
                     mainAxisSize: MainAxisSize.max,
                     children: <Widget>[
@@ -113,31 +120,36 @@ class WalletSeedPage extends BasePage {
                               );
                             },
                             text: S.of(context).save,
-                            color: Theme.of(context).colorScheme.surfaceContainer,
-                            textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+                            color: Theme.of(context).cardColor,
+                            textColor: currentTheme.type == ThemeType.dark
+                                ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                                : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
                           ),
                         ),
                       ),
                       Flexible(
                         child: Container(
                           padding: EdgeInsets.only(left: 8.0, top: 8.0),
-                          child: PrimaryButton(
-                            key: ValueKey('wallet_seed_page_verify_seed_button_key'),
-                            onPressed: () =>
-                                Navigator.pushNamed(context, Routes.walletSeedVerificationPage),
-                            text: S.current.verify_seed,
-                            color: Theme.of(context).colorScheme.primary,
-                            textColor: Theme.of(context).colorScheme.onPrimary,
+                          child: Builder(
+                            builder: (context) => PrimaryButton(
+                              key: ValueKey('wallet_seed_page_verify_seed_button_key'),
+                              onPressed: () =>
+                                  Navigator.pushNamed(context, Routes.walletSeedVerificationPage),
+                              text: S.current.verify_seed,
+                              color: Theme.of(context).primaryColor,
+                              textColor: Colors.white,
+                            ),
                           ),
                         ),
-                      ),
+                      )
                     ],
                   ),
-                ),
-                SizedBox(height: 16),
-              ],
-            )
-          ],
+                  ),
+                  SizedBox(height: 12),
+                ],
+              )
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/src/screens/select_options_page.dart b/lib/src/screens/select_options_page.dart
index bcfb9df98..70cb2abc1 100644
--- a/lib/src/screens/select_options_page.dart
+++ b/lib/src/screens/select_options_page.dart
@@ -3,7 +3,8 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/provider_optoin_tile.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:flutter/material.dart';
 
 abstract class SelectOptionsPage extends BasePage {
@@ -44,15 +45,13 @@ abstract class SelectOptionsPage extends BasePage {
   Widget body(BuildContext context) {
     return ScrollableWithBottomSection(
       content: BodySelectOptionsPage(
-        currentTheme: currentTheme,
-        items: items,
-        onOptionTap: onOptionTap,
-        tilePadding: tilePadding,
-        tileBorderRadius: tileBorderRadius,
-        imageHeight: imageHeight,
-        imageWidth: imageWidth,
-        innerPadding: innerPadding,
-      ),
+          items: items,
+          onOptionTap: onOptionTap,
+          tilePadding: tilePadding,
+          tileBorderRadius: tileBorderRadius,
+          imageHeight: imageHeight,
+          imageWidth: imageWidth,
+          innerPadding: innerPadding),
       bottomSection: Padding(
         padding: contentPadding ?? EdgeInsets.zero,
         child: Column(
@@ -60,23 +59,24 @@ abstract class SelectOptionsPage extends BasePage {
             Text(
               bottomSectionText,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
+              style: TextStyle(
+                fontSize: 14,
+                fontWeight: FontWeight.normal,
+                color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+              ),
             ),
             if (primaryButtonEnabled)
               LoadingPrimaryButton(
-                text: primaryButtonText,
-                onPressed: () {
-                  primaryButtonAction != null
-                      ? primaryButtonAction!(context)
-                      : Navigator.pop(context);
-                },
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
-                isDisabled: false,
-                isLoading: false,
-              )
+                  text: primaryButtonText,
+                  onPressed: () {
+                    primaryButtonAction != null
+                        ? primaryButtonAction!(context)
+                        : Navigator.pop(context);
+                  },
+                  color: Theme.of(context).primaryColor,
+                  textColor: Colors.white,
+                  isDisabled: false,
+                  isLoading: false)
           ],
         ),
       ),
@@ -93,7 +93,6 @@ class BodySelectOptionsPage extends StatefulWidget {
     this.imageHeight,
     this.imageWidth,
     this.innerPadding,
-    required this.currentTheme,
   });
 
   final List<SelectableItem> items;
@@ -103,7 +102,6 @@ class BodySelectOptionsPage extends StatefulWidget {
   final double? imageHeight;
   final double? imageWidth;
   final EdgeInsets? innerPadding;
-  final MaterialThemeBase currentTheme;
 
   @override
   _BodySelectOptionsPageState createState() => _BodySelectOptionsPageState();
@@ -132,6 +130,11 @@ class _BodySelectOptionsPageState extends State<BodySelectOptionsPage> {
 
   @override
   Widget build(BuildContext context) {
+    final isLightMode = Theme.of(context).extension<OptionTileTheme>()?.useDarkImage ?? false;
+
+    Color titleColor =
+        isLightMode ? Theme.of(context).appBarTheme.titleTextStyle!.color! : Colors.white;
+
     return Center(
       child: ConstrainedBox(
         constraints: const BoxConstraints(maxWidth: 350),
@@ -145,7 +148,7 @@ class _BodySelectOptionsPageState extends State<BodySelectOptionsPage> {
                   decoration: BoxDecoration(
                     border: Border(
                       bottom: BorderSide(
-                        color: Theme.of(context).colorScheme.onSurface,
+                        color: titleColor,
                         width: 1,
                       ),
                     ),
@@ -154,10 +157,11 @@ class _BodySelectOptionsPageState extends State<BodySelectOptionsPage> {
                     padding: const EdgeInsets.only(bottom: 8.0),
                     child: Text(
                       item.title,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 18,
-                            fontWeight: FontWeight.w700,
-                          ),
+                      style: TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.w700,
+                        color: titleColor,
+                      ),
                     ),
                   ),
                 ),
@@ -181,7 +185,7 @@ class _BodySelectOptionsPageState extends State<BodySelectOptionsPage> {
                   badges: item.badges,
                   isSelected: item.isOptionSelected,
                   borderRadius: widget.tileBorderRadius,
-                  isLightMode: widget.currentTheme.isDark,
+                  isLightMode: isLightMode,
                   onPressed: () => _handleOptionTap(item),
                 ),
               );
diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart
index 9b6047cdc..69e4bd02a 100644
--- a/lib/src/screens/send/send_page.dart
+++ b/lib/src/screens/send/send_page.dart
@@ -25,12 +25,18 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/template_tile.dart';
 import 'package:cake_wallet/src/widgets/trail_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/request_review_handler.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:cw_core/utils/print_verbose.dart';
+import 'package:cw_core/unspent_coin_type.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/view_model/send/send_view_model.dart';
 import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
@@ -82,24 +88,25 @@ class SendPage extends BasePage {
   Widget? leading(BuildContext context) {
     final _backButton = Icon(
       Icons.arrow_back_ios,
-      color: Theme.of(context).colorScheme.primary,
+      color: titleColor(context),
       size: 16,
     );
-    final _closeButton = currentTheme.isDark ? closeButtonImageDarkTheme : closeButtonImage;
+    final _closeButton =
+        currentTheme.type == ThemeType.dark ? closeButtonImageDarkTheme : closeButtonImage;
 
     bool isMobileView = responsiveLayoutUtil.shouldRenderMobileUI;
 
     return MergeSemantics(
       child: SizedBox(
         height: isMobileView ? 37 : 45,
-        width: isMobileView ? 47 : 45,
+        width: isMobileView ? 47: 45,
         child: ButtonTheme(
           minWidth: double.minPositive,
           child: Semantics(
             label: !isMobileView ? S.of(context).close : S.of(context).seed_alert_back,
             child: TextButton(
               style: ButtonStyle(
-                overlayColor: WidgetStateColor.resolveWith((states) => Colors.transparent),
+                overlayColor: MaterialStateColor.resolveWith((states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
               child: !isMobileView ? _closeButton : _backButton,
@@ -137,29 +144,27 @@ class SendPage extends BasePage {
   }
 
   @override
-  Widget trailing(context) => Observer(
-        builder: (_) {
-          return sendViewModel.isBatchSending
-              ? TrailButton(
-                  caption: S.of(context).remove,
-                  onPressed: () {
-                    var pageToJump = (controller.page?.round() ?? 0) - 1;
-                    pageToJump = pageToJump > 0 ? pageToJump : 0;
-                    final output = _defineCurrentOutput();
-                    sendViewModel.removeOutput(output);
-                    controller.jumpToPage(pageToJump);
-                  },
-                )
-              : TrailButton(
-                  caption: S.of(context).clear,
-                  onPressed: () {
-                    final output = _defineCurrentOutput();
-                    _formKey.currentState?.reset();
-                    output.reset();
-                  },
-                );
-        },
-      );
+  Widget trailing(context) => Observer(builder: (_) {
+        return sendViewModel.isBatchSending
+            ? TrailButton(
+                caption: S.of(context).remove,
+                onPressed: () {
+                  var pageToJump = (controller.page?.round() ?? 0) - 1;
+                  pageToJump = pageToJump > 0 ? pageToJump : 0;
+                  final output = _defineCurrentOutput();
+                  sendViewModel.removeOutput(output);
+                  controller.jumpToPage(pageToJump);
+                })
+            : TrailButton(
+                caption: S.of(context).clear,
+                onPressed: () {
+                  final output = _defineCurrentOutput();
+                  _formKey.currentState?.reset();
+                  output.reset();
+                });
+      });
+
+  bool _bottomSheetOpened = false;
 
   @override
   Widget body(BuildContext context) {
@@ -171,36 +176,26 @@ class SendPage extends BasePage {
       for (var output in sendViewModel.outputs) {
         var cryptoAmountFocus = FocusNode();
         var fiatAmountFocus = FocusNode();
-        sendCards.add(
-          SendCard(
-            currentTheme: currentTheme,
-            key: output.key,
-            output: output,
-            sendViewModel: sendViewModel,
-            initialPaymentRequest: initialPaymentRequest,
-            cryptoAmountFocus: cryptoAmountFocus,
-            fiatAmountFocus: fiatAmountFocus,
-          ),
-        );
-        keyboardActions.add(
-          KeyboardActionsItem(
-            focusNode: cryptoAmountFocus,
-            toolbarButtons: [(_) => KeyboardDoneButton()],
-          ),
-        );
-        keyboardActions.add(
-          KeyboardActionsItem(
-            focusNode: fiatAmountFocus,
-            toolbarButtons: [(_) => KeyboardDoneButton()],
-          ),
-        );
+        sendCards.add(SendCard(
+          currentTheme: currentTheme,
+          key: output.key,
+          output: output,
+          sendViewModel: sendViewModel,
+          initialPaymentRequest: initialPaymentRequest,
+          cryptoAmountFocus: cryptoAmountFocus,
+          fiatAmountFocus: fiatAmountFocus,
+        ));
+        keyboardActions.add(KeyboardActionsItem(
+            focusNode: cryptoAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]));
+        keyboardActions.add(KeyboardActionsItem(
+            focusNode: fiatAmountFocus, toolbarButtons: [(_) => KeyboardDoneButton()]));
       }
       return Stack(
         children: [
           KeyboardActions(
             config: KeyboardActionsConfig(
               keyboardActionsPlatform: KeyboardActionsPlatform.ALL,
-              keyboardBarColor: Theme.of(context).colorScheme.surface,
+              keyboardBarColor: Theme.of(context).extension<KeyboardTheme>()!.keyboardBarColor,
               nextFocus: false,
               actions: keyboardActions,
             ),
@@ -244,18 +239,17 @@ class SendPage extends BasePage {
                                           controller: controller,
                                           count: count,
                                           effect: ScrollingDotsEffect(
-                                            spacing: 6.0,
-                                            radius: 6.0,
-                                            dotWidth: 6.0,
-                                            dotHeight: 6.0,
-                                            dotColor: Theme.of(context)
-                                                .colorScheme
-                                                .primary
-                                                .withOpacity(0.4),
-                                            activeDotColor: Theme.of(context).colorScheme.primary,
-                                          ),
-                                        ),
-                                      )
+                                              spacing: 6.0,
+                                              radius: 6.0,
+                                              dotWidth: 6.0,
+                                              dotHeight: 6.0,
+                                              dotColor: Theme.of(context)
+                                                  .extension<SendPageTheme>()!
+                                                  .indicatorDotColor,
+                                              activeDotColor: Theme.of(context)
+                                                  .extension<SendPageTheme>()!
+                                                  .templateBackgroundColor),
+                                        ))
                                     : Offstage();
                               },
                             ),
@@ -376,7 +370,8 @@ class SendPage extends BasePage {
                               onPressed: () => presentCurrencyPicker(context),
                               text: 'Change your asset (${sendViewModel.selectedCryptoCurrency})',
                               color: Colors.transparent,
-                              textColor: Theme.of(context).colorScheme.onSurfaceVariant,
+                              textColor:
+                                  Theme.of(context).extension<SeedWidgetTheme>()!.hintTextColor,
                             ),
                           ),
                         ),
@@ -393,18 +388,18 @@ class SendPage extends BasePage {
                               },
                               text: S.of(context).add_receiver,
                               color: Colors.transparent,
-                              textColor: Theme.of(context).colorScheme.onSurfaceVariant,
+                              textColor:
+                                  Theme.of(context).extension<SeedWidgetTheme>()!.hintTextColor,
                               isDottedBorder: true,
-                              borderColor: Theme.of(context).colorScheme.outline,
+                              borderColor: Theme.of(context)
+                                  .extension<SendPageTheme>()!
+                                  .templateDottedBorderColor,
                             )),
                       Observer(
                         builder: (_) {
                           return LoadingPrimaryButton(
                             key: ValueKey('send_page_send_button_key'),
                             onPressed: () async {
-                              //Request dummy node to get the focus out of the text fields
-                              FocusScope.of(context).requestFocus(FocusNode());
-
                               if (sendViewModel.state is IsExecutingState) return;
                               if (_formKey.currentState != null &&
                                   !_formKey.currentState!.validate()) {
@@ -468,11 +463,9 @@ class SendPage extends BasePage {
                                 },
                               );
                             },
-                            text: sendViewModel.payjoinUri != null
-                                ? S.of(context).send_payjoin
-                                : S.of(context).send,
-                            color: Theme.of(context).colorScheme.primary,
-                            textColor: Theme.of(context).colorScheme.onPrimary,
+                            text: S.of(context).send,
+                            color: Theme.of(context).primaryColor,
+                            textColor: Colors.white,
                             isLoading: sendViewModel.state is IsExecutingState ||
                                 sendViewModel.state is TransactionCommitting ||
                                 sendViewModel.state is IsAwaitingDeviceResponseState ||
@@ -502,7 +495,7 @@ class SendPage extends BasePage {
       bitcoin!.updateFeeRates(sendViewModel.wallet);
     }
 
-    reaction((_) => sendViewModel.state, (ExecutionState state) async {
+    reaction((_) => sendViewModel.state, (ExecutionState state) {
       if (dialogContext != null && dialogContext?.mounted == true) {
         Navigator.of(dialogContext!).pop();
       }
@@ -513,34 +506,24 @@ class SendPage extends BasePage {
         Navigator.of(loadingBottomSheetContext!).pop();
       }
 
+
       if (state is FailureState) {
-        WidgetsBinding.instance.addPostFrameCallback(
-          (_) {
-            showPopUp<void>(
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          showPopUp<void>(
               context: context,
               builder: (BuildContext context) {
                 return AlertWithOneAction(
-                  key: ValueKey('send_page_send_failure_dialog_key'),
-                  buttonKey: ValueKey('send_page_send_failure_dialog_button_key'),
-                  alertTitle: S.of(context).error,
-                  alertContent: state.error,
-                  buttonText: S.of(context).ok,
-                  buttonAction: () => Navigator.of(context).pop(),
-                );
-              },
-            );
-          },
-        );
+                    key: ValueKey('send_page_send_failure_dialog_key'),
+                    buttonKey: ValueKey('send_page_send_failure_dialog_button_key'),
+                    alertTitle: S.of(context).error,
+                    alertContent: state.error,
+                    buttonText: S.of(context).ok,
+                    buttonAction: () => Navigator.of(context).pop());
+              });
+        });
       }
 
       if (state is IsExecutingState) {
-        // wait a bit to avoid showing the loading dialog if transaction is failed
-        await Future.delayed(const Duration(milliseconds: 300));
-        final currentState = sendViewModel.state;
-        if (currentState is ExecutedSuccessfullyState || currentState is FailureState) {
-          return;
-        }
-
         WidgetsBinding.instance.addPostFrameCallback((_) {
           if (context.mounted) {
             showModalBottomSheet<void>(
@@ -558,9 +541,9 @@ class SendPage extends BasePage {
       }
 
       if (state is ExecutedSuccessfullyState) {
-        WidgetsBinding.instance.addPostFrameCallback((_) async {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
           if (context.mounted) {
-            final result = await showModalBottomSheet<bool>(
+            showModalBottomSheet<void>(
               context: context,
               isDismissible: false,
               isScrollControlled: true,
@@ -569,7 +552,6 @@ class SendPage extends BasePage {
                   key: ValueKey('send_page_confirm_sending_dialog_key'),
                   titleText: S.of(bottomSheetContext).confirm_transaction,
                   currentTheme: currentTheme,
-                  walletType: sendViewModel.walletType,
                   titleIconPath: sendViewModel.selectedCryptoCurrency.iconPath,
                   currency: sendViewModel.selectedCryptoCurrency,
                   amount: S.of(bottomSheetContext).send_amount,
@@ -582,20 +564,19 @@ class SendPage extends BasePage {
                   feeFiatAmount: sendViewModel.pendingTransactionFeeFiatAmountFormatted,
                   outputs: sendViewModel.outputs,
                   onSlideComplete: () async {
-                    Navigator.of(bottomSheetContext).pop(true);
+                    Navigator.of(bottomSheetContext).pop();
                     sendViewModel.commitTransaction(context);
                   },
                   change: sendViewModel.pendingTransaction!.change,
-                  isOpenCryptoPay: sendViewModel.ocpRequest != null,
                 );
               },
             );
-
-            if (result == null) sendViewModel.dismissTransaction();
           }
         });
       }
 
+
+
       if (state is TransactionCommitted) {
         WidgetsBinding.instance.addPostFrameCallback((_) async {
           if (!context.mounted) {
@@ -604,66 +585,54 @@ class SendPage extends BasePage {
 
           newContactAddress = newContactAddress ?? sendViewModel.newContactAddress();
 
-          if (newContactAddress?.address != null &&
-              isRegularElectrumAddress(newContactAddress!.address)) {
+          if (newContactAddress?.address != null && isRegularElectrumAddress(newContactAddress!.address)) {
             newContactAddress = null;
           }
 
-          bool showContactSheet = (newContactAddress != null && sendViewModel.showAddressBookPopup);
-
           await showModalBottomSheet<void>(
             context: context,
             isDismissible: false,
             builder: (BuildContext bottomSheetContext) {
-              return showContactSheet && sendViewModel.ocpRequest == null
+              return newContactAddress != null && sendViewModel.showAddressBookPopup
                   ? InfoBottomSheet(
                       currentTheme: currentTheme,
                       showDontAskMeCheckbox: true,
                       onCheckboxChanged: (value) => sendViewModel.setShowAddressBookPopup(!value),
                       titleText: S.of(bottomSheetContext).transaction_sent,
-                      contentImage: 'assets/images/contact.png',
-                      contentImageColor: Theme.of(context).colorScheme.onSurface,
+                      contentImage: 'assets/images/contact_icon.svg',
+                      contentImageColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                       content: S.of(bottomSheetContext).add_contact_to_address_book,
                       isTwoAction: true,
                       leftButtonText: 'No',
                       rightButtonText: 'Yes',
                       actionLeftButton: () {
                         Navigator.of(bottomSheetContext).pop();
-                        if (context.mounted) {
-                          Navigator.of(context)
-                              .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
-                        }
+                        Navigator.of(context)
+                            .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
                         RequestReviewHandler.requestReview();
                         newContactAddress = null;
                       },
                       actionRightButton: () {
                         Navigator.of(bottomSheetContext).pop();
                         RequestReviewHandler.requestReview();
-                        if (context.mounted) {
-                          Navigator.of(context).pushNamed(Routes.addressBookAddContact,
-                              arguments: newContactAddress);
-                        }
+                        Navigator.of(context)
+                            .pushNamed(Routes.addressBookAddContact, arguments: newContactAddress);
                         newContactAddress = null;
                       },
                     )
                   : InfoBottomSheet(
                       currentTheme: currentTheme,
                       titleText: S.of(bottomSheetContext).transaction_sent,
-                      contentImage: 'assets/images/birthday_cake.png',
+                      contentImage: 'assets/images/birthday_cake.svg',
                       actionButtonText: S.of(bottomSheetContext).close,
                       actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'),
                       actionButton: () {
                         Navigator.of(bottomSheetContext).pop();
-                        Future.delayed(Duration.zero, () {
-                          if (context.mounted) {
-                            Navigator.of(context)
-                                .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
-                          }
-                          RequestReviewHandler.requestReview();
-                          newContactAddress = null;
-                        });
-                      },
-                    );
+                        Navigator.of(context)
+                            .pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
+                        RequestReviewHandler.requestReview();
+                        newContactAddress = null;
+                      });
             },
           );
 
@@ -684,44 +653,21 @@ class SendPage extends BasePage {
         });
       }
 
-      if (state is IsDeviceSigningResponseState) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (!context.mounted) return;
-
-          showModalBottomSheet<void>(
-            context: context,
-            isDismissible: false,
-            builder: (context) {
-              dialogContext = context;
-              return LoadingBottomSheet(titleText: S.of(context).processing_signed_tx);
-            },
-          );
-        });
-      }
-
       if (state is IsAwaitingDeviceResponseState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (!context.mounted) return;
-
-          showModalBottomSheet<void>(
+          showPopUp<void>(
               context: context,
-              isDismissible: false,
-              builder: (context) {
+              builder: (BuildContext context) {
                 dialogContext = context;
-                return InfoBottomSheet(
-                  currentTheme: currentTheme,
-                  titleText: S.of(context).proceed_on_device,
-                  contentImage:
-                      'assets/images/hardware_wallet/ledger_nano_x.png',
-                  contentImageColor: Theme.of(context).colorScheme.onSurface,
-                  content: S.of(context).proceed_on_device_description,
-                  isTwoAction: false,
-                  actionButtonText: S.of(context).cancel,
-                  actionButton: () {
-                    sendViewModel.state = InitialExecutionState();
-                    Navigator.of(context).pop();
-                  },
-                );
+                return AlertWithOneAction(
+                    alertTitle: S.of(context).proceed_on_device,
+                    alertContent: S.of(context).proceed_on_device_description,
+                    buttonText: S.of(context).cancel,
+                    alertBarrierDismissible: false,
+                    buttonAction: () {
+                      sendViewModel.state = InitialExecutionState();
+                      Navigator.of(context).pop();
+                    });
               });
         });
       }
@@ -812,4 +758,5 @@ class SendPage extends BasePage {
 
     return isValid;
   }
+
 }
diff --git a/lib/src/screens/send/send_template_page.dart b/lib/src/screens/send/send_template_page.dart
index 556d10d2e..5db70c0eb 100644
--- a/lib/src/screens/send/send_template_page.dart
+++ b/lib/src/screens/send/send_template_page.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
 import 'package:cake_wallet/src/widgets/trail_button.dart';
 import 'package:cake_wallet/view_model/send/template_view_model.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -7,6 +9,7 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/src/screens/send/widgets/send_template_card.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
 
@@ -31,152 +34,136 @@ class SendTemplatePage extends BasePage {
 
   @override
   Function(BuildContext)? get pushToNextWidget => (context) {
-        FocusScopeNode currentFocus = FocusScope.of(context);
-        if (!currentFocus.hasPrimaryFocus) {
-          currentFocus.focusedChild?.unfocus();
-        }
-      };
+    FocusScopeNode currentFocus = FocusScope.of(context);
+    if (!currentFocus.hasPrimaryFocus) {
+      currentFocus.focusedChild?.unfocus();
+    }
+  };
 
   @override
-  Widget trailing(context) => Observer(
-        builder: (_) {
-          return sendTemplateViewModel.recipients.length > 1
-              ? TrailButton(
-                  caption: S.of(context).remove,
-                  onPressed: () {
-                    int pageToJump = (controller.page?.round() ?? 0) - 1;
-                    pageToJump = pageToJump > 0 ? pageToJump : 0;
-                    final recipient = _defineCurrentRecipient();
-                    sendTemplateViewModel.removeRecipient(recipient);
-                    controller.jumpToPage(pageToJump);
-                  },
-                )
-              : TrailButton(
-                  caption: S.of(context).clear,
-                  onPressed: () {
-                    final recipient = _defineCurrentRecipient();
-                    _formKey.currentState?.reset();
-                    recipient.reset();
-                  },
-                );
-        },
-      );
+  Widget trailing(context) => Observer(builder: (_) {
+        return sendTemplateViewModel.recipients.length > 1
+            ? TrailButton(
+                caption: S.of(context).remove,
+                onPressed: () {
+                  int pageToJump = (controller.page?.round() ?? 0) - 1;
+                  pageToJump = pageToJump > 0 ? pageToJump : 0;
+                  final recipient = _defineCurrentRecipient();
+                  sendTemplateViewModel.removeRecipient(recipient);
+                  controller.jumpToPage(pageToJump);
+                })
+            : TrailButton(
+                caption: S.of(context).clear,
+                onPressed: () {
+                  final recipient = _defineCurrentRecipient();
+                  _formKey.currentState?.reset();
+                  recipient.reset();
+                });
+      });
 
   @override
   Widget body(BuildContext context) {
     return Form(
-      key: _formKey,
-      child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(bottom: 24),
-        content: FocusTraversalGroup(
-          policy: OrderedTraversalPolicy(),
-          child: Column(
-            children: [
-              Container(
-                height: 460,
-                child: Observer(
-                  builder: (_) {
-                    return PageView.builder(
-                      scrollDirection: Axis.horizontal,
-                      controller: controller,
-                      itemCount: sendTemplateViewModel.recipients.length,
-                      itemBuilder: (_, index) {
-                        final template = sendTemplateViewModel.recipients[index];
-                        return SendTemplateCard(
-                          template: template,
-                          index: index,
-                          sendTemplateViewModel: sendTemplateViewModel,
-                        );
-                      },
-                    );
-                  },
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(top: 10, left: 24, right: 24, bottom: 10),
-                child: Container(
-                  height: 10,
-                  child: Observer(
-                    builder: (_) {
-                      final count = sendTemplateViewModel.recipients.length;
+        key: _formKey,
+        child: ScrollableWithBottomSection(
+            contentPadding: EdgeInsets.only(bottom: 24),
+            content: FocusTraversalGroup(
+                policy: OrderedTraversalPolicy(),
+                child: Column(children: [
+                  Container(
+                      height: 460,
+                      child: Observer(builder: (_) {
+                        return PageView.builder(
+                            scrollDirection: Axis.horizontal,
+                            controller: controller,
+                            itemCount: sendTemplateViewModel.recipients.length,
+                            itemBuilder: (_, index) {
+                              final template = sendTemplateViewModel.recipients[index];
+                              return SendTemplateCard(
+                                  template: template,
+                                  index: index,
+                                  sendTemplateViewModel: sendTemplateViewModel);
+                            });
+                      })),
+                  Padding(
+                    padding: EdgeInsets.only(top: 10, left: 24, right: 24, bottom: 10),
+                    child: Container(
+                      height: 10,
+                      child: Observer(
+                        builder: (_) {
+                          final count = sendTemplateViewModel.recipients.length;
 
-                      return count > 1
-                          ? Semantics(
-                              button: false,
-                              label: 'Page Indicator',
-                              hint: 'Swipe to change receiver',
-                              excludeSemantics: true,
-                              child: SmoothPageIndicator(
-                                controller: controller,
-                                count: count,
-                                effect: ScrollingDotsEffect(
-                                  spacing: 6.0,
-                                  radius: 6.0,
-                                  dotWidth: 6.0,
-                                  dotHeight: 6.0,
-                                  dotColor: Theme.of(context).colorScheme.outlineVariant,
-                                  activeDotColor: Theme.of(context).colorScheme.primary,
-                                ),
-                              ),
-                            )
-                          : Offstage();
-                    },
+                          return count > 1
+                              ? Semantics(
+                            button: false,
+                            label: 'Page Indicator',
+                            hint: 'Swipe to change receiver',
+                            excludeSemantics: true,
+                                child: SmoothPageIndicator(
+                                    controller: controller,
+                                    count: count,
+                                    effect: ScrollingDotsEffect(
+                                        spacing: 6.0,
+                                        radius: 6.0,
+                                        dotWidth: 6.0,
+                                        dotHeight: 6.0,
+                                        dotColor: Theme.of(context)
+                                            .extension<SendPageTheme>()!
+                                            .indicatorDotColor,
+                                        activeDotColor: Theme.of(context)
+                                            .extension<DashboardPageTheme>()!
+                                            .indicatorDotTheme
+                                            .activeIndicatorColor)),
+                              )
+                              : Offstage();
+                        },
+                      ),
+                    ),
                   ),
-                ),
-              ),
-            ],
-          ),
-        ),
-        bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
-        bottomSection: Column(
-          children: [
-            if (sendTemplateViewModel.hasMultiRecipient)
-              Padding(
-                padding: EdgeInsets.only(bottom: 12),
-                child: PrimaryButton(
+                ])),
+            bottomSectionPadding: EdgeInsets.only(left: 24, right: 24, bottom: 24),
+            bottomSection: Column(children: [
+              if (sendTemplateViewModel.hasMultiRecipient)
+                Padding(
+                    padding: EdgeInsets.only(bottom: 12),
+                    child: PrimaryButton(
+                        onPressed: () {
+                          sendTemplateViewModel.addRecipient();
+                          Future.delayed(const Duration(milliseconds: 250), () {
+                            controller.jumpToPage(sendTemplateViewModel.recipients.length - 1);
+                          });
+                        },
+                        text: S.of(context).add_receiver,
+                        color: Colors.transparent,
+                        textColor: Theme.of(context).extension<SeedWidgetTheme>()!.hintTextColor,
+                        isDottedBorder: true,
+                        borderColor:
+                            Theme.of(context).extension<SendPageTheme>()!.templateBackgroundColor)),
+              PrimaryButton(
                   onPressed: () {
-                    sendTemplateViewModel.addRecipient();
-                    Future.delayed(const Duration(milliseconds: 250), () {
-                      controller.jumpToPage(sendTemplateViewModel.recipients.length - 1);
-                    });
-                  },
-                  text: S.of(context).add_receiver,
-                  color: Colors.transparent,
-                  textColor: Theme.of(context).colorScheme.onSurfaceVariant,
-                  isDottedBorder: true,
-                  borderColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                ),
-              ),
-            PrimaryButton(
-              onPressed: () {
-                if (_formKey.currentState != null && _formKey.currentState!.validate()) {
-                  final mainTemplate = sendTemplateViewModel.recipients[0];
-                  final additionalRecipients = sendTemplateViewModel.recipients
-                      .map((element) => element.toTemplate(
-                          cryptoCurrency: element.selectedCurrency.title,
-                          fiatCurrency: sendTemplateViewModel.fiatCurrency))
-                      .toList();
+                    if (_formKey.currentState != null && _formKey.currentState!.validate()) {
+                      final mainTemplate = sendTemplateViewModel.recipients[0];
+                      final additionalRecipients = sendTemplateViewModel.recipients
+                          .map((element) => element.toTemplate(
+                              cryptoCurrency: element.selectedCurrency.title,
+                              fiatCurrency: sendTemplateViewModel.fiatCurrency))
+                          .toList();
 
-                  sendTemplateViewModel.addTemplate(
-                    isCurrencySelected: mainTemplate.isCryptoSelected,
-                    name: mainTemplate.name,
-                    address: mainTemplate.address,
-                    cryptoCurrency: mainTemplate.selectedCurrency.title,
-                    amount: mainTemplate.output.cryptoAmount,
-                    amountFiat: mainTemplate.output.fiatAmount,
-                    additionalRecipients: additionalRecipients,
-                  );
-                  Navigator.of(context).pop();
-                }
-              },
-              text: S.of(context).save,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
-            )
-          ],
-        ),
-      ),
-    );
+                      sendTemplateViewModel.addTemplate(
+                          isCurrencySelected: mainTemplate.isCryptoSelected,
+                          name: mainTemplate.name,
+                          address: mainTemplate.address,
+                          cryptoCurrency: mainTemplate.selectedCurrency.title,
+                          amount: mainTemplate.output.cryptoAmount,
+                          amountFiat: mainTemplate.output.fiatAmount,
+                          additionalRecipients: additionalRecipients);
+                      Navigator.of(context).pop();
+                    }
+                  },
+                  text: S.of(context).save,
+                  color: Theme.of(context).primaryColor,
+                  textColor: Colors.white)
+            ])));
   }
 
   TemplateViewModel _defineCurrentRecipient() {
diff --git a/lib/src/screens/send/widgets/choose_yat_address_alert.dart b/lib/src/screens/send/widgets/choose_yat_address_alert.dart
index 83f6cbd4b..00f93ff4b 100644
--- a/lib/src/screens/send/widgets/choose_yat_address_alert.dart
+++ b/lib/src/screens/send/widgets/choose_yat_address_alert.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/cake_scrollbar.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
 import 'package:flutter/material.dart';
@@ -24,7 +25,8 @@ class ChooseYatAddressAlert extends BaseAlertDialog {
   bool get barrierDismissible => false;
 
   @override
-  Widget actionButtons(BuildContext context) => ChooseYatAddressButtons(addresses);
+  Widget actionButtons(BuildContext context) =>
+      ChooseYatAddressButtons(addresses);
 }
 
 class ChooseYatAddressButtons extends StatefulWidget {
@@ -33,11 +35,13 @@ class ChooseYatAddressButtons extends StatefulWidget {
   final List<String> addresses;
 
   @override
-  ChooseYatAddressButtonsState createState() => ChooseYatAddressButtonsState(addresses);
+  ChooseYatAddressButtonsState createState() =>
+      ChooseYatAddressButtonsState(addresses);
 }
 
 class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
-  ChooseYatAddressButtonsState(this.addresses) : itemCount = addresses?.length ?? 0;
+  ChooseYatAddressButtonsState(this.addresses)
+      : itemCount = addresses?.length ?? 0;
 
   final List<String> addresses;
   final int itemCount;
@@ -50,9 +54,8 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
   Widget build(BuildContext context) {
     controller.addListener(() {
       fromTop = controller.hasClients
-          ? (controller.offset /
-              controller.position.maxScrollExtent *
-              (backgroundHeight - thumbHeight))
+          ? (controller.offset / controller.position.maxScrollExtent *
+          (backgroundHeight - thumbHeight))
           : 0;
       setState(() {});
     });
@@ -62,56 +65,54 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
       clipBehavior: Clip.none,
       children: [
         Container(
-          width: 300,
-          height: 158,
-          color: Theme.of(context).colorScheme.surface,
-          child: ListView.separated(
-            controller: controller,
-            padding: EdgeInsets.all(0),
-            itemCount: itemCount,
-            separatorBuilder: (_, __) => const HorizontalSectionDivider(),
-            itemBuilder: (context, index) {
-              final address = addresses[index];
+            width: 300,
+            height: 158,
+            color: Theme.of(context).dialogBackgroundColor,
+            child: ListView.separated(
+                controller: controller,
+                padding: EdgeInsets.all(0),
+                itemCount: itemCount,
+                separatorBuilder: (_, __) => const HorizontalSectionDivider(),
+                itemBuilder: (context, index) {
+                  final address = addresses[index];
 
-              return GestureDetector(
-                onTap: () => Navigator.of(context).pop<String>(address),
-                child: Container(
-                  width: 300,
-                  height: 52,
-                  padding: EdgeInsets.only(left: 24, right: 24),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      Expanded(
-                        child: Text(
-                          address,
-                          textAlign: TextAlign.center,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 15,
-                            fontWeight: FontWeight.w600,
-                             
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            decoration: TextDecoration.none,
-                          ),
-                        ),
-                      )
-                    ],
-                  ),
-                ),
-              );
-            },
-          ),
+                  return GestureDetector(
+                    onTap: () => Navigator.of(context).pop<String>(address),
+                    child: Container(
+                        width: 300,
+                        height: 52,
+                        padding: EdgeInsets.only(left: 24, right: 24),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: [
+                            Expanded(
+                                child: Text(
+                                  address,
+                                  textAlign: TextAlign.center,
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    fontSize: 15,
+                                    fontWeight: FontWeight.w600,
+                                    fontFamily: 'Lato',
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                    decoration: TextDecoration.none,
+                                  ),
+                                )
+                            )
+                          ],
+                        )
+                    ),
+                  );
+                })
         ),
-        if (itemCount > 3)
-          CakeScrollbar(
+        if (itemCount > 3) CakeScrollbar(
             backgroundHeight: backgroundHeight,
             thumbHeight: thumbHeight,
-            fromTop: fromTop,
-          )
-      ],
+            fromTop: fromTop
+        )
+      ]
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/send/widgets/confirm_sending_alert.dart b/lib/src/screens/send/widgets/confirm_sending_alert.dart
new file mode 100644
index 000000000..83866a73c
--- /dev/null
+++ b/lib/src/screens/send/widgets/confirm_sending_alert.dart
@@ -0,0 +1,595 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/view_model/send/output.dart';
+import 'package:cw_core/pending_transaction.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/widgets/cake_scrollbar.dart';
+import 'package:flutter/scheduler.dart';
+
+class ConfirmSendingAlert extends BaseAlertDialog {
+  ConfirmSendingAlert({
+    required this.alertTitle,
+    this.paymentId,
+    this.paymentIdValue,
+    this.expirationTime,
+    required this.amount,
+    required this.amountValue,
+    required this.fiatAmountValue,
+    required this.fee,
+    this.feeRate,
+    required this.feeValue,
+    required this.feeFiatAmount,
+    required this.outputs,
+    this.change,
+    required this.leftButtonText,
+    required this.rightButtonText,
+    required this.actionLeftButton,
+    required this.actionRightButton,
+    this.alertBarrierDismissible = true,
+    this.alertLeftActionButtonTextColor,
+    this.alertRightActionButtonTextColor,
+    this.alertLeftActionButtonColor,
+    this.alertRightActionButtonColor,
+    this.onDispose,
+    this.alertLeftActionButtonKey,
+    this.alertRightActionButtonKey,
+    Key? key,
+  });
+
+  final String alertTitle;
+  final String? paymentId;
+  final String? paymentIdValue;
+  final String? expirationTime;
+  final String amount;
+  final String amountValue;
+  final String fiatAmountValue;
+  final String fee;
+  final String? feeRate;
+  final String feeValue;
+  final String feeFiatAmount;
+  final List<Output> outputs;
+  final PendingChange? change;
+  final String leftButtonText;
+  final String rightButtonText;
+  final VoidCallback actionLeftButton;
+  final VoidCallback actionRightButton;
+  final bool alertBarrierDismissible;
+  final Color? alertLeftActionButtonTextColor;
+  final Color? alertRightActionButtonTextColor;
+  final Color? alertLeftActionButtonColor;
+  final Color? alertRightActionButtonColor;
+  final Function? onDispose;
+  final Key? alertRightActionButtonKey;
+  final Key? alertLeftActionButtonKey;
+
+  @override
+  String get titleText => alertTitle;
+
+  @override
+  bool get isDividerExists => true;
+
+  @override
+  String get leftActionButtonText => leftButtonText;
+
+  @override
+  String get rightActionButtonText => rightButtonText;
+
+  @override
+  VoidCallback get actionLeft => actionLeftButton;
+
+  @override
+  VoidCallback get actionRight => actionRightButton;
+
+  @override
+  bool get barrierDismissible => alertBarrierDismissible;
+
+  @override
+  Color? get leftActionButtonTextColor => alertLeftActionButtonTextColor;
+
+  @override
+  Color? get rightActionButtonTextColor => alertRightActionButtonTextColor;
+
+  @override
+  Color? get leftActionButtonColor => alertLeftActionButtonColor;
+
+  @override
+  Color? get rightActionButtonColor => alertRightActionButtonColor;
+
+  @override
+  Key? get leftActionButtonKey => alertLeftActionButtonKey;
+
+  @override
+  Key? get rightActionButtonKey => alertLeftActionButtonKey;
+
+  @override
+  Widget content(BuildContext context) => ConfirmSendingAlertContent(
+      paymentId: paymentId,
+      paymentIdValue: paymentIdValue,
+      expirationTime: expirationTime,
+      amount: amount,
+      amountValue: amountValue,
+      fiatAmountValue: fiatAmountValue,
+      fee: fee,
+      feeRate: feeRate,
+      feeValue: feeValue,
+      feeFiatAmount: feeFiatAmount,
+      outputs: outputs,
+      change: change,
+      onDispose: onDispose);
+}
+
+class ConfirmSendingAlertContent extends StatefulWidget {
+  ConfirmSendingAlertContent(
+      {this.paymentId,
+      this.paymentIdValue,
+      this.expirationTime,
+      required this.amount,
+      required this.amountValue,
+      required this.fiatAmountValue,
+      required this.fee,
+      this.feeRate,
+      required this.feeValue,
+      required this.feeFiatAmount,
+      required this.outputs,
+      this.change,
+      required this.onDispose}) {}
+
+  final String? paymentId;
+  final String? paymentIdValue;
+  final String? expirationTime;
+  final String amount;
+  final String amountValue;
+  final String fiatAmountValue;
+  final String fee;
+  final String? feeRate;
+  final String feeValue;
+  final String feeFiatAmount;
+  final List<Output> outputs;
+  final PendingChange? change;
+  final Function? onDispose;
+
+  @override
+  ConfirmSendingAlertContentState createState() => ConfirmSendingAlertContentState(
+      paymentId: paymentId,
+      paymentIdValue: paymentIdValue,
+      expirationTime: expirationTime,
+      amount: amount,
+      amountValue: amountValue,
+      fiatAmountValue: fiatAmountValue,
+      fee: fee,
+      feeRate: feeRate,
+      feeValue: feeValue,
+      feeFiatAmount: feeFiatAmount,
+      outputs: outputs,
+      change: change,
+      onDispose: onDispose);
+}
+
+class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent> {
+  ConfirmSendingAlertContentState(
+      {this.paymentId,
+      this.paymentIdValue,
+      this.expirationTime,
+      required this.amount,
+      required this.amountValue,
+      required this.fiatAmountValue,
+      required this.fee,
+      this.feeRate,
+      required this.feeValue,
+      required this.feeFiatAmount,
+      required this.outputs,
+      this.change,
+      this.onDispose})
+      : recipientTitle = '' {
+    recipientTitle = outputs.length > 1
+        ? S.current.transaction_details_recipient_address
+        : S.current.recipient_address;
+  }
+
+  final String? paymentId;
+  final String? paymentIdValue;
+  final String? expirationTime;
+  final String amount;
+  final String amountValue;
+  final String fiatAmountValue;
+  final String fee;
+  final String? feeRate;
+  final String feeValue;
+  final String feeFiatAmount;
+  final List<Output> outputs;
+  final PendingChange? change;
+  final Function? onDispose;
+
+  final double backgroundHeight = 160;
+  final double thumbHeight = 72;
+  ScrollController controller = ScrollController();
+  double fromTop = 0;
+  String recipientTitle;
+  bool showScrollbar = false;
+
+  @override
+  void dispose() {
+    if (onDispose != null) onDispose!();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    controller.addListener(() {
+      fromTop = controller.hasClients
+          ? (controller.offset /
+              controller.position.maxScrollExtent *
+              (backgroundHeight - thumbHeight))
+          : 0;
+      setState(() {});
+    });
+
+    SchedulerBinding.instance.addPostFrameCallback((_) {
+      setState(() {
+        showScrollbar = controller.position.maxScrollExtent > 0;
+      });
+    });
+
+    return Stack(alignment: Alignment.center, clipBehavior: Clip.none, children: [
+      Container(
+          height: feeRate != null ? 250 : 200,
+          child: SingleChildScrollView(
+              controller: controller,
+              child: Column(
+                children: <Widget>[
+                  if (paymentIdValue != null && paymentId != null)
+                    Padding(
+                      padding: EdgeInsets.only(bottom: 32),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.max,
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: <Widget>[
+                          Text(
+                            paymentId!,
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.normal,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              decoration: TextDecoration.none,
+                            ),
+                          ),
+                          Column(
+                            crossAxisAlignment: CrossAxisAlignment.end,
+                            children: [
+                              Container(
+                                width: 160,
+                                child: Text(
+                                  paymentIdValue!,
+                                  textAlign: TextAlign.right,
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.w600,
+                                    fontFamily: 'Lato',
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                    decoration: TextDecoration.none,
+                                  ),
+                                ),
+                              ),
+                            ],
+                          )
+                        ],
+                      ),
+                    ),
+                  if (widget.expirationTime != null)
+                    ExpirationTimeWidget(expirationTime: widget.expirationTime!),
+                  Row(
+                    mainAxisSize: MainAxisSize.max,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      Text(
+                        amount,
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.normal,
+                          fontFamily: 'Lato',
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                          decoration: TextDecoration.none,
+                        ),
+                      ),
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        children: [
+                          Text(
+                            key: ValueKey('confirm_sending_dialog_amount_text_value_key'),
+                            amountValue,
+                            style: TextStyle(
+                              fontSize: 18,
+                              fontWeight: FontWeight.w600,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              decoration: TextDecoration.none,
+                            ),
+                          ),
+                          Text(
+                            fiatAmountValue,
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.w600,
+                              fontFamily: 'Lato',
+                              color: PaletteDark.pigeonBlue,
+                              decoration: TextDecoration.none,
+                            ),
+                          )
+                        ],
+                      )
+                    ],
+                  ),
+                  if (feeValue.isNotEmpty && feeValue != "0")
+                    Padding(
+                        padding: EdgeInsets.only(top: 16),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.max,
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            Text(
+                              fee,
+                              style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.normal,
+                                fontFamily: 'Lato',
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                decoration: TextDecoration.none,
+                              ),
+                            ),
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.end,
+                              children: [
+                                Text(
+                                  feeValue,
+                                  style: TextStyle(
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.w600,
+                                    fontFamily: 'Lato',
+                                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                    decoration: TextDecoration.none,
+                                  ),
+                                ),
+                                Text(
+                                  feeFiatAmount,
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    fontWeight: FontWeight.w600,
+                                    fontFamily: 'Lato',
+                                    color: PaletteDark.pigeonBlue,
+                                    decoration: TextDecoration.none,
+                                  ),
+                                )
+                              ],
+                            )
+                          ],
+                        )),
+                  if (feeRate != null && feeRate!.isNotEmpty)
+                    Padding(
+                        padding: EdgeInsets.only(top: 16),
+                        child: Row(
+                          mainAxisSize: MainAxisSize.max,
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            Text(
+                              S.current.send_estimated_fee,
+                              style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.normal,
+                                fontFamily: 'Lato',
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                decoration: TextDecoration.none,
+                              ),
+                            ),
+                            Text(
+                              "$feeRate sat/byte",
+                              style: TextStyle(
+                                fontSize: 18,
+                                fontWeight: FontWeight.w600,
+                                fontFamily: 'Lato',
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                                decoration: TextDecoration.none,
+                              ),
+                            )
+                          ],
+                        )),
+                  Padding(
+                    padding: EdgeInsets.only(top: 16),
+                    child: Column(
+                      children: [
+                        Text(
+                          '$recipientTitle:',
+                          style: TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.normal,
+                            fontFamily: 'Lato',
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                            decoration: TextDecoration.none,
+                          ),
+                        ),
+                        ListView.builder(
+                          padding: EdgeInsets.only(top: 0),
+                          shrinkWrap: true,
+                          physics: NeverScrollableScrollPhysics(),
+                          itemCount: outputs.length,
+                          itemBuilder: (context, index) {
+                            final item = outputs[index];
+                            final _address =
+                                item.isParsedAddress ? item.extractedAddress : item.address;
+                            final _amount = item.cryptoAmount.replaceAll(',', '.');
+
+                            return Column(
+                              children: [
+                                if (item.isParsedAddress)
+                                  AddressText(text: item.parsedAddress.name),
+                                AddressText(text: _address, fontSize: 10),
+                                if (stealthAddressText(item.stealthAddress) != null)
+                                  AddressText(
+                                      text: stealthAddressText(item.stealthAddress)!, fontSize: 10),
+                                AmountText(text: _amount),
+                              ],
+                            );
+                          },
+                        )
+                      ],
+                    ),
+                  ),
+                  if (change != null)
+                    Padding(
+                      padding: EdgeInsets.only(top: 16),
+                      child: Column(
+                        children: [
+                          Text(
+                            S.of(context).send_change_to_you,
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.normal,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              decoration: TextDecoration.none,
+                            ),
+                          ),
+                          Column(
+                            children: [
+                              AddressText(text: change!.address, fontSize: 10),
+                              AmountText(text: change!.amount),
+                            ],
+                          )
+                        ],
+                      ),
+                    )
+                ],
+              ))),
+      if (showScrollbar)
+        CakeScrollbar(
+            backgroundHeight: backgroundHeight,
+            thumbHeight: thumbHeight,
+            fromTop: fromTop,
+            rightOffset: -15)
+    ]);
+  }
+}
+
+class ExpirationTimeWidget extends StatelessWidget {
+  const ExpirationTimeWidget({
+    required this.expirationTime,
+  });
+
+  final String expirationTime;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.only(bottom: 32),
+      child: Row(
+        mainAxisSize: MainAxisSize.max,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: <Widget>[
+          Text(
+            S.current.offer_expires_in,
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.normal,
+              fontFamily: 'Lato',
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              decoration: TextDecoration.none,
+            ),
+          ),
+          Text(
+            expirationTime,
+            textAlign: TextAlign.right,
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w600,
+              fontFamily: 'Lato',
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              decoration: TextDecoration.none,
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
+
+class AddressText extends StatelessWidget {
+  final String text;
+  final double fontSize;
+  final FontWeight fontWeight;
+  final TextAlign? textAlign;
+
+  const AddressText({
+    required this.text,
+    this.fontSize = 14,
+    this.fontWeight = FontWeight.w600,
+    this.textAlign,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.only(top: 8),
+      child: Text(
+        text,
+        style: TextStyle(
+          fontSize: fontSize,
+          fontWeight: fontWeight,
+          fontFamily: 'Lato',
+          color: PaletteDark.pigeonBlue,
+          decoration: TextDecoration.none,
+        ),
+      ),
+    );
+  }
+}
+
+class AmountText extends StatelessWidget {
+  final String text;
+  final double fontSize;
+  final FontWeight fontWeight;
+  final TextAlign? textAlign;
+
+  const AmountText({
+    required this.text,
+    this.fontSize = 10,
+    this.fontWeight = FontWeight.w600,
+    this.textAlign,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+        padding: EdgeInsets.only(top: 8),
+        child: Row(
+          mainAxisSize: MainAxisSize.max,
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            Text(
+              text,
+              style: TextStyle(
+                fontSize: fontSize,
+                fontWeight: fontWeight,
+                fontFamily: 'Lato',
+                color: PaletteDark.pigeonBlue,
+                decoration: TextDecoration.none,
+              ),
+            )
+          ],
+        ));
+  }
+}
+
+String? stealthAddressText(String? stealthAddress) {
+  if (stealthAddress == null) {
+    return null;
+  }
+
+  return stealthAddress.isNotEmpty ? "-> $stealthAddress" : null;
+}
diff --git a/lib/src/screens/send/widgets/extract_address_from_parsed.dart b/lib/src/screens/send/widgets/extract_address_from_parsed.dart
index b37f87b7f..29c4eb793 100644
--- a/lib/src/screens/send/widgets/extract_address_from_parsed.dart
+++ b/lib/src/screens/send/widgets/extract_address_from_parsed.dart
@@ -8,8 +8,6 @@ import 'choose_yat_address_alert.dart';
 Future<String> extractAddressFromParsed(
     BuildContext context,
     ParsedAddress parsedAddress) async {
-  if (!context.mounted) return parsedAddress.addresses.first;
-
   var title = '';
   var content = '';
   var address = '';
@@ -97,17 +95,16 @@ Future<String> extractAddressFromParsed(
       content += S.of(context).choose_address;
 
       address = await showPopUp<String?>(
-            context: context,
-            builder: (context) => PopScope(
+          context: context,
+          builder: (BuildContext context) {
+
+            return WillPopScope(
               child: ChooseYatAddressAlert(
                 alertTitle: title,
                 alertContent: content,
-                addresses: parsedAddress.addresses,
-              ),
-              canPop: false,
-            ),
-          ) ??
-          '';
+                addresses: parsedAddress.addresses),
+              onWillPop: () async => false);
+          }) ?? '';
 
       if (address.isEmpty) {
         return parsedAddress.name;
@@ -116,20 +113,22 @@ Future<String> extractAddressFromParsed(
       return address;
     case ParseFrom.contact:
     case ParseFrom.notParsed:
-      return parsedAddress.addresses.first;
+      address = parsedAddress.addresses.first;
+      return address;
   }
 
   await showPopUp<void>(
-    context: context,
-    builder: (context) => AlertWithOneAction(
-      alertTitle: title,
-      headerTitleText: profileName.isEmpty ? null : profileName,
-      headerImageProfileUrl: profileImageUrl.isEmpty ? null : profileImageUrl,
-      alertContent: content,
-      buttonText: S.of(context).ok,
-      buttonAction: () => Navigator.of(context).pop(),
-    ),
-  );
+      context: context,
+      builder: (BuildContext context) {
+
+        return AlertWithOneAction(
+            alertTitle: title,
+            headerTitleText: profileName.isEmpty ? null : profileName,
+            headerImageProfileUrl: profileImageUrl.isEmpty ? null : profileImageUrl,
+            alertContent: content,
+            buttonText: S.of(context).ok,
+            buttonAction: () => Navigator.of(context).pop());
+      });
 
   return address;
 }
diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart
index a0c0a9473..7b1ae9098 100644
--- a/lib/src/screens/send/widgets/send_card.dart
+++ b/lib/src/screens/send/widgets/send_card.dart
@@ -1,16 +1,16 @@
-import 'package:cake_wallet/core/open_crypto_pay/open_cryptopay_service.dart';
 import 'package:cake_wallet/entities/priority_for_wallet_type.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/currency_input_field.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/currency.dart';
 import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/unspent_coin_type.dart';
@@ -18,11 +18,16 @@ import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
+import 'package:keyboard_actions/keyboard_actions.dart';
 import 'package:cake_wallet/view_model/send/send_view_model.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/src/widgets/address_text_field.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+
+import '../../../../themes/extensions/cake_text_theme.dart';
+import '../../../../themes/theme_base.dart';
 
 class SendCard extends StatefulWidget {
   SendCard({
@@ -40,18 +45,19 @@ class SendCard extends StatefulWidget {
   final PaymentRequest? initialPaymentRequest;
   final FocusNode? cryptoAmountFocus;
   final FocusNode? fiatAmountFocus;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
+
 
   @override
   SendCardState createState() => SendCardState(
-      output: output,
-      sendViewModel: sendViewModel,
-      initialPaymentRequest: initialPaymentRequest,
-      currentTheme: currentTheme
-      // cryptoAmountFocus: cryptoAmountFocus ?? FocusNode(),
-      // fiatAmountFocus: fiatAmountFocus ?? FocusNode(),
-      // cryptoAmountFocus: FocusNode(),
-      // fiatAmountFocus: FocusNode(),
+        output: output,
+        sendViewModel: sendViewModel,
+        initialPaymentRequest: initialPaymentRequest,
+        currentTheme: currentTheme
+        // cryptoAmountFocus: cryptoAmountFocus ?? FocusNode(),
+        // fiatAmountFocus: fiatAmountFocus ?? FocusNode(),
+        // cryptoAmountFocus: FocusNode(),
+        // fiatAmountFocus: FocusNode(),
       );
 }
 
@@ -71,7 +77,7 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
   static const prefixIconWidth = 34.0;
   static const prefixIconHeight = 34.0;
 
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
   final Output output;
   final SendViewModel sendViewModel;
   final PaymentRequest? initialPaymentRequest;
@@ -88,30 +94,23 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      sendViewModel.updateSendingBalance();
-    });
 
     /// if the current wallet doesn't match the one in the qr code
     if (initialPaymentRequest != null &&
         sendViewModel.walletCurrencyName != initialPaymentRequest!.scheme.toLowerCase()) {
-      WidgetsBinding.instance.addPostFrameCallback(
-        (timeStamp) {
-          if (mounted) {
-            showPopUp<void>(
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+        if (mounted) {
+          showPopUp<void>(
               context: context,
               builder: (BuildContext context) {
                 return AlertWithOneAction(
-                  alertTitle: S.of(context).error,
-                  alertContent: S.of(context).unmatched_currencies,
-                  buttonText: S.of(context).ok,
-                  buttonAction: () => Navigator.of(context).pop(),
-                );
-              },
-            );
-          }
-        },
-      );
+                    alertTitle: S.of(context).error,
+                    alertContent: S.of(context).unmatched_currencies,
+                    buttonText: S.of(context).ok,
+                    buttonAction: () => Navigator.of(context).pop());
+              });
+        }
+      });
     }
   }
 
@@ -152,10 +151,15 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
       decoration: responsiveLayoutUtil.shouldRenderMobileUI
           ? BoxDecoration(
               borderRadius: BorderRadius.only(
-                bottomLeft: Radius.circular(24),
-                bottomRight: Radius.circular(24),
+                  bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
+              gradient: LinearGradient(
+                colors: [
+                  Theme.of(context).extension<SendPageTheme>()!.firstGradientColor,
+                  Theme.of(context).extension<SendPageTheme>()!.secondGradientColor,
+                ],
+                begin: Alignment.topLeft,
+                end: Alignment.bottomRight,
               ),
-              color: Theme.of(context).colorScheme.surfaceContainer,
             )
           : null,
       child: Padding(
@@ -175,39 +179,28 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                     : sendViewModel.addressValidator;
 
                 return AddressTextField(
-                  contentPadding: EdgeInsets.symmetric(vertical: 8),
-                  hasUnderlineBorder: true,
-                  fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
                   addressKey: ValueKey('send_page_address_textfield_key'),
                   focusNode: addressFocusNode,
                   controller: addressController,
-                  onURIScanned: (uri) async {
-                    if (OpenCryptoPayService.isOpenCryptoPayQR(uri.toString())) {
-                      sendViewModel.createOpenCryptoPayTransaction(uri.toString());
-                    } else {
-                      final paymentRequest = PaymentRequest.fromUri(uri);
-                      if (sendViewModel.usePayjoin) {
-                        sendViewModel.payjoinUri = paymentRequest.pjUri;
-                      }
-                      addressController.text = paymentRequest.address;
-                      cryptoAmountController.text = paymentRequest.amount;
-                      noteController.text = paymentRequest.note;
-                    }
+                  onURIScanned: (uri) {
+                    final paymentRequest = PaymentRequest.fromUri(uri);
+                    addressController.text = paymentRequest.address;
+                    cryptoAmountController.text = paymentRequest.amount;
+                    noteController.text = paymentRequest.note;
                   },
                   options: [
                     AddressTextFieldOption.paste,
                     AddressTextFieldOption.qrCode,
                     AddressTextFieldOption.addressBook
                   ],
-                  textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                      ),
-                  hintStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
+                  buttonColor: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
+                  borderColor: Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor,
+                  textStyle:
+                      TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white),
+                  hintStyle: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor),
                   onPushPasteButton: (context) async {
                     output.resetParsedAddress();
                     await output.fetchParsedAddress(context);
@@ -224,115 +217,95 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
               }),
               if (output.isParsedAddress)
                 Padding(
-                  padding: const EdgeInsets.only(top: 20),
-                  child: BaseTextFormField(
-                    fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                    controller: extractedAddressController,
-                    readOnly: true,
-                    textStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w500,
-                          color: Theme.of(context).colorScheme.onSurface,
+                    padding: const EdgeInsets.only(top: 20),
+                    child: BaseTextFormField(
+                        controller: extractedAddressController,
+                        readOnly: true,
+                        borderColor:
+                            Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor,
+                        textStyle: TextStyle(
+                            fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white),
+                        validator: sendViewModel.addressValidator)),
+              CurrencyAmountTextField(
+                  currencyPickerButtonKey: ValueKey('send_page_currency_picker_button_key'),
+                  amountTextfieldKey: ValueKey('send_page_amount_textfield_key'),
+                  sendAllButtonKey: ValueKey('send_page_send_all_button_key'),
+                  currencyAmountTextFieldWidgetKey:
+                      ValueKey('send_page_crypto_currency_amount_textfield_widget_key'),
+                  selectedCurrency: sendViewModel.selectedCryptoCurrency.title,
+                  amountFocusNode: widget.cryptoAmountFocus,
+                  amountController: cryptoAmountController,
+                  isAmountEditable: true,
+                  onTapPicker: () => _presentPicker(context),
+                  isPickerEnable: sendViewModel.hasMultipleTokens,
+                  tag: sendViewModel.selectedCryptoCurrency.tag,
+                  allAmountButton:
+                      !sendViewModel.isBatchSending && sendViewModel.shouldDisplaySendALL,
+                  currencyValueValidator: output.sendAll
+                      ? sendViewModel.allAmountValidator
+                      : sendViewModel.amountValidator,
+                  allAmountCallback: () async => output.setSendAll(sendViewModel.balance)),
+              Divider(
+                  height: 1,
+                  color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor),
+              Observer(
+                builder: (_) => Padding(
+                  padding: EdgeInsets.only(top: 10),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.max,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: <Widget>[
+                      Expanded(
+                        child: Text(
+                          S.of(context).available_balance + ':',
+                          style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.w600,
+                              color:
+                                  Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor),
                         ),
-                    validator: sendViewModel.addressValidator,
+                      ),
+                      Text(
+                        sendViewModel.balance,
+                        style: TextStyle(
+                            fontSize: 12,
+                            fontWeight: FontWeight.w600,
+                            color:
+                                Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor),
+                      )
+                    ],
                   ),
                 ),
-              CurrencyAmountTextField(
-                borderWidth: 0.0,
-                hasUnderlineBorder: true,
-                fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                currencyPickerButtonKey: ValueKey('send_page_currency_picker_button_key'),
-                amountTextfieldKey: ValueKey('send_page_amount_textfield_key'),
-                sendAllButtonKey: ValueKey('send_page_send_all_button_key'),
-                currencyAmountTextFieldWidgetKey:
-                    ValueKey('send_page_crypto_currency_amount_textfield_widget_key'),
-                selectedCurrency: sendViewModel.selectedCryptoCurrency.title,
-                amountFocusNode: widget.cryptoAmountFocus,
-                amountController: cryptoAmountController,
-                isAmountEditable: true,
-                onTapPicker: () => _presentPicker(context),
-                isPickerEnable: sendViewModel.hasMultipleTokens,
-                tag: sendViewModel.selectedCryptoCurrency.tag,
-                allAmountButton:
-                    !sendViewModel.isBatchSending && sendViewModel.shouldDisplaySendALL,
-                currencyValueValidator: output.sendAll
-                    ? sendViewModel.allAmountValidator
-                    : sendViewModel.amountValidator,
-                allAmountCallback: () async =>
-                    output.setSendAll(await sendViewModel.sendingBalance),
-              ),
-              Divider(height: 1, color: Theme.of(context).colorScheme.outlineVariant),
-              Observer(
-                builder: (_) {
-                  // force rebuild on mobx
-                  final _ = sendViewModel.coinTypeToSpendFrom;
-                  return Padding(
-                    padding: EdgeInsets.only(top: 10),
-                    child: Row(
-                      mainAxisSize: MainAxisSize.max,
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: <Widget>[
-                        Expanded(
-                          child: Text(
-                            S.of(context).available_balance + ':',
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  fontWeight: FontWeight.w600,
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                ),
-                          ),
-                        ),
-                        FutureBuilder<String>(
-                          future: sendViewModel.sendingBalance,
-                          builder: (context, snapshot) {
-                            return Text(
-                              snapshot.data ??
-                                  sendViewModel.balance, // default to balance while loading
-                              style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                    fontWeight: FontWeight.w600,
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                  ),
-                            );
-                          },
-                        )
-                      ],
-                    ),
-                  );
-                },
               ),
               if (!sendViewModel.isFiatDisabled)
                 CurrencyAmountTextField(
-                  borderWidth: 0.0,
-                  hasUnderlineBorder: true,
-                  fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                  amountTextfieldKey: ValueKey('send_page_fiat_amount_textfield_key'),
-                  currencyAmountTextFieldWidgetKey:
-                      ValueKey('send_page_fiat_currency_amount_textfield_widget_key'),
-                  selectedCurrency: sendViewModel.fiat.title,
-                  amountFocusNode: widget.fiatAmountFocus,
-                  amountController: fiatAmountController,
-                  hintText: '0.00',
-                  isAmountEditable: true,
-                  allAmountButton: false,
-                ),
-              Divider(height: 1, color: Theme.of(context).colorScheme.outlineVariant),
+                    amountTextfieldKey: ValueKey('send_page_fiat_amount_textfield_key'),
+                    currencyAmountTextFieldWidgetKey:
+                        ValueKey('send_page_fiat_currency_amount_textfield_widget_key'),
+                    selectedCurrency: sendViewModel.fiat.title,
+                    amountFocusNode: widget.fiatAmountFocus,
+                    amountController: fiatAmountController,
+                    hintText: '0.00',
+                    isAmountEditable: true,
+                    allAmountButton: false),
+              Divider(
+                  height: 1,
+                  color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor),
               Padding(
                 padding: EdgeInsets.only(top: 20),
                 child: BaseTextFormField(
-                  hasUnderlineBorder: true,
-                  contentPadding: EdgeInsets.symmetric(vertical: 8),
-                  fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
                   key: ValueKey('send_page_note_textfield_key'),
                   controller: noteController,
                   keyboardType: TextInputType.multiline,
                   maxLines: null,
-                  textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontWeight: FontWeight.w500,
-                      ),
+                  borderColor: Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor,
+                  textStyle:
+                      TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white),
                   hintText: S.of(context).note_optional,
-                  placeholderTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                      ),
+                  placeholderTextStyle: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor),
                 ),
               ),
               if (sendViewModel.feesViewModel.hasFees)
@@ -350,9 +323,8 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                         children: <Widget>[
                           Text(
                             S.of(context).send_estimated_fee,
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  fontWeight: FontWeight.w700,
-                                ),
+                            style: TextStyle(
+                                fontSize: 12, fontWeight: FontWeight.w500, color: Colors.white),
                           ),
                           Container(
                             child: Row(
@@ -366,9 +338,11 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                                       output.estimatedFee.toString() +
                                           ' ' +
                                           sendViewModel.currency.toString(),
-                                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                            fontWeight: FontWeight.w600,
-                                          ),
+                                      style: TextStyle(
+                                        fontSize: 12,
+                                        fontWeight: FontWeight.w600,
+                                        color: Colors.white,
+                                      ),
                                     ),
                                     Padding(
                                       padding: EdgeInsets.only(top: 5),
@@ -378,13 +352,13 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                                               output.estimatedFeeFiatAmount +
                                                   ' ' +
                                                   sendViewModel.fiat.title,
-                                              style:
-                                                  Theme.of(context).textTheme.bodySmall!.copyWith(
-                                                        fontWeight: FontWeight.w600,
-                                                        color: Theme.of(context)
-                                                            .colorScheme
-                                                            .onSurfaceVariant,
-                                                      ),
+                                              style: TextStyle(
+                                                fontSize: 12,
+                                                fontWeight: FontWeight.w600,
+                                                color: Theme.of(context)
+                                                    .extension<SendPageTheme>()!
+                                                    .textFieldHintColor,
+                                              ),
                                             ),
                                     ),
                                   ],
@@ -394,7 +368,7 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                                   child: Icon(
                                     Icons.arrow_forward_ios,
                                     size: 12,
-                                    color: Theme.of(context).colorScheme.onSurface,
+                                    color: Colors.white,
                                   ),
                                 )
                               ],
@@ -410,16 +384,10 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                   padding: EdgeInsets.only(top: 6),
                   child: GestureDetector(
                     key: ValueKey('send_page_unspent_coin_button_key'),
-                    onTap: () async {
-                      await Navigator.of(context).pushNamed(
-                        Routes.unspentCoinsList,
-                        arguments: widget.sendViewModel.coinTypeToSpendFrom,
-                      );
-                      if (mounted) {
-                        // we just got back from the unspent coins list screen, so we need to recompute the sending balance:
-                        sendViewModel.updateSendingBalance();
-                      }
-                    },
+                    onTap: () => Navigator.of(context).pushNamed(
+                      Routes.unspentCoinsList,
+                      arguments: widget.sendViewModel.coinTypeToSpendFrom,
+                    ),
                     child: Container(
                       color: Colors.transparent,
                       child: Row(
@@ -427,14 +395,13 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                         children: [
                           Text(
                             S.of(context).coin_control,
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  fontWeight: FontWeight.w700,
-                                ),
+                            style: TextStyle(
+                                fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white),
                           ),
                           Icon(
                             Icons.arrow_forward_ios,
                             size: 12,
-                            color: Theme.of(context).colorScheme.onSurface,
+                            color: Colors.white,
                           ),
                         ],
                       ),
@@ -459,9 +426,13 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                           children: [
                             StandardCheckbox(
                               caption: S.of(context).litecoin_mweb_allow_coins,
-                              captionColor: Theme.of(context).colorScheme.onSurfaceVariant,
-                              borderColor: Theme.of(context).colorScheme.primary,
-                              iconColor: Theme.of(context).colorScheme.primary,
+                              captionColor: Colors.white,
+                              borderColor: currentTheme.type == ThemeType.bright
+                                  ? Colors.white
+                                  : Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                              iconColor: currentTheme.type == ThemeType.bright
+                                  ? Colors.white
+                                  : Theme.of(context).primaryColor,
                               value:
                                   widget.sendViewModel.coinTypeToSpendFrom == UnspentCoinType.any,
                               onChanged: (bool? value) {
@@ -532,9 +503,9 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
       }
     });
 
-    reaction((_) => sendViewModel.selectedCryptoCurrency, (Currency currency) async {
+    reaction((_) => sendViewModel.selectedCryptoCurrency, (Currency currency) {
       if (output.sendAll) {
-        output.setSendAll(await sendViewModel.sendingBalance);
+        output.setSendAll(sendViewModel.balance);
       }
 
       output.setCryptoAmount(cryptoAmountController.text);
@@ -603,10 +574,7 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
     final customItemIndex = sendViewModel.feesViewModel.getCustomPriorityIndex(items);
     final isBitcoinWallet = sendViewModel.walletType == WalletType.bitcoin;
     final maxCustomFeeRate = sendViewModel.feesViewModel.maxCustomFeeRate?.toDouble();
-    double? customFeeRate =
-        isBitcoinWallet ? sendViewModel.feesViewModel.customBitcoinFeeRate.toDouble() : null;
-
-    FocusManager.instance.primaryFocus?.unfocus();
+    double? customFeeRate = isBitcoinWallet ? sendViewModel.feesViewModel.customBitcoinFeeRate.toDouble() : null;
 
     await showPopUp<void>(
       context: context,
diff --git a/lib/src/screens/send/widgets/send_template_card.dart b/lib/src/screens/send/widgets/send_template_card.dart
index fe7572524..bf2a66b73 100644
--- a/lib/src/screens/send/widgets/send_template_card.dart
+++ b/lib/src/screens/send/widgets/send_template_card.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/currency_input_field.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/send/template_view_model.dart';
@@ -7,6 +8,7 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/currency.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
 import 'package:cake_wallet/src/widgets/address_text_field.dart';
@@ -39,77 +41,74 @@ class SendTemplateCard extends StatelessWidget {
 
     return Container(
       decoration: BoxDecoration(
-        borderRadius: BorderRadius.only(
-          bottomLeft: Radius.circular(24),
-          bottomRight: Radius.circular(24),
-        ),
-        color: Theme.of(context).colorScheme.surfaceContainer,
-      ),
+          borderRadius:
+              BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
+          gradient: LinearGradient(colors: [
+            Theme.of(context).extension<SendPageTheme>()!.firstGradientColor,
+            Theme.of(context).extension<SendPageTheme>()!.secondGradientColor
+          ], begin: Alignment.topLeft, end: Alignment.bottomRight)),
       child: Column(
         children: <Widget>[
           Padding(
             padding: EdgeInsets.fromLTRB(24, 90, 24, 32),
             child: Column(
               children: <Widget>[
-                SizedBox(height: 32),
                 if (index == 0)
                   BaseTextFormField(
-                    contentPadding: EdgeInsets.symmetric(vertical: 8),
-                    hasUnderlineBorder: true,
-                    controller: _nameController,
-                    hintText: sendTemplateViewModel.recipients.length > 1
-                        ? S.of(context).template_name
-                        : S.of(context).send_name,
-                    textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      controller: _nameController,
+                      hintText: sendTemplateViewModel.recipients.length > 1
+                          ? S.of(context).template_name
+                          : S.of(context).send_name,
+                      borderColor:
+                          Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor,
+                      textStyle:
+                          TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white),
+                      placeholderTextStyle: TextStyle(
+                          color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor,
                           fontWeight: FontWeight.w500,
-                        ),
-                    placeholderTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          fontWeight: FontWeight.w500,
-                        ),
-                    validator: sendTemplateViewModel.templateValidator,
-                    fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                  ),
+                          fontSize: 14),
+                      validator: sendTemplateViewModel.templateValidator),
                 Padding(
                   padding: EdgeInsets.only(top: 20),
-                  child: Observer(
-                    builder: (context) {
-                      return AddressTextField(
-                        hasUnderlineBorder: true,
-                        contentPadding: EdgeInsets.symmetric(vertical: 8),
-                        selectedCurrency: template.selectedCurrency,
-                        controller: _addressController,
-                        onURIScanned: (uri) {
-                          final paymentRequest = PaymentRequest.fromUri(uri);
-                          _addressController.text = paymentRequest.address;
-                          _cryptoAmountController.text = paymentRequest.amount;
-                        },
-                        options: [
-                          AddressTextFieldOption.paste,
-                          AddressTextFieldOption.qrCode,
-                          AddressTextFieldOption.addressBook
-                        ],
-                        onPushPasteButton: (context) async {
-                          template.output.resetParsedAddress();
-                          await template.output.fetchParsedAddress(context);
-                        },
-                        onPushAddressBookButton: (context) async {
-                          template.output.resetParsedAddress();
-                          await template.output.fetchParsedAddress(context);
-                        },
-                        buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                        textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontWeight: FontWeight.w500,
-                            ),
-                        hintStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontWeight: FontWeight.w500,
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            ),
-                        validator: sendTemplateViewModel.addressValidator,
-                        fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                      );
-                    },
-                  ),
+                  child: Observer(builder: (context) {
+                    return AddressTextField(
+                      selectedCurrency: template.selectedCurrency,
+                      controller: _addressController,
+                      onURIScanned: (uri) {
+                        final paymentRequest = PaymentRequest.fromUri(uri);
+                        _addressController.text = paymentRequest.address;
+                        _cryptoAmountController.text = paymentRequest.amount;
+                      },
+                      options: [
+                        AddressTextFieldOption.paste,
+                        AddressTextFieldOption.qrCode,
+                        AddressTextFieldOption.addressBook
+                      ],
+                      onPushPasteButton: (context) async {
+                        template.output.resetParsedAddress();
+                        await template.output.fetchParsedAddress(context);
+                      },
+                      onPushAddressBookButton: (context) async {
+                        template.output.resetParsedAddress();
+                        await template.output.fetchParsedAddress(context);
+                      },
+                      buttonColor:
+                          Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
+                      borderColor:
+                          Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor,
+                      textStyle: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.w500,
+                        color: Colors.white,
+                      ),
+                      hintStyle: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor,
+                      ),
+                      validator: sendTemplateViewModel.addressValidator,
+                    );
+                  }),
                 ),
                 Focus(
                   onFocusChange: (hasFocus) {
@@ -118,22 +117,19 @@ class SendTemplateCard extends StatelessWidget {
                   child: Column(
                     children: [
                       Observer(
-                        builder: (context) => CurrencyAmountTextField(
-                          hasUnderlineBorder: true,
-                          borderWidth: 0.0,
-                          selectedCurrency: template.selectedCurrency.title,
-                          amountFocusNode: _cryptoAmountFocus,
-                          amountController: _cryptoAmountController,
-                          isSelected: template.isCryptoSelected,
-                          tag: template.selectedCurrency.tag,
-                          isPickerEnable: sendTemplateViewModel.hasMultipleTokens,
-                          onTapPicker: () => _presentPicker(context),
-                          currencyValueValidator: sendTemplateViewModel.amountValidator,
-                          isAmountEditable: true,
-                          fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                        ),
-                      ),
-                      Divider(height: 1, color: Theme.of(context).colorScheme.outlineVariant),
+                          builder: (context) => CurrencyAmountTextField(
+                              selectedCurrency: template.selectedCurrency.title,
+                              amountFocusNode: _cryptoAmountFocus,
+                              amountController: _cryptoAmountController,
+                              isSelected: template.isCryptoSelected,
+                              tag: template.selectedCurrency.tag,
+                              isPickerEnable: sendTemplateViewModel.hasMultipleTokens,
+                              onTapPicker: () => _presentPicker(context),
+                              currencyValueValidator: sendTemplateViewModel.amountValidator,
+                              isAmountEditable: true)),
+                      Divider(
+                          height: 1,
+                          color: Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor)
                     ],
                   ),
                 ),
@@ -144,19 +140,16 @@ class SendTemplateCard extends StatelessWidget {
                   child: Column(
                     children: [
                       Observer(
-                        builder: (context) => CurrencyAmountTextField(
-                          hasUnderlineBorder: true,
-                          borderWidth: 0.0,
-                          selectedCurrency: sendTemplateViewModel.fiatCurrency,
-                          amountFocusNode: _fiatAmountFocus,
-                          amountController: _fiatAmountController,
-                          isSelected: !template.isCryptoSelected,
-                          hintText: '0.00',
-                          isAmountEditable: true,
-                          fillColor: Theme.of(context).colorScheme.surfaceContainerHighest,
-                        ),
-                      ),
-                      Divider(height: 1, color: Theme.of(context).colorScheme.outlineVariant),
+                          builder: (context) => CurrencyAmountTextField(
+                              selectedCurrency: sendTemplateViewModel.fiatCurrency,
+                              amountFocusNode: _fiatAmountFocus,
+                              amountController: _fiatAmountController,
+                              isSelected: !template.isCryptoSelected,
+                              hintText: '0.00',
+                              isAmountEditable: true)),
+                      Divider(
+                          height: 1,
+                          color: Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor)
                     ],
                   ),
                 ),
diff --git a/lib/src/screens/settings/background_sync_page.dart b/lib/src/screens/settings/background_sync_page.dart
index 91cab896b..f9589297d 100644
--- a/lib/src/screens/settings/background_sync_page.dart
+++ b/lib/src/screens/settings/background_sync_page.dart
@@ -12,7 +12,6 @@ import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/view_model/settings/sync_mode.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:permission_handler/permission_handler.dart';
 
 class BackgroundSyncPage extends BasePage {
   BackgroundSyncPage(this.dashboardViewModel);
@@ -29,30 +28,30 @@ class BackgroundSyncPage extends BasePage {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
+          if (dashboardViewModel.hasBatteryOptimization)
+            Observer(builder: (context) {
+              return SettingsSwitcherCell(
+                title: S.current.unrestricted_background_service,
+                value: !dashboardViewModel.batteryOptimizationEnabled,
+                onValueChange: (_, bool value) {
+                  dashboardViewModel.disableBatteryOptimization();
+                },
+              );
+            }),
           Observer(builder: (context) {
             return SettingsSwitcherCell(
               title: S.current.background_sync,
               value: dashboardViewModel.backgroundSyncEnabled,
-              onValueChange: (_, bool value) async {
+              onValueChange: (dashboardViewModel.batteryOptimizationEnabled && dashboardViewModel.hasBatteryOptimization) ? (_, bool value) {
+                unawaited(showPopUp(context: context, builder: (context) => AlertWithOneAction(
+                  alertTitle: S.current.background_sync,
+                  alertContent: S.current.unrestricted_background_service_notice,
+                  buttonText: S.current.ok,
+                  buttonAction: () => Navigator.of(context).pop(),
+                )));
+              } : (_, bool value) {
                 if (value) {
-                  if (dashboardViewModel.batteryOptimizationEnabled) {
-                    await showPopUp(context: context, builder: (context) => AlertWithOneAction(
-                      alertTitle: S.current.background_sync,
-                      alertContent: S.current.unrestricted_background_service_notice,
-                      buttonText: S.current.ok,
-                      buttonAction: () => Navigator.of(context).pop(),
-                    ));
-                    await dashboardViewModel.disableBatteryOptimization();
-                    for (var i = 0; i < 4 * 60; i++) {
-                      await Future.delayed(Duration(milliseconds: 250));
-                      if (!dashboardViewModel.batteryOptimizationEnabled) {
-                        await dashboardViewModel.enableBackgroundSync();
-                        return;
-                      }
-                    }
-                  } else {
-                    dashboardViewModel.enableBackgroundSync();
-                  }
+                  dashboardViewModel.enableBackgroundSync();
                 } else {
                   dashboardViewModel.disableBackgroundSync();
                 }
@@ -69,58 +68,22 @@ class BackgroundSyncPage extends BasePage {
                   dashboardViewModel.setSyncMode(syncMode);
                 });
           }),
-          if (dashboardViewModel.hasBgsyncNetworkConstraints)
-            Observer(builder: (context) {
-              return SettingsSwitcherCell(
-                title: S.current.background_sync_on_unmetered_network,
-                value: dashboardViewModel.backgroundSyncNetworkUnmetered,
-                onValueChange: (_, bool value) => dashboardViewModel.setBackgroundSyncNetworkUnmetered(value),
-              );
-            }),
-          if (dashboardViewModel.hasBgsyncBatteryNotLowConstraints)
-            Observer(builder: (context) {
-              return SettingsSwitcherCell(
-                title: S.current.background_sync_on_battery_low,
-                value: !dashboardViewModel.backgroundSyncBatteryNotLow,
-                onValueChange: (_, bool value) => dashboardViewModel.setBackgroundSyncBatteryNotLow(!value),
-              );
-            }),
-          if (dashboardViewModel.hasBgsyncChargingConstraints)
-            Observer(builder: (context) {
-              return SettingsSwitcherCell(
-                title: S.current.background_sync_on_charging,
-                value: dashboardViewModel.backgroundSyncCharging,
-                onValueChange: (_, bool value) => dashboardViewModel.setBackgroundSyncCharging(value),
-              );
-            }),
-          if (dashboardViewModel.hasBgsyncDeviceIdleConstraints)
-            Observer(builder: (context) {
-              return SettingsSwitcherCell(
-                title: S.current.background_sync_on_device_idle,
-                value: dashboardViewModel.backgroundSyncDeviceIdle,
-                onValueChange: (_, bool value) => dashboardViewModel.setBackgroundSyncDeviceIdle(value),
-              );
-            }),
-          Observer(builder: (context) {
-            return SettingsSwitcherCell(
-              title: S.current.new_transactions_notifications,
-              value: dashboardViewModel.backgroundSyncNotificationsEnabled,
-              onValueChange: (_, bool value) { 
-                try {
-                  dashboardViewModel.setBackgroundSyncNotificationsEnabled(value);
-                } catch (e) {
-                  showPopUp(context: context, builder: (context) => AlertWithOneAction(
-                    alertTitle: S.current.error,
-                    alertContent: S.current.notification_permission_denied,
-                    buttonText: S.current.ok,
-                    buttonAction: () {
-                      Navigator.of(context).pop();
-                    },
-                  ));
-                }
-              },
-            );
-          }),
+          
+          // Observer(builder: (context) {
+          //   return SettingsSwitcherCell(
+          //     title: S.current.background_sync_on_battery,
+          //     value: dashboardViewModel.backgroundSyncOnBattery,
+          //     onValueChange: (_, bool value) =>
+          //         dashboardViewModel.setBackgroundSyncOnBattery(value),
+          //   );
+          // }),
+          // Observer(builder: (context) {
+          //   return SettingsSwitcherCell(
+          //     title: S.current.background_sync_on_data,
+          //     value: dashboardViewModel.backgroundSyncOnData,
+          //     onValueChange: (_, bool value) => dashboardViewModel.setBackgroundSyncOnData(value),
+          //   );
+          // }),
         ],
       ),
     );
diff --git a/lib/src/screens/settings/connection_sync_page.dart b/lib/src/screens/settings/connection_sync_page.dart
index 61a88cf12..739e01c55 100644
--- a/lib/src/screens/settings/connection_sync_page.dart
+++ b/lib/src/screens/settings/connection_sync_page.dart
@@ -5,12 +5,16 @@ import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/wallet_connect_button.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
+import 'package:cake_wallet/view_model/settings/sync_mode.dart';
+import 'package:cw_core/battery_optimization_native.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 
@@ -45,7 +49,7 @@ class ConnectionSyncPage extends BasePage {
             title: S.current.manage_nodes,
             handler: (context) => Navigator.of(context).pushNamed(Routes.manageNodes),
           ),
-          if (Platform.isAndroid && FeatureFlag.isBackgroundSyncEnabled) ...[
+          if (dashboardViewModel.hasBackgroundSync && Platform.isAndroid && FeatureFlag.isBackgroundSyncEnabled) ...[
             SettingsCellWithArrow(
               title: S.current.background_sync,
               handler: (context) => Navigator.of(context).pushNamed(Routes.backgroundSync),
@@ -72,28 +76,10 @@ class ConnectionSyncPage extends BasePage {
             ),
           ],
           if (FeatureFlag.isInAppTorEnabled)
-            Observer(builder: (context) {
-              return SettingsSwitcherCell(
-                leading: Container(
-                padding: EdgeInsets.symmetric(horizontal: 4, vertical: 1),
-                decoration: BoxDecoration(
-                  color: Colors.red.shade100,
-                  borderRadius: BorderRadius.circular(3),
-                ),
-                child: Text(
-                  'Alpha',
-                  style: TextStyle(
-                    color: Colors.red.shade700,
-                    fontSize: 8,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-                title: S.current.enable_builtin_tor,
-                value: dashboardViewModel.builtinTor,
-                onValueChange: (_, bool value) => dashboardViewModel.setBuiltinTor(value, context),
-              );
-            }),
+            SettingsCellWithArrow(
+              title: S.current.tor_connection,
+              handler: (context) => Navigator.of(context).pushNamed(Routes.torPage),
+            ),
         ],
       ),
     );
diff --git a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart
index 09c3bb0b9..bbcb80791 100644
--- a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart
+++ b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart
@@ -6,6 +6,7 @@ import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/router.dart' as Router;
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
 
 final _settingsNavigatorKey = GlobalKey<NavigatorState>();
 
@@ -33,7 +34,7 @@ class _DesktopSettingsPageState extends State<DesktopSettingsPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       body: Container(
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).colorScheme.background,
         height: MediaQuery.of(context).size.height,
         child: Row(
           children: [
@@ -86,8 +87,8 @@ class _DesktopSettingsPageState extends State<DesktopSettingsPage> {
                         );
                       },
                       separatorBuilder: (_, index) => Container(
-                        height: 0.0,
-                        color: Theme.of(context).colorScheme.outlineVariant,
+                        height: 1,
+                        color: Theme.of(context).extension<CakeMenuTheme>()!.dividerColor,
                       ),
                       itemCount: itemCount,
                     ),
diff --git a/lib/src/screens/settings/display_settings_page.dart b/lib/src/screens/settings/display_settings_page.dart
index e4613d90e..ae9100e4a 100644
--- a/lib/src/screens/settings/display_settings_page.dart
+++ b/lib/src/screens/settings/display_settings_page.dart
@@ -76,21 +76,8 @@ class DisplaySettingsPage extends BasePage {
                   return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
                 },
               ),
-
-              if (responsiveLayoutUtil.shouldRenderMobileUI && DeviceInfo.instance.isMobile) ...[
-                SettingsSwitcherCell(
-                  title: S.current.use_device_theme,
-                  value: _displaySettingsViewModel.themeMode == ThemeMode.system,
-                  onValueChange: (_, bool value) {
-                    _displaySettingsViewModel
-                        .setThemeMode(value ? ThemeMode.system : ThemeMode.dark);
-                  },
-                ),
-                Semantics(
-                  label: S.current.color_theme,
-                  child: SettingsThemeChoicesCell(_displaySettingsViewModel),
-                ),
-              ],
+              if (responsiveLayoutUtil.shouldRenderMobileUI && DeviceInfo.instance.isMobile)
+                Semantics(label: S.current.color_theme, child: SettingsThemeChoicesCell(_displaySettingsViewModel)),
             ],
           ),
         );
diff --git a/lib/src/screens/settings/mweb_logs_page.dart b/lib/src/screens/settings/mweb_logs_page.dart
index 8310673c5..ae476052e 100644
--- a/lib/src/screens/settings/mweb_logs_page.dart
+++ b/lib/src/screens/settings/mweb_logs_page.dart
@@ -38,7 +38,7 @@ class MwebLogsPage extends BasePage {
                   padding: EdgeInsets.all(16.0),
                   child: Text(
                     snapshot.data!,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(fontFamily: 'Monospace'),
+                    style: TextStyle(fontFamily: 'Monospace'),
                   ),
                 ),
               );
@@ -49,8 +49,8 @@ class MwebLogsPage extends BasePage {
           child: LoadingPrimaryButton(
             onPressed: () => onExportLogs(context),
             text: S.of(context).export_logs,
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
+            color: Theme.of(context).primaryColor,
+            textColor: Colors.white,
           ),
           bottom: 24,
           left: 24,
diff --git a/lib/src/screens/settings/mweb_node_page.dart b/lib/src/screens/settings/mweb_node_page.dart
index 3f153f42b..801ab3ac7 100644
--- a/lib/src/screens/settings/mweb_node_page.dart
+++ b/lib/src/screens/settings/mweb_node_page.dart
@@ -37,8 +37,8 @@ class MwebNodePage extends BasePage {
             builder: (_) => LoadingPrimaryButton(
               onPressed: () => save(context),
               text: S.of(context).save,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
+              color: Theme.of(context).primaryColor,
+              textColor: Colors.white,
             ),
           ),
           bottom: 24,
diff --git a/lib/src/screens/settings/other_settings_page.dart b/lib/src/screens/settings/other_settings_page.dart
index 2ff9dcdaf..ca1c1b2cb 100644
--- a/lib/src/screens/settings/other_settings_page.dart
+++ b/lib/src/screens/settings/other_settings_page.dart
@@ -6,10 +6,11 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/setting_priority_picker_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_version_cell.dart';
-import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/view_model/settings/other_settings_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 
@@ -63,42 +64,12 @@ class OtherSettingsPage extends BasePage {
                 handler: (BuildContext context) =>
                     Navigator.of(context).pushNamed(Routes.readDisclaimer),
               ),
-              if (FeatureFlag.hasDevOptions && _otherSettingsViewModel.walletType == WalletType.monero) 
+              if (kDebugMode && _otherSettingsViewModel.walletType == WalletType.monero) 
                 SettingsCellWithArrow(
                   title: '[dev] monero background sync',
                   handler: (BuildContext context) =>
                       Navigator.of(context).pushNamed(Routes.devMoneroBackgroundSync),
                 ),
-              if (FeatureFlag.hasDevOptions && [WalletType.monero, WalletType.wownero, WalletType.zano].contains(_otherSettingsViewModel.walletType))
-                SettingsCellWithArrow(
-                  title: '[dev] xmr call profiler',
-                  handler: (BuildContext context) =>
-                      Navigator.of(context).pushNamed(Routes.devMoneroCallProfiler),
-                ),
-              if (FeatureFlag.hasDevOptions)
-                SettingsCellWithArrow(
-                  title: '[dev] shared preferences',
-                  handler: (BuildContext context) =>
-                      Navigator.of(context).pushNamed(Routes.devSharedPreferences),
-                ),
-              if (FeatureFlag.hasDevOptions)
-                SettingsCellWithArrow(
-                  title: '[dev] secure storage preferences',
-                  handler: (BuildContext context) =>
-                      Navigator.of(context).pushNamed(Routes.devSecurePreferences),
-                ),
-              if (FeatureFlag.hasDevOptions)
-                SettingsCellWithArrow(
-                  title: '[dev] background sync logs',
-                  handler: (BuildContext context) =>
-                      Navigator.of(context).pushNamed(Routes.devBackgroundSyncLogs),
-                ),
-              if (FeatureFlag.hasDevOptions)
-                SettingsCellWithArrow(
-                  title: '[dev] network requests logs',
-                  handler: (BuildContext context) =>
-                      Navigator.of(context).pushNamed(Routes.devNetworkRequests),
-                ),
               Spacer(),
               SettingsVersionCell(
                   title: S.of(context).version(_otherSettingsViewModel.currentVersion)),
diff --git a/lib/src/screens/settings/privacy_page.dart b/lib/src/screens/settings/privacy_page.dart
index 792891453..238e58eab 100644
--- a/lib/src/screens/settings/privacy_page.dart
+++ b/lib/src/screens/settings/privacy_page.dart
@@ -42,21 +42,13 @@ class PrivacyPage extends BasePage {
               ),
               SettingsChoicesCell(
                 ChoicesListItem<ExchangeApiMode>(
-                  title: S.current.swap,
+                  title: S.current.exchange,
                   items: ExchangeApiMode.all,
                   selectedItem: _privacySettingsViewModel.exchangeStatus,
                   onItemSelected: (ExchangeApiMode mode) =>
                       _privacySettingsViewModel.setExchangeApiMode(mode),
                 ),
               ),
-              if (_privacySettingsViewModel.canUsePayjoin)
-                SettingsSwitcherCell(
-                  title: S.of(context).use_payjoin,
-                  value: _privacySettingsViewModel.usePayjoin,
-                  onValueChange: (BuildContext _, bool value) {
-                    _privacySettingsViewModel.setUsePayjoin(value);
-                  },
-                ),
               SettingsSwitcherCell(
                   title: S.current.settings_save_recipient_address,
                   value: _privacySettingsViewModel.shouldSaveRecipientAddress,
@@ -75,41 +67,30 @@ class PrivacyPage extends BasePage {
                 ),
               if (DeviceInfo.instance.isMobile)
                 SettingsSwitcherCell(
-                  title: S.current.prevent_screenshots,
-                  value: _privacySettingsViewModel.isAppSecure,
+                    title: S.current.prevent_screenshots,
+                    value: _privacySettingsViewModel.isAppSecure,
+                    onValueChange: (BuildContext _, bool value) {
+                      _privacySettingsViewModel.setIsAppSecure(value);
+                    }),
+              SettingsSwitcherCell(
+                  title: S.current.disable_exchange_option,
+                  value: _privacySettingsViewModel.disableTradeOption,
                   onValueChange: (BuildContext _, bool value) {
-                    _privacySettingsViewModel.setIsAppSecure(value);
-                  },
-                ),
+                    _privacySettingsViewModel.setDisableTradeOption(value);
+                  }),
               SettingsSwitcherCell(
-                title: S.current.disable_buy,
-                value: _privacySettingsViewModel.disableTradeOption,
-                onValueChange: (BuildContext _, bool value) {
-                  _privacySettingsViewModel.setDisableTradeOption(value);
-                },
-              ),
-              SettingsSwitcherCell(
-                title: S.current.disable_automatic_exchange_status_updates,
-                value: _privacySettingsViewModel.disableAutomaticExchangeStatusUpdates,
-                onValueChange: (BuildContext _, bool value) {
-                  _privacySettingsViewModel.setDisableAutomaticExchangeStatusUpdates(value);
-                },
-              ),
-              SettingsSwitcherCell(
-                title: S.current.disable_bulletin,
-                value: _privacySettingsViewModel.disableBulletin,
-                onValueChange: (BuildContext _, bool value) {
-                  _privacySettingsViewModel.setDisableBulletin(value);
-                },
-              ),
+                  title: S.current.disable_bulletin,
+                  value: _privacySettingsViewModel.disableBulletin,
+                  onValueChange: (BuildContext _, bool value) {
+                    _privacySettingsViewModel.setDisableBulletin(value);
+                  }),
               if (_privacySettingsViewModel.canUseEtherscan)
                 SettingsSwitcherCell(
-                  title: S.current.etherscan_history,
-                  value: _privacySettingsViewModel.useEtherscan,
-                  onValueChange: (BuildContext _, bool value) {
-                    _privacySettingsViewModel.setUseEtherscan(value);
-                  },
-                ),
+                    title: S.current.etherscan_history,
+                    value: _privacySettingsViewModel.useEtherscan,
+                    onValueChange: (BuildContext _, bool value) {
+                      _privacySettingsViewModel.setUseEtherscan(value);
+                    }),
               if (_privacySettingsViewModel.canUsePolygonScan)
                 SettingsSwitcherCell(
                   title: S.current.polygonscan_history,
diff --git a/lib/src/screens/settings/tor_page.dart b/lib/src/screens/settings/tor_page.dart
new file mode 100644
index 000000000..2eb8d6c11
--- /dev/null
+++ b/lib/src/screens/settings/tor_page.dart
@@ -0,0 +1,268 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cw_core/utils/print_verbose.dart';
+import 'package:flutter/material.dart';
+// import 'package:tor/tor.dart';
+
+class TorPage extends BasePage {
+  final AppStore appStore;
+
+  TorPage(this.appStore);
+
+  @override
+  Widget body(BuildContext context) {
+    return TorPageBody(appStore);
+  }
+}
+
+class TorPageBody extends StatefulWidget {
+  final AppStore appStore;
+
+  const TorPageBody(this.appStore, {Key? key}) : super(key: key);
+
+  @override
+  State<TorPageBody> createState() => _TorPageBodyState();
+}
+
+class _TorPageBodyState extends State<TorPageBody> {
+  bool torEnabled = false;
+  bool connecting = false;
+
+  // Set the default text for the host input field.
+  final hostController = TextEditingController(text: 'https://icanhazip.com/');
+
+  // https://check.torproject.org is another good option.
+
+  Future<void> startTor() async {
+    setState(() {
+      connecting = true; // Update flag
+    });
+
+    // await Tor.init();
+    //
+    // // Start the proxy
+    // await Tor.instance.start();
+    //
+    // // Toggle started flag.
+    // setState(() {
+    //   torEnabled = Tor.instance.enabled; // Update flag
+    //   connecting = false;
+    // });
+    //
+    // final node = widget.appStore.settingsStore.getCurrentNode(widget.appStore.wallet!.type);
+    // if (node.socksProxyAddress?.isEmpty ?? true) {
+    //   node.socksProxyAddress = "${InternetAddress.loopbackIPv4.address}:${Tor.instance.port}";
+    // }
+    // widget.appStore.wallet!.connectToNode(node: node);
+
+    printV('Done awaiting; tor should be running');
+  }
+
+  Future<void> endTor() async {
+  //   // Start the proxy
+  //   Tor.instance.disable();
+  //
+  //   // Toggle started flag.
+  //   setState(() {
+  //     torEnabled = Tor.instance.enabled; // Update flag
+  //   });
+  //
+  //   printV('Done awaiting; tor should be stopped');
+  }
+  //
+  // @override
+  // void initState() {
+  //   super.initState();
+  //
+  //   torEnabled = Tor.instance.enabled;
+  // }
+
+  @override
+  void dispose() {
+    // Clean up the controller when the widget is disposed.
+    hostController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Container(
+        padding: const EdgeInsets.all(10),
+        child: connecting
+            ? ConnectingScreen()
+            : torEnabled
+                ? DisconnectScreen(disconnect: endTor)
+                : ConnectScreen(connect: startTor),
+      ),
+    );
+  }
+}
+
+class ConnectScreen extends StatelessWidget {
+  final Function() connect;
+
+  const ConnectScreen({super.key, required this.connect});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: <Widget>[
+          Container(
+            width: 200,
+            height: 200,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              color: Colors.blue,
+            ),
+            child: Icon(
+              Icons.lock,
+              color: Colors.white,
+              size: 100,
+            ),
+          ),
+          SizedBox(height: 20),
+          Text(
+            'Connect to Tor',
+            style: TextStyle(
+              fontSize: 24,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          SizedBox(height: 10),
+          Text(
+            'Your connection to the Tor network ensures privacy and security.',
+            style: TextStyle(
+              fontSize: 16,
+              color: Colors.grey,
+            ),
+            textAlign: TextAlign.center,
+          ),
+          SizedBox(height: 30),
+          ElevatedButton(
+            onPressed: connect,
+            style: ElevatedButton.styleFrom(
+              // primary: Colors.blue,
+              padding: EdgeInsets.symmetric(horizontal: 40, vertical: 15),
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(30),
+              ),
+            ),
+            child: Text(
+              'Connect',
+              style: TextStyle(
+                fontSize: 18,
+                color: Colors.white,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class DisconnectScreen extends StatelessWidget {
+  final Function() disconnect;
+
+  const DisconnectScreen({super.key, required this.disconnect});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: <Widget>[
+          Container(
+            width: 200,
+            height: 200,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              color: Colors.green,
+            ),
+            child: Icon(
+              Icons.check,
+              color: Colors.white,
+              size: 100,
+            ),
+          ),
+          SizedBox(height: 20),
+          Text(
+            'Connected to Tor',
+            style: TextStyle(
+              fontSize: 24,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          SizedBox(height: 10),
+          Text(
+            'You are currently connected to the Tor network.',
+            style: TextStyle(
+              fontSize: 16,
+              color: Colors.grey,
+            ),
+            textAlign: TextAlign.center,
+          ),
+          SizedBox(height: 30),
+          ElevatedButton(
+            onPressed: disconnect,
+            style: ElevatedButton.styleFrom(
+              // primary: Colors.red,
+              padding: EdgeInsets.symmetric(horizontal: 40, vertical: 15),
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(30),
+              ),
+            ),
+            child: Text(
+              'Disconnect',
+              style: TextStyle(
+                fontSize: 18,
+                color: Colors.white,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class ConnectingScreen extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: <Widget>[
+          Container(
+            width: 200,
+            height: 200,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              color: Colors.yellow,
+            ),
+            child: Icon(
+              Icons.hourglass_bottom,
+              color: Colors.white,
+              size: 100,
+            ),
+          ),
+          SizedBox(height: 20),
+          Text(
+            'Connecting...',
+            style: TextStyle(
+              fontSize: 24,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          SizedBox(height: 10),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/screens/settings/trocador_providers_page.dart b/lib/src/screens/settings/trocador_providers_page.dart
index 56ad7541f..d0646bb3a 100644
--- a/lib/src/screens/settings/trocador_providers_page.dart
+++ b/lib/src/screens/settings/trocador_providers_page.dart
@@ -38,8 +38,8 @@ class TrocadorProvidersPage extends BasePage {
                 leading: Badge(
                   title: 'KYC \nRATING',
                   subTitle: providerRatings[providerName] ?? 'N/A',
-                  textColor: Theme.of(context).colorScheme.onPrimary,
-                  backgroundColor: Theme.of(context).colorScheme.primary,
+                  textColor: Colors.white,
+                  backgroundColor: Theme.of(context).primaryColor,
                 ),
                 onValueChange: (BuildContext _, value) =>
                     trocadorProvidersViewModel.toggleProviderState(providerName),
@@ -78,7 +78,7 @@ class Badge extends StatelessWidget {
                 Text(
                   title,
                   textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                  style: TextStyle(
                     color: textColor,
                     fontSize: 7,
                     fontWeight: FontWeight.w600,
@@ -90,8 +90,9 @@ class Badge extends StatelessWidget {
                 ),
                 Text(
                   subTitle,
-                  style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                  style: TextStyle(
                     color: textColor,
+                    fontSize: 12,
                     fontWeight: FontWeight.w600,
                   ),
                 ),
diff --git a/lib/src/screens/settings/widgets/setting_priority_picker_cell.dart b/lib/src/screens/settings/widgets/setting_priority_picker_cell.dart
index 72249a6b5..118924c4d 100644
--- a/lib/src/screens/settings/widgets/setting_priority_picker_cell.dart
+++ b/lib/src/screens/settings/widgets/setting_priority_picker_cell.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
@@ -68,12 +69,13 @@ class SettingsPriorityPickerCell<ItemType> extends StandardListRow {
   @override
   Widget buildTrailing(BuildContext context) {
     return Text(
-      displayItem?.call(selectedItem, customValue?.round() ?? 0) ?? selectedItem.toString(),
+      displayItem?.call(selectedItem,customValue?.round() ?? 0) ?? selectedItem.toString(),
       textAlign: TextAlign.right,
-      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-            fontWeight: FontWeight.w500,
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-          ),
+      style: TextStyle(
+        fontSize: 14.0,
+        fontWeight: FontWeight.w500,
+        color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+      ),
     );
   }
 }
diff --git a/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart b/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart
index 70f5a7977..cb4f9dc78 100644
--- a/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart
+++ b/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class SettingsCellWithArrow extends StandardListRow {
   SettingsCellWithArrow({
@@ -9,8 +10,6 @@ class SettingsCellWithArrow extends StandardListRow {
   }) : super(title: title, isSelected: false, onTap: handler, key: key);
 
   @override
-  Widget buildTrailing(BuildContext context) => Image.asset(
-        'assets/images/select_arrow.png',
-        color: Theme.of(context).colorScheme.onSurfaceVariant,
-      );
+  Widget buildTrailing(BuildContext context) => Image.asset('assets/images/select_arrow.png',
+      color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor);
 }
diff --git a/lib/src/screens/settings/widgets/settings_choices_cell.dart b/lib/src/screens/settings/widgets/settings_choices_cell.dart
index 0f03dce15..cbb8c60e9 100644
--- a/lib/src/screens/settings/widgets/settings_choices_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_choices_cell.dart
@@ -1,5 +1,7 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/view_model/settings/choices_list_item.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
 
 class SettingsChoicesCell extends StatelessWidget {
   const SettingsChoicesCell(this.choicesListItem, {Key? key}) : super(key: key);
@@ -9,7 +11,7 @@ class SettingsChoicesCell extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.background,
       padding: EdgeInsets.only(left: 24, right: 24, top: 16, bottom: 16),
       child: Column(
         mainAxisSize: MainAxisSize.min,
@@ -20,7 +22,11 @@ class SettingsChoicesCell extends StatelessWidget {
               children: [
                 Text(
                   choicesListItem.title,
-                  style: Theme.of(context).textTheme.bodyMedium,
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                  ),
                 ),
               ],
             ),
@@ -29,8 +35,8 @@ class SettingsChoicesCell extends StatelessWidget {
           Center(
             child: Container(
               decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(10),
-                color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                borderRadius: BorderRadius.circular(30),
+                color: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
               ),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
@@ -44,18 +50,18 @@ class SettingsChoicesCell extends StatelessWidget {
                       child: Container(
                         padding: EdgeInsets.symmetric(vertical: 8),
                         decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(10),
-                          color: isSelected ? Theme.of(context).colorScheme.primary : null,
+                          borderRadius: BorderRadius.circular(30),
+                          color: isSelected ? Theme.of(context).primaryColor : null,
                         ),
                         child: Center(
                           child: Text(
                             choicesListItem.displayItem.call(e),
-                            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                  color: isSelected
-                                      ? Theme.of(context).colorScheme.onPrimary
-                                      : Theme.of(context).colorScheme.onSurfaceVariant,
-                                  fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
-                                ),
+                            style: TextStyle(
+                              color: isSelected
+                                  ? Colors.white
+                                  : Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+                              fontWeight: isSelected ? FontWeight.w700 : FontWeight.normal,
+                            ),
                           ),
                         ),
                       ),
diff --git a/lib/src/screens/settings/widgets/settings_link_provider_cell.dart b/lib/src/screens/settings/widgets/settings_link_provider_cell.dart
index a77221d64..5b6d1881f 100644
--- a/lib/src/screens/settings/widgets/settings_link_provider_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_link_provider_cell.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -5,12 +6,13 @@ import 'package:url_launcher/url_launcher.dart';
 class SettingsLinkProviderCell extends StandardListRow {
   SettingsLinkProviderCell(
       {required String title,
-      required this.link,
-      required this.linkTitle,
-      this.icon,
-      this.iconColor})
-      : super(title: title, isSelected: false, onTap: (BuildContext context) => _launchUrl(link));
+        required this.link,
+        required this.linkTitle,
+        this.icon,
+        this.iconColor})
+      : super(title: title, isSelected: false, onTap: (BuildContext context) => _launchUrl(link) );
 
+  
   final String link;
   final String linkTitle;
   final String? icon;
@@ -21,13 +23,11 @@ class SettingsLinkProviderCell extends StandardListRow {
       icon != null ? Image.asset(icon!, color: iconColor, height: 24, width: 24) : null;
 
   @override
-  Widget buildTrailing(BuildContext context) => Text(
-        linkTitle,
-        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontWeight: FontWeight.w500,
-              color: Theme.of(context).colorScheme.primary,
-            ),
-      );
+  Widget buildTrailing(BuildContext context) => Text(linkTitle,
+      style: TextStyle(
+          fontSize: 14.0,
+          fontWeight: FontWeight.w500,
+          color: Theme.of(context).primaryColor));
 
   static void _launchUrl(String url) async {
     try {
diff --git a/lib/src/screens/settings/widgets/settings_picker_cell.dart b/lib/src/screens/settings/widgets/settings_picker_cell.dart
index b7ea61506..765ac2991 100644
--- a/lib/src/screens/settings/widgets/settings_picker_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_picker_cell.dart
@@ -1,5 +1,6 @@
-import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
 
@@ -54,10 +55,11 @@ class SettingsPickerCell<ItemType> extends StandardListRow {
     return Text(
       displayItem?.call(selectedItem) ?? selectedItem.toString(),
       textAlign: TextAlign.right,
-      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            fontWeight: FontWeight.w600,
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-          ),
+      style: TextStyle(
+        fontSize: 14.0,
+        fontWeight: FontWeight.w500,
+        color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+      ),
     );
   }
 }
diff --git a/lib/src/screens/settings/widgets/settings_switcher_cell.dart b/lib/src/screens/settings/widgets/settings_switcher_cell.dart
index 2d97b3ca2..6173cb34d 100644
--- a/lib/src/screens/settings/widgets/settings_switcher_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_switcher_cell.dart
@@ -18,10 +18,8 @@ class SettingsSwitcherCell extends StandardListRow {
   final Widget? leading;
 
   @override
-  Widget buildTrailing(BuildContext context) => StandardSwitch(
-        value: value,
-        onTapped: () => onValueChange?.call(context, !value),
-      );
+  Widget buildTrailing(BuildContext context) =>
+      StandardSwitch(value: value, onTaped: () => onValueChange?.call(context, !value));
 
   @override
   Widget build(BuildContext context) {
@@ -39,10 +37,11 @@ class SettingsSwitcherCell extends StandardListRow {
           }
         },
         style: ButtonStyle(
-          //backgroundColor: MaterialStateProperty.all(Theme.of(context).colorScheme.surfaceContainer),
-          shape: WidgetStateProperty.all(
+          //backgroundColor: MaterialStateProperty.all(Theme.of(context).cardColor),
+          shape: MaterialStateProperty.all(
             RoundedRectangleBorder(
-              borderRadius: BorderRadius.all(Radius.circular(10)),
+              borderRadius: BorderRadius.all(Radius.circular(10)
+              ),
             ),
           ),
         ),
@@ -58,6 +57,7 @@ class SettingsSwitcherCell extends StandardListRow {
     );
   }
 
+
   @override
   Widget? buildLeading(BuildContext context) => leading;
 }
diff --git a/lib/src/screens/settings/widgets/settings_theme_choice.dart b/lib/src/screens/settings/widgets/settings_theme_choice.dart
index ad7371e5b..abe9a4eab 100644
--- a/lib/src/screens/settings/widgets/settings_theme_choice.dart
+++ b/lib/src/screens/settings/widgets/settings_theme_choice.dart
@@ -1,6 +1,7 @@
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/utils/theme_list.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cake_wallet/view_model/settings/display_settings_view_model.dart';
 import 'package:flutter/material.dart';
 
@@ -27,84 +28,92 @@ class SettingsThemeChoicesCell extends StatelessWidget {
             children: [
               Text(
                 S.current.color_theme,
-                style: Theme.of(context).textTheme.bodyMedium,
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.normal,
+                  color:
+                      Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                ),
               ),
             ],
           ),
           SizedBox(height: cellHeight),
           GridView.builder(
-            itemCount: items.length,
-            shrinkWrap: true,
-            physics: NeverScrollableScrollPhysics(),
-            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: 3,
-              mainAxisExtent: 75,
-              crossAxisSpacing: 20,
-            ),
-            itemBuilder: (context, index) {
-              final MaterialThemeBase e = items[index];
-              final currentTheme = _displaySettingsViewModel.theme;
-              final isSelected = currentTheme == e;
+              itemCount: items.length,
+              shrinkWrap: true,
+              physics: NeverScrollableScrollPhysics(),
+              gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: 3,
+                mainAxisExtent: 75,
+                crossAxisSpacing: 20,
+              ),
+              itemBuilder: (context, index) {
+                final ThemeBase e = items[index];
+                final currentTheme = _displaySettingsViewModel.theme;
+                final isSelected = currentTheme == e;
 
-              return Padding(
-                padding: EdgeInsets.all(5),
-                child: Semantics(
-                  label: e.toString(),
-                  selected: isSelected,
-                  child: GestureDetector(
-                    onTap: () {
-                      _displaySettingsViewModel.onThemeSelected(e);
-                    },
-                    child: Container(
-                      padding: EdgeInsets.all(5),
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(cellRadius),
-                        border: isSelected
-                            ? Border.all(color: Theme.of(context).colorScheme.primary)
-                            : null,
-                        color: Theme.of(context)
-                            .colorScheme
-                            .onSurfaceVariant
-                            .withOpacity(currentTheme.brightness == Brightness.light ? 0.1 : 0.3),
-                      ),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Container(
-                            padding:
-                                EdgeInsets.symmetric(horizontal: cellWidth, vertical: cellHeight),
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.only(
-                                topLeft: Radius.circular(cellRadius),
-                                bottomLeft: Radius.circular(cellRadius),
+                return Padding(
+                  padding: EdgeInsets.all(5),
+                  child: Semantics(
+                    label: e.toString(),
+                    selected: isSelected,
+                    child: GestureDetector(
+                      onTap: () {
+                        _displaySettingsViewModel.setTheme(e);
+                      },
+                      child: Container(
+                        padding: EdgeInsets.all(5),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(cellRadius),
+                          border: isSelected
+                              ? Border.all(
+                                  color: Theme.of(context).primaryColor)
+                              : null,
+                          color: Theme.of(context)
+                              .extension<CakeTextTheme>()!
+                              .secondaryTextColor
+                              .withOpacity(
+                                  currentTheme.brightness == Brightness.light
+                                      ? 0.1
+                                      : 0.3),
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            Container(
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: cellWidth, vertical: cellHeight),
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.only(
+                                    topLeft: Radius.circular(cellRadius),
+                                    bottomLeft: Radius.circular(cellRadius)),
+                                color: e.themeData.primaryColor,
                               ),
-                              color: e.colorScheme.primary,
                             ),
-                          ),
-                          Container(
-                            padding:
-                                EdgeInsets.symmetric(horizontal: cellWidth, vertical: cellHeight),
-                            decoration: BoxDecoration(color: e.colorScheme.surface),
-                          ),
-                          Container(
-                            padding:
-                                EdgeInsets.symmetric(horizontal: cellWidth, vertical: cellHeight),
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.only(
-                                topRight: Radius.circular(cellRadius),
-                                bottomRight: Radius.circular(cellRadius),
+                            Container(
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: cellWidth, vertical: cellHeight),
+                              decoration: BoxDecoration(
+                                color: e.themeData.colorScheme.background,
                               ),
-                              color: e.colorScheme.tertiary,
                             ),
-                          ),
-                        ],
+                            Container(
+                              padding: EdgeInsets.symmetric(
+                                  horizontal: cellWidth, vertical: cellHeight),
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.only(
+                                    topRight: Radius.circular(cellRadius),
+                                    bottomRight: Radius.circular(cellRadius)),
+                                color: e.themeData.cardColor,
+                              ),
+                            ),
+                          ],
+                        ),
                       ),
                     ),
                   ),
-                ),
-              );
-            },
-          ),
+                );
+              }),
         ],
       ),
     );
diff --git a/lib/src/screens/settings/widgets/settings_version_cell.dart b/lib/src/screens/settings/widgets/settings_version_cell.dart
index 27af50607..1607012dc 100644
--- a/lib/src/screens/settings/widgets/settings_version_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_version_cell.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class SettingsVersionCell extends StatelessWidget {
   SettingsVersionCell({required this.title});
@@ -15,10 +16,10 @@ class SettingsVersionCell extends StatelessWidget {
         children: <Widget>[
           Text(
             title,
-            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                  fontWeight: FontWeight.normal,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
+            style: TextStyle(
+                fontSize: 12,
+                fontWeight: FontWeight.normal,
+                color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
           )
         ],
       ),
diff --git a/lib/src/screens/settings/widgets/wallet_connect_button.dart b/lib/src/screens/settings/widgets/wallet_connect_button.dart
index 855c399da..d02462619 100644
--- a/lib/src/screens/settings/widgets/wallet_connect_button.dart
+++ b/lib/src/screens/settings/widgets/wallet_connect_button.dart
@@ -1,4 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:flutter/material.dart';
 
 class WalletConnectTile extends StatelessWidget {
@@ -25,14 +27,16 @@ class WalletConnectTile extends StatelessWidget {
             Expanded(
               child: Text(
                 S.current.walletConnect,
-                style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurface,
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.normal,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                 ),
               ),
             ),
             Image.asset(
               'assets/images/select_arrow.png',
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
+              color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
             )
           ],
         ),
diff --git a/lib/src/screens/setup_2fa/setup_2fa.dart b/lib/src/screens/setup_2fa/setup_2fa.dart
index 23b11edba..f74c2bf36 100644
--- a/lib/src/screens/setup_2fa/setup_2fa.dart
+++ b/lib/src/screens/setup_2fa/setup_2fa.dart
@@ -2,9 +2,8 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:cake_wallet/src/widgets/section_divider.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/view_model/set_up_2fa_viewmodel.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -29,13 +28,10 @@ class Setup2FAPage extends BasePage {
           flex: 2,
           child: ConstrainedBox(
             constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.3),
-            child: AspectRatio(
-              aspectRatio: 0.764,
-              child: CakeImageWidget(imageUrl: 'assets/images/2fa.png'),
-            ),
+            child:
+                AspectRatio(aspectRatio: 0.6, child: Image.asset('assets/images/setup_2fa_img.png')),
           ),
         ),
-        const SizedBox(height: 24),
         Expanded(
           flex: 2,
           child: Padding(
@@ -43,10 +39,12 @@ class Setup2FAPage extends BasePage {
             child: Text(
               S.current.setup_2fa_text,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                    height: 1.571,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
+              style: TextStyle(
+                fontWeight: FontWeight.w400,
+                fontSize: 14,
+                height: 1.571,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              ),
             ),
           ),
         ),
@@ -60,10 +58,10 @@ class Setup2FAPage extends BasePage {
                   return Navigator.of(context).pushReplacementNamed(Routes.setup_2faQRPage);
                 },
               ),
-              HorizontalSectionDivider(margin: EdgeInsets.symmetric(horizontal: 24)),
+              StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
               SettingsCellWithArrow(
                   title: cake2FAGuideTitle, handler: (_) => _launchUrl(cake2FAGuideUri)),
-              HorizontalSectionDivider(margin: EdgeInsets.symmetric(horizontal: 24)),
+              StandardListSeparator(padding: EdgeInsets.symmetric(horizontal: 24)),
             ],
           ),
         ),
diff --git a/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart b/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
index 5e7577f0b..64e8f3aab 100644
--- a/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
+++ b/lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
@@ -16,9 +16,11 @@ import 'package:cake_wallet/view_model/set_up_2fa_viewmodel.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 
+import '../../../palette.dart';
 import '../../../routes.dart';
 
-typedef OnTotpAuthenticationFinished = void Function(bool, TotpAuthCodePageState);
+typedef OnTotpAuthenticationFinished = void Function(
+    bool, TotpAuthCodePageState);
 
 class TotpAuthCodePage extends StatefulWidget {
   TotpAuthCodePage(
@@ -44,7 +46,8 @@ class TotpAuthCodePageState extends State<TotpAuthCodePage> {
   @override
   void initState() {
     if (widget.totpArguments.onTotpAuthenticationFinished != null) {
-      _reaction ??= reaction((_) => widget.setup2FAViewModel.state, (ExecutionState state) {
+      _reaction ??= reaction((_) => widget.setup2FAViewModel.state,
+          (ExecutionState state) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           if (state is ExecutedSuccessfullyState) {
             widget.totpArguments.onTotpAuthenticationFinished!(true, this);
@@ -73,7 +76,8 @@ class TotpAuthCodePageState extends State<TotpAuthCodePage> {
 
   void changeProcessText(String text) {
     dismissFlushBar(_authBar);
-    _progressBar = createBar<void>(text, context, duration: null)..show(_key.currentContext!);
+    _progressBar = createBar<void>(text, duration: null)
+      ..show(_key.currentContext!);
   }
 
   Future<void> close({String? route, dynamic arguments}) async {
@@ -82,7 +86,8 @@ class TotpAuthCodePageState extends State<TotpAuthCodePage> {
     }
     await Future<void>.delayed(Duration(milliseconds: 50));
     if (route != null) {
-      Navigator.of(_key.currentContext!).pushReplacementNamed(route, arguments: arguments);
+      Navigator.of(_key.currentContext!)
+          .pushReplacementNamed(route, arguments: arguments);
     } else {
       Navigator.of(_key.currentContext!).pop();
     }
@@ -120,7 +125,8 @@ class TOTPEnterCode extends BasePage {
   }
 
   @override
-  String get title => isForSetup ? S.current.setup_2fa : S.current.verify_with_2fa;
+  String get title =>
+      isForSetup ? S.current.setup_2fa : S.current.verify_with_2fa;
 
   Widget? leading(BuildContext context) {
     return isClosable ? super.leading(context) : null;
@@ -144,18 +150,20 @@ class TOTPEnterCode extends BasePage {
             hintText: S.current.totp_code,
             controller: totpController,
             keyboardType: TextInputType.number,
-            placeholderTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  fontSize: 16,
-                ),
+            placeholderTextStyle: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.w600,
+            ),
           ),
           SizedBox(height: 16),
           Text(
             S.current.please_fill_totp,
-            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  height: 1.2,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
+            style: TextStyle(
+              fontSize: 12,
+              fontWeight: FontWeight.w400,
+              height: 1.2,
+              color: Palette.darkGray,
+            ),
             textAlign: TextAlign.center,
           ),
           Spacer(),
@@ -164,15 +172,17 @@ class TOTPEnterCode extends BasePage {
               return PrimaryButton(
                 isDisabled: setup2FAViewModel.enteredOTPCode.length != 8,
                 onPressed: () async {
-                  final result =
-                      await setup2FAViewModel.totp2FAAuth(totpController.text, isForSetup);
-                  final bannedState = setup2FAViewModel.state is AuthenticationBanned;
+                  final result = await setup2FAViewModel.totp2FAAuth(
+                      totpController.text, isForSetup);
+                  final bannedState =
+                      setup2FAViewModel.state is AuthenticationBanned;
 
                   await showPopUp<void>(
                     context: context,
                     builder: (BuildContext context) {
                       return PopUpCancellableAlertDialog(
-                        contentText: _textDisplayedInPopupOnResult(result, bannedState, context),
+                        contentText: _textDisplayedInPopupOnResult(
+                            result, bannedState, context),
                         actionButtonText: S.of(context).ok,
                         buttonAction: () {
                           result ? setup2FAViewModel.success() : null;
@@ -192,10 +202,11 @@ class TOTPEnterCode extends BasePage {
                       Navigator.pushReplacementNamed(context, Routes.modify2FAPage);
                     }
                   }
+               
                 },
                 text: S.of(context).continue_text,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
+                color: Theme.of(context).primaryColor,
+                textColor: Colors.white,
               );
             },
           ),
@@ -205,10 +216,13 @@ class TOTPEnterCode extends BasePage {
     );
   }
 
-  String _textDisplayedInPopupOnResult(bool result, bool bannedState, BuildContext context) {
+  String _textDisplayedInPopupOnResult(
+      bool result, bool bannedState, BuildContext context) {
     switch (result) {
       case true:
-        return isForSetup ? S.current.totp_2fa_success : S.current.totp_verification_success;
+        return isForSetup
+            ? S.current.totp_2fa_success
+            : S.current.totp_verification_success;
       case false:
         if (bannedState) {
           final state = setup2FAViewModel.state as AuthenticationBanned;
@@ -216,6 +230,8 @@ class TOTPEnterCode extends BasePage {
         } else {
           return S.current.totp_2fa_failure;
         }
+      default:
+        return S.current.enter_totp_code;
     }
   }
 }
diff --git a/lib/src/screens/setup_2fa/setup_2fa_info_page.dart b/lib/src/screens/setup_2fa/setup_2fa_info_page.dart
index 847fab5dd..834d01c26 100644
--- a/lib/src/screens/setup_2fa/setup_2fa_info_page.dart
+++ b/lib/src/screens/setup_2fa/setup_2fa_info_page.dart
@@ -4,12 +4,6 @@ import 'package:cake_wallet/src/screens/Info_page.dart';
 import 'package:flutter/cupertino.dart';
 
 class Setup2FAInfoPage extends InfoPage {
-  Setup2FAInfoPage()
-      : super(
-          imageLightPath: 'assets/images/2fa_warning_light.svg',
-          imageDarkPath: 'assets/images/2fa_warning_dark.svg',
-        );
-
   @override
   String get pageTitle => S.current.pre_seed_title;
 
diff --git a/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart b/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart
index 4213fd8d2..48a90b329 100644
--- a/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart
+++ b/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart
@@ -5,6 +5,7 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/clipboard_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/view_model/set_up_2fa_viewmodel.dart';
@@ -24,7 +25,9 @@ class Setup2FAQRPage extends BasePage {
   @override
   Widget body(BuildContext context) {
     final copyImage = Image.asset('assets/images/copy_content.png',
-        height: 16, width: 16, color: Theme.of(context).colorScheme.onSurface);
+        height: 16,
+        width: 16,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
     final cake2FAHowToUseUrl = Uri.parse(
         'https://docs.cakewallet.com/features/advanced/authentication/#enabling-cake-2fa');
     return Padding(
@@ -34,14 +37,17 @@ class Setup2FAQRPage extends BasePage {
           Spacer(),
           Text(
             S.current.scan_qr_on_device,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w700,
-                  height: 1.5714,
-                ),
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w700,
+              height: 1.5714,
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+            ),
           ),
           SizedBox(height: 10),
           ConstrainedBox(
-            constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.4),
+            constraints: BoxConstraints(
+                maxHeight: MediaQuery.of(context).size.height * 0.4),
             child: AspectRatio(
               aspectRatio: 1.0,
               child: Container(
@@ -49,14 +55,17 @@ class Setup2FAQRPage extends BasePage {
                 decoration: BoxDecoration(
                   border: Border.all(
                     width: 3,
-                    color: Theme.of(context).colorScheme.onSurface,
+                    color: Theme.of(context)
+                        .extension<CakeTextTheme>()!
+                        .titleColor,
                   ),
                 ),
                 child: Container(
                     child: QrImage(
                   data: setup2FAViewModel.totpVersionOneLink,
                   version: qr.QrVersions.auto,
-                  foregroundColor: Theme.of(context).colorScheme.onSurface,
+                  foregroundColor:
+                      Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   backgroundColor: Colors.transparent,
                 )),
               ),
@@ -65,10 +74,12 @@ class Setup2FAQRPage extends BasePage {
           SizedBox(height: 26),
           Text(
             S.current.add_secret_code,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w700,
-                  height: 1.5714,
-                ),
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w700,
+              height: 1.5714,
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+            ),
           ),
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -81,19 +92,23 @@ class Setup2FAQRPage extends BasePage {
                   children: [
                     Text(
                       S.current.totp_secret_code,
-                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            height: 1.8333,
-                          ),
+                      style: TextStyle(
+                        fontSize: 12,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .secondaryTextColor,
+                        height: 1.8333,
+                      ),
                     ),
                     SizedBox(height: 8),
                     Text(
                       '${setup2FAViewModel.totpSecretKey}',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodyMedium!
-                          .copyWith(fontSize: 18, color: Theme.of(context).colorScheme.onSurface),
+                      style: TextStyle(
+                          fontSize: 18,
+                          color: Theme.of(context)
+                              .extension<CakeTextTheme>()!
+                              .titleColor),
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                     ),
@@ -106,8 +121,8 @@ class Setup2FAQRPage extends BasePage {
                 height: 32,
                 child: InkWell(
                   onTap: () {
-                    ClipboardUtil.setSensitiveDataToClipboard(
-                        ClipboardData(text: '${setup2FAViewModel.totpSecretKey}'));
+                    ClipboardUtil.setSensitiveDataToClipboard(ClipboardData(
+                        text: '${setup2FAViewModel.totpSecretKey}'));
                     showBar<void>(context, S.of(context).copied_to_clipboard);
                   },
                   child: Container(
@@ -131,19 +146,23 @@ class Setup2FAQRPage extends BasePage {
                   children: [
                     Text(
                       S.current.totp_auth_url,
-                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            height: 1.8333,
-                          ),
+                      style: TextStyle(
+                        fontSize: 12,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .secondaryTextColor,
+                        height: 1.8333,
+                      ),
                     ),
                     SizedBox(height: 8),
                     Text(
                       '${setup2FAViewModel.totpVersionOneLink}',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodyMedium!
-                          .copyWith(fontSize: 18, color: Theme.of(context).colorScheme.onSurface),
+                      style: TextStyle(
+                          fontSize: 18,
+                          color: Theme.of(context)
+                              .extension<CakeTextTheme>()!
+                              .titleColor),
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                     ),
@@ -156,8 +175,8 @@ class Setup2FAQRPage extends BasePage {
                 height: 32,
                 child: InkWell(
                   onTap: () {
-                    ClipboardUtil.setSensitiveDataToClipboard(
-                        ClipboardData(text: '${setup2FAViewModel.totpVersionOneLink}'));
+                    ClipboardUtil.setSensitiveDataToClipboard(ClipboardData(
+                        text: '${setup2FAViewModel.totpVersionOneLink}'));
                     showBar<void>(context, S.of(context).copied_to_clipboard);
                   },
                   child: Container(
@@ -177,25 +196,32 @@ class Setup2FAQRPage extends BasePage {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   Text(S.current.how_to_use,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      style: TextStyle(
                           decoration: TextDecoration.underline,
                           fontSize: 16,
                           fontWeight: FontWeight.w500,
-                          color: Theme.of(context).colorScheme.onSurface)),
-                  Icon(Icons.info_outline, size: 20, color: Theme.of(context).colorScheme.onSurface)
+                          color: Theme.of(context)
+                              .extension<CakeTextTheme>()!
+                              .titleColor)),
+                  Icon(Icons.info_outline,
+                      size: 20,
+                      color: Theme.of(context)
+                          .extension<CakeTextTheme>()!
+                          .titleColor)
                 ],
               )),
           Spacer(flex: 5),
           PrimaryButton(
             onPressed: () {
-              Navigator.of(context).pushReplacementNamed(Routes.totpAuthCodePage,
-                  arguments: TotpAuthArgumentsModel(
-                    isForSetup: true,
-                  ));
+              Navigator.of(context)
+                  .pushReplacementNamed(Routes.totpAuthCodePage,
+                      arguments: TotpAuthArgumentsModel(
+                        isForSetup: true,
+                      ));
             },
             text: S.current.continue_text,
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
+            color: Theme.of(context).primaryColor,
+            textColor: Colors.white,
           ),
           SizedBox(height: 24),
         ],
diff --git a/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart b/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart
index a12e64c15..2535338e5 100644
--- a/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart
+++ b/lib/src/screens/setup_2fa/widgets/popup_cancellable_alert.dart
@@ -1,6 +1,9 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
+
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 
 class PopUpCancellableAlertDialog extends StatelessWidget {
@@ -24,11 +27,11 @@ class PopUpCancellableAlertDialog extends StatelessWidget {
     return Text(
       contentText,
       textAlign: TextAlign.center,
-      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+      style: TextStyle(
         fontSize: 16,
         fontWeight: FontWeight.normal,
-         
-        color: Theme.of(context).colorScheme.onSurface,
+        fontFamily: 'Lato',
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
         decoration: TextDecoration.none,
       ),
     );
@@ -53,7 +56,7 @@ class PopUpCancellableAlertDialog extends StatelessWidget {
                       child: Container(
                         width: 340,
                         padding: EdgeInsets.all(10),
-                        color: Theme.of(context).colorScheme.surface,
+                        color: Theme.of(context).dialogBackgroundColor,
                         child: Column(
                           mainAxisSize: MainAxisSize.min,
                           children: <Widget>[
@@ -66,8 +69,8 @@ class PopUpCancellableAlertDialog extends StatelessWidget {
                                 PrimaryButton(
                                   onPressed: buttonAction,
                                   text: actionButtonText,
-                                  color: Theme.of(context).colorScheme.primaryContainer,
-                                  textColor: Theme.of(context).colorScheme.onPrimaryContainer,
+                                  color: Color(0xffE9F2FC),
+                                  textColor: Palette.darkBlueCraiola,
                                 ),
                               ],
                             ),
diff --git a/lib/src/screens/start_tor/start_tor_page.dart b/lib/src/screens/start_tor/start_tor_page.dart
deleted file mode 100644
index 97c5c6599..000000000
--- a/lib/src/screens/start_tor/start_tor_page.dart
+++ /dev/null
@@ -1,96 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/view_model/start_tor_view_model.dart';
-
-class StartTorPage extends BasePage {
-  StartTorPage(this.startTorViewModel);
-
-  final StartTorViewModel startTorViewModel;
-
-  @override
-  String get title => S.current.tor_connection;
-
-  @override
-  Widget leading(BuildContext context) {
-    return Container();
-  }
-
-  @override
-  Widget body(BuildContext context) {
-    startTorViewModel.startTor(context);
-    return Container(
-      padding: EdgeInsets.all(24),
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Column(
-            children: [
-              SizedBox(width: double.maxFinite),
-              if (startTorViewModel.isLoading) ...[
-                CircularProgressIndicator(),
-                SizedBox(height: 20),
-                _buildWaitingText(context),
-                ],
-              if (startTorViewModel.showOptions) ...[
-                _buildOptionsButtons(context),
-              ],
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildWaitingText(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        return Column(
-          children: [
-            Text(
-              S.current.establishing_tor_connection,
-              style: TextStyle(
-                fontSize: 16,
-                fontWeight: FontWeight.bold,
-              ),
-              textAlign: TextAlign.center,
-            ),
-            if (startTorViewModel.showOptions) _buildOptionsButtons(context),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildOptionsButtons(BuildContext context) {
-    return Column(
-      children: [
-        Text(
-          S.current.tor_connection_timeout,
-          style: TextStyle(
-            fontSize: 16,
-            fontWeight: FontWeight.bold,
-          ),
-          textAlign: TextAlign.center,
-        ),
-        SizedBox(height: 24),
-        PrimaryButton(
-          onPressed: () => startTorViewModel.disableTor(context),
-          text: S.current.disable_tor,
-          color: Theme.of(context).colorScheme.primary,
-          textColor: Colors.white,
-        ),
-        SizedBox(height: 16),
-        PrimaryButton(
-          onPressed: () => startTorViewModel.ignoreAndLaunchApp(context),
-          text: S.current.ignor,
-          color: Theme.of(context).colorScheme.secondary,
-          textColor: Colors.white,
-        ),
-      ],
-    );
-  }
-} 
\ No newline at end of file
diff --git a/lib/src/screens/subaddress/address_edit_or_create_page.dart b/lib/src/screens/subaddress/address_edit_or_create_page.dart
index a622a9724..b69a6d8df 100644
--- a/lib/src/screens/subaddress/address_edit_or_create_page.dart
+++ b/lib/src/screens/subaddress/address_edit_or_create_page.dart
@@ -13,7 +13,8 @@ class AddressEditOrCreatePage extends BasePage {
       : _formKey = GlobalKey<FormState>(),
         _labelController = TextEditingController(),
         super() {
-    _labelController.addListener(() => addressEditOrCreateViewModel.label = _labelController.text);
+    _labelController.addListener(
+        () => addressEditOrCreateViewModel.label = _labelController.text);
     _labelController.text = addressEditOrCreateViewModel.label;
   }
 
@@ -38,12 +39,10 @@ class AddressEditOrCreatePage extends BasePage {
             children: <Widget>[
               Expanded(
                   child: Center(
-                child: BaseTextFormField(
-                  controller: _labelController,
-                  hintText: S.of(context).new_subaddress_label_name,
-                  validator: AddressLabelValidator(),
-                ),
-              )),
+                      child: BaseTextFormField(
+                          controller: _labelController,
+                          hintText: S.of(context).new_subaddress_label_name,
+                          validator: AddressLabelValidator()))),
               Observer(
                 builder: (_) => LoadingPrimaryButton(
                   onPressed: () async {
@@ -54,10 +53,12 @@ class AddressEditOrCreatePage extends BasePage {
                   text: addressEditOrCreateViewModel.isEdit
                       ? S.of(context).rename
                       : S.of(context).new_subaddress_create,
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
-                  isLoading: addressEditOrCreateViewModel.state is AddressIsSaving,
-                  isDisabled: addressEditOrCreateViewModel.label.isEmpty,
+                  color: Theme.of(context).primaryColor,
+                  textColor: Colors.white,
+                  isLoading:
+                      addressEditOrCreateViewModel.state is AddressIsSaving,
+                  isDisabled:
+                      addressEditOrCreateViewModel.label.isEmpty,
                 ),
               )
             ],
@@ -69,14 +70,16 @@ class AddressEditOrCreatePage extends BasePage {
     if (_isEffectsInstalled) {
       return;
     }
-    reaction((_) => addressEditOrCreateViewModel.state, (AddressEditOrCreateState state) {
-      if (state is AddressSavedSuccessfully) {
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (context.mounted) Navigator.of(context).pop();
+    reaction((_) => addressEditOrCreateViewModel.state,
+            (AddressEditOrCreateState state) {
+          if (state is AddressSavedSuccessfully) {
+            WidgetsBinding.instance
+                .addPostFrameCallback((_) {
+                  if (context.mounted) Navigator.of(context).pop();
+                });
+          }
         });
-      }
-    });
 
     _isEffectsInstalled = true;
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/support/support_page.dart b/lib/src/screens/support/support_page.dart
index 55a2b237c..2dd098813 100644
--- a/lib/src/screens/support/support_page.dart
+++ b/lib/src/screens/support/support_page.dart
@@ -2,10 +2,13 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/option_tile.dart';
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:cake_wallet/themes/extensions/info_theme.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/view_model/support_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 
 class SupportPage extends BasePage {
   SupportPage(this.supportViewModel);
@@ -22,14 +25,20 @@ class SupportPage extends BasePage {
   @override
   AppBarStyle get appBarStyle => AppBarStyle.regular;
 
+
+
   @override
   Widget body(BuildContext context) {
-    final iconColor = Theme.of(context).colorScheme.primary;
+
+    final mainColor = Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor;
+    final brightColor = Theme.of(context).extension<InfoTheme>()!.textColor;
+
+    final iconColor = currentTheme.type == ThemeType.bright ? brightColor : mainColor;
 
     return Container(
       child: Center(
-        child: Container(
-          padding: EdgeInsets.only(left: 24, right: 24),
+        child: ConstrainedBox(
+          constraints: BoxConstraints(maxWidth: 330),
           child: Column(
             children: [
               Padding(
@@ -55,8 +64,8 @@ class SupportPage extends BasePage {
                 padding: EdgeInsets.only(top: 20),
                 child: OptionTile(
                   icon: Icon(
-                    Icons.find_in_page,
-                    color: iconColor,
+                      Icons.find_in_page,
+                      color: iconColor,
                     size: 50,
                   ),
                   title: S.of(context).support_title_guides,
diff --git a/lib/src/screens/support_other_links/support_other_links_page.dart b/lib/src/screens/support_other_links/support_other_links_page.dart
index fe83dfd73..b115594b4 100644
--- a/lib/src/screens/support_other_links/support_other_links_page.dart
+++ b/lib/src/screens/support_other_links/support_other_links_page.dart
@@ -1,11 +1,13 @@
 import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_link_provider_cell.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/themes/extensions/support_page_theme.dart';
 import 'package:cake_wallet/view_model/settings/link_list_item.dart';
 import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
 import 'package:cake_wallet/view_model/support_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class SupportOtherLinksPage extends BasePage {
@@ -21,8 +23,10 @@ class SupportOtherLinksPage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final isLightMode = Theme.of(context).colorScheme.brightness == Brightness.light;
-    final iconColor = Theme.of(context).colorScheme.onSurfaceVariant;
+
+    final iconColor = Theme.of(context).extension<SupportPageTheme>()!.iconColor;
+
+    final isLightMode = Theme.of(context).extension<OptionTileTheme>()?.useDarkImage ?? false;
 
     return Container(
       child: Center(
diff --git a/lib/src/screens/trade_details/trade_details_page.dart b/lib/src/screens/trade_details/trade_details_page.dart
index 371bd265f..40d14fa14 100644
--- a/lib/src/screens/trade_details/trade_details_page.dart
+++ b/lib/src/screens/trade_details/trade_details_page.dart
@@ -9,7 +9,6 @@ import 'package:cake_wallet/src/widgets/list_row.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:cake_wallet/src/widgets/standard_list_card.dart';
 import 'package:cake_wallet/src/widgets/standard_list_status_row.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/view_model/trade_details_view_model.dart';
 import 'package:flutter/material.dart';
@@ -25,14 +24,13 @@ class TradeDetailsPage extends BasePage {
   final TradeDetailsViewModel tradeDetailsViewModel;
 
   @override
-  Widget body(BuildContext context) => TradeDetailsPageBody(tradeDetailsViewModel, currentTheme);
+  Widget body(BuildContext context) => TradeDetailsPageBody(tradeDetailsViewModel);
 }
 
 class TradeDetailsPageBody extends StatefulWidget {
-  TradeDetailsPageBody(this.tradeDetailsViewModel, this.currentTheme);
+  TradeDetailsPageBody(this.tradeDetailsViewModel);
 
   final TradeDetailsViewModel tradeDetailsViewModel;
-  final MaterialThemeBase currentTheme;
 
   @override
   TradeDetailsPageBodyState createState() => TradeDetailsPageBodyState(tradeDetailsViewModel);
@@ -51,43 +49,19 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
 
   @override
   Widget build(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        final itemsCount = tradeDetailsViewModel.items.length;
+    return Observer(builder: (_) {
+      final itemsCount = tradeDetailsViewModel.items.length;
 
-        return SectionStandardList(
+      return SectionStandardList(
           sectionCount: 1,
           itemCounter: (int _) => itemsCount,
           itemBuilder: (__, index) {
             final item = tradeDetailsViewModel.items[index];
 
             if (item is TrackTradeListItem)
-              return ListRow(
-                title: '${item.title}',
-                value: '${item.value}',
-                hintTextColor: Theme.of(context).colorScheme.onSurfaceVariant,
-                textWidget: GestureDetector(
-                  onTap: () {
-                    Clipboard.setData(ClipboardData(text: '${item.value}'));
-                    showBar<void>(context, S.of(context).copied_to_clipboard);
-                  },
-                  child: Text(
-                    '${item.value}',
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.onSurface,
-                    ),
-                  ),
-                ),
-                image: GestureDetector(
+              return GestureDetector(
                   onTap: item.onTap,
-                  child: Icon(
-                    Icons.launch_rounded,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
-                ),
-              );
+                  child: ListRow(title: '${item.title}', value: '${item.value}'));
 
             if (item is DetailsListStatusItem)
               return StandardListStatusRow(title: item.title, value: item.value);
@@ -98,35 +72,26 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
                 extraId: item.extraId,
                 create: item.createdAt,
                 pair: item.pair,
-                currentTheme: widget.currentTheme.type,
+                currentTheme: tradeDetailsViewModel.settingsStore.currentTheme.type,
                 onTap: item.onTap,
               );
 
             if (item is TradeProviderUnsupportedItem)
-              return AutoSizeText(
-                item.value,
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.error,
-                    ),
-              );
+              return AutoSizeText(item.value,
+                  textAlign: TextAlign.center,
+                  style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w500,
+                    color: Colors.red,
+                  ));
 
             return GestureDetector(
-              onTap: () {
-                Clipboard.setData(ClipboardData(text: '${item.value}'));
-                showBar<void>(context, S.of(context).copied_to_clipboard);
-              },
-              child: ListRow(
-                title: '${item.title}',
-                value: '${item.value}',
-                hintTextColor: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
-            );
-          },
-        );
-      },
-    );
+                onTap: () {
+                  Clipboard.setData(ClipboardData(text: '${item.value}'));
+                  showBar<void>(context, S.of(context).copied_to_clipboard);
+                },
+                child: ListRow(title: '${item.title}', value: '${item.value}'));
+          });
+    });
   }
 }
diff --git a/lib/src/screens/trade_details/trade_details_status_item.dart b/lib/src/screens/trade_details/trade_details_status_item.dart
index b1fd89e3e..eb40bdd7a 100644
--- a/lib/src/screens/trade_details/trade_details_status_item.dart
+++ b/lib/src/screens/trade_details/trade_details_status_item.dart
@@ -2,8 +2,6 @@ import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.d
 
 class DetailsListStatusItem extends StandartListItem {
   DetailsListStatusItem(
-      {required String title, required String value, this.status})
+      {required String title, required String value})
       : super(title: title, value: value);
-
-  final String? status; // waiting, action required, created, fetching, finished, success
 }
diff --git a/lib/src/screens/transaction_details/rbf_details_page.dart b/lib/src/screens/transaction_details/rbf_details_page.dart
index a3e1884cd..10cd40940 100644
--- a/lib/src/screens/transaction_details/rbf_details_page.dart
+++ b/lib/src/screens/transaction_details/rbf_details_page.dart
@@ -104,8 +104,8 @@ class RBFDetailsPage extends BasePage {
                       text: S.of(context).send,
                       isLoading:
                           transactionDetailsViewModel.sendViewModel.state is IsExecutingState,
-                      color: Theme.of(context).colorScheme.primary,
-                      textColor: Theme.of(context).colorScheme.onPrimary,
+                      color: Theme.of(context).primaryColor,
+                      textColor: Colors.white,
                     ))),
       ],
     );
@@ -190,7 +190,6 @@ class RBFDetailsPage extends BasePage {
                   key: ValueKey('rbf_confirm_sending_bottom_sheet'),
                   titleText: S.of(bottomSheetContext).confirm_transaction,
                   currentTheme: currentTheme,
-                  walletType: transactionDetailsViewModel.sendViewModel.walletType,
                   titleIconPath: transactionDetailsViewModel.sendViewModel.selectedCryptoCurrency.iconPath,
                   currency: transactionDetailsViewModel.sendViewModel.selectedCryptoCurrency,
                   amount: S.of(bottomSheetContext).send_amount,
diff --git a/lib/src/screens/transaction_details/transaction_details_page.dart b/lib/src/screens/transaction_details/transaction_details_page.dart
index cbfd5286b..9484bf4da 100644
--- a/lib/src/screens/transaction_details/transaction_details_page.dart
+++ b/lib/src/screens/transaction_details/transaction_details_page.dart
@@ -9,10 +9,8 @@ import 'package:cake_wallet/src/screens/transaction_details/textfield_list_item.
 import 'package:cake_wallet/src/screens/transaction_details/widgets/textfield_list_row.dart';
 import 'package:cake_wallet/src/widgets/list_row.dart';
 import 'package:cake_wallet/src/widgets/standard_list.dart';
-import 'package:cake_wallet/utils/address_formatter.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/view_model/transaction_details_view_model.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -41,28 +39,13 @@ class TransactionDetailsPage extends BasePage {
               final item = transactionDetailsViewModel.items[index];
 
               if (item is StandartListItem) {
-                Widget? addressTextWidget;
-
-                if (item.title.toLowerCase() == 'recipient addresses' ||
-                    item.title.toLowerCase() == 'source address') {
-                  addressTextWidget = getFormattedAddress(
-                    context: context,
-                    value: item.value,
-                    walletType: transactionDetailsViewModel.sendViewModel.walletType,
-                  );
-                }
-
                 return GestureDetector(
                   key: item.key,
                   onTap: () {
                     Clipboard.setData(ClipboardData(text: item.value));
                     showBar<void>(context, S.of(context).transaction_details_copied(item.title));
                   },
-                  child: ListRow(
-                    title: '${item.title}:',
-                    value: item.value,
-                    textWidget: addressTextWidget,
-                  ),
+                  child: ListRow(title: '${item.title}:', value: item.value),
                 );
               }
 
@@ -108,80 +91,4 @@ class TransactionDetailsPage extends BasePage {
       ],
     );
   }
-
-  Widget getFormattedAddress({
-    required BuildContext context,
-    required String value,
-    required WalletType walletType,
-  }) {
-    final textStyle = Theme.of(context).textTheme.bodyMedium!.copyWith(
-      fontSize: 16,
-      fontWeight: FontWeight.w500,
-      color: Theme.of(context).colorScheme.onSurface,
-    );
-    final List<Widget> children = [];
-    final bool hasDoubleNewline = value.contains('\n\n');
-
-    if (hasDoubleNewline) {
-      final blocks = value
-          .split('\n\n')
-          .map((b) => b.trim())
-          .where((b) => b.isNotEmpty)
-          .toList();
-      for (final block in blocks) {
-        final lines = block
-            .split('\n')
-            .map((l) => l.trim())
-            .where((l) => l.isNotEmpty)
-            .toList();
-        if (lines.length > 1) {
-          children.add(Text(lines.first, style: textStyle));
-          for (int i = 1; i < lines.length; i++) {
-            children.add(
-              AddressFormatter.buildSegmentedAddress(
-                address: lines[i],
-                walletType: walletType,
-                evenTextStyle: textStyle,
-              ),
-            );
-          }
-        } else {
-          children.add(
-            AddressFormatter.buildSegmentedAddress(
-              address: lines.first,
-              walletType: walletType,
-              evenTextStyle: textStyle,
-            ),
-          );
-        }
-        children.add(SizedBox(height: 8));
-      }
-    } else {
-      final lines = value
-          .split('\n')
-          .map((l) => l.trim())
-          .where((l) => l.isNotEmpty)
-          .toList();
-      bool firstLineIsContactName = (lines.length > 1 && lines.first.length < 20);
-      int startIndex = 0;
-      if (firstLineIsContactName) {
-        children.add(Text(lines.first, style: textStyle));
-        startIndex = 1;
-      }
-      for (int i = startIndex; i < lines.length; i++) {
-        children.add(
-          AddressFormatter.buildSegmentedAddress(
-            address: lines[i],
-            walletType: walletType,
-            evenTextStyle: textStyle,
-          ),
-        );
-      }
-    }
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: children,
-    );
-  }
 }
diff --git a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart
index a6f6ad42e..24016a293 100644
--- a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart
+++ b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:flutter/material.dart';
 
 class TextFieldListRow extends StatefulWidget {
@@ -50,7 +51,7 @@ class _TextFieldListRowState extends State<TextFieldListRow> {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.background,
       child: Padding(
         padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
         child: Column(
@@ -58,35 +59,37 @@ class _TextFieldListRowState extends State<TextFieldListRow> {
           children: <Widget>[
             Text(
               widget.title,
-              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                    fontSize: widget.titleFontSize,
-                    fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
+              style: TextStyle(
+                fontSize: widget.titleFontSize,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+              ),
               textAlign: TextAlign.left,
             ),
-            SizedBox(height: 4),
-            BaseTextFormField(
+            TextField(
               controller: _textController,
               focusNode: _focusNode,
               keyboardType: TextInputType.multiline,
               textInputAction: TextInputAction.done,
               maxLines: null,
               textAlign: TextAlign.start,
-              textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: widget.valueFontSize,
-                    fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
-              isDense: true,
-              contentPadding: EdgeInsets.only(top: 12, bottom: 0, left: 8, right: 8),
-              hintText: S.of(context).enter_your_note,
-              placeholderTextStyle: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                    fontSize: widget.valueFontSize,
-                    fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-              onSubmit: (value) {
+              style: TextStyle(
+                fontSize: widget.valueFontSize,
+                fontWeight: FontWeight.w500,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              ),
+              decoration: InputDecoration(
+                isDense: true,
+                contentPadding: EdgeInsets.only(top: 12, bottom: 0),
+                hintText: S.of(context).enter_your_note,
+                hintStyle: TextStyle(
+                  fontSize: widget.valueFontSize,
+                  fontWeight: FontWeight.w500,
+                  color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+                ),
+                border: InputBorder.none,
+              ),
+              onSubmitted: (value) {
                 widget.onSubmitted?.call(value);
               },
             ),
diff --git a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
index 3c47ea203..d44107939 100644
--- a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
+++ b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
@@ -4,6 +4,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart';
 import 'package:cake_wallet/src/widgets/alert_with_no_action.dart.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_list_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -27,7 +28,7 @@ class UnspentCoinsListPage extends BasePage {
             label: S.of(context).seed_alert_back,
             child: TextButton(
               style: ButtonStyle(
-                overlayColor: WidgetStateProperty.all(Colors.transparent),
+                overlayColor: WidgetStateColor.resolveWith((states) => Colors.transparent),
               ),
               onPressed: () async => await handleOnPopInvoked(context),
               child: backButton(context),
@@ -41,18 +42,15 @@ class UnspentCoinsListPage extends BasePage {
   final UnspentCoinsListViewModel unspentCoinsListViewModel;
 
   Future<void> handleOnPopInvoked(BuildContext context) async {
-    final navigator = Navigator.of(context);
     final hasChanged = unspentCoinsListViewModel.hasAdjustableFieldChanged;
     if (unspentCoinsListViewModel.items.isEmpty || !hasChanged) {
-      if (navigator.canPop()) navigator.pop();
-      return;
+      Navigator.of(context).pop();
+    } else {
+      unspentCoinsListViewModel.setIsDisposing(true);
+      await unspentCoinsListViewModel.dispose();
+      Navigator.of(context).pop();
+      Navigator.of(context).pop();
     }
-
-    unspentCoinsListViewModel.setIsDisposing(true);
-    await unspentCoinsListViewModel.dispose();
-
-    if (navigator.canPop()) navigator.pop();
-    if (navigator.canPop()) navigator.pop();
   }
 
   @override
@@ -99,7 +97,6 @@ class UnspentCoinsListFormState extends State<UnspentCoinsListForm> {
   void _showSavingDataAlert() {
     showDialog<void>(
       context: context,
-      useRootNavigator: false,
       builder: (BuildContext context) {
         return AlertWithNoAction(
           alertContent: 'Updating, please wait…',
@@ -128,9 +125,7 @@ class UnspentCoinsListFormState extends State<UnspentCoinsListForm> {
         future: _initialization,
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.waiting) {
-            return Center(child: CircularProgressIndicator(
-              color: Theme.of(context).colorScheme.primary,
-            ));
+            return Center(child: CircularProgressIndicator());
           }
 
           if (snapshot.hasError) return Center(child: Text('Failed to load unspent coins'));
@@ -145,33 +140,21 @@ class UnspentCoinsListFormState extends State<UnspentCoinsListForm> {
                       children: [
                         SizedBox(width: 12),
                         StandardCheckbox(
-                          iconColor: Theme.of(context).colorScheme.onSurfaceVariant,
+                          iconColor: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
                           value: unspentCoinsListViewModel.isAllSelected,
                           onChanged: (value) => unspentCoinsListViewModel.toggleSelectAll(value),
                         ),
                         SizedBox(width: 12),
                         Text(
                           S.current.all_coins,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.bold,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
+                          style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
                         ),
                       ],
                     ),
                   SizedBox(height: 15),
                   Expanded(
                     child: unspentCoinsListViewModel.items.isEmpty
-                        ? Center(
-                            child: Text(
-                              'No unspent coins available',
-                              textAlign: TextAlign.center,
-                              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
-                            )
-                          )
+                        ? Center(child: Text('No unspent coins available',textAlign: TextAlign.center))
                         : ListView.separated(
                             itemCount: unspentCoinsListViewModel.items.length,
                             separatorBuilder: (_, __) => SizedBox(height: 15),
diff --git a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart
index fd9dc0c6d..236d06f4e 100644
--- a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart
+++ b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart
@@ -1,6 +1,7 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class UnspentCoinsListItem extends StatelessWidget {
@@ -26,170 +27,144 @@ class UnspentCoinsListItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final unselectedItemColor = Theme.of(context).colorScheme.surfaceContainer;
-    final selectedItemColor = Theme.of(context).colorScheme.primary;
+    final unselectedItemColor = Theme.of(context).cardColor;
+    final selectedItemColor = Theme.of(context).primaryColor;
     final itemColor = isSending ? selectedItemColor : unselectedItemColor;
-    final amountColor = isSending
-        ? Theme.of(context).colorScheme.onPrimary
-        : Theme.of(context).colorScheme.onSurface;
+    final amountColor =
+        isSending ? Colors.white : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor;
     final addressColor = isSending
-        ? Theme.of(context).colorScheme.onPrimary
-        : Theme.of(context).colorScheme.onSurface;
+        ? Colors.white.withOpacity(0.5)
+        : Theme.of(context).extension<CakeTextTheme>()!.buttonSecondaryTextColor;
 
     return Container(
-      height: 70,
-      padding: EdgeInsets.symmetric(vertical: 6, horizontal: 12),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.all(Radius.circular(12)),
-        color: itemColor,
-      ),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Padding(
-            padding: EdgeInsets.only(right: 12),
-            child: StandardCheckbox(
-              iconColor: amountColor,
-              borderColor: addressColor,
-              value: isSending,
-              onChanged: (value) => onCheckBoxTap?.call(),
-            ),
-          ),
-          Expanded(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
+        height: 70,
+        padding: EdgeInsets.symmetric(vertical: 6, horizontal: 12),
+        decoration:
+            BoxDecoration(borderRadius: BorderRadius.all(Radius.circular(12)), color: itemColor),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Padding(
+                padding: EdgeInsets.only(right: 12),
+                child: StandardCheckbox(
+                    iconColor: amountColor,
+                    borderColor: addressColor,
+                    value: isSending,
+                    onChanged: (value) => onCheckBoxTap?.call())),
+            Expanded(
+                child: Column(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
                         if (note.isNotEmpty)
                           AutoSizeText(
                             note,
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: amountColor,
-                              fontSize: 15,
-                              fontWeight: FontWeight.w600,
-                            ),
+                            style: TextStyle(
+                                color: amountColor, fontSize: 15, fontWeight: FontWeight.w600),
                             maxLines: 1,
                           ),
                         AutoSizeText(
                           amount,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            color: amountColor,
-                            fontSize: 15,
-                            fontWeight: FontWeight.w600,
-                          ),
+                          style: TextStyle(
+                              color: amountColor, fontSize: 15, fontWeight: FontWeight.w600),
                           maxLines: 1,
                         )
-                      ],
-                    ),
-                    if (isFrozen)
-                      Container(
-                        height: 17,
-                        padding: EdgeInsets.only(left: 6, right: 6),
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.all(Radius.circular(8.5)),
-                          color: Theme.of(context).colorScheme.primary,
-                        ),
-                        alignment: Alignment.center,
-                        child: Text(
-                          S.of(context).frozen,
-                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                fontWeight: FontWeight.w600,
-                                color: itemColor,
-                                fontSize: 8,
-                              ),
-                        ),
-                      ),
-                  ],
-                ),
-                Expanded(
-                  child: Row(
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      AutoSizeText(
-                        '${address.substring(0, 5)}...${address.substring(address.length - 5)}', // ToDo: Maybe use address label
-                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                          color: addressColor,
-                        ),
-                        maxLines: 1,
-                      ),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                        children: [
-                          if (isChange)
-                            Container(
-                              height: 17,
-                              padding: EdgeInsets.only(left: 6, right: 6),
-                              decoration: BoxDecoration(
+                      ]),
+                      if (isFrozen)
+                        Container(
+                            height: 17,
+                            padding: EdgeInsets.only(left: 6, right: 6),
+                            decoration: BoxDecoration(
                                 borderRadius: BorderRadius.all(Radius.circular(8.5)),
-                                color: Theme.of(context).colorScheme.primaryContainer,
-                              ),
-                              alignment: Alignment.center,
-                              child: Text(
-                                S.of(context).unspent_change,
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      fontWeight: FontWeight.w600,
-                                      fontSize: 8,
-                                      color: Theme.of(context).colorScheme.onPrimaryContainer,
-                                    ),
-                              ),
-                            ),
-                          if (address.toLowerCase().contains("mweb"))
-                            Container(
-                              height: 17,
-                              padding: EdgeInsets.only(left: 6, right: 6),
-                              margin: EdgeInsets.only(left: 6),
-                              decoration: BoxDecoration(
-                                borderRadius: BorderRadius.all(
-                                  Radius.circular(8.5),
-                                ),
-                                color: Theme.of(context).colorScheme.primaryContainer,
-                              ),
-                              alignment: Alignment.center,
-                              child: Text(
-                                "MWEB",
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      fontWeight: FontWeight.w600,
-                                      fontSize: 8,
-                                      color: Theme.of(context).colorScheme.onPrimaryContainer,
-                                    ),
-                              ),
-                            ),
-                          if (isSilentPayment)
-                            Container(
-                              height: 17,
-                              padding: EdgeInsets.only(left: 6, right: 6),
-                              decoration: BoxDecoration(
-                                borderRadius: BorderRadius.all(Radius.circular(8.5)),
-                                color: Theme.of(context).colorScheme.primaryContainer,
-                              ),
-                              alignment: Alignment.center,
-                              child: Text(
-                                S.of(context).silent_payments,
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      fontWeight: FontWeight.w600,
-                                      fontSize: 8,
-                                      color: Theme.of(context).colorScheme.onPrimaryContainer,
-                                    ),
-                              ),
-                            ),
-                        ],
-                      ),
+                                color: Colors.white),
+                            alignment: Alignment.center,
+                            child: Text(
+                              S.of(context).frozen,
+                              style: TextStyle(
+                                  color: Colors.black, fontSize: 7, fontWeight: FontWeight.w600),
+                            )),
                     ],
                   ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
+                  Expanded(
+                    child: Row(
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        AutoSizeText(
+                          '${address.substring(0, 5)}...${address.substring(address.length - 5)}', // ToDo: Maybe use address label
+                          style: TextStyle(
+                            color: addressColor,
+                            fontSize: 12,
+                          ),
+                          maxLines: 1,
+                        ),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                          children: [
+                            if (isChange)
+                              Container(
+                                height: 17,
+                                padding: EdgeInsets.only(left: 6, right: 6),
+                                decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.all(Radius.circular(8.5)),
+                                    color: Colors.white),
+                                alignment: Alignment.center,
+                                child: Text(
+                                  S.of(context).unspent_change,
+                                  style: TextStyle(
+                                    color: itemColor,
+                                    fontSize: 7,
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                              ),
+                            if (address.toLowerCase().contains("mweb"))
+                              Container(
+                                height: 17,
+                                padding: EdgeInsets.only(left: 6, right: 6),
+                                margin: EdgeInsets.only(left: 6),
+                                decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.all(Radius.circular(8.5)),
+                                    color: Colors.white),
+                                alignment: Alignment.center,
+                                child: Text(
+                                  "MWEB",
+                                  style: TextStyle(
+                                    color: itemColor,
+                                    fontSize: 7,
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                              ),
+                            if (isSilentPayment)
+                              Container(
+                                height: 17,
+                                padding: EdgeInsets.only(left: 6, right: 6),
+                                decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.all(Radius.circular(8.5)),
+                                    color: Colors.white),
+                                alignment: Alignment.center,
+                                child: Text(
+                                  S.of(context).silent_payments,
+                                  style: TextStyle(
+                                    color: itemColor,
+                                    fontSize: 7,
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                              ),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                ])),
+          ],
+        ));
   }
 }
diff --git a/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart b/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart
index 65ab3999d..f62582460 100644
--- a/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart
+++ b/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart
@@ -1,12 +1,13 @@
 import 'package:cake_wallet/src/widgets/standard_switch.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class UnspentCoinsSwitchRow extends StatelessWidget {
   UnspentCoinsSwitchRow(
-      {required this.title,
-      required this.switchValue,
-      required this.onSwitchValueChange,
-      this.titleFontSize = 14});
+       {required this.title,
+        required this.switchValue,
+        required this.onSwitchValueChange,
+        this.titleFontSize = 14});
 
   final String title;
   final double titleFontSize;
@@ -17,31 +18,27 @@ class UnspentCoinsSwitchRow extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.background,
       child: Padding(
-        padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
+        padding:
+        const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
-            Text(
-              title,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: titleFontSize,
-                    fontWeight: FontWeight.w500,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-              textAlign: TextAlign.left,
-            ),
-            Padding(
-              padding: EdgeInsets.only(top: 12),
-              child: StandardSwitch(
-                value: switchValue,
-                onTapped: () => onSwitchValueChange(!switchValue),
-              ),
-            )
-          ],
-        ),
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(title,
+                  style: TextStyle(
+                      fontSize: titleFontSize,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
+                  textAlign: TextAlign.left),
+              Padding(
+                padding: EdgeInsets.only(top: 12),
+                child: StandardSwitch(
+                    value: switchValue,
+                    onTaped: () => onSwitchValueChange(!switchValue))
+              )
+            ]),
       ),
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/ur/animated_ur_page.dart b/lib/src/screens/ur/animated_ur_page.dart
index a4ef3517f..cf9aa8509 100644
--- a/lib/src/screens/ur/animated_ur_page.dart
+++ b/lib/src/screens/ur/animated_ur_page.dart
@@ -1,14 +1,22 @@
 import 'dart:async';
 
+import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/receive/widgets/qr_image.dart';
+import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/animated_ur_model.dart';
+import 'package:cake_wallet/view_model/dashboard/wallet_balance.dart';
+import 'package:cw_core/balance.dart';
+import 'package:cw_core/transaction_history.dart';
+import 'package:cw_core/transaction_info.dart';
+import 'package:cw_core/wallet_base.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 // ur:xmr-txunsigned - unsigned transaction
@@ -55,8 +63,8 @@ class AnimatedURPage extends BasePage {
               child: PrimaryButton(
                 onPressed: () => _continue(context),
                 text: "Continue",
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
+                color: Theme.of(context).primaryColor,
+                textColor: Colors.white,
               ),
             ),
           ),
@@ -69,7 +77,7 @@ class AnimatedURPage extends BasePage {
                 onPressed: () => _exportAll(context),
                 text: "Export all",
                 color: Theme.of(context).colorScheme.secondary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
+                textColor: Colors.white,
               ),
             ),
           ),
diff --git a/lib/src/screens/wallet/wallet_edit_page.dart b/lib/src/screens/wallet/wallet_edit_page.dart
index 13cc8dc87..9e62284de 100644
--- a/lib/src/screens/wallet/wallet_edit_page.dart
+++ b/lib/src/screens/wallet/wallet_edit_page.dart
@@ -1,6 +1,7 @@
 import 'package:another_flushbar/flushbar.dart';
 import 'package:cake_wallet/core/wallet_name_validator.dart';
 import 'package:cake_wallet/entities/wallet_edit_page_arguments.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/routes.dart';
@@ -71,12 +72,11 @@ class WalletEditPage extends BasePage {
                         child: Container(
                           padding: EdgeInsets.only(right: 8.0),
                           child: LoadingPrimaryButton(
-                            isDisabled: isLoading,
-                            onPressed: () => _removeWallet(context),
-                            text: S.of(context).delete,
-                            color: Theme.of(context).colorScheme.errorContainer,
-                            textColor: Theme.of(context).colorScheme.onErrorContainer,
-                          ),
+                              isDisabled: isLoading,
+                              onPressed: () => _removeWallet(context),
+                              text: S.of(context).delete,
+                              color: Palette.red,
+                              textColor: Colors.white),
                         ),
                       ),
                     Flexible(
@@ -142,8 +142,8 @@ class WalletEditPage extends BasePage {
                             }
                           },
                           text: S.of(context).save,
-                          color: Theme.of(context).colorScheme.primary,
-                          textColor: Theme.of(context).colorScheme.onPrimary,
+                          color: Theme.of(context).primaryColor,
+                          textColor: Colors.white,
                           isDisabled: walletEditViewModel.newName.isEmpty || isLoading,
                         ),
                       ),
@@ -176,22 +176,20 @@ class WalletEditPage extends BasePage {
     bool confirmed = false;
 
     await showPopUp<void>(
-      context: context,
-      builder: (BuildContext dialogContext) {
-        return AlertWithTwoActions(
-          alertTitle: S.of(context).delete_wallet,
-          alertContent:
-              S.of(context).delete_wallet_confirm_message(pageArguments.editingWallet.name),
-          leftButtonText: S.of(context).cancel,
-          rightButtonText: S.of(context).delete,
-          actionLeftButton: () => Navigator.of(dialogContext).pop(),
-          actionRightButton: () {
-            confirmed = true;
-            Navigator.of(dialogContext).pop();
-          },
-        );
-      },
-    );
+        context: context,
+        builder: (BuildContext dialogContext) {
+          return AlertWithTwoActions(
+              alertTitle: S.of(context).delete_wallet,
+              alertContent:
+                  S.of(context).delete_wallet_confirm_message(pageArguments.editingWallet.name),
+              leftButtonText: S.of(context).cancel,
+              rightButtonText: S.of(context).delete,
+              actionLeftButton: () => Navigator.of(dialogContext).pop(),
+              actionRightButton: () {
+                confirmed = true;
+                Navigator.of(dialogContext).pop();
+              });
+        });
 
     if (confirmed) {
       Navigator.of(context).pop();
@@ -213,7 +211,7 @@ class WalletEditPage extends BasePage {
   }
 
   void changeProcessText(BuildContext context, String text) {
-    _progressBar = createBar<void>(text, context, duration: null)..show(context);
+    _progressBar = createBar<void>(text, duration: null)..show(context);
   }
 
   Future<void> hideProgressText() async {
diff --git a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart b/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart
deleted file mode 100644
index e70930b48..000000000
--- a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart
+++ /dev/null
@@ -1,595 +0,0 @@
-import 'dart:convert';
-
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/reactions/wallet_connect.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:eth_sig_util/eth_sig_util.dart';
-import 'package:eth_sig_util/util/utils.dart';
-import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/eth/evm_chain_id.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/eth/evm_supported_methods.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/models/wc_connection_model.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/utils/eth_utils.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/utils/method_utils.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/.secrets.g.dart' as secrets;
-
-class EvmChainServiceImpl {
-  Map<String, dynamic Function(String, dynamic)> get sessionRequestHandlers => {
-        EVMSupportedMethods.ethSign.name: ethSign,
-        EVMSupportedMethods.ethSignTransaction.name: ethSignTransaction,
-        EVMSupportedMethods.ethSignTypedData.name: ethSignTypedData,
-        EVMSupportedMethods.ethSignTypedDataV4.name: ethSignTypedDataV4,
-      };
-
-  Map<String, dynamic Function(String, dynamic)> get methodRequestHandlers => {
-        EVMSupportedMethods.personalSign.name: personalSign,
-        EVMSupportedMethods.ethSendTransaction.name: ethSendTransaction,
-      };
-
-  EvmChainServiceImpl({
-    required this.reference,
-    required this.appStore,
-    required this.wcKeyService,
-    required this.bottomSheetService,
-    required this.walletKit,
-    Web3Client? web3Client,
-  }) : ethClient = web3Client ??
-            Web3Client(
-              appStore.settingsStore.getCurrentNode(appStore.wallet!.type).uri.toString(),
-              ProxyWrapper().getHttpIOClient(),
-            ) {
-    for (final event in EventsConstants.allEvents) {
-      walletKit.registerEventEmitter(
-        chainId: getChainId(),
-        event: event,
-      );
-    }
-
-    for (var handler in methodRequestHandlers.entries) {
-      walletKit.registerRequestHandler(
-        chainId: getChainId(),
-        method: handler.key,
-        handler: handler.value,
-      );
-    }
-    for (var handler in sessionRequestHandlers.entries) {
-      walletKit.registerRequestHandler(
-        chainId: getChainId(),
-        method: handler.key,
-        handler: handler.value,
-      );
-    }
-
-    walletKit.onSessionRequest.subscribe(_onSessionRequest);
-  }
-
-  final AppStore appStore;
-  final EVMChainId reference;
-  final Web3Client ethClient;
-  final ReownWalletKit walletKit;
-  final WalletConnectKeyService wcKeyService;
-  final BottomSheetService bottomSheetService;
-
-  String getChainId() => reference.chain();
-
-  Future<void> personalSign(String topic, dynamic parameters) async {
-    debugPrint('personalSign request: $parameters');
-
-    final pRequest = walletKit.pendingRequests.getAll().last;
-    final address = EthUtils.getAddressFromSessionRequest(pRequest);
-    final data = EthUtils.getDataFromSessionRequest(pRequest);
-    final message = EthUtils.getUtf8Message(data.toString());
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    final isApproved = await MethodsUtils.requestApproval(
-      message,
-      method: pRequest.method,
-      chainId: pRequest.chainId,
-      address: address,
-      transportType: pRequest.transportType.name,
-      verifyContext: pRequest.verifyContext,
-    );
-
-    if (isApproved) {
-      try {
-        // Load the private key
-        final keys = wcKeyService.getKeysForChain(appStore.wallet!);
-        final credentials = EthPrivateKey.fromHex(keys[0].privateKey);
-
-        final signature = credentials.signPersonalMessageToUint8List(
-          utf8.encode(message),
-        );
-        final signedTx = bytesToHex(signature, include0x: true);
-
-        isValidSignature(signedTx, message, credentials.address.hex);
-
-        response = response.copyWith(result: signedTx);
-      } catch (e) {
-        debugPrint('personalSign error $e');
-        final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } else {
-      final error = Errors.getSdkError(Errors.USER_REJECTED);
-      response = response.copyWith(
-        error: JsonRpcError(code: error.code, message: error.message),
-      );
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  Future<void> ethSign(String topic, dynamic parameters) async {
-    debugPrint('ethSign request: $parameters');
-
-    final pRequest = walletKit.pendingRequests.getAll().last;
-    final address = EthUtils.getAddressFromSessionRequest(pRequest);
-    final data = EthUtils.getDataFromSessionRequest(pRequest);
-    final message = EthUtils.getUtf8Message(data.toString());
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    final isApproved = await MethodsUtils.requestApproval(
-      message,
-      method: pRequest.method,
-      chainId: pRequest.chainId,
-      address: address,
-      transportType: pRequest.transportType.name,
-      verifyContext: pRequest.verifyContext,
-    );
-
-    if (isApproved) {
-      try {
-        // Load the private key
-        final keys = wcKeyService.getKeysForChain(appStore.wallet!);
-        final credentials = EthPrivateKey.fromHex(keys[0].privateKey);
-
-        final signature = credentials.signPersonalMessageToUint8List(
-          utf8.encode(message),
-        );
-        final signedTx = bytesToHex(signature, include0x: true);
-
-        isValidSignature(signedTx, message, credentials.address.hex);
-
-        response = response.copyWith(result: signedTx);
-      } catch (e) {
-        debugPrint('ethSign error $e');
-        final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } else {
-      final error = Errors.getSdkError(Errors.USER_REJECTED).toSignError();
-      response = response.copyWith(
-        error: JsonRpcError(code: error.code, message: error.message),
-      );
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  Future<void> ethSignTypedData(String topic, dynamic parameters) async {
-    debugPrint('ethSignTypedData request: $parameters');
-
-    final pRequest = walletKit.pendingRequests.getAll().last;
-    final address = EthUtils.getAddressFromSessionRequest(pRequest);
-    final data = EthUtils.getDataFromSessionRequest(pRequest) as String;
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    final isApproved = await MethodsUtils.requestApproval(
-      data,
-      method: pRequest.method,
-      chainId: pRequest.chainId,
-      address: address,
-      transportType: pRequest.transportType.name,
-      verifyContext: pRequest.verifyContext,
-    );
-
-    if (isApproved) {
-      try {
-        final keys = wcKeyService.getKeysForChain(appStore.wallet!);
-
-        final signature = EthSigUtil.signTypedData(
-          privateKey: keys[0].privateKey,
-          jsonData: data,
-          version: TypedDataVersion.V4,
-        );
-
-        response = response.copyWith(result: signature);
-      } catch (e) {
-        debugPrint('ethSignTypedData error $e');
-        final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } else {
-      final error = Errors.getSdkError(Errors.USER_REJECTED).toSignError();
-      response = response.copyWith(
-        error: JsonRpcError(code: error.code, message: error.message),
-      );
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  Future<void> ethSignTypedDataV4(String topic, dynamic parameters) async {
-    debugPrint('ethSignTypedDataV4 request: $parameters');
-
-    final permitRequestMessage = await extractPermitData(parameters);
-
-    final pRequest = walletKit.pendingRequests.getAll().last;
-    final address = EthUtils.getAddressFromSessionRequest(pRequest);
-    final data = EthUtils.getDataFromSessionRequest(pRequest) as String;
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    final isApproved = await MethodsUtils.requestApproval(
-      permitRequestMessage,
-      method: pRequest.method,
-      chainId: pRequest.chainId,
-      address: address,
-      transportType: pRequest.transportType.name,
-      verifyContext: pRequest.verifyContext,
-    );
-
-    if (isApproved) {
-      try {
-        final keys = wcKeyService.getKeysForChain(appStore.wallet!);
-
-        final signature = EthSigUtil.signTypedData(
-          privateKey: keys[0].privateKey,
-          jsonData: data,
-          version: TypedDataVersion.V4,
-        );
-
-        response = response.copyWith(result: signature);
-      } catch (e) {
-        debugPrint('ethSignTypedDataV4 error $e');
-        final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } else {
-      response = response.copyWith(
-        error: JsonRpcError(code: 5002, message: S.current.user_rejected_method),
-      );
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  Future<void> ethSignTransaction(String topic, dynamic parameters) async {
-    debugPrint('ethSignTransaction request: $parameters');
-
-    final SessionRequest pRequest = walletKit.pendingRequests.getAll().last;
-    final data = EthUtils.getTransactionFromSessionRequest(pRequest);
-
-    if (data == null) return;
-
-    final address = EthUtils.getAddressFromSessionRequest(pRequest);
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    final transaction = await _approveTransaction(
-      data,
-      method: pRequest.method,
-      chainId: pRequest.chainId,
-      address: address,
-      transportType: pRequest.transportType.name,
-      verifyContext: pRequest.verifyContext,
-    );
-
-    if (transaction is Transaction) {
-      try {
-        // Load the private key
-        final keys = wcKeyService.getKeysForChain(appStore.wallet!);
-        final credentials = EthPrivateKey.fromHex(keys[0].privateKey);
-
-        final chainId = getChainId().split(':').last;
-
-        final signature = await ethClient.signTransaction(
-          credentials,
-          transaction,
-          chainId: int.parse(chainId),
-        );
-
-        // Sign the transaction
-        final signedTx = bytesToHex(signature, include0x: true);
-        response = response.copyWith(result: signedTx);
-      } on RPCError catch (e) {
-        debugPrint('ethSignTransaction error $e');
-        response = response.copyWith(
-          error: JsonRpcError(code: e.errorCode, message: e.message),
-        );
-      } catch (e) {
-        debugPrint('ethSignTransaction error $e');
-        final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } else {
-      response = response.copyWith(error: transaction as JsonRpcError);
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  Future<void> ethSendTransaction(String topic, dynamic parameters) async {
-    debugPrint('ethSendTransaction request: $parameters');
-    final SessionRequest pRequest = walletKit.pendingRequests.getAll().last;
-
-    final data = EthUtils.getTransactionFromSessionRequest(pRequest);
-    if (data == null) return;
-
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    final transaction = await _approveTransaction(
-      data,
-      method: pRequest.method,
-      chainId: pRequest.chainId,
-      transportType: pRequest.transportType.name,
-      verifyContext: pRequest.verifyContext,
-    );
-    if (transaction is Transaction) {
-      try {
-        // Load the private key
-        final keys = wcKeyService.getKeysForChain(appStore.wallet!);
-        final credentials = EthPrivateKey.fromHex(keys[0].privateKey);
-        final chainId = getChainId().split(':').last;
-
-        final signedTx = await ethClient.sendTransaction(
-          credentials,
-          transaction,
-          chainId: int.parse(chainId),
-        );
-
-        response = response.copyWith(result: signedTx);
-      } on RPCError catch (e) {
-        debugPrint('ethSendTransaction error $e');
-        response = response.copyWith(
-          error: JsonRpcError(code: e.errorCode, message: e.message),
-        );
-      } catch (e) {
-        debugPrint('ethSendTransaction error $e');
-        final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } else {
-      response = response.copyWith(error: transaction as JsonRpcError);
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  void _handleResponseForTopic(String topic, JsonRpcResponse<dynamic> response) async {
-    final session = walletKit.sessions.get(topic);
-
-    try {
-      await walletKit.respondSessionRequest(
-        topic: topic,
-        response: response,
-      );
-
-      if (session == null) return;
-
-      MethodsUtils.handleRedirect(
-        topic,
-        session.peer.metadata.redirect,
-        response.error?.message,
-        response.error == null,
-      );
-    } on ReownSignError catch (error) {
-      if (session == null) return;
-
-      MethodsUtils.handleRedirect(
-        topic,
-        session.peer.metadata.redirect,
-        error.message,
-      );
-    }
-  }
-
-  Future<dynamic> _approveTransaction(
-    Map<String, dynamic> transactionJson, {
-    String? title,
-    String? method,
-    String? chainId,
-    String? address,
-    VerifyContext? verifyContext,
-    required String transportType,
-  }) async {
-    Transaction transaction = transactionJson.toTransaction();
-
-    final gasPrice = await ethClient.getGasPrice();
-    try {
-      final gasLimit = await ethClient.estimateGas(
-        sender: transaction.from,
-        to: transaction.to,
-        value: transaction.value,
-        data: transaction.data,
-        gasPrice: gasPrice,
-      );
-
-      transaction = transaction.copyWith(
-        gasPrice: gasPrice,
-        maxGas: gasLimit.toInt(),
-      );
-    } on RPCError catch (e) {
-      return JsonRpcError(code: e.errorCode, message: e.message);
-    }
-
-    final gweiGasPrice = (transaction.gasPrice?.getInWei ?? BigInt.zero) / BigInt.from(1000000000);
-
-    final amount = (transaction.value?.getInWei ?? BigInt.zero) / BigInt.from(1e18);
-
-    final txMessageText = '${S.current.value}: ${amount.toStringAsFixed(9)} ETH\n'
-        '${S.current.from}: ${transaction.from?.hex}\n'
-        '${S.current.to}: ${transaction.to?.hex}';
-
-    if (await MethodsUtils.requestApproval(
-      txMessageText,
-      title: title,
-      method: method,
-      chainId: chainId,
-      address: address,
-      transportType: transportType,
-      verifyContext: verifyContext,
-      extraModels: [
-        WCConnectionModel(
-          title: S.current.gas_price,
-          elements: ['${gweiGasPrice.toStringAsFixed(2)} GWEI'],
-        ),
-      ],
-    )) {
-      return transaction;
-    }
-
-    return JsonRpcError(code: 5002, message: S.current.user_rejected_method);
-  }
-
-  void _onSessionRequest(SessionRequestEvent? args) async {
-    if (args != null && args.chainId == getChainId()) {
-      debugPrint('_onSessionRequest ${args.toString()}');
-      final handler = sessionRequestHandlers[args.method];
-      if (handler != null) {
-        await handler(args.topic, args.params);
-      }
-    }
-  }
-
-  bool isValidSignature(String hexSignature, String message, String hexAddress) {
-    try {
-      debugPrint('isValidSignature: $hexSignature, $message, $hexAddress');
-      final recoveredAddress = EthSigUtil.recoverPersonalSignature(
-        signature: hexSignature,
-        message: utf8.encode(message),
-      );
-      debugPrint('recoveredAddress: $recoveredAddress');
-
-      final recoveredAddress2 = EthSigUtil.recoverSignature(
-        signature: hexSignature,
-        message: utf8.encode(message),
-      );
-      debugPrint('recoveredAddress2: $recoveredAddress2');
-
-      final isValid = recoveredAddress == hexAddress;
-      return isValid;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  Future<String> extractPermitData(dynamic data) async {
-    if (data is List && data.length >= 2) {
-      final typedData = jsonDecode(data[1] as String) as Map<String, dynamic>;
-
-      // Extracting domain details.
-      final domain = typedData['domain'] as Map<String, dynamic>? ?? {};
-      final domainName = domain['name']?.toString() ?? '';
-      final version = domain['version']?.toString() ?? '';
-      final chainId = domain['chainId']?.toString() ?? '';
-      final verifyingContract = domain['verifyingContract']?.toString() ?? '';
-
-      // Get the primary type and types
-      final primaryType = typedData['primaryType']?.toString() ?? '';
-      final types = typedData['types']  as Map<String, dynamic>? ?? {};
-      final message = typedData['message'] as Map<String, dynamic>? ?? {};
-
-      // Build a readable message based on the primary type and its structure
-      String messageDetails = '';
-
-      if (types.containsKey(primaryType)) {
-        final typeFields = types[primaryType] as List<dynamic>;
-        messageDetails = _formatMessageFields(message, typeFields, types);
-      } else {
-        // For unknown types, show the raw message
-        messageDetails = message.toString();
-      }
-
-      return '''Domain Name: $domainName
-Version: $version
-Chain ID: $chainId
-Verifying Contract: $verifyingContract
-Primary Type: $primaryType\n
-Message:
-$messageDetails''';
-    }
-    return 'Invalid typed data format';
-  }
-
-  String _formatMessageFields(
-      Map<String, dynamic> message, List<dynamic> fields, Map<String, dynamic> types) {
-    final buffer = StringBuffer();
-
-    for (var field in fields) {
-      final fieldName = _toCamelCase(field['name'] as String);
-      final fieldType = field['type'] as String;
-      final value = message[field['name'] as String];
-
-      if (value == null) continue;
-
-      if (types.containsKey(fieldType)) {
-        // Handle nested types
-        final nestedFields = types[fieldType] as List<dynamic>;
-        if (fieldType == 'Person') {
-          // Special formatting for Person type
-          final name = value['name'] as String;
-          final wallet = value['wallet'] as String;
-          buffer.writeln('$fieldName: $name ($wallet)');
-        } else {
-          // For other nested types, format each field
-          final formattedValue =
-              _formatMessageFields(value as Map<String, dynamic>, nestedFields, types);
-          buffer.writeln('$fieldName: $formattedValue');
-        }
-      } else {
-        // Handle primitive types
-        buffer.writeln('$fieldName: $value');
-      }
-    }
-
-    return buffer.toString();
-  }
-
-  String _toCamelCase(String input) {
-    if (input.isEmpty) return input;
-    return input[0].toUpperCase() + input.substring(1).toLowerCase();
-  }
-
-  Future<String> getTokenDetails(String contractAddress, String chainName) async {
-    final uri = Uri.https(
-      'deep-index.moralis.io',
-      '/api/v2.2/erc20/metadata',
-      {
-        "chain": chainName,
-        "addresses": contractAddress,
-      },
-    );
-
-    final response = await ProxyWrapper().get(
-      clearnetUri: uri,
-      headers: {
-        "Accept": "application/json",
-        "X-API-Key": secrets.moralisApiKey,
-      },
-    );
-
-    
-    final decodedResponse = jsonDecode(response.body)[0] as Map<String, dynamic>;
-
-    final symbol = (decodedResponse['symbol'] ?? '') as String;
-
-    final name = decodedResponse['name'] ?? '';
-    return '$name ($symbol)';
-  }
-}
diff --git a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_supported_methods.dart b/lib/src/screens/wallet_connect/services/chain_service/eth/evm_supported_methods.dart
deleted file mode 100644
index 32e00570c..000000000
--- a/lib/src/screens/wallet_connect/services/chain_service/eth/evm_supported_methods.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-enum EVMSupportedMethods {
-  ethSign,
-  ethSignTransaction,
-  ethSignTypedData,
-  ethSignTypedDataV4,
-  switchChain,
-  addChain,
-  personalSign,
-  ethSendTransaction;
-
-  String get name {
-    switch (this) {
-      case ethSign:
-        return 'eth_sign';
-      case ethSignTransaction:
-        return 'eth_signTransaction';
-      case ethSignTypedData:
-        return 'eth_signTypedData';
-      case ethSignTypedDataV4:
-        return 'eth_signTypedData_v4';
-      case switchChain:
-        return 'wallet_switchEthereumChain';
-      case addChain:
-        return 'wallet_addEthereumChain';
-      case personalSign:
-        return 'personal_sign';
-      case ethSendTransaction:
-        return 'eth_sendTransaction';
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_id.dart b/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_id.dart
deleted file mode 100644
index c5a3c9d25..000000000
--- a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_id.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-enum SolanaChainId { mainnet, devnet, testnet }
-
-extension SolanaChainIdX on SolanaChainId {
-  String chain() {
-    String name = '';
-
-    switch (this) {
-      case SolanaChainId.mainnet:
-        name = '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ';
-        // '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
-        break;
-      case SolanaChainId.devnet:
-        name = 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1';
-        break;
-      case SolanaChainId.testnet:
-        name = '4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z';
-        break;
-    }
-
-    return 'solana:$name';
-  }
-}
diff --git a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_service.dart b/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_service.dart
deleted file mode 100644
index f7a57b51d..000000000
--- a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_chain_service.dart
+++ /dev/null
@@ -1,273 +0,0 @@
-import 'dart:convert';
-
-import 'package:blockchain_utils/base58/base58.dart';
-import 'package:blockchain_utils/blockchain_utils.dart' as blockchain_utils;
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/solana/solana_supported_methods.dart';
-import 'package:flutter/material.dart';
-import 'package:on_chain/solana/solana.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/solana/solana_chain_id.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/utils/method_utils.dart';
-import 'package:cake_wallet/store/app_store.dart';
-
-class SolanaChainService {
-  Map<String, dynamic Function(String, dynamic)> get solanaRequestHandlers => {
-        SolanaSupportedMethods.solSignMessage.name: solanaSignMessage,
-        SolanaSupportedMethods.solSignTransaction.name: solanaSignTransaction,
-        SolanaSupportedMethods.solSignAllTransaction.name: solanaSignAllTransaction,
-      };
-
-  SolanaChainService({
-    required this.appStore,
-    required this.bottomSheetService,
-    required this.walletKit,
-    required this.wcKeyService,
-    required this.reference,
-  }) {
-    for (var handler in solanaRequestHandlers.entries) {
-      walletKit.registerRequestHandler(
-        chainId: getChainId(),
-        method: handler.key,
-        handler: handler.value,
-      );
-    }
-  }
-
-  final AppStore appStore;
-  final BottomSheetService bottomSheetService;
-  final ReownWalletKit walletKit;
-  final WalletConnectKeyService wcKeyService;
-  final SolanaChainId reference;
-
-  String getChainId() => reference.chain();
-
-  Future<void> solanaSignMessage(String topic, dynamic parameters) async {
-    debugPrint('solanaSignMessage request: $parameters');
-
-    final pRequest = walletKit.pendingRequests.getAll().last;
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    try {
-      final params = parameters as Map<String, dynamic>;
-      final message = params['message'].toString();
-
-      final privateKey = _getSolanaPrivateKey();
-
-      // it's sent as base58 encoded from the dapp
-      final base58Decoded = base58.decode(message);
-      final decodedMessage = utf8.decode(base58Decoded);
-
-      final isApproved = await MethodsUtils.requestApproval(
-        decodedMessage,
-        method: pRequest.method,
-        chainId: pRequest.chainId,
-        address: privateKey.publicKey().toAddress().address,
-        transportType: pRequest.transportType.name,
-      );
-
-      if (isApproved) {
-        final signedBytes = await privateKey.sign(base58Decoded);
-
-        final signature = blockchain_utils.Base58Encoder.encode(signedBytes);
-
-        response = response.copyWith(result: {'signature': signature});
-      } else {
-        final error = Errors.getSdkError(Errors.USER_REJECTED);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-      //
-    } catch (e) {
-      debugPrint('solanaSignMessage error $e');
-      final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-
-      response = response.copyWith(
-        error: JsonRpcError(code: error.code, message: error.message),
-      );
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  Future<void> solanaSignTransaction(String topic, dynamic parameters) async {
-    debugPrint('solanaSignTransaction: ${jsonEncode(parameters)}');
-
-    final pRequest = walletKit.pendingRequests.getAll().last;
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    try {
-      final params = parameters as Map<String, dynamic>;
-      final privateKey = _getSolanaPrivateKey();
-
-      final beautifiedTrx = const JsonEncoder.withIndent('  ').convert(params);
-
-      SolanaTransaction unSignedTransaction;
-      if (params.containsKey('transaction')) {
-        final transaction = params['transaction'] as String;
-        final transactionBytes = base64.decode(transaction);
-        unSignedTransaction = SolanaTransaction.deserialize(transactionBytes);
-      } else {
-        final feePayer = params['feePayer'].toString();
-        final recentBlockHash = params['recentBlockhash'].toString();
-        final instructionsList = params['instructions'] as List<dynamic>;
-
-        final instructions = instructionsList.map((json) {
-          return (json as Map<String, dynamic>).toInstruction();
-        }).toList();
-
-        unSignedTransaction = SolanaTransaction(
-          payerKey: SolAddress(feePayer),
-          instructions: instructions,
-          recentBlockhash: SolAddress(recentBlockHash),
-        );
-      }
-
-      final isApproved = await MethodsUtils.requestApproval(
-        beautifiedTrx,
-        method: pRequest.method,
-        chainId: pRequest.chainId,
-        address: privateKey.publicKey().toAddress().address,
-        transportType: pRequest.transportType.name,
-      );
-
-      if (isApproved) {
-        final signedTx = await privateKey.sign(unSignedTransaction.serializeMessage());
-
-        final signature = Base58Encoder.encode(signedTx.toList(growable: false));
-
-        response = response.copyWith(result: {'signature': signature});
-      } else {
-        final error = Errors.getSdkError(Errors.USER_REJECTED);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } catch (e, s) {
-      debugPrint('solanaSignTransaction error $e, $s');
-      final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-
-      response = response.copyWith(
-        error: JsonRpcError(code: error.code, message: error.message),
-      );
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  Future<void> solanaSignAllTransaction(String topic, dynamic parameters) async {
-    debugPrint('solanaSignAllTransaction: ${jsonEncode(parameters)}');
-
-    final pRequest = walletKit.pendingRequests.getAll().last;
-    var response = JsonRpcResponse(id: pRequest.id, jsonrpc: '2.0');
-
-    try {
-      final params = parameters as Map<String, dynamic>;
-      final beautifiedTrx = const JsonEncoder.withIndent('  ').convert(params);
-
-      final privateKey = _getSolanaPrivateKey();
-
-      final isApproved = await MethodsUtils.requestApproval(
-        beautifiedTrx,
-        method: pRequest.method,
-        chainId: pRequest.chainId,
-        address: privateKey.publicKey().toAddress().address,
-        transportType: pRequest.transportType.name,
-      );
-
-      if (isApproved) {
-        if (params.containsKey('transactions')) {
-          final transactions = params['transactions'] as List<String>;
-
-          List<String> signedTransactions = [];
-          for (var transaction in transactions) {
-            final transactionBytes = base64.decode(transaction);
-
-            final unsignedTx = SolanaTransaction.deserialize(transactionBytes);
-
-            final serializedTx = await privateKey.sign(unsignedTx.serializeMessage());
-
-            unsignedTx.addSignature(privateKey.publicKey().toAddress(), serializedTx);
-
-            final reEncodedTx = unsignedTx.serializeString(
-              encoding: TransactionSerializeEncoding.base64,
-            );
-
-            signedTransactions.add(reEncodedTx);
-          }
-
-          response = response.copyWith(result: {'transactions': signedTransactions});
-        }
-      } else {
-        final error = Errors.getSdkError(Errors.USER_REJECTED);
-        response = response.copyWith(
-          error: JsonRpcError(code: error.code, message: error.message),
-        );
-      }
-    } catch (e, s) {
-      debugPrint('solanaSignAllTransactions error $e, $s');
-      final error = Errors.getSdkError(Errors.MALFORMED_REQUEST_PARAMS);
-
-      response = response.copyWith(
-        error: JsonRpcError(code: error.code, message: error.message),
-      );
-    }
-
-    _handleResponseForTopic(topic, response);
-  }
-
-  SolanaPrivateKey _getSolanaPrivateKey() {
-    final keys = wcKeyService.getKeysForChain(appStore.wallet!);
-
-    return SolanaPrivateKey.fromSeedHex(keys[0].privateKey);
-  }
-
-  void _handleResponseForTopic(String topic, JsonRpcResponse<dynamic> response) async {
-    final session = walletKit.sessions.get(topic);
-
-    try {
-      await walletKit.respondSessionRequest(topic: topic, response: response);
-
-      MethodsUtils.handleRedirect(
-        topic,
-        session!.peer.metadata.redirect,
-        response.error?.message,
-        response.error == null,
-      );
-    } on ReownSignError catch (error) {
-      MethodsUtils.handleRedirect(
-        topic,
-        session!.peer.metadata.redirect,
-        error.message,
-      );
-    }
-  }
-}
-
-extension on Map<String, dynamic> {
-  TransactionInstruction toInstruction() {
-    final programId = this['programId'] as String;
-
-    final data = (this['data'] as List).map((e) => e as int).toList();
-    // final data58 = base58.encode(Uint8List.fromList(data));
-    // final dataBytes = ByteArray.fromBase58(data58);
-
-    final keys = this['keys'] as List;
-    return TransactionInstruction.fromBytes(
-      programId: SolAddress(programId),
-      instructionBytes: data,
-      keys: keys.map((k) {
-        final kParams = (k as Map<String, dynamic>);
-        return AccountMeta(
-          publicKey:
-              SolanaPublicKey.fromBytes(base58.decode(kParams['pubkey'] as String)).toAddress(),
-          isWritable: kParams['isWritable'] as bool,
-          isSigner: kParams['isSigner'] as bool,
-        );
-      }).toList(),
-    );
-  }
-}
diff --git a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_supported_methods.dart b/lib/src/screens/wallet_connect/services/chain_service/solana/solana_supported_methods.dart
deleted file mode 100644
index c51482d3a..000000000
--- a/lib/src/screens/wallet_connect/services/chain_service/solana/solana_supported_methods.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-enum SolanaSupportedMethods {
-  solSignMessage,
-  solSignTransaction,
-  solSignAllTransaction;
-
-  String get name {
-    switch (this) {
-      case solSignMessage:
-        return 'solana_signMessage';
-      case solSignTransaction:
-        return 'solana_signTransaction';
-      case solSignAllTransaction:
-        return 'solana_signAllTransactions';
-    }
-  }
-}
diff --git a/lib/src/screens/wallet_connect/services/key_service/chain_key_model.dart b/lib/src/screens/wallet_connect/services/key_service/chain_key_model.dart
deleted file mode 100644
index e85c31ac3..000000000
--- a/lib/src/screens/wallet_connect/services/key_service/chain_key_model.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'dart:convert';
-
-class ChainKeyModel {
-  final List<String> chains;
-  final String privateKey;
-  final String publicKey;
-
-  ChainKeyModel({
-    required this.chains,
-    required this.privateKey,
-    required this.publicKey,
-  });
-
-  String get namespace {
-    if (chains.isNotEmpty) {
-      return chains.first.split(':').first;
-    }
-    return '';
-  }
-
-  Map<String, dynamic> toJson() => {
-        'chains': chains,
-        'privateKey': privateKey,
-        'publicKey': privateKey,
-      };
-
-  factory ChainKeyModel.fromJson(Map<String, dynamic> json) {
-    return ChainKeyModel(
-      chains: (json['chains'] as List).map((e) => '$e').toList(),
-      privateKey: json['privateKey'] as String,
-      publicKey: json['publicKey'] as String,
-    );
-  }
-
-  @override
-  String toString() => jsonEncode(toJson());
-}
diff --git a/lib/src/screens/wallet_connect/services/walletkit_service.dart b/lib/src/screens/wallet_connect/services/walletkit_service.dart
deleted file mode 100644
index 4c25032a4..000000000
--- a/lib/src/screens/wallet_connect/services/walletkit_service.dart
+++ /dev/null
@@ -1,624 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:cw_core/wallet_type.dart';
-import 'package:eth_sig_util/util/utils.dart';
-import 'package:flutter/material.dart';
-import 'package:mobx/mobx.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-import 'package:cake_wallet/.secrets.g.dart' as secrets;
-import 'package:cake_wallet/entities/preferences_key.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/reactions/wallet_connect.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/eth/evm_chain_id.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/chain_service/eth/evm_chain_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/chain_key_model.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/utils/eth_utils.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/utils/method_utils.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_connection_request_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_message_display_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_request_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_session_auth_request_widget.dart';
-import 'package:cake_wallet/store/app_store.dart';
-
-import 'bottom_sheet_service.dart';
-import 'chain_service/solana/solana_chain_id.dart';
-import 'chain_service/solana/solana_chain_service.dart';
-
-part 'walletkit_service.g.dart';
-
-class WalletKitService = WalletKitServiceBase with _$WalletKitService;
-
-abstract class WalletKitServiceBase with Store {
-  WalletKitServiceBase(
-    this._bottomSheetHandler,
-    this.walletKeyService,
-    this.appStore,
-    this.sharedPreferences,
-  )   : pairings = ObservableList<PairingInfo>(),
-        sessions = ObservableList<SessionData>(),
-        auth = ObservableList<PendingSessionAuthRequest>(),
-        isInitialized = false;
-
-  final AppStore appStore;
-  final SharedPreferences sharedPreferences;
-  final BottomSheetService _bottomSheetHandler;
-  final WalletConnectKeyService walletKeyService;
-
-  late ReownWalletKit _walletKit;
-
-  @observable
-  bool isInitialized;
-
-  /// The list of requests from the dapp
-  /// Potential types include, but aren't limited to:
-  /// [SessionProposalEvent], [SessionAuthRequest]
-  @observable
-  ObservableList<PairingInfo> pairings;
-
-  @observable
-  ObservableList<SessionData> sessions;
-
-  @observable
-  ObservableList<PendingSessionAuthRequest> auth;
-
-  @action
-  void create() {
-    // Create the walletkit client
-    _walletKit = ReownWalletKit(
-      core: ReownCore(
-        projectId: secrets.walletConnectProjectId,
-      ),
-      metadata: const PairingMetadata(
-        name: 'Cake Wallet',
-        description: 'Cake Wallet',
-        url: 'https://cakewallet.com',
-        icons: ['https://cakewallet.com/assets/image/cake_logo.png'],
-        redirect: Redirect(native: 'cakewallet://'),
-      ),
-    );
-
-    _walletKit.core.addLogListener(_logListener);
-
-    // Setup our listeners
-    log('Created instance of walletKit');
-
-    _walletKit.core.pairing.onPairingInvalid.subscribe(_onPairingInvalid);
-    _walletKit.core.pairing.onPairingCreate.subscribe(_onPairingCreate);
-    _walletKit.core.relayClient.onRelayClientError.subscribe(_onRelayClientError);
-    _walletKit.core.relayClient.onRelayClientMessage.subscribe(_onRelayClientMessage);
-
-    _walletKit.onSessionProposal.subscribe(_onSessionProposal);
-    _walletKit.onSessionProposalError.subscribe(_onSessionProposalError);
-    _walletKit.onSessionConnect.subscribe(_onSessionConnect);
-    _walletKit.onSessionAuthRequest.subscribe(_onSessionAuthRequest);
-
-    _walletKit.pairings.onSync.subscribe(_onPairingsSync);
-    _walletKit.core.pairing.onPairingDelete.subscribe(_onPairingDelete);
-    _walletKit.core.pairing.onPairingExpire.subscribe(_onPairingDelete);
-
-    // Setup our accounts
-    List<ChainKeyModel> chainKeys = walletKeyService.getKeys(appStore.wallet!);
-    for (final chainKey in chainKeys) {
-      for (final chainId in chainKey.chains) {
-        final chainNameSpace = getChainNameSpaceAndIdBasedOnWalletType(appStore.wallet!.type);
-        if (chainNameSpace == chainId) {
-          final account = '$chainId:${chainKey.publicKey}';
-          debugPrint('registerAccount $account');
-          _walletKit.registerAccount(
-            chainId: chainId,
-            accountAddress: chainKey.publicKey,
-          );
-        }
-      }
-    }
-  }
-
-  void _logListener(String event) {
-    debugPrint('[WalletKit] $event');
-  }
-
-  @action
-  Future<void> init() async {
-    // Await the initialization of walletKit
-    debugPrint('Intializing walletKit');
-    if (!isInitialized) {
-      try {
-        await _walletKit.init();
-        debugPrint('Initialized');
-        isInitialized = true;
-      } catch (e) {
-        debugPrint('init Error: ${e.toString()}');
-        isInitialized = false;
-      }
-    }
-
-    await _emitEvent();
-
-    _refreshPairings();
-
-    final newSessions = _walletKit.sessions.getAll();
-    sessions.addAll(newSessions);
-
-    final newAuthRequests = _walletKit.sessionAuthRequests.getAll();
-    auth.addAll(newAuthRequests);
-
-    if (isEVMCompatibleChain(appStore.wallet!.type)) {
-      for (final cId in EVMChainId.values) {
-        EvmChainServiceImpl(
-          reference: cId,
-          appStore: appStore,
-          wcKeyService: walletKeyService,
-          bottomSheetService: _bottomSheetHandler,
-          walletKit: _walletKit,
-        );
-      }
-    }
-
-    if (appStore.wallet!.type == WalletType.solana) {
-      for (final cId in SolanaChainId.values) {
-        SolanaChainService(
-          reference: cId,
-          appStore: appStore,
-          wcKeyService: walletKeyService,
-          bottomSheetService: _bottomSheetHandler,
-          walletKit: _walletKit,
-        );
-      }
-    }
-  }
-
-  @action
-  Future<void> _emitEvent() async {
-    final isOnline = _walletKit.core.connectivity.isOnline.value;
-    if (!isOnline) {
-      await Future.delayed(const Duration(milliseconds: 500));
-      _emitEvent();
-      return;
-    }
-
-    final sessions = _walletKit.sessions.getAll();
-    for (var session in sessions) {
-      final chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-      for (var chain in chainKeys) {
-        for (var chainID in chain.chains) {
-          try {
-            final events = NamespaceUtils.getNamespacesEventsForChain(
-              chainId: chainID,
-              namespaces: session.namespaces,
-            );
-            if (events.contains('accountsChanged')) {
-              final chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-              _walletKit.emitSessionEvent(
-                topic: session.topic,
-                chainId: chainID,
-                event: SessionEventParams(
-                  name: 'accountsChanged',
-                  data: [chainKeys.first.publicKey],
-                ),
-              );
-            }
-          } catch (_) {}
-        }
-      }
-    }
-  }
-
-  @action
-  FutureOr<void> onDispose() {
-    log('walletKit dispose');
-    _walletKit.core.removeLogListener(_logListener);
-
-    _walletKit.core.pairing.onPairingInvalid.unsubscribe(_onPairingInvalid);
-    _walletKit.core.pairing.onPairingCreate.unsubscribe(_onPairingCreate);
-    _walletKit.core.relayClient.onRelayClientError.unsubscribe(_onRelayClientError);
-    _walletKit.core.relayClient.onRelayClientMessage.unsubscribe(_onRelayClientMessage);
-
-    _walletKit.onSessionProposal.unsubscribe(_onSessionProposal);
-    _walletKit.onSessionProposalError.unsubscribe(_onSessionProposalError);
-    _walletKit.onSessionConnect.unsubscribe(_onSessionConnect);
-    _walletKit.onSessionAuthRequest.unsubscribe(_onSessionAuthRequest);
-
-    _walletKit.pairings.onSync.unsubscribe(_onPairingsSync);
-    _walletKit.core.pairing.onPairingDelete.unsubscribe(_onPairingDelete);
-    _walletKit.core.pairing.onPairingExpire.unsubscribe(_onPairingDelete);
-
-    isInitialized = false;
-  }
-
-  ReownWalletKit get walletKit => _walletKit;
-
-  void _onRelayClientMessage(MessageEvent? event) async {
-    if (event != null) {
-      final jsonObject = await EthUtils.decodeMessageEvent(event);
-      debugPrint('_onRelayClientMessage $jsonObject');
-
-      if (jsonObject is JsonRpcRequest) {
-        debugPrint(jsonObject.id.toString());
-        debugPrint(jsonObject.method);
-
-        if (jsonObject.method == 'wc_sessionDelete') {
-          await disconnectSession(topic: event.topic);
-        }
-      }
-    }
-  }
-
-  void _onPairingsSync(StoreSyncEvent? args) {
-    if (args != null) {
-      _refreshPairings();
-    }
-  }
-
-  void _onPairingDelete(PairingEvent? event) {
-    _refreshPairings();
-  }
-
-  @action
-  Future<void> _onSessionProposal(SessionProposalEvent? args) async {
-    debugPrint('_onSessionProposal ${jsonEncode(args?.params)}');
-
-    if (args != null) {
-      final proposer = args.params.proposer;
-      final result = (await _bottomSheetHandler.queueBottomSheet(
-            widget: WCRequestWidget(
-              verifyContext: args.verifyContext,
-              child: WCConnectionRequestWidget(
-                proposalData: args.params,
-                verifyContext: args.verifyContext,
-                requester: proposer,
-                walletKeyService: walletKeyService,
-                walletKit: walletKit,
-                appStore: appStore,
-              ),
-            ),
-          )) ??
-          WCBottomSheetResult.reject;
-
-      if (result != WCBottomSheetResult.reject) {
-        try {
-          await _walletKit.approveSession(
-            id: args.id,
-            namespaces: NamespaceUtils.regenerateNamespacesWithChains(
-              args.params.generatedNamespaces!,
-            ),
-            sessionProperties: args.params.sessionProperties,
-          );
-        } on ReownSignError catch (error) {
-          MethodsUtils.handleRedirect(
-            '',
-            proposer.metadata.redirect,
-            error.message,
-          );
-        }
-      } else {
-        final error = Errors.getSdkError(Errors.USER_REJECTED).toSignError();
-        await _walletKit.rejectSession(id: args.id, reason: error);
-        await _walletKit.core.pairing.disconnect(topic: args.params.pairingTopic);
-        MethodsUtils.handleRedirect(
-          '',
-          proposer.metadata.redirect,
-          error.message,
-        );
-      }
-    }
-  }
-
-  @action
-  Future<void> _onSessionProposalError(SessionProposalErrorEvent? args) async {
-    debugPrint('_onSessionProposalError $args');
-
-    if (args != null) {
-      String errorMessage = args.error.message;
-      if (args.error.code == 5100) {
-        errorMessage =
-            errorMessage.replaceFirst('${S.current.requested}:', '\n\n${S.current.requested}:');
-        errorMessage =
-            errorMessage.replaceFirst('${S.current.supported}:', '\n\n${S.current.supported}:');
-      }
-      MethodsUtils.goBackModal(
-        title: S.current.error,
-        message: errorMessage,
-        success: false,
-      );
-    }
-  }
-
-  @action
-  Future<void> _onSessionConnect(SessionConnect? args) async {
-    if (args != null) {
-      final session = jsonEncode(args.session.toJson());
-
-      debugPrint('_onSessionConnect $session');
-
-      await savePairingTopicToLocalStorage(args.session.pairingTopic);
-
-      sessions.add(args.session);
-
-      _refreshPairings();
-
-      MethodsUtils.handleRedirect(
-        args.session.topic,
-        args.session.peer.metadata.redirect,
-        '',
-        true,
-      );
-    }
-  }
-
-  @action
-  void _onRelayClientError(ErrorEvent? args) {
-    debugPrint('_onRelayClientError ${args?.error}');
-    //  _bottomSheetHandler.queueBottomSheet(
-    //     isModalDismissible: true,
-    //     widget: BottomSheetMessageDisplayWidget(
-    //       message: "WC RelayClient Error: ${args?.error}",
-    //     ),
-    //   );
-  }
-
-  @action
-  void _onPairingInvalid(PairingInvalidEvent? args) {
-    debugPrint('_onPairingInvalid $args');
-    _bottomSheetHandler.queueBottomSheet(
-      isModalDismissible: true,
-      widget: BottomSheetMessageDisplayWidget(
-        message: '${S.current.pairingInvalidEvent}: $args',
-      ),
-    );
-  }
-
-  @action
-  void _onPairingCreate(PairingEvent? args) {
-    debugPrint('_onPairingCreate $args');
-  }
-
-  Future<void> _onSessionAuthRequest(SessionAuthRequest? args) async {
-    if (args != null) {
-      final SessionAuthPayload authPayload = args.authPayload;
-      final jsonPyaload = jsonEncode(authPayload.toJson());
-
-      debugPrint('_onSessionAuthRequest $jsonPyaload');
-
-      final chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-      final supportedChains = chainKeys.first.chains;
-      final supportedMethods = getChainSupportedMethodsOnWalletType(appStore.wallet!.type);
-
-      final newAuthPayload = AuthSignature.populateAuthPayload(
-        authPayload: authPayload,
-        chains: supportedChains.toList(),
-        methods: supportedMethods.toList(),
-      );
-      final cacaoRequestPayload = CacaoRequestPayload.fromSessionAuthPayload(
-        newAuthPayload,
-      );
-
-      final List<Map<String, dynamic>> formattedMessages = [];
-      for (var chain in newAuthPayload.chains) {
-        final chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-        final iss = 'did:pkh:$chain:${chainKeys.first.publicKey}';
-
-        final message = _walletKit.formatAuthMessage(
-          iss: iss,
-          cacaoPayload: cacaoRequestPayload,
-        );
-        formattedMessages.add({iss: message});
-      }
-
-      final WCBottomSheetResult result = (await _bottomSheetHandler.queueBottomSheet(
-            widget: WCSessionAuthRequestWidget(
-              child: WCConnectionRequestWidget(
-                sessionAuthPayload: newAuthPayload,
-                verifyContext: args.verifyContext,
-                requester: args.requester,
-                walletKeyService: walletKeyService,
-                walletKit: _walletKit,
-                appStore: appStore,
-              ),
-            ),
-          ) as WCBottomSheetResult?) ??
-          WCBottomSheetResult.reject;
-
-      if (result != WCBottomSheetResult.reject) {
-        final chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-        final privateKey = '0x${chainKeys.first.privateKey}';
-        final credentials = EthPrivateKey.fromHex(privateKey);
-        //
-        final messageToSign = formattedMessages.length;
-        final count = (result == WCBottomSheetResult.one) ? 1 : messageToSign;
-        //
-        final List<Cacao> cacaos = [];
-        for (var i = 0; i < count; i++) {
-          final iss = formattedMessages[i].keys.first;
-          final message = formattedMessages[i].values.first as String;
-
-          final signature = credentials.signPersonalMessageToUint8List(
-            Uint8List.fromList(message.codeUnits),
-          );
-          final hexSignature = bytesToHex(signature, include0x: true);
-
-          cacaos.add(
-            AuthSignature.buildAuthObject(
-              requestPayload: cacaoRequestPayload,
-              signature: CacaoSignature(t: CacaoSignature.EIP191, s: hexSignature),
-              iss: iss,
-            ),
-          );
-        }
-        //
-        try {
-          final session = await _walletKit.approveSessionAuthenticate(
-            id: args.id,
-            auths: cacaos,
-          );
-
-          debugPrint('_onSessionAuthRequest - approveSessionAuthenticate $session');
-
-          MethodsUtils.handleRedirect(
-            session.topic,
-            session.session?.peer.metadata.redirect,
-            '',
-            true,
-          );
-        } on ReownSignError catch (error) {
-          MethodsUtils.handleRedirect(
-            args.topic,
-            args.requester.metadata.redirect,
-            error.message,
-          );
-        }
-      } else {
-        final error = Errors.getSdkError(Errors.USER_REJECTED_AUTH);
-        await _walletKit.rejectSessionAuthenticate(
-          id: args.id,
-          reason: error.toSignError(),
-        );
-        MethodsUtils.handleRedirect(
-          args.topic,
-          args.requester.metadata.redirect,
-          error.message,
-        );
-      }
-    }
-  }
-
-  @action
-  Future<void> deletePairing({required String topic}) async {
-    final topicSessions = sessions.where((element) => element.pairingTopic == topic);
-
-    await _walletKit.core.pairing.disconnect(topic: topic);
-    for (var session in topicSessions) {
-      await _walletKit.disconnectSession(
-        topic: session.topic,
-        reason: Errors.getSdkError(Errors.USER_DISCONNECTED).toSignError(),
-      );
-    }
-  }
-
-  @action
-  Future<void> disconnectSession({required String topic}) async {
-    await walletKit.disconnectSession(
-      topic: topic,
-      reason: Errors.getSdkError(Errors.USER_DISCONNECTED).toSignError(),
-    );
-  }
-
-  @action
-  Future<void> updateSession({
-    required String topic,
-    required Map<String, Namespace> namespaces,
-  }) async {
-    await walletKit.updateSession(topic: topic, namespaces: namespaces);
-  }
-
-  @action
-  Future<void> extendSession({required String topic}) async {
-    await walletKit.extendSession(topic: topic);
-  }
-
-  @action
-  Future<void> pairWithUri(Uri uri) async {
-    try {
-      debugPrint('pairWithUri - Pairing with URI: $uri');
-      await _walletKit.pair(uri: uri);
-    } on ReownSignError catch (e) {
-      _bottomSheetHandler.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(message: e.message),
-      );
-    } catch (e) {
-      _bottomSheetHandler.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(message: e.toString()),
-      );
-    }
-  }
-
-  @action
-  void _refreshPairings() {
-    debugPrint('_refreshPairings - Refreshing pairings');
-
-    pairings.clear();
-
-    final allPairings = _walletKit.pairings.getAll();
-
-    final keyForWallet = getKeyForStoringTopicsForWallet();
-
-    if (keyForWallet.isEmpty) return;
-
-    final currentTopicsForWallet = getPairingTopicsForWallet(keyForWallet);
-
-    final filteredPairings = allPairings.where(
-      (pairing) {
-        bool isInCurrentTopics = currentTopicsForWallet.contains(pairing.topic);
-        bool isActive = pairing.active;
-
-        return isInCurrentTopics && isActive;
-      },
-    ).toList();
-
-    pairings.addAll(filteredPairings);
-  }
-
-  @action
-  List<SessionData> getSessionsForPairingInfo(PairingInfo pairing) {
-    return sessions.where((element) => element.pairingTopic == pairing.topic).toList();
-  }
-
-  String getKeyForStoringTopicsForWallet() {
-    List<ChainKeyModel> chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-
-    if (chainKeys.isEmpty) {
-      return '';
-    }
-
-    final keyForPairingTopic =
-        PreferencesKey.walletConnectPairingTopicsListForWallet(chainKeys.first.publicKey);
-
-    return keyForPairingTopic;
-  }
-
-  List<String> getPairingTopicsForWallet(String key) {
-    // Get the JSON-encoded string from shared preferences
-    final jsonString = sharedPreferences.getString(key);
-
-    // If the string is null, return an empty list
-    if (jsonString == null) {
-      return [];
-    }
-
-    // Decode the JSON string to a list of strings
-    final List<dynamic> jsonList = jsonDecode(jsonString) as List<dynamic>;
-
-    // Cast each item to a string
-    return jsonList.map((item) => item as String).toList();
-  }
-
-  Future<void> savePairingTopicToLocalStorage(String pairingTopic) async {
-    // Get key specific to the current wallet
-    final key = getKeyForStoringTopicsForWallet();
-
-    if (key.isEmpty) return;
-
-    // Get all pairing topics attached to this key
-    final pairingTopicsForWallet = getPairingTopicsForWallet(key);
-
-    bool isPairingTopicAlreadySaved = pairingTopicsForWallet.contains(pairingTopic);
-    debugPrint('Is Pairing Topic Saved: $isPairingTopicAlreadySaved');
-
-    if (!isPairingTopicAlreadySaved) {
-      // Update the list with the most recent pairing topic
-      pairingTopicsForWallet.add(pairingTopic);
-
-      // Convert the list of updated pairing topics to a JSON-encoded string
-      final jsonString = jsonEncode(pairingTopicsForWallet);
-
-      // Save the encoded string to shared preferences
-      await sharedPreferences.setString(key, jsonString);
-    }
-  }
-}
diff --git a/lib/src/screens/wallet_connect/utils/eth_utils.dart b/lib/src/screens/wallet_connect/utils/eth_utils.dart
deleted file mode 100644
index 766182b75..000000000
--- a/lib/src/screens/wallet_connect/utils/eth_utils.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-import 'dart:convert';
-
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart';
-import 'package:convert/convert.dart';
-import 'package:flutter/foundation.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-class EthUtils {
-  static String getUtf8Message(String maybeHex) {
-    if (maybeHex.startsWith('0x')) {
-      final List<int> decoded = hex.decode(
-        maybeHex.substring(2),
-      );
-      return utf8.decode(decoded);
-    }
-
-    return maybeHex;
-  }
-
-  static String? getAddressFromSessionRequest(SessionRequest request) {
-    try {
-      final paramsList = List<String?>.from((request.params as List));
-      if (request.method == 'personal_sign') {
-        // for `personal_sign` first value in params has to be always the message
-        paramsList.removeAt(0);
-      }
-
-      return paramsList.firstWhere((p) {
-        try {
-          EthereumAddress.fromHex(p ?? '');
-          return true;
-        } catch (e) {
-          return false;
-        }
-      });
-    } catch (e) {
-      debugPrint(e.toString());
-      return null;
-    }
-  }
-
-  static dynamic getDataFromSessionRequest(SessionRequest request) {
-    try {
-      final paramsList = List.from((request.params as List));
-      if (request.method == 'personal_sign') {
-        return paramsList.first;
-      }
-      return paramsList.firstWhere((p) {
-        final address = getAddressFromSessionRequest(request);
-        return p != address;
-      });
-    } catch (e) {
-      debugPrint('getDataFromSessionRequest $e');
-      return null;
-    }
-  }
-
-  static Map<String, dynamic>? getTransactionFromSessionRequest(
-    SessionRequest request,
-  ) {
-    try {
-      final param = (request.params as List<dynamic>).first;
-      return param as Map<String, dynamic>;
-    } catch (e) {
-      debugPrint('getTransactionFromSessionRequest $e');
-      return null;
-    }
-  }
-
-  static Future<dynamic> decodeMessageEvent(MessageEvent event) async {
-    final walletKit = getIt<WalletKitService>().walletKit;
-
-    final payloadString = await walletKit.core.crypto.decode(
-      event.topic,
-      event.message,
-    );
-
-    if (payloadString == null) return null;
-
-    final data = jsonDecode(payloadString) as Map<String, dynamic>;
-    if (data.containsKey('method')) {
-      return JsonRpcRequest.fromJson(data);
-    } else {
-      return JsonRpcResponse.fromJson(data);
-    }
-  }
-}
diff --git a/lib/src/screens/wallet_connect/utils/method_utils.dart b/lib/src/screens/wallet_connect/utils/method_utils.dart
deleted file mode 100644
index 5c4027a2b..000000000
--- a/lib/src/screens/wallet_connect/utils/method_utils.dart
+++ /dev/null
@@ -1,146 +0,0 @@
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/models/wc_connection_model.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_connection_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_request_widget.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
-import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-class MethodsUtils {
-  static final walletKit = getIt.get<WalletKitService>().walletKit;
-  static final bottomSheetService = getIt.get<BottomSheetService>();
-
-  static Future<bool> requestApproval(
-    String text, {
-    String? title,
-    String? method,
-    String? chainId,
-    String? address,
-    required String transportType,
-    List<WCConnectionModel> extraModels = const [],
-    VerifyContext? verifyContext,
-  }) async {
-    final WCBottomSheetResult result = (await bottomSheetService.queueBottomSheet(
-          widget: WCRequestWidget(
-            verifyContext: verifyContext,
-            child: WCConnectionWidget(
-              title: title ?? S.current.approve_request,
-              info: [
-                WCConnectionModel(
-                  title: '${S.current.method}: $method\n'
-                      '${S.current.transport_type}: ${transportType.toUpperCase()}\n'
-                      '${S.current.chain_id}: $chainId\n'
-                      '${S.current.address}: $address\n\n'
-                      '${S.current.message}:',
-                  elements: [text],
-                ),
-                ...extraModels,
-              ],
-            ),
-          ),
-        ) as WCBottomSheetResult?) ??
-        WCBottomSheetResult.reject;
-
-    return result != WCBottomSheetResult.reject;
-  }
-
-  static void handleRedirect(
-    String topic,
-    Redirect? redirect, [
-    String? error,
-    bool success = false,
-  ]) {
-    debugPrint('handleRedirect topic: $topic, redirect: $redirect, error: $error');
-    openApp(
-      topic,
-      redirect,
-      onFail: (e) => goBackModal(
-        title: success ? S.current.success : S.current.error,
-        message: error,
-        success: success,
-      ),
-    );
-  }
-
-  static void openApp(
-    String topic,
-    Redirect? redirect, {
-    int delay = 100,
-    Function(ReownSignError? error)? onFail,
-  }) async {
-    await Future.delayed(Duration(milliseconds: delay));
-    try {
-      await walletKit.redirectToDapp(
-        topic: topic,
-        redirect: redirect,
-      );
-    } on ReownSignError catch (e) {
-      onFail?.call(e);
-    }
-  }
-
-  static void goBackModal({
-    String? title,
-    String? message,
-    bool success = true,
-  }) async {
-    await bottomSheetService.queueBottomSheet(
-      closeAfter: success ? 3 : 0,
-      widget: GoBackModalWidget(
-        isSuccess: success,
-        title: title,
-        message: message,
-      ),
-    );
-  }
-}
-
-class GoBackModalWidget extends StatelessWidget {
-  const GoBackModalWidget({
-    required this.isSuccess,
-    this.message,
-    this.title,
-    super.key,
-  });
-
-  final bool isSuccess;
-  final String? title;
-  final String? message;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      color: Theme.of(context).colorScheme.surface,
-      height: 280.0,
-      width: double.infinity,
-      padding: const EdgeInsets.all(20.0),
-      child: Column(
-        children: [
-          Icon(
-            isSuccess ? Icons.check_circle_sharp : Icons.error_outline_sharp,
-            color: isSuccess
-                ? CustomThemeColors.syncGreen
-                : Theme.of(context).colorScheme.errorContainer,
-            size: 80.0,
-          ),
-          Text(
-            title ?? S.current.connected,
-            style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                  fontSize: 18.0,
-                  fontWeight: FontWeight.w600,
-                ),
-          ),
-          Text(
-            message ?? S.current.youCanGoBackToYourDapp,
-            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  fontSize: 16.0,
-                ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/src/screens/wallet_connect/utils/namespace_model_builder.dart b/lib/src/screens/wallet_connect/utils/namespace_model_builder.dart
index 26cb3bbcf..936df93d3 100644
--- a/lib/src/screens/wallet_connect/utils/namespace_model_builder.dart
+++ b/lib/src/screens/wallet_connect/utils/namespace_model_builder.dart
@@ -1,76 +1,71 @@
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/models/wc_connection_model.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_connection_widget.dart';
-import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_widget.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+
+import '../../../../core/wallet_connect/models/connection_model.dart';
 
 class ConnectionWidgetBuilder {
-  static List<WCConnectionWidget> buildFromRequiredNamespaces(
-    Map<String, Namespace> generatedNamespaces,
+  static List<ConnectionWidget> buildFromRequiredNamespaces(
+    Map<String, RequiredNamespace> requiredNamespaces,
   ) {
-    final List<WCConnectionWidget> views = [];
-    for (final key in generatedNamespaces.keys) {
-      final namespaces = generatedNamespaces[key]!;
-      final chains = NamespaceUtils.getChainsFromAccounts(namespaces.accounts);
-
-      final List<WCConnectionModel> models = [];
-
+    final List<ConnectionWidget> views = [];
+    for (final key in requiredNamespaces.keys) {
+      RequiredNamespace ns = requiredNamespaces[key]!;
+      final List<ConnectionModel> models = [];
       // If the chains property is present, add the chain data to the models
-      models.add(WCConnectionModel(title: S.current.chains, elements: chains));
-      models.add(WCConnectionModel(title: S.current.methods, elements: namespaces.methods));
-
-      if (namespaces.events.isNotEmpty) {
-        models.add(WCConnectionModel(title: S.current.events, elements: namespaces.events));
+      if (ns.chains != null) {
+        models.add(ConnectionModel(title: S.current.chains, elements: ns.chains!));
       }
+      models.add(ConnectionModel(title: S.current.methods, elements: ns.methods));
+      models.add(ConnectionModel(title: S.current.events, elements: ns.events));
 
-      views.add(WCConnectionWidget(title: key, info: models));
+      views.add(ConnectionWidget(title: key, info: models));
     }
 
     return views;
   }
 
-  static List<WCConnectionWidget> buildFromNamespaces(
+  static List<ConnectionWidget> buildFromNamespaces(
     String topic,
     Map<String, Namespace> namespaces,
-    BuildContext context,
+    Web3Wallet web3wallet,
   ) {
-    final List<WCConnectionWidget> views = [];
+    final List<ConnectionWidget> views = [];
     for (final key in namespaces.keys) {
-      final ns = namespaces[key]!;
-      final List<WCConnectionModel> models = [];
-
+      final Namespace ns = namespaces[key]!;
+      final List<ConnectionModel> models = [];
       // If the chains property is present, add the chain data to the models
-      models.add(WCConnectionModel(title: S.current.accounts, elements: ns.accounts));
-      models.add(WCConnectionModel(title: S.current.methods, elements: ns.methods));
+      models.add(
+        ConnectionModel(
+          title: S.current.chains,
+          elements: ns.accounts,
+        ),
+      );
+      models.add(ConnectionModel(
+        title: S.current.methods,
+        elements: ns.methods,
+      ));
 
-      if (ns.events.isNotEmpty) {
-        models.add(WCConnectionModel(title: S.current.events, elements: ns.events));
+      Map<String, void Function()> actions = {};
+      for (final String event in ns.events) {
+        actions[event] = () async {
+          final String chainId = NamespaceUtils.isValidChainId(key)
+              ? key
+              : NamespaceUtils.getChainFromAccount(ns.accounts.first);
+          await web3wallet.emitSessionEvent(
+            topic: topic,
+            chainId: chainId,
+            event: SessionEventParams(name: event, data: '${S.current.event}: $event'),
+          );
+        };
       }
+      models.add(
+        ConnectionModel(title: S.current.events, elements: ns.events, elementActions: actions),
+      );
 
-      views.add(WCConnectionWidget(title: key, info: models));
+      views.add(ConnectionWidget(title: key, info: models));
     }
 
     return views;
   }
-
-  static Map<String, Namespace> updateNamespaces(
-    Map<String, Namespace> currentNamespaces,
-    String namespace,
-    List<String> newChains,
-  ) {
-    final updatedNamespaces = Map<String, Namespace>.from(currentNamespaces);
-
-    final accounts = currentNamespaces[namespace]!.accounts;
-    final address = NamespaceUtils.getAccount(accounts.first);
-    final newAccounts = newChains.map((c) => '$c:$address').toList();
-
-    final newNamespaces = currentNamespaces[namespace]!.copyWith(
-      chains: NamespaceUtils.getChainsFromAccounts(accounts)..addAll(newChains),
-      accounts: List<String>.from(accounts)..addAll(newAccounts),
-    );
-
-    updatedNamespaces[namespace] = newNamespaces;
-
-    return updatedNamespaces;
-  }
 }
diff --git a/lib/src/screens/wallet_connect/utils/string_parsing.dart b/lib/src/screens/wallet_connect/utils/string_parsing.dart
index bb36e1879..0aed1b9e9 100644
--- a/lib/src/screens/wallet_connect/utils/string_parsing.dart
+++ b/lib/src/screens/wallet_connect/utils/string_parsing.dart
@@ -1,6 +1,20 @@
+import 'dart:convert';
 import 'dart:math';
 
+import 'package:convert/convert.dart';
+
 extension StringParsing on String {
+  String get utf8Message {
+    if (startsWith('0x')) {
+      final List<int> decoded = hex.decode(
+        substring(2),
+      );
+      return utf8.decode(decoded);
+    }
+
+    return this;
+  }
+
   String safeSubString(int start, int end) {
     return this.substring(0, min(this.toString().length, 12));
   }
diff --git a/lib/src/screens/wallet_connect/wc_connections_listing_view.dart b/lib/src/screens/wallet_connect/wc_connections_listing_view.dart
index 9fcdb61fc..3a78f6af6 100644
--- a/lib/src/screens/wallet_connect/wc_connections_listing_view.dart
+++ b/lib/src/screens/wallet_connect/wc_connections_listing_view.dart
@@ -1,25 +1,27 @@
+import 'dart:developer';
+import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/widgets/enter_wallet_connect_uri_widget.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:permission_handler/permission_handler.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/utils/permission_handler.dart';
 
-import 'widgets/wc_pairing_item_widget.dart';
+import 'widgets/pairing_item_widget.dart';
 import 'wc_pairing_detail_page.dart';
 
 class WalletConnectConnectionsView extends StatelessWidget {
-  final WalletKitService walletKitService;
+  final Web3WalletService web3walletService;
 
-  WalletConnectConnectionsView({required this.walletKitService, Uri? launchUri, Key? key})
+  WalletConnectConnectionsView({required this.web3walletService, Uri? launchUri, Key? key})
       : super(key: key) {
     _triggerPairingFromDeeplink(launchUri);
   }
@@ -37,38 +39,42 @@ class WalletConnectConnectionsView extends StatelessWidget {
 
     final uriData = Uri.parse(uri);
 
-    await walletKitService.pairWithUri(uriData);
+    await web3walletService.pairWithUri(uriData);
   }
 
   @override
   Widget build(BuildContext context) {
-    return WCPairingsWidget(walletKitService: walletKitService);
+    return WCPairingsWidget(web3walletService: web3walletService);
   }
 }
 
 class WCPairingsWidget extends BasePage {
-  WCPairingsWidget({required this.walletKitService, Key? key})
-      : walletKit = walletKitService.walletKit;
+  WCPairingsWidget({required this.web3walletService, Key? key})
+      : web3wallet = web3walletService.getWeb3Wallet();
 
-  final ReownWalletKit walletKit;
-  final WalletKitService walletKitService;
+  final Web3Wallet web3wallet;
+  final Web3WalletService web3walletService;
 
   @override
   String get title => S.current.walletConnect;
 
-  Future<void> _onScanQrCode(BuildContext context, ReownWalletKit web3Wallet) async {
+  Future<void> _onScanQrCode(BuildContext context, Web3Wallet web3Wallet) async {
     final String? uri;
 
     if (DeviceInfo.instance.isMobile) {
       bool isCameraPermissionGranted =
-          await PermissionHandler.checkPermission(Permission.camera, context);
+      await PermissionHandler.checkPermission(Permission.camera, context);
       if (!isCameraPermissionGranted) return;
       uri = await presentQRScanner(context);
     } else {
       uri = await _showEnterWalletConnectURIPopUp(context);
     }
 
-    await _handleWalletConnectURI(uri, context);
+    if (uri == null) return _invalidUriToast(context, S.current.nullURIError);
+
+    log('_onFoundUri: $uri');
+    final Uri uriData = Uri.parse(uri);
+    await web3walletService.pairWithUri(uriData);
   }
 
   Future<String?> _showEnterWalletConnectURIPopUp(BuildContext context) async {
@@ -81,17 +87,6 @@ class WCPairingsWidget extends BasePage {
     return walletConnectURI;
   }
 
-  Future<void> _handleWalletConnectURI(
-    String? walletConnectURI,
-    BuildContext context,
-  ) async {
-    if (walletConnectURI == null) return _invalidUriToast(context, S.current.nullURIError);
-
-    log('_onFoundUri: $walletConnectURI');
-    final Uri uriData = Uri.parse(walletConnectURI);
-    await walletKitService.pairWithUri(uriData);
-  }
-
   Future<void> _invalidUriToast(BuildContext context, String message) async {
     await showPopUp<void>(
       context: context,
@@ -120,53 +115,42 @@ class WCPairingsWidget extends BasePage {
                   SizedBox(height: 24),
                   Text(
                     S.current.connectWalletPrompt,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    style: TextStyle(
                       fontSize: 16.0,
                       fontWeight: FontWeight.normal,
-                      color: Theme.of(context).colorScheme.onSurface,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                     ),
                   ),
                   SizedBox(height: 16),
                   PrimaryButton(
                     text: S.current.newConnection,
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
-                    onPressed: () => _onScanQrCode(context, walletKit),
-                  ),
-                  SizedBox(height: 4),
-                  TextButton(
-                    onPressed: () async {
-                      final uri = await _showEnterWalletConnectURIPopUp(context);
-                      await _handleWalletConnectURI(uri, context);
-                    },
-                    child: Text(
-                      'Click to paste WalletConnect Link',
-                      style: Theme.of(context).textTheme.bodyMedium,
-                    ),
+                    color: Theme.of(context).primaryColor,
+                    textColor: Colors.white,
+                    onPressed: () => _onScanQrCode(context, web3wallet),
                   ),
                 ],
               ),
             ),
-            SizedBox(height: 16),
+            SizedBox(height: 48),
             Expanded(
               child: Visibility(
-                visible: walletKitService.pairings.isEmpty,
+                visible: web3walletService.pairings.isEmpty,
                 child: Center(
                   child: Text(
                     S.current.activeConnectionsPrompt,
                     textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    style: TextStyle(
                       fontSize: 16.0,
                       fontWeight: FontWeight.normal,
-                      color: Theme.of(context).colorScheme.onSurface,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                     ),
                   ),
                 ),
                 replacement: ListView.builder(
-                  itemCount: walletKitService.pairings.length,
+                  itemCount: web3walletService.pairings.length,
                   itemBuilder: (BuildContext context, int index) {
-                    final pairing = walletKitService.pairings[index];
-                    return WCPairingItemWidget(
+                    final pairing = web3walletService.pairings[index];
+                    return PairingItemWidget(
                       key: ValueKey(pairing.topic),
                       pairing: pairing,
                       onTap: () {
@@ -175,7 +159,7 @@ class WCPairingsWidget extends BasePage {
                           MaterialPageRoute(
                             builder: (context) => WalletConnectPairingDetailsPage(
                               pairing: pairing,
-                              walletKitService: walletKitService,
+                              web3walletService: web3walletService,
                             ),
                           ),
                         );
diff --git a/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart b/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart
index a109fa9f3..f99eb9cdb 100644
--- a/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart
+++ b/lib/src/screens/wallet_connect/wc_pairing_detail_page.dart
@@ -1,22 +1,24 @@
+import 'dart:developer';
+
+import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 
 import 'utils/namespace_model_builder.dart';
 
 class WalletConnectPairingDetailsPage extends StatefulWidget {
   final PairingInfo pairing;
-  final WalletKitService walletKitService;
+  final Web3WalletService web3walletService;
 
   const WalletConnectPairingDetailsPage({
     required this.pairing,
-    required this.walletKitService,
+    required this.web3walletService,
     super.key,
   });
 
@@ -31,9 +33,7 @@ class WalletConnectPairingDetailsPageState extends State<WalletConnectPairingDet
   void initState() {
     super.initState();
     initDateTime();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      initSessions();
-    });
+    initSessions();
   }
 
   void initDateTime() {
@@ -46,13 +46,13 @@ class WalletConnectPairingDetailsPageState extends State<WalletConnectPairingDet
   }
 
   void initSessions() {
-    List<SessionData> sessions = widget.walletKitService.getSessionsForPairingInfo(widget.pairing);
+    List<SessionData> sessions = widget.web3walletService.getSessionsForPairingInfo(widget.pairing);
 
     for (final SessionData session in sessions) {
       List<Widget> namespaceWidget = ConnectionWidgetBuilder.buildFromNamespaces(
         session.topic,
         session.namespaces,
-        context,
+        widget.web3walletService.getWeb3Wallet(),
       );
       // Loop through and add the namespace widgets, but put 20 pixels between each one
       for (int i = 0; i < namespaceWidget.length; i++) {
@@ -61,59 +61,6 @@ class WalletConnectPairingDetailsPageState extends State<WalletConnectPairingDet
           sessionWidgets.add(const SizedBox(height: 20.0));
         }
       }
-
-      sessionWidgets.add(const SizedBox.square(dimension: 10.0));
-      sessionWidgets.add(
-        PrimaryButton(
-          onPressed: () async {
-            try {
-              await widget.walletKitService.extendSession(
-                topic: session.topic,
-              );
-            } catch (e) {
-              debugPrint('${e.toString()}');
-            }
-          },
-          text: S.current.extend_session,
-          color: Theme.of(context).colorScheme.primary,
-          textColor: Theme.of(context).colorScheme.onPrimary,
-        ),
-      );
-      sessionWidgets.add(const SizedBox.square(dimension: 10.0));
-      sessionWidgets.add(
-        PrimaryButton(
-          onPressed: () async {
-            try {
-              await widget.walletKitService.updateSession(
-                topic: session.topic,
-                namespaces: session.namespaces,
-              );
-            } catch (e) {
-              debugPrint('${e.toString()}');
-            }
-          },
-          text: S.current.update_session,
-          color: Theme.of(context).colorScheme.primary,
-          textColor: Theme.of(context).colorScheme.onPrimary,
-        ),
-      );
-      sessionWidgets.add(const SizedBox.square(dimension: 10.0));
-      sessionWidgets.add(
-        PrimaryButton(
-          onPressed: () async {
-            try {
-              await widget.walletKitService.disconnectSession(
-                topic: session.topic,
-              );
-            } catch (e) {
-              debugPrint('${e.toString()}');
-            }
-          },
-          text: S.current.disconnect_session,
-          color: Theme.of(context).colorScheme.primary,
-          textColor: Theme.of(context).colorScheme.onPrimary,
-        ),
-      );
     }
   }
 
@@ -123,7 +70,7 @@ class WalletConnectPairingDetailsPageState extends State<WalletConnectPairingDet
       widget.pairing,
       expiryDate,
       sessionWidgets,
-      widget.walletKitService,
+      widget.web3walletService,
     );
   }
 }
@@ -133,13 +80,13 @@ class WCCDetailsWidget extends BasePage {
     this.pairing,
     this.expiryDate,
     this.sessionWidgets,
-    this.walletKitService,
+    this.web3walletService,
   );
 
   final PairingInfo pairing;
   final String expiryDate;
   final List<Widget> sessionWidgets;
-  final WalletKitService walletKitService;
+  final Web3WalletService web3walletService;
 
   @override
   Widget body(BuildContext context) {
@@ -153,35 +100,37 @@ class WCCDetailsWidget extends BasePage {
               Flexible(
                 child: CircleAvatar(
                   backgroundImage: (pairing.peerMetadata!.icons.isNotEmpty
-                      ? NetworkImage(pairing.peerMetadata!.icons[0])
-                      : AssetImage(
-                        CakeTor.instance.enabled
-                        ? 'assets/images/tor_logo.svg'
-                        : 'assets/images/app_logo.png')) as ImageProvider<Object>,
+                          ? NetworkImage(pairing.peerMetadata!.icons[0])
+                          : const AssetImage('assets/images/default_icon.png'))
+                      as ImageProvider<Object>,
                 ),
               ),
               const SizedBox(height: 20.0),
               Text(
                 pairing.peerMetadata!.name,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      fontSize: 16.0,
-                      fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                  fontSize: 16.0,
+                  fontWeight: FontWeight.w500,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                ),
               ),
               const SizedBox(height: 16.0),
               Text(
                 pairing.peerMetadata!.url,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.normal,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                ),
               ),
               const SizedBox(height: 8.0),
               Text(
                 '${S.current.expiresOn}: $expiryDate',
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.normal,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                ),
               ),
               const SizedBox(height: 20.0),
               Column(
@@ -192,10 +141,10 @@ class WCCDetailsWidget extends BasePage {
               const SizedBox(height: 20.0),
               PrimaryButton(
                 onPressed: () =>
-                    _onDeleteButtonPressed(context, pairing.peerMetadata!.name, walletKitService),
+                    _onDeleteButtonPressed(context, pairing.peerMetadata!.name, web3walletService),
                 text: S.current.delete,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
+                color: Theme.of(context).primaryColor,
+                textColor: Colors.white,
               ),
             ],
           ),
@@ -205,10 +154,7 @@ class WCCDetailsWidget extends BasePage {
   }
 
   Future<void> _onDeleteButtonPressed(
-    BuildContext context,
-    String dAppName,
-    WalletKitService walletKitService,
-  ) async {
+      BuildContext context, String dAppName, Web3WalletService web3walletService) async {
     bool confirmed = false;
 
     await showPopUp<void>(
@@ -229,13 +175,11 @@ class WCCDetailsWidget extends BasePage {
     );
     if (confirmed) {
       try {
-        await walletKitService.deletePairing(topic: pairing.topic);
+        await web3walletService.disconnectSession(pairing.topic);
 
-        if (Navigator.canPop(context)) {
-          Navigator.pop(context);
-        }
+        Navigator.of(context).pop();
       } catch (e) {
-        debugPrint(e.toString());
+        log(e.toString());
       }
     }
   }
diff --git a/lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_listener_widget.dart b/lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_listener_widget.dart
deleted file mode 100644
index b19474cc0..000000000
--- a/lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_listener_widget.dart
+++ /dev/null
@@ -1,103 +0,0 @@
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/models/bottom_sheet_queue_item_model.dart';
-import 'package:flutter/material.dart';
-
-class BottomSheetListener extends StatefulWidget {
-  final BottomSheetService bottomSheetService;
-  final Widget child;
-
-  const BottomSheetListener({
-    required this.bottomSheetService,
-    required this.child,
-    super.key,
-  });
-
-  @override
-  BottomSheetListenerState createState() => BottomSheetListenerState();
-}
-
-class BottomSheetListenerState extends State<BottomSheetListener> {
-  @override
-  void initState() {
-    super.initState();
-    widget.bottomSheetService.currentSheet.addListener(_showBottomSheet);
-  }
-
-  @override
-  void dispose() {
-    widget.bottomSheetService.currentSheet.removeListener(_showBottomSheet);
-    super.dispose();
-  }
-
-  Future<void> _showBottomSheet() async {
-    if (widget.bottomSheetService.currentSheet.value != null) {
-      BottomSheetQueueItemModel item = widget.bottomSheetService.currentSheet.value!;
-      final value = await showModalBottomSheet(
-        context: context,
-        isDismissible: item.isModalDismissible,
-        backgroundColor: Color.fromARGB(0, 0, 0, 0),
-        isScrollControlled: true,
-        constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.9),
-        builder: (context) {
-          if (item.closeAfter > 0) {
-            Future.delayed(Duration(seconds: item.closeAfter), () {
-              try {
-                if (!mounted) return;
-                if (Navigator.canPop(context)) {
-                  Navigator.pop(context);
-                }
-              } catch (e, s) {
-                debugPrint('[$runtimeType] close $e $s');
-              }
-            });
-          }
-          return Material(
-            color: Theme.of(context).colorScheme.surface,
-            borderRadius: BorderRadius.all(Radius.circular(16)),
-            child: Padding(
-              padding: EdgeInsets.only(
-                top: 16,
-                left: 16,
-                right: 16,
-                bottom: MediaQuery.of(context).viewInsets.bottom + 24,
-              ),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  // Row(
-                  //   mainAxisAlignment: MainAxisAlignment.end,
-                  //   children: [
-                  //     IconButton(
-                  //       color: Theme.of(context).colorScheme.surfaceContainerHighest,
-                  //       padding: const EdgeInsets.all(0.0),
-                  //       visualDensity: VisualDensity.compact,
-                  //       onPressed: () {
-                  //         if (Navigator.canPop(context)) {
-                  //           Navigator.pop(context);
-                  //         }
-                  //       },
-                  //       icon: Icon(
-                  //         Icons.close_sharp,
-                  //         color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  //       ),
-                  //     ),
-                  //   ],
-                  // ),
-                  Flexible(child: item.widget),
-                ],
-              ),
-            ),
-          );
-        },
-      );
-
-      if (!item.completer.isCompleted) {
-        item.completer.complete(value);
-      }
-      widget.bottomSheetService.showNext();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) => widget.child;
-}
diff --git a/lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_message_display_widget.dart b/lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_message_display_widget.dart
deleted file mode 100644
index 5245d52fe..000000000
--- a/lib/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_message_display_widget.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:flutter/material.dart';
-
-class BottomSheetMessageDisplayWidget extends StatelessWidget {
-  final String message;
-  final bool isError;
-
-  const BottomSheetMessageDisplayWidget({super.key, required this.message, this.isError = true});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            Text(
-              isError ? S.current.error : S.current.successful,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 16,
-                    fontWeight: FontWeight.normal,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-            ),
-            IconButton(
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
-              padding: const EdgeInsets.all(0.0),
-              visualDensity: VisualDensity.compact,
-              onPressed: () {
-                if (Navigator.canPop(context)) {
-                  Navigator.pop(context);
-                }
-              },
-              icon: Icon(
-                Icons.close_sharp,
-                color: Theme.of(context).colorScheme.onSurfaceVariant,
-              ),
-            ),
-          ],
-        ),
-        SizedBox(height: 8),
-        Row(
-          children: [
-            Expanded(
-              child: Text(
-                message,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
-              ),
-            ),
-          ],
-        ),
-        SizedBox(height: 16),
-      ],
-    );
-  }
-}
diff --git a/lib/src/screens/wallet_connect/widgets/wc_connection_item_widget.dart b/lib/src/screens/wallet_connect/widgets/connection_item_widget.dart
similarity index 58%
rename from lib/src/screens/wallet_connect/widgets/wc_connection_item_widget.dart
rename to lib/src/screens/wallet_connect/widgets/connection_item_widget.dart
index b701bdc62..77c30417a 100644
--- a/lib/src/screens/wallet_connect/widgets/wc_connection_item_widget.dart
+++ b/lib/src/screens/wallet_connect/widgets/connection_item_widget.dart
@@ -1,17 +1,19 @@
-import 'package:cake_wallet/src/screens/wallet_connect/models/wc_connection_model.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
+import '../../../../core/wallet_connect/models/connection_model.dart';
 
-class WCConnectionItemWidget extends StatelessWidget {
-  const WCConnectionItemWidget({required this.model, Key? key}) : super(key: key);
+class ConnectionItemWidget extends StatelessWidget {
+  const ConnectionItemWidget({required this.model, Key? key}) : super(key: key);
 
-  final WCConnectionModel model;
+  final ConnectionModel model;
 
   @override
   Widget build(BuildContext context) {
+    
     return Container(
       width: double.infinity,
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        color: Theme.of(context).cardColor,
         borderRadius: BorderRadius.circular(8),
       ),
       padding: const EdgeInsets.all(8),
@@ -23,20 +25,22 @@ class WCConnectionItemWidget extends StatelessWidget {
           children: [
             Text(
               model.title ?? '',
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontWeight: FontWeight.w600,
-                  ),
+              style: TextStyle(
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                fontSize: 14,
+                fontWeight: FontWeight.w600,
+              ),
             ),
             const SizedBox(height: 8),
             if (model.elements != null)
-              Wrap(
-                spacing: 4,
-                runSpacing: 4,
-                direction: Axis.horizontal,
-                children: model.elements!
-                    .map((e) => _ModelElementWidget(model: model, modelElement: e))
-                    .toList(),
-              ),
+            Wrap(
+              spacing: 4,
+              runSpacing: 4,
+              direction: Axis.horizontal,
+              children: model.elements!
+                  .map((e) => _ModelElementWidget(model: model, modelElement: e))
+                  .toList(),
+            ),
           ],
         ),
         replacement: _NoModelElementWidget(model: model),
@@ -48,15 +52,17 @@ class WCConnectionItemWidget extends StatelessWidget {
 class _NoModelElementWidget extends StatelessWidget {
   const _NoModelElementWidget({required this.model});
 
-  final WCConnectionModel model;
+  final ConnectionModel model;
 
   @override
   Widget build(BuildContext context) {
     return Text(
       model.text!,
-      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-            fontWeight: FontWeight.w600,
-          ),
+      style: TextStyle(
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+        fontSize: 14,
+        fontWeight: FontWeight.w600,
+      ),
     );
   }
 }
@@ -67,7 +73,7 @@ class _ModelElementWidget extends StatelessWidget {
     required this.modelElement,
   });
 
-  final WCConnectionModel model;
+  final ConnectionModel model;
   final String modelElement;
 
   @override
@@ -76,16 +82,18 @@ class _ModelElementWidget extends StatelessWidget {
       onTap: model.elementActions != null ? model.elementActions![modelElement] : null,
       child: Container(
         decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).colorScheme.background,
           borderRadius: BorderRadius.circular(6),
         ),
         padding: const EdgeInsets.all(8),
         child: Text(
           modelElement,
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                fontWeight: FontWeight.w600,
-              ),
-          maxLines: 50,
+          style: TextStyle(
+            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+            fontSize: 14,
+            fontWeight: FontWeight.w600,
+          ),
+          maxLines: 10,
           overflow: TextOverflow.ellipsis,
         ),
       ),
diff --git a/lib/src/screens/wallet_connect/widgets/connection_request_widget.dart b/lib/src/screens/wallet_connect/widgets/connection_request_widget.dart
new file mode 100644
index 000000000..179bd6b93
--- /dev/null
+++ b/lib/src/screens/wallet_connect/widgets/connection_request_widget.dart
@@ -0,0 +1,180 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:flutter/material.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
+
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+
+import '../../../../core/wallet_connect/models/auth_request_model.dart';
+import '../../../../core/wallet_connect/models/connection_model.dart';
+import '../../../../core/wallet_connect/models/session_request_model.dart';
+import '../utils/namespace_model_builder.dart';
+import 'connection_widget.dart';
+
+class ConnectionRequestWidget extends StatefulWidget {
+  const ConnectionRequestWidget({
+    required this.wallet,
+    required this.chaindIdNamespace,
+    this.authRequest,
+    this.sessionProposal,
+    Key? key,
+  }) : super(key: key);
+
+  final Web3Wallet wallet;
+  final String chaindIdNamespace;
+  final AuthRequestModel? authRequest;
+  final SessionRequestModel? sessionProposal;
+
+  @override
+  State<ConnectionRequestWidget> createState() => _ConnectionRequestWidgetState();
+}
+
+class _ConnectionRequestWidgetState extends State<ConnectionRequestWidget> {
+  ConnectionMetadata? metadata;
+
+  @override
+  void initState() {
+    super.initState();
+    // Get the connection metadata
+    metadata = widget.authRequest?.request.requester ?? widget.sessionProposal?.request.proposer;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (metadata == null) {
+      return Text(
+        S.current.error,
+        style: TextStyle(
+          fontSize: 14,
+          fontWeight: FontWeight.normal,
+          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+        ),
+      );
+    }
+
+    return _ConnectionMetadataDisplayWidget(
+      metadata: metadata,
+      wallet: widget.wallet,
+      authRequest: widget.authRequest,
+      sessionProposal: widget.sessionProposal,
+      chaindIdNamespace: widget.chaindIdNamespace,
+    );
+  }
+}
+
+class _ConnectionMetadataDisplayWidget extends StatelessWidget {
+  const _ConnectionMetadataDisplayWidget({
+    required this.wallet,
+    required this.metadata,
+    required this.sessionProposal,
+    required this.chaindIdNamespace,
+    this.authRequest,
+  });
+
+  final ConnectionMetadata? metadata;
+  final Web3Wallet wallet;
+  final String chaindIdNamespace;
+  final AuthRequestModel? authRequest;
+  final SessionRequestModel? sessionProposal;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        color: Color.fromARGB(255, 18, 18, 19),
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            metadata!.metadata.name,
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.normal,
+              color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+            ),
+            textAlign: TextAlign.center,
+          ),
+          Text(
+            S.current.wouoldLikeToConnect,
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.normal,
+              color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+            ),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 8),
+          Text(
+            metadata!.metadata.url,
+            style: TextStyle(
+              fontSize: 16.0,
+              fontWeight: FontWeight.normal,
+              color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+            ),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 8),
+          Visibility(
+            visible: authRequest != null,
+            child: _AuthRequestWidget(
+              wallet: wallet,
+              authRequest: authRequest,
+              chaindIdNamespace: chaindIdNamespace,
+            ),
+
+            //If authRequest is null, sessionProposal is not null.
+            replacement: _SessionProposalWidget(sessionProposal: sessionProposal!),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _AuthRequestWidget extends StatelessWidget {
+  const _AuthRequestWidget({
+    required this.wallet,
+    required this.chaindIdNamespace,
+    this.authRequest,
+  });
+
+  final Web3Wallet wallet;
+  final String chaindIdNamespace;
+  final AuthRequestModel? authRequest;
+
+  @override
+  Widget build(BuildContext context) {
+    final model = ConnectionModel(
+      text: wallet.formatAuthMessage(
+        iss: 'did:pkh:$chaindIdNamespace:${authRequest!.iss}',
+        cacaoPayload: CacaoRequestPayload.fromPayloadParams(
+          authRequest!.request.payloadParams,
+        ),
+      ),
+    );
+    return ConnectionWidget(
+      title: S.current.message,
+      info: [model],
+    );
+  }
+}
+
+class _SessionProposalWidget extends StatelessWidget {
+  const _SessionProposalWidget({required this.sessionProposal});
+
+  final SessionRequestModel sessionProposal;
+
+  @override
+  Widget build(BuildContext context) {
+    // Create the connection models using the required and optional namespaces provided by the proposal data
+    // The key is the title and the list of values is the data
+    final List<ConnectionWidget> views = ConnectionWidgetBuilder.buildFromRequiredNamespaces(
+      sessionProposal.request.requiredNamespaces,
+    );
+
+    return Column(children: views);
+  }
+}
diff --git a/lib/src/screens/wallet_connect/widgets/wc_connection_widget.dart b/lib/src/screens/wallet_connect/widgets/connection_widget.dart
similarity index 54%
rename from lib/src/screens/wallet_connect/widgets/wc_connection_widget.dart
rename to lib/src/screens/wallet_connect/widgets/connection_widget.dart
index 150165a95..921d8ea5c 100644
--- a/lib/src/screens/wallet_connect/widgets/wc_connection_widget.dart
+++ b/lib/src/screens/wallet_connect/widgets/connection_widget.dart
@@ -1,20 +1,20 @@
-import 'package:cake_wallet/src/screens/wallet_connect/models/wc_connection_model.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
-import 'wc_connection_item_widget.dart';
+import '../../../../core/wallet_connect/models/connection_model.dart';
+import 'connection_item_widget.dart';
 
-class WCConnectionWidget extends StatelessWidget {
-  const WCConnectionWidget({required this.title, required this.info, super.key});
+class ConnectionWidget extends StatelessWidget {
+  const ConnectionWidget({required this.title, required this.info, super.key});
 
   final String title;
-  final List<WCConnectionModel> info;
+  final List<ConnectionModel> info;
 
   @override
   Widget build(BuildContext context) {
-    
     return Container(
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.primary,
+        color: Theme.of(context).primaryColorLight,
         borderRadius: BorderRadius.circular(8),
       ),
       padding: const EdgeInsets.all(8),
@@ -23,21 +23,21 @@ class WCConnectionWidget extends StatelessWidget {
         children: [
           Container(
             decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.surface,
+              color: Theme.of(context).colorScheme.background,
               borderRadius: BorderRadius.circular(8),
             ),
             padding: EdgeInsets.symmetric(vertical: 8, horizontal: 8),
             child: Text(
               title,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+              style: TextStyle(
                 fontSize: 16,
                 fontWeight: FontWeight.w600,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              ),
             ),
           ),
           const SizedBox(height: 8),
-          ...info.map((e) => WCConnectionItemWidget(model: e)),
+          ...info.map((e) => ConnectionItemWidget(model: e)),
         ],
       ),
     );
diff --git a/lib/src/screens/wallet_connect/widgets/enter_wallet_connect_uri_widget.dart b/lib/src/screens/wallet_connect/widgets/enter_wallet_connect_uri_widget.dart
index 7a06cc4f4..927e7fb02 100644
--- a/lib/src/screens/wallet_connect/widgets/enter_wallet_connect_uri_widget.dart
+++ b/lib/src/screens/wallet_connect/widgets/enter_wallet_connect_uri_widget.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -29,14 +29,14 @@ class _EnterWallectConnectURIWrapperWidgetState extends State<EnterWalletConnect
 
   @override
   Widget build(BuildContext context) {
-    return EnterWalletConnectURIWidget(
+    return _EnterWalletConnectURIWidget(
       controller: controller,
     );
   }
 }
 
-class EnterWalletConnectURIWidget extends BaseAlertDialog {
-  EnterWalletConnectURIWidget({
+class _EnterWalletConnectURIWidget extends BaseAlertDialog {
+  _EnterWalletConnectURIWidget({
     required this.controller,
   });
 
@@ -57,49 +57,53 @@ class EnterWalletConnectURIWidget extends BaseAlertDialog {
   @override
   Widget content(BuildContext context) {
     return Card(
-      color: Theme.of(context).colorScheme.surface,
-      elevation: 0.0,
       margin: EdgeInsets.zero,
       child: Column(
         children: [
           SizedBox(height: 8),
           Text(
             S.current.copyWalletConnectLink,
-            textAlign: TextAlign.center,
             style: Theme.of(context).textTheme.bodySmall,
           ),
           SizedBox(height: 16),
-          BaseTextFormField(
+          TextField(
             controller: controller,
-            textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w500,
-                ),
-            suffixIcon: Container(
-              width: 24,
-              height: 24,
-              padding: EdgeInsets.only(top: 0),
-              child: Semantics(
-                label: S.of(context).paste,
-                child: InkWell(
-                  onTap: () => _pasteWalletConnectURI(),
-                  child: Container(
-                    padding: EdgeInsets.all(10),
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.all(Radius.circular(6)),
-                    ),
-                    child: Image.asset(
-                      'assets/images/paste_ios.png',
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+            style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white),
+            decoration: InputDecoration(
+              suffixIcon: Container(
+                width: 24,
+                height: 24,
+                padding: EdgeInsets.only(top: 0),
+                child: Semantics(
+                  label: S.of(context).paste,
+                  child: InkWell(
+                    onTap: () => _pasteWalletConnectURI(),
+                    child: Container(
+                      padding: EdgeInsets.all(8),
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.all(Radius.circular(6)),
+                      ),
+                      child: Image.asset(
+                        'assets/images/paste_ios.png',
+                        color:
+                            Theme.of(context).extension<SendPageTheme>()!.textFieldButtonIconColor,
+                      ),
                     ),
                   ),
                 ),
               ),
-            ),
-            hintText: S.current.enterWalletConnectURI,
-            placeholderTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  fontWeight: FontWeight.w500,
+              hintText: S.current.enterWalletConnectURI,
+              border: OutlineInputBorder(
+                borderSide: BorderSide(
+                  color: Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor,
                 ),
+              ),
+              hintStyle: TextStyle(
+                color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor,
+                fontWeight: FontWeight.w500,
+                fontSize: 14,
+              ),
+            ),
           ),
         ],
       ),
@@ -112,7 +116,7 @@ class EnterWalletConnectURIWidget extends BaseAlertDialog {
       width: 300,
       height: 52,
       padding: EdgeInsets.only(left: 12, right: 12),
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).dialogBackgroundColor,
       child: ButtonTheme(
         minWidth: double.infinity,
         child: TextButton(
@@ -122,12 +126,12 @@ class EnterWalletConnectURIWidget extends BaseAlertDialog {
           child: Text(
             S.current.confirm,
             textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontSize: 15,
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.primary,
-                  decoration: TextDecoration.none,
-                ),
+            style: TextStyle(
+              fontSize: 15,
+              fontWeight: FontWeight.w600,
+              color: Theme.of(context).primaryColor,
+              decoration: TextDecoration.none,
+            ),
           ),
         ),
       ),
diff --git a/lib/src/screens/wallet_connect/widgets/message_display_widget.dart b/lib/src/screens/wallet_connect/widgets/message_display_widget.dart
new file mode 100644
index 000000000..044915511
--- /dev/null
+++ b/lib/src/screens/wallet_connect/widgets/message_display_widget.dart
@@ -0,0 +1,42 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:flutter/material.dart';
+
+class BottomSheetMessageDisplayWidget extends StatelessWidget {
+  final String message;
+  final bool isError;
+
+  const BottomSheetMessageDisplayWidget({super.key, required this.message, this.isError = true});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          isError ? S.current.error : S.current.successful,
+          style: TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.normal,
+            color: Colors.white,
+          ),
+        ),
+        SizedBox(height: 8),
+        Row(
+          children: [
+            Expanded(
+              child: Text(
+                message,
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.normal,
+                  color: Colors.white,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart b/lib/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart
new file mode 100644
index 000000000..42bef5135
--- /dev/null
+++ b/lib/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart
@@ -0,0 +1,64 @@
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
+import 'package:flutter/material.dart';
+
+import '../../../../../core/wallet_connect/models/bottom_sheet_queue_item_model.dart';
+
+class BottomSheetListener extends StatefulWidget {
+  final BottomSheetService bottomSheetService;
+  final Widget child;
+
+  const BottomSheetListener({
+    required this.child,
+    required this.bottomSheetService,
+    super.key,
+  });
+
+  @override
+  BottomSheetListenerState createState() => BottomSheetListenerState();
+}
+
+class BottomSheetListenerState extends State<BottomSheetListener> {
+
+  @override
+  void initState() {
+    super.initState();
+    widget.bottomSheetService.currentSheet.addListener(_showBottomSheet);
+  }
+
+  @override
+  void dispose() {
+    widget.bottomSheetService.currentSheet.removeListener(_showBottomSheet);
+    super.dispose();
+  }
+
+  Future<void> _showBottomSheet() async {
+    if (widget.bottomSheetService.currentSheet.value != null) {
+      BottomSheetQueueItemModel item = widget.bottomSheetService.currentSheet.value!;
+      final value = await showModalBottomSheet(
+        context: context,
+        isDismissible: item.isModalDismissible,
+        backgroundColor: Color.fromARGB(0, 0, 0, 0),
+        isScrollControlled: true,
+        constraints: BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.9),
+        builder: (context) {
+          return Container(
+            decoration: const BoxDecoration(
+              color: Color.fromARGB(255, 18, 18, 19),
+              borderRadius: BorderRadius.all(Radius.circular(16)),
+            ),
+            padding: const EdgeInsets.all(16),
+            margin: const EdgeInsets.all(16),
+            child: item.widget,
+          );
+        },
+      );
+      if (!item.completer.isCompleted) {
+        item.completer.complete(value);
+      }
+      widget.bottomSheetService.resetCurrentSheet();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) => widget.child;
+}
diff --git a/lib/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart b/lib/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart
new file mode 100644
index 000000000..f16dcc0f8
--- /dev/null
+++ b/lib/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart
@@ -0,0 +1,48 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:flutter/material.dart';
+
+class Web3RequestModal extends StatelessWidget {
+  const Web3RequestModal({required this.child, this.onAccept, this.onReject, super.key});
+
+  final Widget child;
+  final VoidCallback? onAccept;
+  final VoidCallback? onReject;
+  
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          child,
+          const SizedBox(height: 16),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            children: [
+             
+              Expanded(
+                child: PrimaryButton(
+                  onPressed: onReject ?? () => Navigator.of(context).pop(false),
+                  text: S.current.reject,
+                  color: Theme.of(context).colorScheme.error,
+                  textColor: Theme.of(context).colorScheme.onError,
+                ),
+              ),
+              const SizedBox(width: 16),
+              Expanded(
+                child: PrimaryButton(
+                  onPressed: onAccept ?? () => Navigator.of(context).pop(true),
+                  text: S.current.approve,
+                  color: Theme.of(context).primaryColor,
+                  textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                ),
+              ),       
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/src/screens/wallet_connect/widgets/pairing_item_widget.dart b/lib/src/screens/wallet_connect/widgets/pairing_item_widget.dart
new file mode 100644
index 000000000..518cf32f7
--- /dev/null
+++ b/lib/src/screens/wallet_connect/widgets/pairing_item_widget.dart
@@ -0,0 +1,82 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:flutter/material.dart';
+import 'package:walletconnect_flutter_v2/apis/core/pairing/utils/pairing_models.dart';
+
+class PairingItemWidget extends StatelessWidget {
+  const PairingItemWidget({required this.pairing, required this.onTap, super.key});
+
+  final PairingInfo pairing;
+  final void Function() onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    PairingMetadata? metadata = pairing.peerMetadata;
+    if (metadata == null) {
+      return SizedBox.shrink();
+    }
+
+    DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(pairing.expiry * 1000);
+    int year = dateTime.year;
+    int month = dateTime.month;
+    int day = dateTime.day;
+
+    String expiryDate =
+        '$year-${month.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')}';
+
+    return ListTile(
+      leading: CakeImageWidget(
+        imageUrl: metadata.icons.isNotEmpty ?  metadata.icons[0]: null,
+        displayOnError: CircleAvatar(
+          backgroundImage: AssetImage('assets/images/walletconnect_logo.png'),
+        ),
+      ),
+      title: Text(
+        metadata.name,
+        style: TextStyle(
+          fontSize: 16.0,
+          fontWeight: FontWeight.w700,
+          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+        ),
+      ),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            metadata.url,
+            style: TextStyle(
+              fontSize: 14.0,
+              fontWeight: FontWeight.w700,
+              color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+            ),
+          ),
+          Text(
+            '${S.current.expiresOn}: $expiryDate',
+            style: TextStyle(
+              fontSize: 14.0,
+              fontWeight: FontWeight.w700,
+              color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+            ),
+          ),
+        ],
+      ),
+      trailing: Container(
+        height: 40,
+        width: 44,
+        padding: EdgeInsets.all(10),
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          color: Theme.of(context).extension<ReceivePageTheme>()!.iconsBackgroundColor,
+        ),
+        child: Icon(
+          Icons.edit,
+          size: 14,
+          color: Theme.of(context).extension<ReceivePageTheme>()!.iconsColor,
+        ),
+      ),
+      onTap: onTap,
+    );
+  }
+}
diff --git a/lib/src/screens/wallet_connect/widgets/wc_connection_request_widget.dart b/lib/src/screens/wallet_connect/widgets/wc_connection_request_widget.dart
deleted file mode 100644
index 1db99ddc0..000000000
--- a/lib/src/screens/wallet_connect/widgets/wc_connection_request_widget.dart
+++ /dev/null
@@ -1,100 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/key_service/wallet_connect_key_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/models/wc_connection_model.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/utils/namespace_model_builder.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_connection_widget.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-class WCConnectionRequestWidget extends StatelessWidget {
-  WCConnectionRequestWidget({
-    this.sessionAuthPayload,
-    this.proposalData,
-    this.requester,
-    this.verifyContext,
-    required this.walletKeyService,
-    required this.walletKit,
-    required this.appStore,
-  });
-
-  final SessionAuthPayload? sessionAuthPayload;
-  final ProposalData? proposalData;
-  final ConnectionMetadata? requester;
-  final VerifyContext? verifyContext;
-  final WalletConnectKeyService walletKeyService;
-  final AppStore appStore;
-  final ReownWalletKit walletKit;
-
-  @override
-  Widget build(BuildContext context) {
-    if (requester == null) {
-      return Text(S.current.error.toUpperCase());
-    }
-
-    return Container(
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(8),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const SizedBox(height: 8),
-          Text(
-            '${requester!.metadata.name} ${S.current.wouoldLikeToConnect}',
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontSize: 18.0,
-              fontWeight: FontWeight.bold,
-            ),
-            textAlign: TextAlign.center,
-          ),
-          const SizedBox(height: 8),
-          (sessionAuthPayload != null)
-              ? _buildSessionAuthRequestView()
-              : _buildSessionProposalView(context),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildSessionAuthRequestView() {
-    final cacaoPayload = CacaoRequestPayload.fromSessionAuthPayload(
-      sessionAuthPayload!,
-    );
-
-    final List<WCConnectionModel> messagesModels = [];
-    for (var chain in sessionAuthPayload!.chains) {
-      final chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-      final iss = 'did:pkh:$chain:${chainKeys.first.publicKey}';
-
-      final message = walletKit.formatAuthMessage(
-        iss: iss,
-        cacaoPayload: cacaoPayload,
-      );
-
-      messagesModels.add(
-        WCConnectionModel(
-          title: '${S.current.message} ${messagesModels.length + 1}',
-          elements: [message],
-        ),
-      );
-    }
-
-    return WCConnectionWidget(
-      title: '${messagesModels.length} ${S.current.messages}',
-      info: messagesModels,
-    );
-  }
-
-  Widget _buildSessionProposalView(BuildContext context) {
-    // Create the connection models using the required and optional namespaces provided by the proposal data
-
-    final views = ConnectionWidgetBuilder.buildFromRequiredNamespaces(
-      proposalData!.generatedNamespaces ?? {},
-    );
-
-    return Column(children: views);
-  }
-}
-
diff --git a/lib/src/screens/wallet_connect/widgets/wc_pairing_item_widget.dart b/lib/src/screens/wallet_connect/widgets/wc_pairing_item_widget.dart
deleted file mode 100644
index 3d0ce8dc0..000000000
--- a/lib/src/screens/wallet_connect/widgets/wc_pairing_item_widget.dart
+++ /dev/null
@@ -1,89 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-class WCPairingItemWidget extends StatelessWidget {
-  const WCPairingItemWidget({required this.pairing, required this.onTap, super.key});
-
-  final PairingInfo pairing;
-  final void Function() onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    PairingMetadata? metadata = pairing.peerMetadata;
-
-    if (metadata == null) {
-      return SizedBox.shrink();
-    }
-
-    DateTime dateTime = DateTime.fromMillisecondsSinceEpoch(pairing.expiry * 1000);
-    int year = dateTime.year;
-    int month = dateTime.month;
-    int day = dateTime.day;
-
-    String expiryDate =
-        '$year-${month.toString().padLeft(2, '0')}-${day.toString().padLeft(2, '0')}';
-
-    return ListTile(
-      contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-      leading: SizedBox(
-        width: 60,
-        height: 60,
-        child: CakeImageWidget(
-          borderRadius: 8,
-          width: 60,
-          height: 60,
-          imageUrl: metadata.icons.isNotEmpty ? metadata.icons[0] : null,
-          errorWidget: CircleAvatar(
-            backgroundImage: AssetImage('assets/images/walletconnect_logo.png'),
-          ),
-        ),
-      ),
-      title: Text(
-        metadata.name,
-        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontSize: 16.0,
-              fontWeight: FontWeight.w700,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-            ),
-      ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            metadata.url,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w700,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-          ),
-          Text(
-            '${S.current.expiresOn}: $expiryDate',
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w700,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-          ),
-        ],
-      ),
-      trailing: SizedBox(
-        width: 44,
-        height: 40,
-        child: Container(
-          padding: EdgeInsets.all(10),
-          decoration: BoxDecoration(
-            shape: BoxShape.circle,
-            color: Theme.of(context).colorScheme.primary,
-          ),
-          child: Icon(
-            Icons.edit,
-            size: 14,
-            color: Theme.of(context).colorScheme.onPrimary,
-          ),
-        ),
-      ),
-      onTap: onTap,
-    );
-  }
-}
diff --git a/lib/src/screens/wallet_connect/widgets/wc_request_widget.dart b/lib/src/screens/wallet_connect/widgets/wc_request_widget.dart
deleted file mode 100644
index d6ff37fcd..000000000
--- a/lib/src/screens/wallet_connect/widgets/wc_request_widget.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/wc_verify_context_widget.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
-import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-class WCRequestWidget extends StatelessWidget {
-  WCRequestWidget({
-    required this.child,
-    this.verifyContext,
-    this.onAccept,
-    this.onReject,
-  });
-
-  final Widget child;
-  final VerifyContext? verifyContext;
-  final VoidCallback? onAccept;
-  final VoidCallback? onReject;
-
-  @override
-  Widget build(BuildContext context) {
-    final currentTheme = getIt.get<ThemeStore>().currentTheme;
-    
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        WCVerifyContextWidget(
-          currentTheme: currentTheme,
-          verifyContext: verifyContext,
-        ),
-        const SizedBox(height: 8),
-        Flexible(
-          child: SingleChildScrollView(child: child),
-        ),
-        const SizedBox(height: 16),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: [
-            Expanded(
-              child: PrimaryButton(
-                onPressed: onReject ??
-                    () {
-                      if (Navigator.canPop(context)) {
-                        Navigator.of(context).pop(WCBottomSheetResult.reject);
-                      }
-                    },
-                text: S.current.reject,
-                color: Theme.of(context).colorScheme.error,
-                textColor: Theme.of(context).colorScheme.onError,
-              ),
-            ),
-            const SizedBox(width: 16),
-            Expanded(
-              child: PrimaryButton(
-                onPressed: onAccept ??
-                    () {
-                      if (Navigator.canPop(context)) {
-                        Navigator.of(context).pop(WCBottomSheetResult.one);
-                      }
-                    },
-                text: S.current.approve,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/src/screens/wallet_connect/widgets/wc_session_auth_request_widget.dart b/lib/src/screens/wallet_connect/widgets/wc_session_auth_request_widget.dart
deleted file mode 100644
index 7e10c0469..000000000
--- a/lib/src/screens/wallet_connect/widgets/wc_session_auth_request_widget.dart
+++ /dev/null
@@ -1,60 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:flutter/material.dart';
-
-class WCSessionAuthRequestWidget extends StatelessWidget {
-  const WCSessionAuthRequestWidget({super.key, required this.child});
-
-  final Widget child;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Expanded(
-          child: SingleChildScrollView(child: child),
-        ),
-        const SizedBox(height: 16),
-        Column(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: [
-            PrimaryButton(
-              onPressed: () {
-                if (Navigator.canPop(context)) {
-                  Navigator.of(context).pop(WCBottomSheetResult.reject);
-                }
-              },
-              text: S.current.cancel,
-              color: Theme.of(context).colorScheme.error,
-              textColor: Theme.of(context).colorScheme.onError,
-            ),
-            const SizedBox(height: 8),
-            PrimaryButton(
-              onPressed: () {
-                if (Navigator.canPop(context)) {
-                  Navigator.of(context).pop(WCBottomSheetResult.one);
-                }
-              },
-              text: S.current.sign_one,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
-            ),
-            const SizedBox(height: 8),
-            PrimaryButton(
-              onPressed: () {
-                if (Navigator.canPop(context)) {
-                  Navigator.of(context).pop(WCBottomSheetResult.all);
-                }
-              },
-              text: S.current.sign_all,
-              color: Theme.of(context).colorScheme.secondaryContainer,
-              textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/src/screens/wallet_connect/widgets/wc_verify_context_widget.dart b/lib/src/screens/wallet_connect/widgets/wc_verify_context_widget.dart
deleted file mode 100644
index b85a8e10f..000000000
--- a/lib/src/screens/wallet_connect/widgets/wc_verify_context_widget.dart
+++ /dev/null
@@ -1,134 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
-import 'package:flutter/material.dart';
-import 'package:reown_walletkit/reown_walletkit.dart';
-
-class WCVerifyContextWidget extends StatelessWidget {
-  const WCVerifyContextWidget({
-    super.key,
-    required this.verifyContext,
-    required this.currentTheme,
-  });
-
-  final VerifyContext? verifyContext;
-  final MaterialThemeBase currentTheme;
-
-  @override
-  Widget build(BuildContext context) {
-    if (verifyContext == null) {
-      return const SizedBox.shrink();
-    }
-
-    if (verifyContext!.validation.scam) {
-      return VerifyBanner(
-        color: Theme.of(context).colorScheme.errorContainer,
-        origin: verifyContext!.origin,
-        title: S.current.security_risk,
-        text: S.current.security_risk_description,
-      );
-    }
-    if (verifyContext!.validation.invalid) {
-      return VerifyBanner(
-        color: Theme.of(context).colorScheme.errorContainer,
-        origin: verifyContext!.origin,
-        title: S.current.domain_mismatch,
-        text: S.current.domain_mismatch_description,
-      );
-    }
-    if (verifyContext!.validation.valid) {
-      return VerifyHeader(
-        iconColor: Theme.of(context).colorScheme.onPrimary,
-        title: verifyContext!.origin,
-      );
-    }
-    return VerifyBanner(
-      color: CustomThemeColors.syncYellow,
-      origin: verifyContext!.origin,
-      title: S.current.cannot_verify,
-      text: S.current.cannot_verify_description,
-    );
-  }
-}
-
-class VerifyHeader extends StatelessWidget {
-  const VerifyHeader({
-    super.key,
-    required this.iconColor,
-    required this.title,
-  });
-  final Color iconColor;
-  final String title;
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        Icon(
-          Icons.shield_outlined,
-          color: iconColor,
-        ),
-        const SizedBox(width: 8),
-        Text(
-          title,
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                color: iconColor,
-                fontWeight: FontWeight.bold,
-              ),
-        ),
-      ],
-    );
-  }
-}
-
-class VerifyBanner extends StatelessWidget {
-  const VerifyBanner({
-    super.key,
-    required this.origin,
-    required this.title,
-    required this.text,
-    required this.color,
-  });
-  final String origin, title, text;
-  final Color color;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Text(
-          origin,
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                fontWeight: FontWeight.bold,
-              ),
-        ),
-        const SizedBox.square(dimension: 8.0),
-        Container(
-          padding: const EdgeInsets.all(8.0),
-          decoration: BoxDecoration(
-            color: color.withOpacity(0.2),
-            borderRadius: const BorderRadius.all(Radius.circular(12.0)),
-          ),
-          child: Column(
-            children: [
-              VerifyHeader(
-                iconColor: color,
-                title: title,
-              ),
-              const SizedBox(height: 4.0),
-              Text(
-                text,
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      color: color,
-                      fontWeight: FontWeight.bold,
-                    ),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/src/screens/wallet_keys/wallet_keys_page.dart b/lib/src/screens/wallet_keys/wallet_keys_page.dart
index 917891854..29a1bfb6f 100644
--- a/lib/src/screens/wallet_keys/wallet_keys_page.dart
+++ b/lib/src/screens/wallet_keys/wallet_keys_page.dart
@@ -6,7 +6,9 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/seedphrase_grid_widget.dart';
 import 'package:cake_wallet/src/widgets/text_info_box.dart';
 import 'package:cake_wallet/src/widgets/warning_box_widget.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/brightness_util.dart';
 import 'package:cake_wallet/utils/clipboard_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
@@ -57,7 +59,7 @@ class WalletKeysPageBody extends StatefulWidget {
   });
 
   final WalletKeysViewModel walletKeysViewModel;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   @override
   State<StatefulWidget> createState() => _WalletKeysPageBodyState();
@@ -106,29 +108,29 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
               splashFactory: NoSplash.splashFactory,
               indicatorSize: TabBarIndicatorSize.label,
               isScrollable: true,
-              labelStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 18,
-                     
-                    fontWeight: FontWeight.w600,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-              unselectedLabelStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 18,
-                     
-                    fontWeight: FontWeight.w600,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.5),
-                  ),
-              labelColor: Theme.of(context).colorScheme.onSurfaceVariant,
-              indicatorColor: Theme.of(context).colorScheme.onSurfaceVariant,
+              labelStyle: TextStyle(
+                fontSize: 18,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).appBarTheme.titleTextStyle!.color,
+              ),
+              unselectedLabelStyle: TextStyle(
+                fontSize: 18,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).appBarTheme.titleTextStyle!.color?.withOpacity(0.5),
+              ),
+              labelColor: Theme.of(context).appBarTheme.titleTextStyle!.color,
+              indicatorColor: Theme.of(context).appBarTheme.titleTextStyle!.color,
               indicatorPadding: EdgeInsets.zero,
               labelPadding: const EdgeInsets.only(right: 24),
               tabAlignment: TabAlignment.start,
               dividerColor: Colors.transparent,
               padding: EdgeInsets.zero,
               tabs: [
-                Tab(text: S.of(context).widgets_seed, key: ValueKey('wallet_keys_page_seed')),
-                if (showKeyTab) Tab(text: S.of(context).keys, key: ValueKey('wallet_keys_page_keys'),),
-                if (showLegacySeedTab) Tab(text: S.of(context).legacy, key: ValueKey('wallet_keys_page_seed_legacy')),
+                Tab(text: S.of(context).widgets_seed),
+                if (showKeyTab) Tab(text: S.of(context).keys),
+                if (showLegacySeedTab) Tab(text: S.of(context).legacy),
               ],
             ),
           ),
@@ -217,7 +219,7 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 14),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(8),
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        color: Theme.of(context).cardColor,
       ),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
@@ -225,10 +227,11 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
           Text(
             S.of(context).block_height,
             textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.5),
-                ),
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w500,
+              color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor.withOpacity(0.5),
+            ),
           ),
           const SizedBox(width: 6),
           Expanded(
@@ -244,10 +247,11 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
                   children: [
                     Text(
                       textToDisplay,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
+                      style: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
+                      ),
                     ),
                     if (snapshot.connectionState == ConnectionState.done && snapshot.data != null)
                       GestureDetector(
@@ -274,7 +278,7 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 14),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(8),
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        color: Theme.of(context).cardColor,
       ),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.center,
@@ -282,32 +286,31 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
           Text(
             S.of(context).passphrase_view_keys,
             textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.5),
-                ),
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w500,
+              color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor.withOpacity(0.5),
+            ),
           ),
           const SizedBox(width: 6),
           Expanded(
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Observer(
-                  builder: (BuildContext context) {
-                    return Text(
-                      (widget.walletKeysViewModel.obscurePassphrase)
-                          ? "*****"
-                          : widget.walletKeysViewModel.passphrase,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
-                    );
-                  },
-                ),
-                Observer(
-                  builder: (BuildContext context) {
-                    return GestureDetector(
+                Observer(builder: (BuildContext context) {
+                  return Text(
+                    (widget.walletKeysViewModel.obscurePassphrase)
+                        ? "*****"
+                        : widget.walletKeysViewModel.passphrase,
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
+                    ),
+                  );
+                }),
+                Observer(builder: (BuildContext context) {
+                  return GestureDetector(
                       onTap: () {
                         widget.walletKeysViewModel.obscurePassphrase =
                             !widget.walletKeysViewModel.obscurePassphrase;
@@ -318,10 +321,8 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
                             : Icons.visibility,
                         size: 16,
                         color: Theme.of(context).textTheme.bodyLarge?.color?.withOpacity(0.7),
-                      ),
-                    );
-                  },
-                ),
+                      ));
+                }),
               ],
             ),
           ),
@@ -349,8 +350,10 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
                     key: const ValueKey('wallet_keys_page_copy_seeds_button_key'),
                     onPressed: () => _onCopy(titleForClipboard, dataToCopy, context),
                     text: S.of(context).copy,
-                    color: Theme.of(context).colorScheme.surfaceContainer,
-                    textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+                    color: Theme.of(context).cardColor,
+                    textColor: widget.currentTheme.type == ThemeType.dark
+                        ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                        : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
                   ),
                 ),
               ),
@@ -361,8 +364,8 @@ class _WalletKeysPageBodyState extends State<WalletKeysPageBody>
                     key: const ValueKey('wallet_keys_page_show_qr_seeds_button_key'),
                     onPressed: onShowQR,
                     text: S.current.show + ' QR',
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
+                    color: Theme.of(context).primaryColor,
+                    textColor: Colors.white,
                   ),
                 ),
               ),
diff --git a/lib/src/screens/wallet_list/edit_wallet_button_widget.dart b/lib/src/screens/wallet_list/edit_wallet_button_widget.dart
index d926230bd..fd6f1a0ee 100644
--- a/lib/src/screens/wallet_list/edit_wallet_button_widget.dart
+++ b/lib/src/screens/wallet_list/edit_wallet_button_widget.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
 import 'package:flutter/material.dart';
 
 class EditWalletButtonWidget extends StatelessWidget {
@@ -29,12 +31,12 @@ class EditWalletButtonWidget extends StatelessWidget {
                 padding: EdgeInsets.all(10),
                 decoration: BoxDecoration(
                   shape: BoxShape.circle,
-                  color: Theme.of(context).colorScheme.surface,
+                  color: Theme.of(context).extension<ReceivePageTheme>()!.iconsBackgroundColor,
                 ),
                 child: Icon(
                   Icons.edit,
                   size: 14,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  color: Theme.of(context).extension<ReceivePageTheme>()!.iconsColor,
                 ),
               ),
             ),
@@ -44,7 +46,7 @@ class EditWalletButtonWidget extends StatelessWidget {
             Icon(
               isExpanded ? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down,
               size: 24,
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
+              color: Theme.of(context).extension<FilterTheme>()!.titlesColor,
             ),
           },
         ],
diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart
index b2f3bc605..62f79bdc4 100644
--- a/lib/src/screens/wallet_list/wallet_list_page.dart
+++ b/lib/src/screens/wallet_list/wallet_list_page.dart
@@ -17,6 +17,9 @@ import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.da
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
@@ -46,11 +49,14 @@ class WalletListPage extends BasePage {
   Widget body(BuildContext context) => WalletListBody(
         walletListViewModel: walletListViewModel,
         authService: authService,
-        onWalletLoaded: onWalletLoaded ?? (context) => Navigator.of(context).pop(),
+        onWalletLoaded:
+            onWalletLoaded ?? (context) => Navigator.of(context).pop(),
       );
 
   @override
   Widget trailing(BuildContext context) {
+    final filterIcon = Image.asset('assets/images/filter_icon.png',
+        color: Theme.of(context).extension<FilterTheme>()!.iconColor);
     return MergeSemantics(
       child: SizedBox(
         height: 37,
@@ -82,12 +88,10 @@ class WalletListPage extends BasePage {
                   width: 36,
                   decoration: BoxDecoration(
                     shape: BoxShape.circle,
-                    color: Theme.of(context).colorScheme.surfaceContainer,
-                  ),
-                  child: Image.asset(
-                    'assets/images/filter_icon.png',
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    color:
+                        Theme.of(context).extension<FilterTheme>()!.buttonColor,
                   ),
+                  child: filterIcon,
                 ),
               ),
             ),
@@ -137,9 +141,17 @@ class WalletListBodyState extends State<WalletListBody> {
 
   @override
   Widget build(BuildContext context) {
+    final newWalletImage = Image.asset('assets/images/new_wallet.png',
+        height: 12, width: 12, color: Colors.white);
+    final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
+        height: 12,
+        width: 12,
+        color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor);
+
     return Container(
-      height: double.infinity,
+        height: double.infinity,
       padding: EdgeInsets.only(top: 16),
+
       child: Stack(
         alignment: Alignment.bottomCenter,
         fit: StackFit.expand,
@@ -148,16 +160,19 @@ class WalletListBodyState extends State<WalletListBody> {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                if (widget.walletListViewModel.multiWalletGroups.isNotEmpty) ...{
+                if (widget
+                    .walletListViewModel.multiWalletGroups.isNotEmpty) ...{
                   Padding(
                     padding: const EdgeInsets.only(left: 24),
                     child: Text(
                       S.current.shared_seed_wallet_groups,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 18,
-                            fontWeight: FontWeight.w700,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
+                      style: TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .titleColor,
+                      ),
                     ),
                   ),
                   SizedBox(height: 16),
@@ -166,27 +181,34 @@ class WalletListBodyState extends State<WalletListBody> {
                       builder: (_) => FilteredList(
                         shrinkWrap: true,
                         list: widget.walletListViewModel.multiWalletGroups,
-                        updateFunction: widget.walletListViewModel.reorderAccordingToWalletList,
+                        updateFunction: widget
+                            .walletListViewModel.reorderAccordingToWalletList,
                         itemBuilder: (context, index) {
-                          final group = widget.walletListViewModel.multiWalletGroups[index];
-                          final groupName =
-                              group.groupName ?? '${S.current.wallet_group} ${index + 1}';
+                          final group = widget
+                              .walletListViewModel.multiWalletGroups[index];
+                          final groupName = group.groupName ??
+                              '${S.current.wallet_group} ${index + 1}';
 
                           widget.walletListViewModel.updateTileState(
                             index,
-                            widget.walletListViewModel.expansionTileStateTrack[index] ?? false,
+                            widget.walletListViewModel
+                                    .expansionTileStateTrack[index] ??
+                                false,
                           );
 
                           return GroupedWalletExpansionTile(
                             onExpansionChanged: (value) {
-                              widget.walletListViewModel.updateTileState(index, value);
+                              widget.walletListViewModel
+                                  .updateTileState(index, value);
                               setState(() {});
                             },
                             shouldShowCurrentWalletPointer: true,
                             borderRadius: BorderRadius.all(Radius.circular(16)),
-                            margin: EdgeInsets.only(left: 20, right: 20, bottom: 12),
+                            margin: EdgeInsets.only(
+                                left: 20, right: 20, bottom: 12),
                             title: groupName,
-                            tileKey: ValueKey('group_wallets_expansion_tile_widget_$index'),
+                            tileKey: ValueKey(
+                                'group_wallets_expansion_tile_widget_$index'),
                             leadingWidget: Icon(
                               Icons.account_balance_wallet_outlined,
                               size: 28,
@@ -194,15 +216,17 @@ class WalletListBodyState extends State<WalletListBody> {
                             trailingWidget: EditWalletButtonWidget(
                               width: 74,
                               isGroup: true,
-                              isExpanded:
-                                  widget.walletListViewModel.expansionTileStateTrack[index]!,
+                              isExpanded: widget.walletListViewModel
+                                  .expansionTileStateTrack[index]!,
                               onTap: () {
                                 final wallet = widget.walletListViewModel
-                                    .convertWalletInfoToWalletListItem(group.wallets.first);
+                                    .convertWalletInfoToWalletListItem(
+                                        group.wallets.first);
                                 Navigator.of(context).pushNamed(
                                   Routes.walletEdit,
                                   arguments: WalletEditPageArguments(
-                                    walletListViewModel: widget.walletListViewModel,
+                                    walletListViewModel:
+                                        widget.walletListViewModel,
                                     editingWallet: wallet,
                                     isWalletGroup: true,
                                     groupName: groupName,
@@ -213,7 +237,8 @@ class WalletListBodyState extends State<WalletListBody> {
                             ),
                             childWallets: group.wallets.map((walletInfo) {
                               return widget.walletListViewModel
-                                  .convertWalletInfoToWalletListItem(walletInfo);
+                                  .convertWalletInfoToWalletListItem(
+                                      walletInfo);
                             }).toList(),
                             isSelected: false,
                             onChildItemTapped: (wallet) =>
@@ -225,10 +250,12 @@ class WalletListBodyState extends State<WalletListBody> {
                                       padding: const EdgeInsets.only(right: 16),
                                       child: EditWalletButtonWidget(
                                         width: 44,
-                                        onTap: () => Navigator.of(context).pushNamed(
+                                        onTap: () =>
+                                            Navigator.of(context).pushNamed(
                                           Routes.walletEdit,
                                           arguments: WalletEditPageArguments(
-                                            walletListViewModel: widget.walletListViewModel,
+                                            walletListViewModel:
+                                                widget.walletListViewModel,
                                             editingWallet: item,
                                           ),
                                         ),
@@ -242,16 +269,19 @@ class WalletListBodyState extends State<WalletListBody> {
                   ),
                   SizedBox(height: 24),
                 },
-                if (widget.walletListViewModel.singleWalletsList.isNotEmpty) ...{
+                if (widget
+                    .walletListViewModel.singleWalletsList.isNotEmpty) ...{
                   Padding(
                     padding: const EdgeInsets.only(left: 24),
                     child: Text(
                       S.current.single_seed_wallets_group,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 18,
-                            fontWeight: FontWeight.w700,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
+                      style: TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .titleColor,
+                      ),
                     ),
                   ),
                   SizedBox(height: 16),
@@ -260,15 +290,20 @@ class WalletListBodyState extends State<WalletListBody> {
                       builder: (_) => FilteredList(
                         shrinkWrap: true,
                         list: widget.walletListViewModel.singleWalletsList,
-                        updateFunction: widget.walletListViewModel.reorderAccordingToWalletList,
+                        updateFunction: widget
+                            .walletListViewModel.reorderAccordingToWalletList,
                         itemBuilder: (context, index) {
-                          final wallet = widget.walletListViewModel.singleWalletsList[index];
+                          final wallet = widget
+                              .walletListViewModel.singleWalletsList[index];
                           final currentColor = wallet.isCurrent
-                              ? Theme.of(context).colorScheme.primary
-                              : Theme.of(context).colorScheme.surface;
+                              ? Theme.of(context)
+                                  .extension<WalletListTheme>()!
+                                  .createNewWalletButtonBackgroundColor
+                              : Theme.of(context).colorScheme.background;
 
                           return GroupedWalletExpansionTile(
-                            tileKey: ValueKey('single_wallets_expansion_tile_widget_$index'),
+                            tileKey: ValueKey(
+                                'single_wallets_expansion_tile_widget_$index'),
                             isCurrentlySelectedWallet: wallet.isCurrent,
                             leadingWidget: SizedBox(
                               width: wallet.isCurrent ? 56 : 40,
@@ -289,7 +324,8 @@ class WalletListBodyState extends State<WalletListBody> {
                                         )
                                       : SizedBox(width: 6),
                                   Image.asset(
-                                    walletTypeToCryptoCurrency(wallet.type).iconPath!,
+                                    walletTypeToCryptoCurrency(wallet.type)
+                                        .iconPath!,
                                     width: 32,
                                     height: 32,
                                   ),
@@ -299,8 +335,10 @@ class WalletListBodyState extends State<WalletListBody> {
                             title: wallet.name,
                             isSelected: false,
                             borderRadius: BorderRadius.all(Radius.circular(16)),
-                            margin: EdgeInsets.only(left: 20, right: 20, bottom: 12),
-                            onTitleTapped: () => wallet.isCurrent ? null : _loadWallet(wallet),
+                            margin: EdgeInsets.only(
+                                left: 20, right: 20, bottom: 12),
+                            onTitleTapped: () =>
+                                wallet.isCurrent ? null : _loadWallet(wallet),
                             trailingWidget: wallet.isCurrent
                                 ? null
                                 : EditWalletButtonWidget(
@@ -309,7 +347,8 @@ class WalletListBodyState extends State<WalletListBody> {
                                       Navigator.of(context).pushNamed(
                                         Routes.walletEdit,
                                         arguments: WalletEditPageArguments(
-                                          walletListViewModel: widget.walletListViewModel,
+                                          walletListViewModel:
+                                              widget.walletListViewModel,
                                           editingWallet: wallet,
                                         ),
                                       );
@@ -325,8 +364,8 @@ class WalletListBodyState extends State<WalletListBody> {
               ],
             ),
           ),
-          Positioned(
-            bottom: 0.0,
+            Positioned(
+              bottom: 0.0,
             child: Container(
               //padding: EdgeInsets.only(top: 100),
               alignment: Alignment.bottomCenter,
@@ -338,10 +377,10 @@ class WalletListBodyState extends State<WalletListBody> {
                   begin: Alignment.topCenter,
                   end: Alignment.bottomCenter,
                   colors: <Color>[
-                    Theme.of(context).colorScheme.surface.withAlpha(10),
-                    Theme.of(context).colorScheme.surface,
-                    Theme.of(context).colorScheme.surface,
-                    Theme.of(context).colorScheme.surface
+                    Theme.of(context).colorScheme.background.withAlpha(10),
+                    Theme.of(context).colorScheme.background,
+                    Theme.of(context).colorScheme.background,
+                    Theme.of(context).colorScheme.background
                   ],
                 ),
               ),
@@ -357,86 +396,89 @@ class WalletListBodyState extends State<WalletListBody> {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: <Widget>[
                     PrimaryImageButton(
-                      image: Image.asset(
-                        'assets/images/restore_wallet.png',
-                        height: 12,
-                        width: 12,
-                        color: Theme.of(context).colorScheme.onSecondaryContainer,
-                      ),
-                      key: ValueKey('wallet_list_page_restore_wallet_button_key'),
+                      key: ValueKey(
+                          'wallet_list_page_restore_wallet_button_key'),
                       onPressed: () {
-                        if (widget.walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
+                        if (widget.walletListViewModel
+                            .shouldRequireTOTP2FAForCreatingNewWallets) {
                           widget.authService.authenticateAction(
                             context,
                             route: Routes.restoreOptions,
                             arguments: false,
                             conditionToDetermineIfToUse2FA: widget
-                                .walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+                                .walletListViewModel
+                                .shouldRequireTOTP2FAForCreatingNewWallets,
                           );
                         } else {
-                          Navigator.of(context).pushNamed(Routes.restoreOptions, arguments: false);
+                          Navigator.of(context).pushNamed(Routes.restoreOptions,
+                              arguments: false);
                         }
                       },
+                      image: restoreWalletImage,
                       text: S.of(context).wallet_list_restore_wallet,
-                      color: Theme.of(context).colorScheme.surfaceContainer,
-                      textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+                      color: Theme.of(context).cardColor,
+                      textColor: Theme.of(context)
+                          .extension<CakeTextTheme>()!
+                          .buttonTextColor,
                     ),
                     SizedBox(height: 10.0),
                     PrimaryImageButton(
-                      image: Image.asset(
-                        'assets/images/new_wallet.png',
-                        height: 12,
-                        width: 12,
-                        color: Theme.of(context).colorScheme.onPrimary,
-                      ),
-                      key: ValueKey('wallet_list_page_create_new_wallet_button_key'),
+                      key: ValueKey(
+                          'wallet_list_page_create_new_wallet_button_key'),
                       onPressed: () {
                         //TODO(David): Find a way to optimize this
                         if (isSingleCoin) {
-                          if (widget
-                              .walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
+                          if (widget.walletListViewModel
+                              .shouldRequireTOTP2FAForCreatingNewWallets) {
                             widget.authService.authenticateAction(
                               context,
                               route: Routes.newWallet,
                               arguments: NewWalletArguments(
-                                type: widget.walletListViewModel.currentWalletType,
+                                type: widget
+                                    .walletListViewModel.currentWalletType,
                               ),
                               conditionToDetermineIfToUse2FA: widget
-                                  .walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+                                  .walletListViewModel
+                                  .shouldRequireTOTP2FAForCreatingNewWallets,
                             );
                           } else {
                             Navigator.of(context).pushNamed(
                               Routes.newWallet,
                               arguments: NewWalletArguments(
-                                type: widget.walletListViewModel.currentWalletType,
+                                type: widget
+                                    .walletListViewModel.currentWalletType,
                               ),
                             );
                           }
                         } else {
-                          if (widget
-                              .walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets) {
+                          if (widget.walletListViewModel
+                              .shouldRequireTOTP2FAForCreatingNewWallets) {
                             widget.authService.authenticateAction(
                               context,
                               route: Routes.newWalletType,
                               conditionToDetermineIfToUse2FA: widget
-                                  .walletListViewModel.shouldRequireTOTP2FAForCreatingNewWallets,
+                                  .walletListViewModel
+                                  .shouldRequireTOTP2FAForCreatingNewWallets,
                             );
                           } else {
-                            Navigator.of(context).pushNamed(Routes.newWalletType);
+                            Navigator.of(context)
+                                .pushNamed(Routes.newWalletType);
                           }
                         }
                       },
+                      image: newWalletImage,
                       text: S.of(context).wallet_list_create_new_wallet,
-                      color: Theme.of(context).colorScheme.primary,
-                      textColor: Theme.of(context).colorScheme.onPrimary,
+                      color: Theme.of(context).primaryColor,
+                      textColor: Colors.white,
                     ),
                   ],
                 ),
               ),
             ),
-          ),
+            ),
         ],
       ),
+
     );
   }
 
@@ -448,7 +490,8 @@ class WalletListBodyState extends State<WalletListBody> {
     if (SettingsStoreBase.walletPasswordDirectInput) {
       Navigator.of(context).pushNamed(Routes.walletUnlockLoadable,
           arguments: WalletUnlockArguments(
-              callback: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
+              callback:
+                  (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
                 if (isAuthenticatedSuccessfully) {
                   auth.close();
                   setState(() {});
@@ -469,8 +512,8 @@ class WalletListBodyState extends State<WalletListBody> {
         }
 
         try {
-          final requireHardwareWalletConnection =
-              widget.walletListViewModel.requireHardwareWalletConnection(wallet);
+          final requireHardwareWalletConnection = widget.walletListViewModel
+              .requireHardwareWalletConnection(wallet);
           if (requireHardwareWalletConnection) {
             bool didConnect = false;
             await Navigator.of(context).pushNamed(
@@ -482,7 +525,6 @@ class WalletListBodyState extends State<WalletListBody> {
                   didConnect = true;
                   Navigator.of(context).pop();
                 },
-                isReconnect: true,
               ),
             );
 
@@ -499,7 +541,8 @@ class WalletListBodyState extends State<WalletListBody> {
             );
           }
 
-          changeProcessText(S.of(context).wallet_list_loading_wallet(wallet.name));
+          changeProcessText(
+              S.of(context).wallet_list_loading_wallet(wallet.name));
           await widget.walletListViewModel.loadWallet(wallet);
           await hideProgressText();
           // only pop the wallets route in mobile as it will go back to dashboard page
@@ -519,7 +562,9 @@ class WalletListBodyState extends State<WalletListBody> {
           final err = e.toString();
           await ExceptionHandler.onError(FlutterErrorDetails(exception: err));
           if (this.mounted) {
-            changeProcessText(S.of(context).wallet_list_failed_to_load(wallet.name, e.toString()));
+            changeProcessText(S
+                .of(context)
+                .wallet_list_failed_to_load(wallet.name, e.toString()));
           }
         } finally {
           _loadingWallet = false;
@@ -531,7 +576,7 @@ class WalletListBodyState extends State<WalletListBody> {
   }
 
   void changeProcessText(String text) {
-    _progressBar = createBar<void>(text, context, duration: null)..show(context);
+    _progressBar = createBar<void>(text, duration: null)..show(context);
   }
 
   Future<void> hideProgressText() async {
diff --git a/lib/src/screens/wallet_unlock/wallet_unlock_page.dart b/lib/src/screens/wallet_unlock/wallet_unlock_page.dart
index d0c6d0844..4afbfe2c1 100644
--- a/lib/src/screens/wallet_unlock/wallet_unlock_page.dart
+++ b/lib/src/screens/wallet_unlock/wallet_unlock_page.dart
@@ -3,8 +3,9 @@ import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:flutter/cupertino.dart';
@@ -51,8 +52,7 @@ class WalletUnlockPageState extends AuthPageState<WalletUnlockPage> {
       if (state is IsExecutingState) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           // null duration to make it indefinite until its disposed
-          _authBar = createBar<void>(S.of(context).authentication, context, duration: null)
-            ..show(context);
+          _authBar = createBar<void>(S.of(context).authentication, duration: null)..show(context);
         });
       }
 
@@ -90,7 +90,7 @@ class WalletUnlockPageState extends AuthPageState<WalletUnlockPage> {
   @override
   void changeProcessText(String text) {
     dismissFlushBar(_authBar);
-    _progressBar = createBar<void>(text, context, duration: null)..show(_key.currentContext!);
+    _progressBar = createBar<void>(text, duration: null)..show(_key.currentContext!);
   }
 
   @override
@@ -141,7 +141,7 @@ class WalletUnlockPageState extends AuthPageState<WalletUnlockPage> {
                     ),
                   ))
               : Container(),
-          backgroundColor: Theme.of(context).colorScheme.surface,
+          backgroundColor: Theme.of(context).colorScheme.background,
           border: null),
       resizeToAvoidBottomInset: false,
       body: Center(
@@ -161,30 +161,45 @@ class WalletUnlockPageState extends AuthPageState<WalletUnlockPage> {
                     Text(
                       widget.walletUnlockViewModel.walletName,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 24,
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
+                      style: TextStyle(
+                        fontSize: 24,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      ),
                     ),
                     SizedBox(height: 24),
                     Form(
-                      child: BaseTextFormField(
+                      child: TextFormField(
                         key: ValueKey('enter_wallet_password'),
                         onChanged: (value) => null,
                         controller: _passwordController,
                         textAlign: TextAlign.center,
                         obscureText: true,
-                        textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 20.0,
-                              fontWeight: FontWeight.w600,
+                        style: TextStyle(
+                          fontSize: 20.0,
+                          fontWeight: FontWeight.w600,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        ),
+                        decoration: InputDecoration(
+                          hintStyle: TextStyle(
+                            fontSize: 18.0,
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                          ),
+                          hintText: S.of(context).enter_wallet_password,
+                          focusedBorder: UnderlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Theme.of(context).extension<NewWalletTheme>()!.underlineColor,
+                              width: 1.0,
                             ),
-                        placeholderTextStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 18.0,
-                              fontWeight: FontWeight.w500,
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                              ),
-                        hintText: S.of(context).enter_wallet_password,
+                          ),
+                          enabledBorder: UnderlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Theme.of(context).extension<NewWalletTheme>()!.underlineColor,
+                              width: 1.0,
+                            ),
+                          ),
+                        ),
                       ),
                     ),
                   ],
@@ -195,25 +210,25 @@ class WalletUnlockPageState extends AuthPageState<WalletUnlockPage> {
                 padding: EdgeInsets.only(bottom: 24),
                 child: Observer(
                   builder: (_) => LoadingPrimaryButton(
-                    onPressed: () async {
-                      if (widget.authPasswordHandler != null) {
-                        try {
-                          await widget.authPasswordHandler!(widget.walletUnlockViewModel.password);
-                          widget.walletUnlockViewModel.success();
-                        } catch (e) {
-                          widget.walletUnlockViewModel.failure(e);
+                      onPressed: () async {
+                        if (widget.authPasswordHandler != null) {
+                          try {
+                            await widget
+                                .authPasswordHandler!(widget.walletUnlockViewModel.password);
+                            widget.walletUnlockViewModel.success();
+                          } catch (e) {
+                            widget.walletUnlockViewModel.failure(e);
+                          }
+                          return;
                         }
-                        return;
-                      }
 
-                      widget.walletUnlockViewModel.unlock();
-                    },
-                    text: S.of(context).unlock,
-                    color: Theme.of(context).colorScheme.primary,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
-                    isLoading: widget.walletUnlockViewModel.state is IsExecutingState,
-                    isDisabled: widget.walletUnlockViewModel.state is IsExecutingState,
-                  ),
+                        widget.walletUnlockViewModel.unlock();
+                      },
+                      text: S.of(context).unlock,
+                      color: Colors.green,
+                      textColor: Colors.white,
+                      isLoading: widget.walletUnlockViewModel.state is IsExecutingState,
+                      isDisabled: widget.walletUnlockViewModel.state is IsExecutingState),
                 ),
               ),
             ],
diff --git a/lib/src/screens/welcome/create_pin_welcome_page.dart b/lib/src/screens/welcome/create_pin_welcome_page.dart
index 49082a1e6..d4230668a 100644
--- a/lib/src/screens/welcome/create_pin_welcome_page.dart
+++ b/lib/src/screens/welcome/create_pin_welcome_page.dart
@@ -1,6 +1,7 @@
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
@@ -8,20 +9,17 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
-import '../../widgets/gradient_background.dart';
-import '../../widgets/animated_typing_text.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 
 class CreatePinWelcomePage extends BasePage {
   CreatePinWelcomePage(this.isWalletPasswordDirectInput);
 
   final bool isWalletPasswordDirectInput;
 
-  static const imageAspectRatio = 1.25;
-  static const imageMaxWidth = 600.0;
-  final welcomeImageLight = 'assets/images/welcome_light_theme.svg';
-  final welcomeImageDark = 'assets/images/welcome_dark_theme.svg';
-  final cakeLogoLight = 'assets/images/cake_logo_light.svg';
-  final cakeLogoDark = 'assets/images/cake_logo_dark.svg';
+  static const aspectRatioImage = 1.25;
+  final welcomeImageLight = Image.asset('assets/images/welcome_light.png');
+  final welcomeImageDark = Image.asset('assets/images/welcome.png');
 
   String appTitle(BuildContext context) {
     if (isMoneroOnly) {
@@ -36,157 +34,82 @@ class CreatePinWelcomePage extends BasePage {
       return S.of(context).monero_com_wallet_text;
     }
 
-    return S.of(context).payment_made_easy;
+    return S.of(context).new_first_wallet_text;
   }
 
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-      (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: Theme.of(context).colorScheme.surface,
-      resizeToAvoidBottomInset: false,
-      body: Builder(
-        builder: (BuildContext context) {
-          return Container(
-            decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.surface,
-              gradient: LinearGradient(
-                colors: [
-                  Theme.of(context).colorScheme.surface,
-                  currentTheme.isDark
-                      ? CustomThemeColors.backgroundGradientColorDark
-                      : CustomThemeColors.backgroundGradientColorLight,
-                ],
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-              ),
-            ),
-            child: body(context),
-          );
-        },
-      ),
-    );
+        backgroundColor: Theme.of(context).colorScheme.background,
+        resizeToAvoidBottomInset: false,
+        body: body(context));
   }
 
   @override
   Widget body(BuildContext context) {
-    String welcomeImage;
-    String cakeLogoThemed;
+    final welcomeImage = currentTheme.type == ThemeType.dark ? welcomeImageDark : welcomeImageLight;
 
-    if (currentTheme.isDark) {
-      welcomeImage = welcomeImageDark;
-      cakeLogoThemed = cakeLogoDark;
-    } else {
-      welcomeImage = welcomeImageLight;
-      cakeLogoThemed = cakeLogoLight;
-    }
+    final newWalletImage = Image.asset('assets/images/new_wallet.png',
+        height: 12,
+        width: 12,
+        color: Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor);
 
     return PopScope(
       canPop: false,
       child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.zero,
         content: Container(
           alignment: Alignment.center,
           child: ConstrainedBox(
-            constraints: BoxConstraints(maxWidth: imageMaxWidth),
-            child: Stack(
-              alignment: Alignment.center,
-              clipBehavior: Clip.none,
+            constraints:
+                BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[
-                AspectRatio(
-                  aspectRatio: imageAspectRatio,
-                  child: FittedBox(
-                    child: CakeImageWidget(
-                      imageUrl: welcomeImage,
-                      fit: BoxFit.contain,
+                Column(
+                  children: <Widget>[
+                    SizedBox(height: 70),
+                    AspectRatio(
+                      aspectRatio: aspectRatioImage,
+                      child: FittedBox(child: welcomeImage, fit: BoxFit.contain),
                     ),
-                    fit: BoxFit.contain,
-                  ),
-                ),
-                Positioned(
-                  top: (imageMaxWidth / imageAspectRatio) * 0.57,
-                  child: Column(
-                    children: <Widget>[
-                      Text(
-                        S.current.welcome,
-                        style: Theme.of(context).textTheme.displayLarge?.copyWith(
-                              fontWeight: FontWeight.w700,
-                              fontSize: 60,
-                              letterSpacing: 2.5,
-                              color: Theme.of(context).colorScheme.primary,
-                            ),
+                    SizedBox(height: 50),
+                    Padding(
+                      padding: EdgeInsets.only(top: 24),
+                      child: Text(
+                        S.of(context).welcome,
+                        style: TextStyle(
+                          fontSize: 18,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                        ),
                         textAlign: TextAlign.center,
                       ),
-                      SizedBox(height: 16),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Text(
-                            S.current.to.toLowerCase(),
-                            style: Theme.of(context).textTheme.titleMedium,
-                            textAlign: TextAlign.center,
-                          ),
-                          SizedBox(width: 8),
-                          if (!isMoneroOnly) ...[
-                            SizedBox(width: 8),
-                            CakeImageWidget(
-                              height: 40,
-                              imageUrl: cakeLogoThemed,
-                              fit: BoxFit.contain,
-                            ),
-                            SizedBox(width: 8),
-                          ],
-                          Text(
-                            appTitle(context),
-                            style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                  fontWeight: FontWeight.w600,
-                                ),
-                            textAlign: TextAlign.center,
-                          ),
-                        ],
+                    ),
+                    Padding(
+                      padding: EdgeInsets.only(top: 5),
+                      child: Text(
+                        appTitle(context),
+                        style: TextStyle(
+                          fontSize: 36,
+                          fontWeight: FontWeight.bold,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        ),
+                        textAlign: TextAlign.center,
                       ),
-                      SizedBox(height: 48),
-                      if (isMoneroOnly)
-                        Text(
-                          appDescription(context),
-                          style: Theme.of(context)
-                              .textTheme
-                              .bodyLarge
-                              ?.copyWith(fontWeight: FontWeight.w500),
-                          textAlign: TextAlign.center,
+                    ),
+                    Padding(
+                      padding: EdgeInsets.only(top: 5),
+                      child: Text(
+                        appDescription(context),
+                        style: TextStyle(
+                          fontSize: 16,
+                          fontWeight: FontWeight.w500,
+                          color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
                         ),
-                      if (!isMoneroOnly)
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            AnimatedTypingText(
-                              words: [S.current.payments, S.current.privacy, S.current.security],
-                              style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                    fontWeight: FontWeight.w600,
-                                    color: Theme.of(context).colorScheme.primary,
-                                  ),
-                              cursorColor: Theme.of(context).colorScheme.primary,
-                              cursorHeight: 28,
-                              cursorWidth: 4,
-                            ),
-                            SizedBox(width: 4),
-                            Text(
-                              S.current.made_easy,
-                              style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                    fontWeight: FontWeight.w600,
-                                  ),
-                            ),
-                          ],
-                        ),
-                    ],
-                  ),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                  ],
                 ),
               ],
             ),
@@ -197,24 +120,18 @@ class CreatePinWelcomePage extends BasePage {
             RichText(
               textAlign: TextAlign.center,
               text: TextSpan(
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                  fontSize: 14,
+                  color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                ),
                 children: [
-                  TextSpan(
-                    text: 'By continuing, you agree to our ',
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          fontWeight: FontWeight.w500,
-                        ),
-                  ),
+                  TextSpan(text: 'By continuing, you agree to our '),
                   TextSpan(
                     text: 'Terms of Service',
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          decoration: TextDecoration.underline,
-                          fontWeight: FontWeight.w700,
-                        ),
+                    style: TextStyle(
+                      color: Theme.of(context).primaryColor,
+                      decoration: TextDecoration.underline,
+                    ),
                     recognizer: TapGestureRecognizer()
                       ..onTap = () => Navigator.pushNamed(context, Routes.readDisclaimer),
                   ),
@@ -223,15 +140,18 @@ class CreatePinWelcomePage extends BasePage {
             ),
             Padding(
               padding: EdgeInsets.only(top: 24),
-              child: PrimaryButton(
+              child: PrimaryImageButton(
                 key: ValueKey('create_pin_welcome_page_create_a_pin_button_key'),
                 onPressed: () => Navigator.pushNamed(context, Routes.welcomeWallet),
+                image: newWalletImage,
                 text: isWalletPasswordDirectInput ? S.current.set_up_a_wallet : S.current.set_a_pin,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: Theme.of(context).colorScheme.onPrimary,
+                color: Theme.of(context)
+                    .extension<WalletListTheme>()!
+                    .createNewWalletButtonBackgroundColor,
+                textColor:
+                    Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor,
               ),
             ),
-            SizedBox(height: 16),
           ],
         ),
       ),
diff --git a/lib/src/screens/welcome/welcome_page.dart b/lib/src/screens/welcome/welcome_page.dart
index 023bafbe2..b45322996 100644
--- a/lib/src/screens/welcome/welcome_page.dart
+++ b/lib/src/screens/welcome/welcome_page.dart
@@ -1,38 +1,33 @@
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:cake_wallet/src/widgets/gradient_background.dart';
 
 class WelcomePage extends BasePage {
-  static const aspectRatioImage = 1.5;
-  final welcomeImageLight = 'assets/images/welcome_wallet_light.png';
-  final welcomeImageDark = 'assets/images/welcome_wallet_dark.png';
+  static const aspectRatioImage = 1.25;
+  final welcomeImageLight = Image.asset('assets/images/wallet_type_light.png');
+  final welcomeImageDark = Image.asset('assets/images/wallet_type.png');
 
   @override
   String? get title => S.current.wallet;
 
-  @override
-  bool get gradientBackground => true;
-
-  @override
-  Widget Function(BuildContext, Widget) get rootWrapper =>
-          (BuildContext context, Widget scaffold) => GradientBackground(scaffold: scaffold);
-
   @override
   bool get resizeToAvoidBottomInset => false;
 
   @override
   Widget trailing(BuildContext context) {
-    final Uri _url =
-        Uri.parse('https://docs.cakewallet.com/get-started/setup/create-first-wallet/');
+    final Uri _url = Uri.parse('https://docs.cakewallet.com/get-started/setup/create-first-wallet/');
     return IconButton(
-      icon: Icon(Icons.info_outline, size: 26,),
+      icon: Icon(Icons.info_outline),
       onPressed: () async {
         await launchUrl(_url);
       },
@@ -41,7 +36,14 @@ class WelcomePage extends BasePage {
 
   @override
   Widget body(BuildContext context) {
-    final welcomeImage = currentTheme.isDark ? welcomeImageDark : welcomeImageLight;
+    final welcomeImage = currentTheme.type == ThemeType.dark ? welcomeImageDark : welcomeImageLight;
+
+    final newWalletImage = Image.asset('assets/images/new_wallet.png',
+        height: 12,
+        width: 12,
+        color: Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor);
+    final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
+        height: 12, width: 12, color: Theme.of(context).extension<CakeTextTheme>()!.titleColor);
 
     return ScrollableWithBottomSection(
       content: Container(
@@ -57,28 +59,17 @@ class WelcomePage extends BasePage {
                 children: <Widget>[
                   AspectRatio(
                     aspectRatio: aspectRatioImage,
-                    child: FittedBox(
-                      fit: BoxFit.contain,
-                      child: CakeImageWidget(imageUrl: welcomeImage),
-                    ),
+                    child: FittedBox(child: welcomeImage, fit: BoxFit.contain),
                   ),
                   Padding(
-                    padding: EdgeInsets.only(top: 48),
-                    child: highlightText(
-                      context,
-                      S.of(context).welcome_subtitle_new_wallet,
-                      S.of(context).create_new,
-                    ),
-                  ),
+                      padding: EdgeInsets.only(top: 20),
+                      child: highlightText(context, S.of(context).welcome_subtitle_new_wallet,
+                          S.of(context).create_new)),
                   SizedBox(height: 10),
                   Padding(
-                    padding: EdgeInsets.only(top: 5),
-                    child: highlightText(
-                      context,
-                      S.of(context).welcome_subtitle_restore_wallet,
-                      S.of(context).restore_existing_wallet,
-                    ),
-                  ),
+                      padding: EdgeInsets.only(top: 5),
+                      child: highlightText(context, S.of(context).welcome_subtitle_restore_wallet,
+                          S.of(context).restore_existing_wallet)),
                 ],
               ),
             ],
@@ -87,37 +78,32 @@ class WelcomePage extends BasePage {
       ),
       bottomSection: Column(
         children: <Widget>[
-          Text(
-            'Please make selection below \nto create or recover your wallet.',
-            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-            textAlign: TextAlign.center,
-          ),
           Padding(
             padding: EdgeInsets.only(top: 24),
-            child: PrimaryButton(
-              key: ValueKey('welcome_page_restore_wallet_button_key'),
-              onPressed: () {
-                Navigator.pushNamed(context, Routes.restoreOptions, arguments: true);
-              },
-              text: S.of(context).restore_restore_wallet,
-              color: Theme.of(context).colorScheme.surfaceContainer,
-              textColor: Theme.of(context).colorScheme.onSecondaryContainer,
-            ),
+            child: PrimaryImageButton(
+                key: ValueKey('welcome_page_restore_wallet_button_key'),
+                onPressed: () {
+                  Navigator.pushNamed(context, Routes.restoreOptions, arguments: true);
+                },
+                image: restoreWalletImage,
+                text: S.of(context).restore_existing_wallet,
+                color: Theme.of(context).cardColor,
+                textColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
           ),
           Padding(
-            padding: EdgeInsets.only(top: 12),
-            child: PrimaryButton(
+            padding: EdgeInsets.only(top: 10),
+            child: PrimaryImageButton(
               key: ValueKey('welcome_page_create_new_wallet_button_key'),
               onPressed: () => Navigator.pushNamed(context, Routes.newWalletFromWelcome),
+              image: newWalletImage,
               text: S.of(context).create_new,
-              color: Theme.of(context).colorScheme.primary,
-              textColor: Theme.of(context).colorScheme.onPrimary,
+              color: Theme.of(context)
+                  .extension<WalletListTheme>()!
+                  .createNewWalletButtonBackgroundColor,
+              textColor:
+                  Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor,
             ),
           ),
-          SizedBox(height: 16),
         ],
       ),
     );
@@ -132,7 +118,12 @@ class WelcomePage extends BasePage {
         textAlign: TextAlign.center,
         text: TextSpan(
           text: text,
-          style: Theme.of(context).textTheme.bodyLarge?.copyWith(height: 1.5),
+          style: TextStyle(
+            fontSize: 16,
+            height: 1.5,
+            fontWeight: FontWeight.w400,
+            color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+          ),
         ),
       );
     }
@@ -145,34 +136,40 @@ class WelcomePage extends BasePage {
       final end = match.end;
 
       if (start > lastMatchEnd) {
-        spans.add(
-          TextSpan(
-            text: text.substring(lastMatchEnd, start),
-            style: Theme.of(context).textTheme.bodyLarge?.copyWith(height: 1.5),
+        spans.add(TextSpan(
+          text: text.substring(lastMatchEnd, start),
+          style: TextStyle(
+            fontSize: 16,
+            height: 1.5,
+            fontWeight: FontWeight.w400,
+            color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
           ),
-        );
+        ));
       }
 
-      spans.add(
-        TextSpan(
-          text: text.substring(start, end),
-          style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                height: 1.5,
-                fontWeight: FontWeight.w700,
-              ),
+      spans.add(TextSpan(
+        text: text.substring(start, end),
+        style: TextStyle(
+          fontSize: 16,
+          height: 1.5,
+          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+          fontWeight: FontWeight.bold,
         ),
-      );
+      ));
 
       lastMatchEnd = end;
     }
 
     if (lastMatchEnd < text.length) {
-      spans.add(
-        TextSpan(
-          text: text.substring(lastMatchEnd),
-          style: Theme.of(context).textTheme.bodyLarge?.copyWith(height: 1.5),
+      spans.add(TextSpan(
+        text: text.substring(lastMatchEnd),
+        style: TextStyle(
+          fontSize: 16,
+          height: 1.5,
+          fontWeight: FontWeight.w400,
+          color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
         ),
-      );
+      ));
     }
 
     return RichText(
diff --git a/lib/src/screens/yat/widgets/first_introduction.dart b/lib/src/screens/yat/widgets/first_introduction.dart
index b7e11f860..95dd5da2b 100644
--- a/lib/src/screens/yat/widgets/first_introduction.dart
+++ b/lib/src/screens/yat/widgets/first_introduction.dart
@@ -2,7 +2,9 @@ import 'package:cake_wallet/src/screens/yat/widgets/yat_bar.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/yat_page_indicator.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:lottie/lottie.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
@@ -22,7 +24,7 @@ class FirstIntroduction extends StatelessWidget {
     return Container(
         height: screenHeight,
         width: screenWidth,
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        color: Colors.white,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.only(top: 40, bottom: 40),
           content: Column(
@@ -40,11 +42,11 @@ class FirstIntroduction extends StatelessWidget {
                           Text(
                               S.of(context).yat_alert_title,
                               textAlign: TextAlign.center,
-                              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              style: TextStyle(
                                 fontSize: 24,
                                 fontWeight: FontWeight.bold,
-                                 
-                                color: Theme.of(context).colorScheme.onSurface,
+                                fontFamily: 'Lato',
+                                color: Colors.black,
                                 decoration: TextDecoration.none,
                               )
                           ),
@@ -53,11 +55,11 @@ class FirstIntroduction extends StatelessWidget {
                               child: Text(
                                   S.of(context).yat_alert_content,
                                   textAlign: TextAlign.center,
-                                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                  style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.normal,
-                                     
-                                    color: Theme.of(context).colorScheme.onSurface,
+                                    fontFamily: 'Lato',
+                                    color: Colors.black,
                                     decoration: TextDecoration.none,
                                   )
                               )
@@ -73,8 +75,8 @@ class FirstIntroduction extends StatelessWidget {
               children: [
                 PrimaryButton(
                     text: S.of(context).restore_next,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
-                    color: Theme.of(context).colorScheme.primary,
+                    textColor: Colors.white,
+                    color: Palette.protectiveBlue,
                     onPressed: onNext
                 ),
                 Padding(
diff --git a/lib/src/screens/yat/widgets/second_introduction.dart b/lib/src/screens/yat/widgets/second_introduction.dart
index 6d2f2959a..c4cdcadc1 100644
--- a/lib/src/screens/yat/widgets/second_introduction.dart
+++ b/lib/src/screens/yat/widgets/second_introduction.dart
@@ -2,7 +2,9 @@ import 'package:cake_wallet/src/screens/yat/widgets/yat_bar.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/yat_page_indicator.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:lottie/lottie.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
@@ -21,7 +23,7 @@ class SecondIntroduction extends StatelessWidget {
     return Container(
         height: screenHeight,
         width: screenWidth,
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        color: Colors.white,
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.only(top: 40, bottom: 40),
           content: Column(
@@ -39,11 +41,11 @@ class SecondIntroduction extends StatelessWidget {
                       Text(
                           S.of(context).second_intro_title,
                           textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                          style: TextStyle(
                             fontSize: 24,
                             fontWeight: FontWeight.bold,
-                             
-                            color: Theme.of(context).colorScheme.onSurface,
+                            fontFamily: 'Lato',
+                            color: Colors.black,
                             decoration: TextDecoration.none,
                           )
                       ),
@@ -52,11 +54,11 @@ class SecondIntroduction extends StatelessWidget {
                           child: Text(
                               S.of(context).second_intro_content,
                               textAlign: TextAlign.center,
-                              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              style: TextStyle(
                                 fontSize: 16,
                                 fontWeight: FontWeight.normal,
-                                 
-                                color: Theme.of(context).colorScheme.onSurface,
+                                fontFamily: 'Lato',
+                                color: Colors.black,
                                 decoration: TextDecoration.none,
                               )
                           )
@@ -72,8 +74,8 @@ class SecondIntroduction extends StatelessWidget {
               children: [
                 PrimaryButton(
                     text: S.of(context).restore_next,
-                    textColor: Theme.of(context).colorScheme.onPrimary,
-                    color: Theme.of(context).colorScheme.primary,
+                    textColor: Colors.white,
+                    color: Palette.protectiveBlue,
                     onPressed: onNext
                 ),
                 Padding(
diff --git a/lib/src/screens/yat/widgets/third_introduction.dart b/lib/src/screens/yat/widgets/third_introduction.dart
index 061e82208..af7b84e30 100644
--- a/lib/src/screens/yat/widgets/third_introduction.dart
+++ b/lib/src/screens/yat/widgets/third_introduction.dart
@@ -4,11 +4,15 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:lottie/lottie.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class ThirdIntroduction extends StatelessWidget {
-  ThirdIntroduction({required this.onGet, required this.onConnect, this.onClose});
+  ThirdIntroduction({
+    required this.onGet,
+    required this.onConnect,
+    this.onClose});
 
   final VoidCallback? onClose;
   final VoidCallback onGet;
@@ -21,80 +25,89 @@ class ThirdIntroduction extends StatelessWidget {
     final screenWidth = MediaQuery.of(context).size.width;
 
     return Container(
-      height: screenHeight,
-      width: screenWidth,
-      color: Theme.of(context).colorScheme.surfaceContainer,
-      child: ScrollableWithBottomSection(
-        contentPadding: EdgeInsets.only(top: 40, bottom: 40),
-        content: Column(
-          children: [
-            Container(
-                height: 90,
-                padding: EdgeInsets.only(left: 24, right: 24),
-                child: YatBar(onClose: onClose)),
-            animation,
-            Padding(
-                padding: EdgeInsets.only(top: 40, left: 30, right: 30),
-                child: Column(children: [
-                  Text(S.of(context).third_intro_title,
-                      textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 24,
-                        fontWeight: FontWeight.bold,
-                         
-                        color: Theme.of(context).colorScheme.onSurface,
-                        decoration: TextDecoration.none,
-                      )),
-                  Padding(
-                      padding: EdgeInsets.only(top: 20),
-                      child: Text(S.of(context).third_intro_content,
-                          textAlign: TextAlign.center,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.normal,
-                             
-                            color: Theme.of(context).colorScheme.onSurface,
-                            decoration: TextDecoration.none,
-                          )))
-                ])),
-          ],
-        ),
-        bottomSectionPadding: EdgeInsets.fromLTRB(24, 0, 24, 24),
-        bottomSection: Column(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            PrimaryIconButton(
-              text: S.of(context).get_your_yat,
-              textColor: Theme.of(context).colorScheme.onPrimary,
-              color: Theme.of(context).colorScheme.primary,
-              borderColor: Theme.of(context).colorScheme.primary,
-              iconColor: Theme.of(context).colorScheme.onPrimary,
-              iconBackgroundColor: Colors.transparent,
-              iconData: CupertinoIcons.arrow_up_right_square,
-              mainAxisAlignment: MainAxisAlignment.end,
-              onPressed: onGet,
-            ),
-            Padding(
-              padding: EdgeInsets.only(top: 12),
-              child: PrimaryIconButton(
-                text: S.of(context).connect_an_existing_yat,
-                textColor: Theme.of(context).colorScheme.onPrimary,
-                color: Theme.of(context).colorScheme.primary,
-                borderColor: Theme.of(context).colorScheme.primary,
-                iconColor: Theme.of(context).colorScheme.onPrimary,
-                iconBackgroundColor: Colors.transparent,
-                iconData: CupertinoIcons.arrow_up_right_square,
-                mainAxisAlignment: MainAxisAlignment.end,
-                onPressed: onConnect,
+        height: screenHeight,
+        width: screenWidth,
+        color: Colors.white,
+        child: ScrollableWithBottomSection(
+          contentPadding: EdgeInsets.only(top: 40, bottom: 40),
+          content: Column(
+            children: [
+              Container(
+                  height: 90,
+                  padding: EdgeInsets.only(left: 24, right: 24),
+                  child: YatBar(onClose: onClose)
               ),
-            ),
-            Padding(
-              padding: EdgeInsets.only(top: 24),
-              child: YatPageIndicator(filled: 2),
-            )
-          ],
-        ),
-      ),
+              animation,
+              Padding(
+                  padding: EdgeInsets.only(top: 40, left: 30, right: 30),
+                  child: Column(
+                      children: [
+                        Text(
+                            S.of(context).third_intro_title,
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                              fontSize: 24,
+                              fontWeight: FontWeight.bold,
+                              fontFamily: 'Lato',
+                              color: Colors.black,
+                              decoration: TextDecoration.none,
+                            )
+                        ),
+                        Padding(
+                            padding: EdgeInsets.only(top: 20),
+                            child: Text(
+                                S.of(context).third_intro_content,
+                                textAlign: TextAlign.center,
+                                style: TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.normal,
+                                  fontFamily: 'Lato',
+                                  color: Colors.black,
+                                  decoration: TextDecoration.none,
+                                )
+                            )
+                        )
+                      ]
+                  )
+              ),
+            ],
+          ),
+          bottomSectionPadding: EdgeInsets.fromLTRB(24, 0, 24, 24),
+          bottomSection: Column(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                PrimaryIconButton(
+                    text: S.of(context).get_your_yat,
+                    textColor: Colors.white,
+                    color: Palette.protectiveBlue,
+                    borderColor: Palette.protectiveBlue,
+                    iconColor: Colors.white,
+                    iconBackgroundColor: Colors.transparent,
+                    iconData: CupertinoIcons
+                        .arrow_up_right_square,
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    onPressed: onGet),
+                Padding(
+                    padding: EdgeInsets.only(top: 12),
+                    child: PrimaryIconButton(
+                        text: S.of(context).connect_an_existing_yat,
+                        textColor: Colors.black,
+                        color: Palette.blueAlice,
+                        borderColor: Palette.blueAlice,
+                        iconColor: Colors.black,
+                        iconBackgroundColor: Colors.transparent,
+                        iconData: CupertinoIcons
+                            .arrow_up_right_square,
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        onPressed: onConnect)
+                ),
+                Padding(
+                    padding: EdgeInsets.only(top: 24),
+                    child: YatPageIndicator(filled: 2)
+                )
+              ]
+          ),
+        )
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/yat/widgets/yat_close_button.dart b/lib/src/screens/yat/widgets/yat_close_button.dart
index 4e3ff0aeb..ed2b3fabf 100644
--- a/lib/src/screens/yat/widgets/yat_close_button.dart
+++ b/lib/src/screens/yat/widgets/yat_close_button.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
 
 class YatCloseButton extends StatelessWidget {
@@ -8,21 +9,20 @@ class YatCloseButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: onClose,
-      child: Container(
-        height: 28,
-        width: 28,
-        alignment: Alignment.center,
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainerHighest,
-          shape: BoxShape.circle,
-        ),
-        child: Icon(
-          Icons.clear,
-          color: Theme.of(context).colorScheme.onSecondaryContainer,
-          size: 20,
-        ),
-      ),
+        onTap: onClose,
+        child: Container(
+            height: 28,
+            width: 28,
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+                color: Palette.manatee,
+                shape: BoxShape.circle
+            ),
+            child: Icon(
+                Icons.clear,
+                color: Colors.white,
+                size: 20)
+        )
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/yat/widgets/yat_page_indicator.dart b/lib/src/screens/yat/widgets/yat_page_indicator.dart
index ec1d40584..a91e21318 100644
--- a/lib/src/screens/yat/widgets/yat_page_indicator.dart
+++ b/lib/src/screens/yat/widgets/yat_page_indicator.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
 class YatPageIndicator extends StatelessWidget {
   YatPageIndicator({required this.filled});
@@ -21,8 +22,8 @@ class YatPageIndicator extends StatelessWidget {
                   decoration: BoxDecoration(
                       shape: BoxShape.circle,
                       color: isFilled
-                          ? Theme.of(context).colorScheme.primary
-                          : Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.1)
+                          ? Palette.frostySky
+                          : Palette.stateGray.withOpacity(0.1)
                   )
               );
             })
diff --git a/lib/src/screens/yat/yat_popup.dart b/lib/src/screens/yat/yat_popup.dart
index 33c94a463..4ccd24259 100644
--- a/lib/src/screens/yat/yat_popup.dart
+++ b/lib/src/screens/yat/yat_popup.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/first_introduction.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/second_introduction.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/third_introduction.dart';
@@ -14,7 +15,9 @@ import 'package:cake_wallet/generated/i18n.dart';
 
 class YatPopup extends StatelessWidget {
   YatPopup({required this.dashboardViewModel, required this.onClose})
-      : baseUrl = YatLink.isDevMode ? YatLink.baseDevUrl : YatLink.baseReleaseUrl;
+      : baseUrl = YatLink.isDevMode
+          ? YatLink.baseDevUrl
+          : YatLink.baseReleaseUrl;
 
   static const durationInMilliseconds = 250;
 
@@ -31,124 +34,154 @@ class YatPopup extends StatelessWidget {
       clipBehavior: Clip.none,
       alignment: Alignment.bottomCenter,
       children: [
-        AlertBackground(child: Container()),
+        AlertBackground(
+            child: Container()
+        ),
         SlideInUp(
           from: 420,
           duration: Duration(milliseconds: durationInMilliseconds),
           child: ClipRRect(
-              borderRadius:
-                  BorderRadius.only(topLeft: Radius.circular(24), topRight: Radius.circular(24)),
+              borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(24),
+                  topRight: Radius.circular(24)),
               child: Container(
                   height: 420,
-                  color: Theme.of(context).colorScheme.surfaceContainer,
+                  color: Colors.white,
                   padding: EdgeInsets.fromLTRB(24, 15, 24, 24),
                   child: Column(
                     mainAxisSize: MainAxisSize.max,
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      Column(children: [
-                        Row(
-                            mainAxisSize: MainAxisSize.max,
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: [YatCloseButton(onClose: onClose)]),
-                        Row(
-                            mainAxisSize: MainAxisSize.max,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Container(
-                                  height: 64,
-                                  width: 165,
-                                  alignment: Alignment.center,
-                                  decoration: BoxDecoration(
-                                      color: Theme.of(context).colorScheme.surfaceContainer,
-                                      borderRadius: BorderRadius.all(Radius.circular(32)),
-                                      boxShadow: [
-                                        BoxShadow(
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .onSurface
-                                                .withOpacity(0.05),
-                                            blurRadius: 15,
-                                            offset: Offset(0, 5))
-                                      ]),
-                                  child: image)
-                            ])
-                      ]),
+                      Column(
+                          children: [
+                            Row(
+                                mainAxisSize: MainAxisSize.max,
+                                mainAxisAlignment: MainAxisAlignment.end,
+                                children: [
+                                  YatCloseButton(onClose: onClose)
+                                ]
+                            ),
+                            Row(
+                                mainAxisSize: MainAxisSize.max,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Container(
+                                      height: 64,
+                                      width: 165,
+                                      alignment: Alignment.center,
+                                      decoration: BoxDecoration(
+                                          color: Colors.white,
+                                          borderRadius: BorderRadius
+                                              .all(Radius.circular(32)),
+                                          boxShadow: [
+                                            BoxShadow(
+                                                color: Colors.black.withOpacity(0.05),
+                                                blurRadius: 15,
+                                                offset: Offset(0, 5)
+                                            )
+                                          ]
+                                      ),
+                                      child: image
+                                  )
+                                ]
+                            )
+                          ]
+                      ),
                       Container(
                           padding: EdgeInsets.only(left: 6, right: 6),
-                          child: Column(children: [
-                            Text(S.of(context).yat_popup_title,
-                                textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                          child: Column(
+                              children: [
+                                Text(
+                                    S.of(context).yat_popup_title,
+                                    textAlign: TextAlign.center,
+                                    style: TextStyle(
                                       fontSize: 24,
                                       fontWeight: FontWeight.bold,
+                                      fontFamily: 'Lato',
+                                      color: Colors.black,
                                       decoration: TextDecoration.none,
-                                    )),
-                            Padding(
-                                padding: EdgeInsets.only(top: 20),
-                                child: Text(S.of(context).yat_popup_content,
-                                    textAlign: TextAlign.center,
-                                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                                    )
+                                ),
+                                Padding(
+                                    padding: EdgeInsets.only(top: 20),
+                                    child: Text(
+                                        S.of(context).yat_popup_content,
+                                        textAlign: TextAlign.center,
+                                        style: TextStyle(
                                           fontSize: 16,
+                                          fontWeight: FontWeight.normal,
+                                          fontFamily: 'Lato',
+                                          color: Colors.black,
                                           decoration: TextDecoration.none,
-                                        )))
-                          ])),
+                                        )
+                                    )
+                                )
+                              ]
+                          )
+                      ),
                       PrimaryButton(
                           text: S.of(context).learn_more,
-                          textColor: Theme.of(context).colorScheme.onPrimary,
-                          color: Theme.of(context).colorScheme.primary,
-                          onPressed: () => dashboardViewModel.isShowFirstYatIntroduction = true)
+                          textColor: Colors.white,
+                          color: Palette.protectiveBlue,
+                          onPressed: () => dashboardViewModel
+                              .isShowFirstYatIntroduction = true
+                      )
                     ],
-                  ))),
+                  )
+              )
+          ),
         ),
-        Observer(
-            builder: (_) => dashboardViewModel.isShowFirstYatIntroduction
-                ? SlideInRight(
-                    from: screenWidth,
-                    duration: Duration(milliseconds: durationInMilliseconds),
-                    child: FirstIntroduction(
-                        onClose: onClose,
-                        onNext: () => dashboardViewModel.isShowSecondYatIntroduction = true))
-                : Container()),
-        Observer(
-            builder: (_) => dashboardViewModel.isShowSecondYatIntroduction
-                ? SlideInRight(
-                    from: screenWidth,
-                    duration: Duration(milliseconds: durationInMilliseconds),
-                    child: SecondIntroduction(
-                        onClose: onClose,
-                        onNext: () => dashboardViewModel.isShowThirdYatIntroduction = true))
-                : Container()),
-        Observer(
-            builder: (_) => dashboardViewModel.isShowThirdYatIntroduction
-                ? SlideInRight(
-                    from: screenWidth,
-                    duration: Duration(milliseconds: durationInMilliseconds),
-                    child: ThirdIntroduction(
-                        onClose: onClose,
-                        onGet: () {
-                          var createNewYatUrl = YatLink.startFlowUrl;
-                          final createNewYatUrlParameters =
-                              dashboardViewModel.yatStore.defineQueryParameters();
+        Observer(builder: (_) => dashboardViewModel.isShowFirstYatIntroduction
+            ? SlideInRight(
+            from: screenWidth,
+            duration: Duration(milliseconds: durationInMilliseconds),
+            child: FirstIntroduction(
+                onClose: onClose,
+                onNext: () => dashboardViewModel
+                    .isShowSecondYatIntroduction = true
+            ))
+            : Container()
+        ),
+        Observer(builder: (_) => dashboardViewModel.isShowSecondYatIntroduction
+            ? SlideInRight(
+            from: screenWidth,
+            duration: Duration(milliseconds: durationInMilliseconds),
+            child: SecondIntroduction(
+                onClose: onClose,
+                onNext: () => dashboardViewModel
+                    .isShowThirdYatIntroduction = true
+            ))
+            : Container()
+        ),
+        Observer(builder: (_) => dashboardViewModel.isShowThirdYatIntroduction
+            ? SlideInRight(
+            from: screenWidth,
+            duration: Duration(milliseconds: durationInMilliseconds),
+            child: ThirdIntroduction(
+                onClose: onClose,
+                onGet: () {
+                  var createNewYatUrl = YatLink.startFlowUrl;
+                  final createNewYatUrlParameters =
+                  dashboardViewModel.yatStore.defineQueryParameters();
 
-                          if (createNewYatUrlParameters.isNotEmpty) {
-                            createNewYatUrl += '?sub1=' + createNewYatUrlParameters;
-                          }
+                  if (createNewYatUrlParameters.isNotEmpty) {
+                    createNewYatUrl += '?sub1=' + createNewYatUrlParameters;
+                  }
 
-                          final uri = Uri.parse(createNewYatUrl);
-                          launchUrl(uri, mode: LaunchMode.externalApplication);
-                        },
-                        onConnect: () {
-                          String url = baseUrl + YatLink.signInSuffix;
-                          final parameters = dashboardViewModel.yatStore.defineQueryParameters();
-                          if (parameters.isNotEmpty) {
-                            url += YatLink.queryParameter + parameters;
-                          }
-                          final uri = Uri.parse(url);
-                          launchUrl(uri, mode: LaunchMode.externalApplication);
-                        }))
-                : Container())
+                  final uri = Uri.parse(createNewYatUrl);
+                  launchUrl(uri, mode: LaunchMode.externalApplication);
+                },
+                onConnect: () {
+                  String url = baseUrl + YatLink.signInSuffix;
+                  final parameters = dashboardViewModel.yatStore.defineQueryParameters();
+                  if (parameters.isNotEmpty) {
+                    url += YatLink.queryParameter + parameters;
+                  }
+                  final uri = Uri.parse(url);
+                  launchUrl(uri, mode: LaunchMode.externalApplication);
+                }))
+            : Container())
       ],
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/screens/yat_emoji_id.dart b/lib/src/screens/yat_emoji_id.dart
index c433aa57d..944331285 100644
--- a/lib/src/screens/yat_emoji_id.dart
+++ b/lib/src/screens/yat_emoji_id.dart
@@ -1,8 +1,20 @@
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/src/screens/yat/widgets/first_introduction.dart';
+import 'package:cake_wallet/src/screens/yat/widgets/second_introduction.dart';
+import 'package:cake_wallet/src/screens/yat/widgets/third_introduction.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/yat_close_button.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/store/yat/yat_store.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:animate_do/animate_do.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 
 class YatEmojiId extends StatelessWidget {
   YatEmojiId(this.emojiId);
@@ -24,70 +36,95 @@ class YatEmojiId extends StatelessWidget {
           from: 420,
           duration: Duration(milliseconds: durationInMilliseconds),
           child: ClipRRect(
-              borderRadius:
-                  BorderRadius.only(topLeft: Radius.circular(24), topRight: Radius.circular(24)),
+              borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(24),
+                  topRight: Radius.circular(24)),
               child: Container(
                   height: 420,
-                  color: Theme.of(context).colorScheme.primaryContainer,
+                  color:
+                      Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
                   padding: EdgeInsets.fromLTRB(24, 15, 24, 24),
                   child: Column(
                     mainAxisSize: MainAxisSize.max,
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      Column(children: [
-                        Row(
-                            mainAxisSize: MainAxisSize.max,
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            children: [YatCloseButton(onClose: () => Navigator.of(context).pop())]),
-                        Row(
-                            mainAxisSize: MainAxisSize.max,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Container(
-                                  padding: EdgeInsets.fromLTRB(10, 5, 10, 5),
-                                  decoration: BoxDecoration(
-                                      color: Theme.of(context).colorScheme.surfaceContainer,
-                                      border: Border.all(
-                                          color: Theme.of(context).colorScheme.outlineVariant),
-                                      borderRadius: BorderRadius.all(Radius.circular(50))),
-                                  child: Text(emojiId,
+                      Column(
+                          children: [
+                            Row(
+                                mainAxisSize: MainAxisSize.max,
+                                mainAxisAlignment: MainAxisAlignment.end,
+                                children: [
+                                  YatCloseButton(onClose: () => Navigator.of(context).pop())
+                                ]
+                            ),
+                            Row(
+                                mainAxisSize: MainAxisSize.max,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Container(
+                                    padding: EdgeInsets.fromLTRB(10, 5, 10, 5),
+                                    decoration: BoxDecoration(
+                                      color: Colors.white,
+                                      border: Border.all(color: Colors.white),
+                                      borderRadius: BorderRadius.all(Radius.circular(50))
+                                    ),
+                                    child: 
+                                    Text(
+                                      emojiId,
                                       textAlign: TextAlign.center,
-                                      style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                            fontSize: 46,
-                                            decoration: TextDecoration.none,
-                                          )))
-                            ])
-                      ]),
+                                      style: TextStyle(
+                                        fontSize: 46,
+                                        decoration: TextDecoration.none,
+                                      )
+                                  ))
+                                ]
+                            )
+                          ]
+                      ),
                       Container(
                           padding: EdgeInsets.only(left: 6, right: 6),
-                          child: Column(children: [
-                            Text("That's one nice Yat!",
-                                textAlign: TextAlign.center,
-                                style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                          child: Column(
+                              children: [
+                                Text(
+                                    "That's one nice Yat!",
+                                    textAlign: TextAlign.center,
+                                    style: TextStyle(
                                       fontSize: 32,
                                       fontWeight: FontWeight.bold,
+                                      fontFamily: 'Lato',
+                                      color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
                                       decoration: TextDecoration.none,
-                                    )),
-                            Padding(
-                                padding: EdgeInsets.only(top: 20),
-                                child: Text(
-                                    'You can manage your Yat or purchase additional Yats in your account settings',
-                                    textAlign: TextAlign.center,
-                                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                                    )
+                                ),
+                                Padding(
+                                    padding: EdgeInsets.only(top: 20),
+                                    child: Text(
+                                        'You can manage your Yat or purchase additional Yats in your account settings',
+                                        textAlign: TextAlign.center,
+                                        style: TextStyle(
                                           fontSize: 18,
-                                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                          fontWeight: FontWeight.normal,
+                                          fontFamily: 'Lato',
+                                          color: Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
                                           decoration: TextDecoration.none,
-                                        )))
-                          ])),
+                                        )
+                                    )
+                                )
+                              ]
+                          )
+                      ),
                       PrimaryButton(
                           text: 'Got it',
-                          textColor: Theme.of(context).colorScheme.onPrimary,
-                          color: Theme.of(context).colorScheme.primary,
-                          onPressed: () => Navigator.of(context).pop())
+                          textColor: Colors.white,
+                          color: Palette.protectiveBlue,
+                          onPressed: () => Navigator.of(context).pop()
+                      )
                     ],
-                  ))),
+                  )
+              )
+          ),
         )
       ],
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/widgets/adaptable_page_view.dart b/lib/src/widgets/adaptable_page_view.dart
index fc2506e01..c6800ae22 100644
--- a/lib/src/widgets/adaptable_page_view.dart
+++ b/lib/src/widgets/adaptable_page_view.dart
@@ -137,25 +137,10 @@ class _RenderSizingContainer extends RenderProxyBox {
         parentUsesSize: true,
       );
 
-      final int floorPage = page.floor();
-      final int ceilPage = page.ceil();
-
-      Size? a = sizes[floorPage];
-      Size? b = sizes[ceilPage];
-
-      if (a == null && sizes.isNotEmpty) {
-        a = sizes.values.first;
-      }
-      if (b == null && sizes.isNotEmpty) {
-        b = sizes.values.first;
-      }
-
-      a ??= child.getDryLayout(constraints);
-      b ??= a;
-
-      final double t = (page - floorPage).clamp(0.0, 1.0);
-      final double height = lerpDouble(a.height, b.height, t) ?? a.height;
+      final a = sizes[page.floor()]!;
+      final b = sizes[page.ceil()]!;
 
+      final height = lerpDouble(a.height, b.height, page - page.floor());
 
       child.layout(
         constraints.copyWith(minHeight: height, maxHeight: height),
diff --git a/lib/src/widgets/add_template_button.dart b/lib/src/widgets/add_template_button.dart
index f9935ebc3..a5e9f2e2a 100644
--- a/lib/src/widgets/add_template_button.dart
+++ b/lib/src/widgets/add_template_button.dart
@@ -2,6 +2,7 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 
 class AddTemplateButton extends StatelessWidget {
   final Function() onTap;
@@ -19,30 +20,31 @@ class AddTemplateButton extends StatelessWidget {
         child: DottedBorder(
           borderType: BorderType.RRect,
           dashPattern: [6, 4],
-          color: Theme.of(context).colorScheme.outline,
+          color:
+              Theme.of(context).extension<SendPageTheme>()!.templateDottedBorderColor,
           strokeWidth: 2,
-          radius: Radius.circular(12),
+          radius: Radius.circular(20),
           child: Container(
             height: 34,
             padding: EdgeInsets.symmetric(
-              horizontal: responsiveLayoutUtil.shouldRenderMobileUI ? 10 : 30,
-            ),
+                horizontal: responsiveLayoutUtil.shouldRenderMobileUI ? 10 : 30),
             alignment: Alignment.center,
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.all(Radius.circular(12)),
+              borderRadius: BorderRadius.all(Radius.circular(20)),
               color: Colors.transparent,
             ),
             child: currentTemplatesLength >= 1
                 ? Icon(
                     Icons.add,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    color: Theme.of(context).extension<SendPageTheme>()!.templateNewTextColor,
                   )
                 : Text(
                     S.of(context).new_template,
-                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                          fontWeight: FontWeight.w600,
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                        ),
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).extension<SendPageTheme>()!.templateNewTextColor,
+                    ),
                   ),
           ),
         ),
diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart
index 94312aaa1..1f30e648b 100644
--- a/lib/src/widgets/address_text_field.dart
+++ b/lib/src/widgets/address_text_field.dart
@@ -1,19 +1,21 @@
-import 'package:cake_wallet/entities/contact_base.dart';
-import 'package:cake_wallet/entities/qr_scanner.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/utils/device_info.dart';
-import 'package:cake_wallet/utils/permission_handler.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cw_core/currency.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/entities/qr_scanner.dart';
+import 'package:cake_wallet/entities/contact_base.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/utils/permission_handler.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 enum AddressTextFieldOption { paste, qrCode, addressBook, walletAddresses }
 
-class AddressTextField<T extends Currency> extends StatelessWidget {
+
+class AddressTextField<T extends Currency> extends StatelessWidget{
   AddressTextField({
     required this.controller,
     this.isActive = true,
@@ -21,7 +23,9 @@ class AddressTextField<T extends Currency> extends StatelessWidget {
     this.options = const [AddressTextFieldOption.qrCode, AddressTextFieldOption.addressBook],
     this.onURIScanned,
     this.focusNode,
+    this.isBorderExist = true,
     this.buttonColor,
+    this.borderColor,
     this.iconColor,
     this.textStyle,
     this.hintStyle,
@@ -32,10 +36,6 @@ class AddressTextField<T extends Currency> extends StatelessWidget {
     this.onSelectedContact,
     this.selectedCurrency,
     this.addressKey,
-    this.fillColor,
-    this.hasUnderlineBorder = false,
-    this.borderWidth = 1.0,
-    this.contentPadding,
   });
 
   static const prefixIconWidth = 34.0;
@@ -48,32 +48,25 @@ class AddressTextField<T extends Currency> extends StatelessWidget {
   final Function(Uri)? onURIScanned;
   final List<AddressTextFieldOption> options;
   final FormFieldValidator<String>? validator;
-
+  final bool isBorderExist;
   final Color? buttonColor;
-  final Color? fillColor;
+  final Color? borderColor;
   final Color? iconColor;
-  final double borderWidth;
   final TextStyle? textStyle;
   final TextStyle? hintStyle;
-  final bool hasUnderlineBorder;
-  final EdgeInsetsGeometry? contentPadding;
   final FocusNode? focusNode;
-  final T? selectedCurrency;
-  final Key? addressKey;
-
   final Function(BuildContext context)? onPushPasteButton;
   final Function(BuildContext context)? onPushAddressBookButton;
   final Function(BuildContext context)? onPushAddressPickerButton;
   final Function(ContactBase contact)? onSelectedContact;
+  final T? selectedCurrency;
+  final Key? addressKey;
 
   @override
   Widget build(BuildContext context) {
     return Stack(
       children: <Widget>[
-        BaseTextFormField(
-          contentPadding: contentPadding,
-          borderWidth: borderWidth,
-          hasUnderlineBorder: hasUnderlineBorder,
+        TextFormField(
           key: addressKey,
           enableIMEPersonalizedLearning: false,
           keyboardType: TextInputType.visiblePassword,
@@ -81,142 +74,156 @@ class AddressTextField<T extends Currency> extends StatelessWidget {
           enabled: isActive,
           controller: controller,
           focusNode: focusNode,
-          textStyle: textStyle ??
-              Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 16,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-          fillColor: fillColor ?? Theme.of(context).colorScheme.surfaceContainer,
-          suffixIcon: SizedBox(
-            width: prefixIconWidth * options.length + (spaceBetweenPrefixIcons * options.length),
+          style: textStyle ??
+              TextStyle(
+                  fontSize: 16, color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+          decoration: InputDecoration(
+            suffixIcon: SizedBox(
+              width: prefixIconWidth * options.length + (spaceBetweenPrefixIcons * options.length),
+            ),
+            hintStyle: hintStyle ?? TextStyle(fontSize: 16, color: Theme.of(context).hintColor),
+            hintText: placeholder ?? S.current.widgets_address,
+            focusedBorder: isBorderExist
+                ? UnderlineInputBorder(
+                    borderSide: BorderSide(
+                        color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
+                : InputBorder.none,
+            disabledBorder: isBorderExist
+                ? UnderlineInputBorder(
+                    borderSide: BorderSide(
+                        color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
+                : InputBorder.none,
+            enabledBorder: isBorderExist
+                ? UnderlineInputBorder(
+                    borderSide: BorderSide(
+                        color: borderColor ?? Theme.of(context).dividerColor, width: 1.0))
+                : InputBorder.none,
           ),
-          placeholderTextStyle: hintStyle ??
-              Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 16,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
-          hintText: placeholder ?? S.current.widgets_address,
           validator: validator,
         ),
         Positioned(
-          top: 8,
-          right: 6,
-          child: SizedBox(
-            width: (prefixIconWidth * options.length) + (spaceBetweenPrefixIcons * options.length),
-            child: Row(
-              mainAxisAlignment: responsiveLayoutUtil.shouldRenderMobileUI
-                  ? MainAxisAlignment.spaceBetween
-                  : MainAxisAlignment.end,
-              children: [
-                if (this.options.contains(AddressTextFieldOption.paste)) ...[
-                  SizedBox(width: 5),
-                  Container(
-                    width: prefixIconWidth,
-                    height: prefixIconHeight,
-                    padding: EdgeInsets.only(top: 0),
-                    child: Semantics(
-                      label: S.of(context).paste,
-                      child: InkWell(
-                        onTap: () async => _pasteAddress(context),
-                        child: Container(
-                          padding: EdgeInsets.all(8),
-                          decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.surface,
-                            borderRadius: BorderRadius.all(Radius.circular(6)),
-                          ),
-                          child: Image.asset(
-                            'assets/images/paste_ios.png',
-                            color: iconColor ?? Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
+            top: 2,
+            right: 0,
+            child: SizedBox(
+              width:
+                  (prefixIconWidth * options.length) + (spaceBetweenPrefixIcons * options.length),
+              child: Row(
+                mainAxisAlignment: responsiveLayoutUtil.shouldRenderMobileUI
+                    ? MainAxisAlignment.spaceBetween
+                    : MainAxisAlignment.end,
+                children: [
+                  if (this.options.contains(AddressTextFieldOption.paste)) ...[
+                    SizedBox(width: 5),
+                    Container(
+                      width: prefixIconWidth,
+                      height: prefixIconHeight,
+                      padding: EdgeInsets.only(top: 0),
+                      child: Semantics(
+                        label: S.of(context).paste,
+                        child: InkWell(
+                          onTap: () async => _pasteAddress(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color:
+                                      buttonColor ?? Theme.of(context).dialogTheme.backgroundColor,
+                                  borderRadius: BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                'assets/images/paste_ios.png',
+                                color: iconColor ??
+                                    Theme.of(context)
+                                        .extension<SendPageTheme>()!
+                                        .textFieldButtonIconColor,
+                              )),
                         ),
                       ),
                     ),
-                  ),
-                ],
-                if (this.options.contains(AddressTextFieldOption.qrCode) &&
-                    DeviceInfo.instance.isMobile) ...[
-                  SizedBox(width: 5),
-                  Container(
-                    width: prefixIconWidth,
-                    height: prefixIconHeight,
-                    padding: EdgeInsets.only(top: 0),
-                    child: Semantics(
-                      label: S.of(context).scan_qr_code,
-                      child: InkWell(
-                        onTap: () async => _presentQRScanner(context),
-                        child: Container(
-                          padding: EdgeInsets.all(8),
-                          decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.surface,
-                            borderRadius: BorderRadius.all(
-                              Radius.circular(6),
-                            ),
-                          ),
-                          child: Image.asset(
-                            'assets/images/qr_code_icon.png',
-                            color: iconColor ?? Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
+                  ],
+                  if (this.options.contains(AddressTextFieldOption.qrCode) &&
+                      DeviceInfo.instance.isMobile) ...[
+                    SizedBox(width: 5),
+                    Container(
+                      width: prefixIconWidth,
+                      height: prefixIconHeight,
+                      padding: EdgeInsets.only(top: 0),
+                      child: Semantics(
+                        label: S.of(context).scan_qr_code,
+                        child: InkWell(
+                          onTap: () async => _presentQRScanner(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color:
+                                      buttonColor ?? Theme.of(context).dialogTheme.backgroundColor,
+                                  borderRadius: BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                'assets/images/qr_code_icon.png',
+                                color: iconColor ??
+                                    Theme.of(context)
+                                        .extension<SendPageTheme>()!
+                                        .textFieldButtonIconColor,
+                              )),
                         ),
                       ),
                     ),
-                  ),
-                ],
-                if (this.options.contains(AddressTextFieldOption.addressBook)) ...[
-                  SizedBox(width: 5),
-                  Container(
-                    width: prefixIconWidth,
-                    height: prefixIconHeight,
-                    padding: EdgeInsets.only(top: 0),
-                    child: Semantics(
-                      label: S.of(context).address_book,
-                      child: InkWell(
-                        onTap: () async => _presetAddressBookPicker(context),
-                        child: Container(
-                          padding: EdgeInsets.all(8),
-                          decoration: BoxDecoration(
-                            color: Theme.of(context).colorScheme.surface,
-                            borderRadius: BorderRadius.all(
-                              Radius.circular(6),
-                            ),
-                          ),
-                          child: Image.asset(
-                            'assets/images/open_book.png',
-                            color: iconColor ?? Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
+                  ],
+                  if (this.options.contains(AddressTextFieldOption.addressBook)) ...[
+                    SizedBox(width: 5),
+                    Container(
+                      width: prefixIconWidth,
+                      height: prefixIconHeight,
+                      padding: EdgeInsets.only(top: 0),
+                      child: Semantics(
+                        label: S.of(context).address_book,
+                        child: InkWell(
+                          onTap: () async => _presetAddressBookPicker(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color:
+                                      buttonColor ?? Theme.of(context).dialogTheme.backgroundColor,
+                                  borderRadius: BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                'assets/images/open_book.png',
+                                color: iconColor ??
+                                    Theme.of(context)
+                                        .extension<SendPageTheme>()!
+                                        .textFieldButtonIconColor,
+                              )),
                         ),
                       ),
                     ),
-                  ),
-                ],
-                if (this.options.contains(AddressTextFieldOption.walletAddresses)) ...[
-                  SizedBox(width: 5),
-                  Container(
-                    width: prefixIconWidth,
-                    height: prefixIconHeight,
-                    padding: EdgeInsets.only(top: 0),
-                    child: Semantics(
-                      label: S.of(context).address_book,
-                      child: InkWell(
-                        onTap: () async => _presetWalletAddressPicker(context),
-                        child: Container(
-                          padding: EdgeInsets.all(8),
-                          decoration: BoxDecoration(
-                            color: buttonColor ?? Theme.of(context).colorScheme.surfaceContainerLow,
-                            borderRadius: BorderRadius.all(Radius.circular(6)),
-                          ),
-                          child: Image.asset(
-                            'assets/images/open_book.png',
-                            color: iconColor ?? Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
+                  ],
+                  if (this.options.contains(AddressTextFieldOption.walletAddresses)) ...[
+                    SizedBox(width: 5),
+                    Container(
+                      width: prefixIconWidth,
+                      height: prefixIconHeight,
+                      padding: EdgeInsets.only(top: 0),
+                      child: Semantics(
+                        label: S.of(context).address_book,
+                        child: InkWell(
+                          onTap: () async => _presetWalletAddressPicker(context),
+                          child: Container(
+                              padding: EdgeInsets.all(8),
+                              decoration: BoxDecoration(
+                                  color:
+                                      buttonColor ?? Theme.of(context).dialogTheme.backgroundColor,
+                                  borderRadius: BorderRadius.all(Radius.circular(6))),
+                              child: Image.asset(
+                                'assets/images/open_book.png',
+                                color: iconColor ??
+                                    Theme.of(context)
+                                        .extension<SendPageTheme>()!
+                                        .textFieldButtonIconColor,
+                              )),
                         ),
                       ),
-                    ),
-                  )
+                    )
+                  ],
                 ],
-              ],
-            ),
-          ),
-        )
+              ),
+            ))
       ],
     );
   }
@@ -227,7 +234,9 @@ class AddressTextField<T extends Currency> extends StatelessWidget {
     if (!isCameraPermissionGranted) return;
     final code = await presentQRScanner(context);
     if (code == null) return;
-    if (code.isEmpty) return;
+    if (code.isEmpty) {
+      return;
+    }
 
     try {
       final uri = Uri.parse(code);
@@ -263,19 +272,7 @@ class AddressTextField<T extends Currency> extends StatelessWidget {
     final address = clipboard?.text ?? '';
 
     if (address.isNotEmpty) {
-      // if it has query parameters then it's a valid uri
-      // added because Uri.parse(address) can parse a normal address string and would still be valid
-      if (address.contains("=")) {
-        try {
-          final uri = Uri.parse(address);
-          controller?.text = uri.path;
-          onURIScanned?.call(uri);
-        } catch (_) {
-          controller?.text = address;
-        }
-      } else {
-        controller?.text = address;
-      }
+      controller?.text = address;
     }
 
     onPushPasteButton?.call(context);
diff --git a/lib/src/widgets/alert_background.dart b/lib/src/widgets/alert_background.dart
index cc5898961..56f10d1f6 100644
--- a/lib/src/widgets/alert_background.dart
+++ b/lib/src/widgets/alert_background.dart
@@ -1,4 +1,5 @@
 import 'dart:ui';
+import 'package:cake_wallet/themes/extensions/alert_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 
@@ -20,7 +21,8 @@ class AlertBackground extends StatelessWidget {
           filter: ImageFilter.blur(sigmaX: 3.0, sigmaY: 3.0),
           child: Container(
             decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.surface.withOpacity(0.8)),
+                color:
+                    Theme.of(context).extension<AlertTheme>()!.backdropColor),
             child: Center(
               child: Container(
                 width: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint,
diff --git a/lib/src/widgets/alert_close_button.dart b/lib/src/widgets/alert_close_button.dart
index 83664063d..6ef0bdaa5 100644
--- a/lib/src/widgets/alert_close_button.dart
+++ b/lib/src/widgets/alert_close_button.dart
@@ -1,4 +1,5 @@
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
 
 class AlertCloseButton extends StatelessWidget {
@@ -6,7 +7,6 @@ class AlertCloseButton extends StatelessWidget {
     this.image,
     this.bottom,
     this.onTap,
-    this.isPositioned = true,
     super.key,
   });
 
@@ -14,34 +14,32 @@ class AlertCloseButton extends StatelessWidget {
 
   final Image? image;
   final double? bottom;
-  final bool isPositioned;
+
+  final closeButton = Image.asset(
+    'assets/images/close.png',
+    color: Palette.darkBlueCraiola,
+  );
 
   @override
   Widget build(BuildContext context) {
-    final button = GestureDetector(
-      onTap: onTap ?? () => Navigator.of(context).pop(),
-      child: Semantics(
-        label: S.of(context).close,
-        button: true,
-        enabled: true,
-        child: Container(
-          height: 42,
-          width: 42,
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.onSurface,
-            shape: BoxShape.circle,
-          ),
-          child: Center(
-            child: image ??
-                Image.asset(
-                  'assets/images/close.png',
-                  color: Theme.of(context).colorScheme.surface,
-                ),
+    return Positioned(
+      bottom: bottom ?? 60,
+      child: GestureDetector(
+        onTap: onTap ?? () => Navigator.of(context).pop(),
+        child: Semantics(
+          label: S.of(context).close,
+          button: true,
+          enabled: true,
+          child: Container(
+            height: 42,
+            width: 42,
+            decoration: BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+            child: Center(
+              child: image ?? closeButton,
+            ),
           ),
         ),
       ),
     );
-
-    return isPositioned ? Positioned(bottom: bottom ?? 60, child: button) : button;
   }
 }
diff --git a/lib/src/widgets/alert_with_one_action.dart b/lib/src/widgets/alert_with_one_action.dart
index f66cae177..6f0ba5e8b 100644
--- a/lib/src/widgets/alert_with_one_action.dart
+++ b/lib/src/widgets/alert_with_one_action.dart
@@ -44,26 +44,25 @@ class AlertWithOneAction extends BaseAlertDialog {
       width: 300,
       height: 52,
       padding: EdgeInsets.only(left: 12, right: 12),
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).dialogBackgroundColor,
       child: ButtonTheme(
         minWidth: double.infinity,
         child: TextButton(
-          key: buttonKey,
-          onPressed: buttonAction,
-          // FIX-ME: Style
-          //highlightColor: Colors.transparent,
-          //splashColor: Colors.transparent,
-          child: Text(
-            buttonText,
-            textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontSize: 15,
-              fontWeight: FontWeight.w600,
-              color: Theme.of(context).colorScheme.primary,
-              decoration: TextDecoration.none,
-            ),
-          ),
-        ),
+            key: buttonKey,
+            onPressed: buttonAction,
+            // FIX-ME: Style
+            //highlightColor: Colors.transparent,
+            //splashColor: Colors.transparent,
+            child: Text(
+              buttonText,
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                fontSize: 15,
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).primaryColor,
+                decoration: TextDecoration.none,
+              ),
+            )),
       ),
     );
   }
diff --git a/lib/src/widgets/alert_with_picker_option.dart b/lib/src/widgets/alert_with_picker_option.dart
index fdc8f0b98..bedcdefd4 100644
--- a/lib/src/widgets/alert_with_picker_option.dart
+++ b/lib/src/widgets/alert_with_picker_option.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 class AlertWithPickerOption extends BaseAlertDialog {
   AlertWithPickerOption(
@@ -45,13 +46,12 @@ class AlertWithPickerOption extends BaseAlertDialog {
         Text(
           contentText,
           textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                fontSize: 10,
-                fontWeight: FontWeight.w500,
-                 
-                color: Theme.of(context).colorScheme.onSurface,
-                decoration: TextDecoration.none,
-              ),
+          style: TextStyle(
+              fontSize: 10,
+              fontWeight: FontWeight.w500,
+              fontFamily: 'Lato',
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              decoration: TextDecoration.none),
         ),
         const SizedBox(height: 4),
         Container(
@@ -75,29 +75,35 @@ class AlertWithPickerOption extends BaseAlertDialog {
                   padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
                   decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(30),
-                      color: Theme.of(context).colorScheme.surface),
+                      color: Theme.of(context).colorScheme.background),
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Text(
                         displayKey,
-                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                              decoration: TextDecoration.none,
-                            ),
+                        style: TextStyle(
+                          fontSize: 12,
+                          fontFamily: 'Lato',
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                          decoration: TextDecoration.none,
+                        ),
                       ),
                       Row(
                         children: [
                           Text(
                             displayValue,
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  decoration: TextDecoration.none,
-                                ),
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              decoration: TextDecoration.none,
+                            ),
                           ),
                           const SizedBox(width: 4),
                           Icon(
                             Icons.arrow_forward_ios,
                             size: 18,
-                            color: Theme.of(context).colorScheme.onSurface,
+                            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                           ),
                         ],
                       ),
diff --git a/lib/src/widgets/alert_with_two_actions.dart b/lib/src/widgets/alert_with_two_actions.dart
index bbbc1d64d..e3d4408a6 100644
--- a/lib/src/widgets/alert_with_two_actions.dart
+++ b/lib/src/widgets/alert_with_two_actions.dart
@@ -1,3 +1,4 @@
+import 'dart:ui';
 import 'package:cake_wallet/src/widgets/base_alert_dialog.dart';
 import 'package:flutter/cupertino.dart';
 
@@ -5,7 +6,6 @@ class AlertWithTwoActions extends BaseAlertDialog {
   AlertWithTwoActions({
     required this.alertTitle,
     required this.alertContent,
-    this.alertContentTextWidget,
     required this.leftButtonText,
     required this.rightButtonText,
     required this.actionLeftButton,
@@ -21,7 +21,6 @@ class AlertWithTwoActions extends BaseAlertDialog {
 
   final String alertTitle;
   final String alertContent;
-  final Widget? alertContentTextWidget;
   final String leftButtonText;
   final String rightButtonText;
   final VoidCallback actionLeftButton;
@@ -39,8 +38,6 @@ class AlertWithTwoActions extends BaseAlertDialog {
   @override
   String get contentText => alertContent;
   @override
-  Widget? get contentTextWidget => alertContentTextWidget;
-  @override
   String get leftActionButtonText => leftButtonText;
   @override
   String get rightActionButtonText => rightButtonText;
diff --git a/lib/src/widgets/animated_typing_text.dart b/lib/src/widgets/animated_typing_text.dart
deleted file mode 100644
index aba821c04..000000000
--- a/lib/src/widgets/animated_typing_text.dart
+++ /dev/null
@@ -1,169 +0,0 @@
-import 'package:flutter/material.dart';
-
-class AnimatedTypingText extends StatefulWidget {
-  final List<String> words;
-  final TextStyle? style;
-  final Duration typingSpeed;
-  final Duration pauseDuration;
-  final Color cursorColor;
-  final double cursorWidth;
-  final double cursorHeight;
-  final Duration cursorBlinkDuration;
-
-  const AnimatedTypingText({
-    Key? key,
-    required this.words,
-    this.style,
-    this.typingSpeed = const Duration(milliseconds: 100),
-    this.pauseDuration = const Duration(milliseconds: 3000),
-    this.cursorColor = Colors.black,
-    this.cursorWidth = 2.0,
-    this.cursorHeight = 20.0,
-    this.cursorBlinkDuration = const Duration(milliseconds: 500),
-  }) : super(key: key);
-
-  @override
-  State<AnimatedTypingText> createState() => _AnimatedTypingTextState();
-}
-
-class _AnimatedTypingTextState extends State<AnimatedTypingText> with TickerProviderStateMixin {
-  late AnimationController _controller;
-  late AnimationController _cursorController;
-  late Animation<double> _cursorAnimation;
-
-  String _displayText = '';
-
-  int _currentWordIndex = 0;
-  int _currentCharIndex = 0;
-
-  bool _isTyping = true;
-  bool _isPaused = false;
-  bool _isWaitingForPause = false;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: widget.typingSpeed,
-    );
-
-    _cursorController = AnimationController(
-      vsync: this,
-      duration: widget.cursorBlinkDuration,
-    )..repeat(reverse: true);
-
-    _cursorAnimation = Tween<double>(begin: 1.0, end: 0.0).animate(
-      CurvedAnimation(
-        parent: _cursorController,
-        curve: Curves.easeInOut,
-      ),
-    );
-
-    _controller.addStatusListener((status) {
-      if (status == AnimationStatus.completed) {
-        _updateText();
-        if (!_isWaitingForPause) {
-          _controller.reset();
-          _controller.forward();
-        }
-      }
-    });
-
-    _controller.forward();
-  }
-
-  void _updateText() {
-    if (_isWaitingForPause) return;
-
-    if (_isPaused) {
-      if (_isTyping) {
-        _isTyping = false;
-        _isWaitingForPause = true;
-        Future.delayed(widget.pauseDuration, () {
-          if (mounted) {
-            setState(() {
-              _isPaused = false;
-              _isWaitingForPause = false;
-              _controller.reset();
-              _controller.forward();
-            });
-          }
-        });
-      } else {
-        _deletePrevChar();
-      }
-    } else {
-      if (_isTyping) {
-        _typeNextChar();
-      } else {
-        _deletePrevChar();
-      }
-    }
-
-    setState(() {
-      _displayText = widget.words[_currentWordIndex].substring(0, _currentCharIndex);
-    });
-  }
-
-  void _typeNextChar() {
-    if (_currentCharIndex < widget.words[_currentWordIndex].length) {
-      _currentCharIndex++;
-    } else {
-      _isPaused = true;
-    }
-  }
-
-  void _deletePrevChar() {
-    if (_currentCharIndex > 0) {
-      _currentCharIndex--;
-    } else {
-      _currentWordIndex = (_currentWordIndex + 1) % widget.words.length;
-      _currentCharIndex = 0;
-      _isTyping = true;
-      _isPaused = false;
-    }
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    _cursorController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      clipBehavior: Clip.none,
-      children: [
-        // Fixed cursor position
-        Positioned(
-          right: 0,
-          bottom: 0,
-          child: AnimatedBuilder(
-            animation: _cursorAnimation,
-            builder: (context, child) {
-              return Opacity(
-                opacity: _cursorAnimation.value,
-                child: Container(
-                  width: widget.cursorWidth,
-                  height: widget.cursorHeight,
-                  color: widget.cursorColor,
-                ),
-              );
-            },
-          ),
-        ),
-        // Animated text
-        Align(
-          alignment: Alignment.centerRight,
-          child: Text(
-            _displayText + ' ',
-            style: widget.style,
-          ),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart
index a27f79724..02b8f85ab 100644
--- a/lib/src/widgets/base_alert_dialog.dart
+++ b/lib/src/widgets/base_alert_dialog.dart
@@ -1,6 +1,7 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'dart:ui';
-
 import 'package:cake_wallet/src/widgets/section_divider.dart';
+import 'package:cake_wallet/themes/extensions/alert_theme.dart';
 import 'package:flutter/material.dart';
 
 class BaseAlertDialog extends StatelessWidget {
@@ -12,8 +13,6 @@ class BaseAlertDialog extends StatelessWidget {
 
   String get contentText => '';
 
-  Widget? get contentTextWidget => null;
-
   String get leftActionButtonText => '';
 
   String get rightActionButtonText => '';
@@ -48,12 +47,13 @@ class BaseAlertDialog extends StatelessWidget {
     return Text(
       titleText!,
       textAlign: TextAlign.center,
-      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-            fontSize: titleTextSize,
-            fontWeight: FontWeight.w600,
-            color: Theme.of(context).colorScheme.onSurface,
-            decoration: TextDecoration.none,
-          ),
+      style: TextStyle(
+        fontSize: titleTextSize,
+        fontFamily: 'Lato',
+        fontWeight: FontWeight.w600,
+        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+        decoration: TextDecoration.none,
+      ),
     );
   }
 
@@ -63,12 +63,13 @@ class BaseAlertDialog extends StatelessWidget {
       child: Text(
         headerText!,
         textAlign: TextAlign.center,
-        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontSize: 25,
-              fontWeight: FontWeight.w600,
-              color: Theme.of(context).colorScheme.onSurface,
-              decoration: TextDecoration.none,
-            ),
+        style: TextStyle(
+          fontSize: 25,
+          fontFamily: 'Lato',
+          fontWeight: FontWeight.w600,
+          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+          decoration: TextDecoration.none,
+        ),
       ),
     );
   }
@@ -78,15 +79,17 @@ class BaseAlertDialog extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          contentTextWidget ??
-              Text(
-                contentText,
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontSize: 16,
-                      decoration: TextDecoration.none,
-                    ),
-              ),
+          Text(
+            contentText,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.normal,
+              fontFamily: 'Lato',
+              color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              decoration: TextDecoration.none,
+            ),
+          ),
         ],
       ),
     );
@@ -94,59 +97,57 @@ class BaseAlertDialog extends StatelessWidget {
 
   Widget actionButtons(BuildContext context) {
     return Container(
-      height: 60,
-      child: Row(
-        mainAxisSize: MainAxisSize.max,
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: <Widget>[
-          Expanded(
-            child: TextButton(
-                key: leftActionButtonKey,
-                onPressed: actionLeft,
-                style: TextButton.styleFrom(
-                  backgroundColor: leftActionButtonColor ?? Theme.of(context).colorScheme.surface,
-                  shape: const RoundedRectangleBorder(
-                    borderRadius: BorderRadius.all(Radius.zero),
-                  ),
-                ),
-                child: Text(
-                  leftActionButtonText,
-                  textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 15,
-                        fontWeight: FontWeight.w600,
-                        color: leftActionButtonTextColor ??
-                            Theme.of(context).colorScheme.errorContainer,
-                        decoration: TextDecoration.none,
-                      ),
-                )),
-          ),
-          const VerticalSectionDivider(),
-          Expanded(
-            child: TextButton(
-              key: rightActionButtonKey,
-              onPressed: actionRight,
-              style: TextButton.styleFrom(
-                backgroundColor: rightActionButtonColor ?? Theme.of(context).colorScheme.surface,
-                shape: const RoundedRectangleBorder(
-                  borderRadius: BorderRadius.all(Radius.zero),
-                ),
-              ),
-              child: Text(
-                rightActionButtonText,
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+        height: 60,
+        child: Row(
+          mainAxisSize: MainAxisSize.max,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: <Widget>[
+            Expanded(
+              child: TextButton(
+                  key: leftActionButtonKey,
+                  onPressed: actionLeft,
+                  style: TextButton.styleFrom(
+                      backgroundColor:
+                          leftActionButtonColor ?? Theme.of(context).dialogBackgroundColor,
+                      shape: const RoundedRectangleBorder(
+                          borderRadius: BorderRadius.all(Radius.zero))),
+                  child: Text(
+                    leftActionButtonText,
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
                       fontSize: 15,
+                      fontFamily: 'Lato',
                       fontWeight: FontWeight.w600,
-                      color: rightActionButtonTextColor ?? Theme.of(context).colorScheme.onSurface,
+                      color: leftActionButtonTextColor ??
+                          Theme.of(context).extension<AlertTheme>()!.leftButtonTextColor,
                       decoration: TextDecoration.none,
                     ),
-              ),
+                  )),
             ),
-          ),
-        ],
-      ),
-    );
+            const VerticalSectionDivider(),
+            Expanded(
+              child: TextButton(
+                  key: rightActionButtonKey,
+                  onPressed: actionRight,
+                  style: TextButton.styleFrom(
+                      backgroundColor:
+                          rightActionButtonColor ?? Theme.of(context).dialogBackgroundColor,
+                      shape: const RoundedRectangleBorder(
+                          borderRadius: BorderRadius.all(Radius.zero))),
+                  child: Text(
+                    rightActionButtonText,
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      fontSize: 15,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w600,
+                      color: rightActionButtonTextColor ?? Theme.of(context).primaryColor,
+                      decoration: TextDecoration.none,
+                    ),
+                  )),
+            ),
+          ],
+        ));
   }
 
   Widget headerImage(BuildContext context, String imageUrl) {
@@ -156,7 +157,7 @@ class BaseAlertDialog extends StatelessWidget {
       right: 0,
       child: CircleAvatar(
         radius: 50,
-        backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
+        backgroundColor: Colors.white,
         child: ClipOval(
           child: Image.network(
             imageUrl,
@@ -178,15 +179,14 @@ class BaseAlertDialog extends StatelessWidget {
           filter: ImageFilter.blur(sigmaX: 3.0, sigmaY: 3.0),
           child: Container(
             decoration:
-                BoxDecoration(color: Theme.of(context).colorScheme.surface.withOpacity(0.8)),
+                BoxDecoration(color: Theme.of(context).extension<AlertTheme>()!.backdropColor),
             child: Center(
               child: GestureDetector(
                 onTap: () => null,
                 child: Container(
                   decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(30),
-                    color: Theme.of(context).colorScheme.surface,
-                  ),
+                      borderRadius: BorderRadius.circular(30),
+                      color: Theme.of(context).dialogBackgroundColor),
                   width: 300,
                   child: Stack(
                     clipBehavior: Clip.none,
@@ -200,12 +200,11 @@ class BaseAlertDialog extends StatelessWidget {
                             crossAxisAlignment: CrossAxisAlignment.center,
                             children: <Widget>[
                               if (headerText?.isNotEmpty ?? false) headerTitle(context),
-                              titleText != null
-                                  ? Padding(
-                                      padding: EdgeInsets.fromLTRB(24, 20, 24, 0),
-                                      child: title(context),
-                                    )
-                                  : SizedBox(height: 16),
+                              titleText != null ?
+                              Padding(
+                                padding: EdgeInsets.fromLTRB(24, 20, 24, 0),
+                                child: title(context),
+                              ) : SizedBox(height: 16),
                               isDividerExists
                                   ? Padding(
                                       padding: EdgeInsets.only(top: 16, bottom: 8),
diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart
index bc2f69287..4648b88cc 100644
--- a/lib/src/widgets/base_text_form_field.dart
+++ b/lib/src/widgets/base_text_form_field.dart
@@ -1,50 +1,37 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 class BaseTextFormField extends StatelessWidget {
-  BaseTextFormField({
-    this.onChanged,
-    this.controller,
-    this.keyboardType = TextInputType.text,
-    this.textInputAction = TextInputAction.done,
-    this.textAlign = TextAlign.start,
-    this.autovalidateMode,
-    this.hintText = '',
-    this.maxLines = 1,
-    this.inputFormatters,
-    this.textColor,
-    this.hintColor,
-    this.fillColor,
-    this.prefix,
-    this.prefixIcon,
-    this.suffix,
-    this.suffixIcon,
-    this.enabled = true,
-    this.readOnly = false,
-    this.enableInteractiveSelection = true,
-    this.obscureText = false,
-    this.validator,
-    this.textStyle,
-    this.placeholderTextStyle,
-    this.maxLength,
-    this.focusNode,
-    this.initialValue,
-    this.onSubmit,
-    this.autofocus = false,
-    this.autocorrect = true,
-    this.enableSuggestions = true,
-    this.contentPadding,
-    this.alignLabelWithHint = false,
-    this.floatingLabelBehavior,
-    this.cursorColor,
-    this.cursorWidth,
-    this.isDense,
-    this.enableIMEPersonalizedLearning,
-    this.onFieldSubmitted,
-    this.hasUnderlineBorder = false,
-    this.borderWidth = 1.0,
-    super.key,
-  });
+  BaseTextFormField(
+      {this.controller,
+      this.keyboardType = TextInputType.text,
+      this.textInputAction = TextInputAction.done,
+      this.textAlign = TextAlign.start,
+      this.autovalidateMode,
+      this.hintText = '',
+      this.maxLines = 1,
+      this.inputFormatters,
+      this.textColor,
+      this.hintColor,
+      this.borderColor,
+      this.prefix,
+      this.prefixIcon,
+      this.suffix,
+      this.suffixIcon,
+      this.enabled = true,
+      this.readOnly = false,
+      this.enableInteractiveSelection = true,
+      this.obscureText = false,
+      this.validator,
+      this.textStyle,
+      this.placeholderTextStyle,
+      this.maxLength,
+      this.focusNode,
+      this.initialValue,
+      this.onSubmit,
+      this.borderWidth = 1.0,
+      super.key});
 
   final TextEditingController? controller;
   final TextInputType? keyboardType;
@@ -56,7 +43,7 @@ class BaseTextFormField extends StatelessWidget {
   final List<TextInputFormatter>? inputFormatters;
   final Color? textColor;
   final Color? hintColor;
-  final Color? fillColor;
+  final Color? borderColor;
   final Widget? prefix;
   final Widget? prefixIcon;
   final Widget? suffix;
@@ -70,33 +57,13 @@ class BaseTextFormField extends StatelessWidget {
   final bool readOnly;
   final bool? enableInteractiveSelection;
   final String? initialValue;
+  final double borderWidth;
   final void Function(String)? onSubmit;
   final bool obscureText;
-  final bool? autofocus;
-  final bool? autocorrect;
-  final bool? enableSuggestions;
-  final void Function(String)? onChanged;
-  final EdgeInsetsGeometry? contentPadding;
-  final bool? alignLabelWithHint;
-  final FloatingLabelBehavior? floatingLabelBehavior;
-  final Color? cursorColor;
-  final double? cursorWidth;
-  final bool? isDense;
-  final bool? enableIMEPersonalizedLearning;
-  final void Function(String)? onFieldSubmitted;
-  final bool hasUnderlineBorder;
-  final double borderWidth;
 
   @override
   Widget build(BuildContext context) {
     return TextFormField(
-      enableIMEPersonalizedLearning: enableIMEPersonalizedLearning ?? true,
-      cursorColor: cursorColor,
-      cursorWidth: cursorWidth ?? 2.0,
-      onChanged: onChanged,
-      autofocus: autofocus ?? false,
-      autocorrect: autocorrect ?? true,
-      enableSuggestions: enableSuggestions ?? true,
       enableInteractiveSelection: enableInteractiveSelection,
       readOnly: readOnly,
       initialValue: initialValue,
@@ -113,69 +80,35 @@ class BaseTextFormField extends StatelessWidget {
       maxLength: maxLength,
       onFieldSubmitted: onSubmit,
       style: textStyle ??
-          Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontSize: 16.0, color: textColor ?? Theme.of(context).colorScheme.onSurface),
+          TextStyle(
+              fontSize: 16.0,
+              color: textColor ??
+                  Theme.of(context).extension<CakeTextTheme>()!.titleColor),
       decoration: InputDecoration(
-        isDense: isDense,
-        alignLabelWithHint: alignLabelWithHint,
-        contentPadding: contentPadding,
-        floatingLabelBehavior: FloatingLabelBehavior.never,
-        prefix: prefix,
-        prefixIcon: prefixIcon,
-        suffix: suffix,
-        suffixIcon: suffixIcon,
-        filled: !hasUnderlineBorder,
-        fillColor:
-            hasUnderlineBorder ? null : fillColor ?? Theme.of(context).colorScheme.surfaceContainer,
-        hintStyle: placeholderTextStyle ??
-            Theme.of(context)
-                .textTheme
-                .bodyMedium!
-                .copyWith(color: hintColor ?? Theme.of(context).hintColor, fontSize: 16),
-        hintText: hasUnderlineBorder ? hintText : null,
-        labelText: !hasUnderlineBorder ? hintText : null,
-        labelStyle: !hasUnderlineBorder ? placeholderTextStyle : null,
-        border: hasUnderlineBorder
-            ? UnderlineInputBorder(
-                borderSide: BorderSide(
-                  color: Theme.of(context).colorScheme.outlineVariant,
-                  style: borderWidth == 0.0 ? BorderStyle.none : BorderStyle.solid,
-                  width: borderWidth,
-                ),
-              )
-            : null,
-        focusedBorder: hasUnderlineBorder
-            ? UnderlineInputBorder(
-                borderSide: BorderSide(
-                  color: Theme.of(context).colorScheme.outlineVariant,
-                  style: borderWidth == 0.0 ? BorderStyle.none : BorderStyle.solid,
-                  width: borderWidth,
-                ),
-              )
-            : null,
-        disabledBorder: hasUnderlineBorder
-            ? UnderlineInputBorder(
-                borderSide: BorderSide(
-                  color: Theme.of(context).colorScheme.outlineVariant,
-                  width: borderWidth,
-                ),
-              )
-            : null,
-        enabledBorder: hasUnderlineBorder
-            ? UnderlineInputBorder(
-                borderSide: BorderSide(
-                  color: Theme.of(context).colorScheme.outlineVariant,
-                  style: borderWidth == 0.0 ? BorderStyle.none : BorderStyle.solid,
-                  width: borderWidth,
-                ),
-              )
-            : null,
-        errorBorder: hasUnderlineBorder
-            ? UnderlineInputBorder(
-                borderSide: BorderSide(color: Theme.of(context).colorScheme.error),
-              )
-            : null,
-      ),
+          prefix: prefix,
+          prefixIcon: prefixIcon,
+          suffix: suffix,
+          suffixIcon: suffixIcon,
+          hintStyle: placeholderTextStyle ??
+              TextStyle(
+                  color: hintColor ?? Theme.of(context).hintColor,
+                  fontSize: 16),
+          hintText: hintText,
+          focusedBorder: UnderlineInputBorder(
+              borderSide: BorderSide(
+                  color: borderColor ??
+                      Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
+                  width: borderWidth)),
+          disabledBorder: UnderlineInputBorder(
+              borderSide: BorderSide(
+                  color: borderColor ??
+                      Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
+                  width: borderWidth)),
+          enabledBorder: UnderlineInputBorder(
+              borderSide: BorderSide(
+                  color: borderColor ??
+                      Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor,
+                  width: borderWidth))),
       validator: validator,
     );
   }
diff --git a/lib/src/widgets/blockchain_height_widget.dart b/lib/src/widgets/blockchain_height_widget.dart
index cb7f71b24..605ae4484 100644
--- a/lib/src/widgets/blockchain_height_widget.dart
+++ b/lib/src/widgets/blockchain_height_widget.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/src/widgets/standard_switch.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/date_picker.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
 import 'package:cw_core/wallet_type.dart';
@@ -9,6 +10,8 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/decred/decred.dart';
+import 'package:cw_core/wallet_type.dart';
+
 
 class BlockchainHeightWidget extends StatefulWidget {
   BlockchainHeightWidget({
@@ -80,22 +83,18 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
           Row(
             children: <Widget>[
               Flexible(
-                child: Container(
-                  padding: EdgeInsets.only(top: 20.0, bottom: 10.0),
-                  child: BaseTextFormField(
-                    key: widget.blockHeightTextFieldKey,
-                    focusNode: widget.focusNode,
-                    controller: restoreHeightController,
-                    keyboardType: TextInputType.numberWithOptions(
-                      signed: false,
-                      decimal: false,
-                    ),
-                    hintText: widget.isSilentPaymentsScan
-                        ? S.of(context).silent_payments_scan_from_height
-                        : S.of(context).widgets_restore_from_blockheight,
-                  ),
-                ),
-              )
+                  child: Container(
+                      padding: EdgeInsets.only(top: 20.0, bottom: 10.0),
+                      child: BaseTextFormField(
+                        key: widget.blockHeightTextFieldKey,
+                        focusNode: widget.focusNode,
+                        controller: restoreHeightController,
+                        keyboardType:
+                            TextInputType.numberWithOptions(signed: false, decimal: false),
+                        hintText: widget.isSilentPaymentsScan
+                            ? S.of(context).silent_payments_scan_from_height
+                            : S.of(context).widgets_restore_from_blockheight,
+                      )))
             ],
           ),
           if (widget.hasDatePicker) ...[
@@ -103,11 +102,10 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
               padding: EdgeInsets.only(top: 15, bottom: 15),
               child: Text(
                 S.of(context).widgets_or,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                    fontSize: 16.0,
+                    fontWeight: FontWeight.w500,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
               ),
             ),
             Row(
@@ -117,13 +115,12 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
                   child: InkWell(
                     onTap: () => _selectDate(context),
                     child: IgnorePointer(
-                      child: BaseTextFormField(
-                        controller: dateController,
-                        hintText: widget.isSilentPaymentsScan
-                            ? S.of(context).silent_payments_scan_from_date
-                            : S.of(context).widgets_restore_from_date,
-                      ),
-                    ),
+                        child: BaseTextFormField(
+                      controller: dateController,
+                      hintText: widget.isSilentPaymentsScan
+                          ? S.of(context).silent_payments_scan_from_date
+                          : S.of(context).widgets_restore_from_date,
+                    )),
                   ),
                 ))
               ],
@@ -136,15 +133,17 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
                   children: [
                     Text(
                       S.of(context).scan_one_block,
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          ),
+                      style: TextStyle(
+                        fontSize: 14,
+                        fontWeight: FontWeight.normal,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      ),
                     ),
                     Padding(
                       padding: const EdgeInsets.only(right: 8),
                       child: StandardSwitch(
                         value: widget.doSingleScan,
-                        onTapped: () => widget.toggleSingleScan?.call(),
+                        onTaped: () => widget.toggleSingleScan?.call(),
                       ),
                     )
                   ],
@@ -157,9 +156,10 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
                     ? S.of(context).silent_payments_scan_from_date_or_blockheight
                     : S.of(context).restore_from_date_or_blockheight,
                 textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    ),
+                style: TextStyle(
+                    fontSize: 12,
+                    fontWeight: FontWeight.normal,
+                    color: Theme.of(context).hintColor),
               ),
             )
           ]
diff --git a/lib/src/widgets/bottom_sheet/add_passphrase_bottom_sheet_widget.dart b/lib/src/widgets/bottom_sheet/add_passphrase_bottom_sheet_widget.dart
deleted file mode 100644
index d00fd12fd..000000000
--- a/lib/src/widgets/bottom_sheet/add_passphrase_bottom_sheet_widget.dart
+++ /dev/null
@@ -1,207 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:flutter/material.dart';
-
-class AddPassphraseBottomSheet extends StatefulWidget {
-  AddPassphraseBottomSheet({
-    required String titleText,
-    required this.currentTheme,
-    required this.onRestoreButtonPressed,
-  });
-
-  final void Function(String) onRestoreButtonPressed;
-  final MaterialThemeBase currentTheme;
-
-  @override
-  State<AddPassphraseBottomSheet> createState() => _AddPassphraseBottomSheetState();
-}
-
-class _AddPassphraseBottomSheetState extends State<AddPassphraseBottomSheet> {
-  late final TextEditingController passphraseController;
-  late final TextEditingController confirmPassphraseController;
-
-  @override
-  void initState() {
-    super.initState();
-    passphraseController = TextEditingController();
-    confirmPassphraseController = TextEditingController();
-  }
-
-  @override
-  void dispose() {
-    passphraseController.dispose();
-    confirmPassphraseController.dispose();
-    super.dispose();
-  }
-
-  final passphraseImageLight = 'assets/images/passphrase_light.png';
-  final passphraseImageDark = 'assets/images/passphrase_dark.png';
-
-  bool obscurePassphrase = true;
-  @override
-  Widget build(BuildContext context) {
-
-    final passphraseImage = widget.currentTheme.isDark ? passphraseImageDark : passphraseImageLight;
-
-    return Container(
-      decoration: BoxDecoration(
-        borderRadius: const BorderRadius.vertical(top: Radius.circular(30.0)),
-        color: Theme.of(context).colorScheme.surface,
-      ),
-      child: SingleChildScrollView(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
-        child: Column(
-          children: [
-            Row(
-              children: [
-                const Spacer(flex: 4),
-                Expanded(
-                  flex: 2,
-                  child: Container(
-                    height: 6,
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(4),
-                      color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                    ),
-                  ),
-                ),
-                const Spacer(flex: 4),
-              ],
-            ),
-            SizedBox(height: 16),
-            Text(
-              S.of(context).add_passphrase,
-              textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 18,
-                    fontWeight: FontWeight.w600,
-                    color: Theme.of(context).colorScheme.onSurface,
-                    decoration: TextDecoration.none,
-                  ),
-            ),
-            SizedBox(height: 20),
-            CakeImageWidget(imageUrl: passphraseImage, height: 85),
-            SizedBox(height: 20),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: Text.rich(
-                TextSpan(
-                  children: [
-                    TextSpan(
-                      text: '${S.of(context).warning.toUpperCase()}: ',
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w700,
-                            color: Theme.of(context).colorScheme.errorContainer,
-                            decoration: TextDecoration.none,
-                          ),
-                    ),
-                    TextSpan(
-                      text: S.of(context).add_passphrase_warning_text,
-                    ),
-                  ],
-                ),
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7),
-                      decoration: TextDecoration.none,
-                    ),
-              ),
-            ),
-            SizedBox(height: 24),
-            BaseTextFormField(
-              key: ValueKey('add_passphrase_bottom_sheet_widget_passphrase_textfield_key'),
-              controller: passphraseController,
-              obscureText: obscurePassphrase,
-              contentPadding: EdgeInsets.symmetric(horizontal: 12),
-              hintText: S.of(context).required_passphrase,
-              suffixIcon: GestureDetector(
-                onTap: () {
-                  setState(() {
-                    obscurePassphrase = !obscurePassphrase;
-                  });
-                },
-                child: Icon(
-                  obscurePassphrase ? Icons.visibility_off : Icons.visibility,
-                  size: 24,
-                  color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                ),
-              ),
-            ),
-            SizedBox(height: 8),
-            BaseTextFormField(
-              key: ValueKey('add_passphrase_bottom_sheet_widget_confirm_passphrase_textfield_key'),
-              controller: confirmPassphraseController,
-              obscureText: obscurePassphrase,
-              contentPadding: EdgeInsets.symmetric(horizontal: 12),
-              hintText: S.of(context).confirm_passphrase,
-              suffixIcon: GestureDetector(
-                onTap: () {
-                  setState(() {
-                    obscurePassphrase = !obscurePassphrase;
-                  });
-                },
-                child: Icon(
-                  obscurePassphrase ? Icons.visibility_off : Icons.visibility,
-                  size: 24,
-                  color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
-                ),
-              ),
-              validator: (text) {
-                if (text == passphraseController.text) {
-                  return null;
-                }
-
-                return S.of(context).passphrases_doesnt_match;
-              },
-            ),
-            SizedBox(height: 16),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16),
-              child: Row(
-                mainAxisSize: MainAxisSize.max,
-                children: [
-                  Flexible(
-                    child: Container(
-                      padding: const EdgeInsets.only(right: 8.0, top: 8.0),
-                      child: PrimaryButton(
-                        key: ValueKey('add_passphrase_bottom_sheet_widget_cancel_button_key'),
-                        onPressed: () {
-                          Navigator.pop(context);
-                        },
-                        text: S.of(context).cancel,
-                        color: Theme.of(context).colorScheme.surfaceContainer,
-                        textColor: Theme.of(context).colorScheme.onSurface,
-                      ),
-                    ),
-                  ),
-                  Flexible(
-                    child: Container(
-                      padding: const EdgeInsets.only(left: 8.0, top: 8.0),
-                      child: PrimaryButton(
-                        key: ValueKey('add_passphrase_bottom_sheet_widget_restore_button_key'),
-                        onPressed: () {
-                          Navigator.pop(context);
-                          widget.onRestoreButtonPressed(passphraseController.text);
-                        },
-                        text: S.of(context).restore,
-                        color: Theme.of(context).colorScheme.primary,
-                        textColor: Theme.of(context).colorScheme.onPrimary,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            SizedBox(height: 24),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart b/lib/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart
index 2fbbf6284..206780eae 100644
--- a/lib/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart
+++ b/lib/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 
 abstract class BaseBottomSheet extends StatelessWidget {
   final String titleText;
@@ -20,7 +21,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
                   height: 6,
                   decoration: BoxDecoration(
                     borderRadius: BorderRadius.circular(4),
-                    color: Theme.of(context).colorScheme.onSurface,
+                    color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                   ),
                 ),
               ),
@@ -32,22 +33,24 @@ abstract class BaseBottomSheet extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             if (titleIconPath != null)
-              Image.asset(titleIconPath!, height: 24, width: 24, excludeFromSemantics: true)
+              Image.asset(titleIconPath!, height: 24, width: 24)
             else
               Container(),
             const SizedBox(width: 6),
             Text(
               titleText,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.titleLarge!.copyWith(
-                    fontSize: 20,
-                    fontWeight: FontWeight.w600,
-                    decoration: TextDecoration.none,
-                  ),
+              style: TextStyle(
+                fontSize: 20,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.w600,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                decoration: TextDecoration.none,
+              ),
             ),
           ],
         ),
-        const SizedBox(height: 24),
+        const SizedBox(height: 13),
       ],
     );
   }
@@ -64,7 +67,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
         borderRadius: const BorderRadius.only(
             topLeft: Radius.circular(30.0), topRight: Radius.circular(30.0)),
         child: Container(
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).dialogBackgroundColor,
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
diff --git a/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart b/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart
index 48009d084..84997b34e 100644
--- a/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart
+++ b/lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart
@@ -1,18 +1,20 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/standard_slide_button_widget.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/utils/address_formatter.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/pending_transaction.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
+import 'dart:math' as math;
 
 import 'base_bottom_sheet_widget.dart';
 
 class ConfirmSendingBottomSheet extends BaseBottomSheet {
   final CryptoCurrency currency;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
   final String? paymentId;
   final String? paymentIdValue;
   final String? expirationTime;
@@ -24,9 +26,7 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
   final String feeFiatAmount;
   final List<Output> outputs;
   final VoidCallback onSlideComplete;
-  final WalletType walletType;
   final PendingChange? change;
-  final bool isOpenCryptoPay;
 
   ConfirmSendingBottomSheet({
     required String titleText,
@@ -44,9 +44,7 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
     required this.feeFiatAmount,
     required this.outputs,
     required this.onSlideComplete,
-    required this.walletType,
     this.change,
-    this.isOpenCryptoPay = false,
     Key? key,
   })  : showScrollbar = outputs.length > 3,
         super(titleText: titleText, titleIconPath: titleIconPath);
@@ -56,18 +54,22 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
 
   @override
   Widget contentWidget(BuildContext context) {
-    final itemTitleTextStyle = Theme.of(context).textTheme.bodyMedium!.copyWith(
-          fontSize: 16,
-          fontWeight: FontWeight.w500,
-          decoration: TextDecoration.none,
-        );
-    final itemSubTitleTextStyle = Theme.of(context).textTheme.bodySmall!.copyWith(
-          fontWeight: FontWeight.w600,
-          color: Theme.of(context).colorScheme.onSurfaceVariant,
-          decoration: TextDecoration.none,
-        );
-
-    final tileBackgroundColor = Theme.of(context).colorScheme.surfaceContainer;
+    final itemTitleTextStyle = TextStyle(
+      fontSize: 16,
+      fontFamily: 'Lato',
+      fontWeight: FontWeight.w500,
+      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+      decoration: TextDecoration.none,
+    );
+    final itemSubTitleTextStyle = TextStyle(
+      fontSize: 12,
+      fontFamily: 'Lato',
+      fontWeight: FontWeight.w600,
+      color: currentTheme.type == ThemeType.bright
+          ? Theme.of(context).extension<CakeTextTheme>()!.titleColor
+          : Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
+      decoration: TextDecoration.none,
+    );
 
     Widget content = Padding(
       padding: EdgeInsets.fromLTRB(8, 0, showScrollbar ? 16 : 8, 8),
@@ -78,13 +80,12 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
               padding: const EdgeInsets.only(bottom: 8),
               child: AddressTile(
                 itemTitle: paymentId!,
+                currentTheme: currentTheme,
                 itemTitleTextStyle: itemTitleTextStyle,
-                walletType: walletType,
                 isBatchSending: false,
                 amount: '',
                 address: paymentIdValue!,
                 itemSubTitleTextStyle: itemSubTitleTextStyle,
-                tileBackgroundColor: tileBackgroundColor,
               ),
             ),
           StandardTile(
@@ -93,7 +94,6 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
             itemTitleTextStyle: itemTitleTextStyle,
             itemSubTitle: fiatAmountValue,
             itemSubTitleTextStyle: itemSubTitleTextStyle,
-            tileBackgroundColor: tileBackgroundColor,
           ),
           const SizedBox(height: 8),
           StandardTile(
@@ -102,7 +102,6 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
             itemTitleTextStyle: itemTitleTextStyle,
             itemSubTitle: feeFiatAmount,
             itemSubTitleTextStyle: itemSubTitleTextStyle,
-            tileBackgroundColor: tileBackgroundColor,
           ),
           const SizedBox(height: 8),
           Column(
@@ -123,25 +122,23 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
                   final _amount = item.cryptoAmount.replaceAll(',', '.') + ' ${currency.title}';
                   return isBatchSending || contactName.isNotEmpty
                       ? AddressExpansionTile(
-                          contactType: isOpenCryptoPay ? 'Open CryptoPay' : S.of(context).contact,
+                          contactType: 'Contact',
+                          currentTheme: currentTheme,
                           name: isBatchSending ? batchContactTitle : contactName,
                           address: _address,
                           amount: _amount,
-                          walletType: walletType,
                           isBatchSending: isBatchSending,
                           itemTitleTextStyle: itemTitleTextStyle,
                           itemSubTitleTextStyle: itemSubTitleTextStyle,
-                          tileBackgroundColor: tileBackgroundColor,
                         )
                       : AddressTile(
-                          itemTitle: S.of(context).address,
+                          itemTitle: 'Address',
+                          currentTheme: currentTheme,
                           itemTitleTextStyle: itemTitleTextStyle,
                           isBatchSending: isBatchSending,
-                          walletType: walletType,
                           amount: _amount,
                           address: _address,
                           itemSubTitleTextStyle: itemSubTitleTextStyle,
-                          tileBackgroundColor: tileBackgroundColor,
                         );
                 },
               ),
@@ -150,14 +147,13 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
                   padding: const EdgeInsets.only(top: 8),
                   child: AddressExpansionTile(
                     contactType: 'Change',
+                    currentTheme: currentTheme,
                     name: S.of(context).send_change_to_you,
                     address: change!.address,
                     amount: change!.amount + ' ${currency.title}',
                     isBatchSending: true,
-                    walletType: walletType,
                     itemTitleTextStyle: itemTitleTextStyle,
                     itemSubTitleTextStyle: itemSubTitleTextStyle,
-                    tileBackgroundColor: tileBackgroundColor,
                   ),
                 ),
             ],
@@ -190,11 +186,11 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
     return Container(
       padding: const EdgeInsets.fromLTRB(40, 12, 40, 34),
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).dialogBackgroundColor,
         boxShadow: [
           if (showScrollbar)
             BoxShadow(
-              color: Theme.of(context).colorScheme.outlineVariant,
+              color: Colors.black.withOpacity(0.5),
               spreadRadius: 2,
               blurRadius: 10,
               offset: const Offset(0, 0),
@@ -205,7 +201,6 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
         onSlideComplete: onSlideComplete,
         buttonText: 'Swipe to send',
         currentTheme: currentTheme,
-        accessibleNavigationModeButtonText: S.of(context).send,
       ),
     );
   }
@@ -219,7 +214,6 @@ class StandardTile extends StatelessWidget {
     required this.itemTitleTextStyle,
     this.itemSubTitle,
     required this.itemSubTitleTextStyle,
-    required this.tileBackgroundColor,
   });
 
   final String itemTitle;
@@ -227,34 +221,28 @@ class StandardTile extends StatelessWidget {
   final TextStyle itemTitleTextStyle;
   final String? itemSubTitle;
   final TextStyle itemSubTitleTextStyle;
-  final Color tileBackgroundColor;
 
   @override
   Widget build(BuildContext context) {
-    return Semantics(
-      container: true,
-      label: itemTitle,
-      child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
-        decoration: BoxDecoration(
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
+      decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(10),
-          color: tileBackgroundColor,
-        ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text(itemTitle, style: itemTitleTextStyle),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Text(itemValue, style: itemTitleTextStyle),
-                itemSubTitle == null
-                    ? Container()
-                    : Text(itemSubTitle!, style: itemSubTitleTextStyle),
-              ],
-            ),
-          ],
-        ),
+          color: Theme.of(context).extension<FilterTheme>()!.buttonColor),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(itemTitle, style: itemTitleTextStyle),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              Text(itemValue, style: itemTitleTextStyle),
+              itemSubTitle == null
+                  ? Container()
+                  : Text(itemSubTitle!, style: itemSubTitleTextStyle),
+            ],
+          ),
+        ],
       ),
     );
   }
@@ -264,31 +252,38 @@ class AddressTile extends StatelessWidget {
   const AddressTile({
     super.key,
     required this.itemTitle,
+    required this.currentTheme,
     required this.itemTitleTextStyle,
     required this.isBatchSending,
     required this.amount,
     required this.address,
     required this.itemSubTitleTextStyle,
-    required this.tileBackgroundColor,
-    required this.walletType,
   });
 
   final String itemTitle;
+  final ThemeBase currentTheme;
   final TextStyle itemTitleTextStyle;
   final bool isBatchSending;
   final String amount;
   final String address;
   final TextStyle itemSubTitleTextStyle;
-  final Color tileBackgroundColor;
-  final WalletType walletType;
 
   @override
   Widget build(BuildContext context) {
+    final addressTextStyle = TextStyle(
+      fontSize: 12,
+      fontFamily: 'Lato',
+      fontWeight: FontWeight.w600,
+      color: currentTheme.type == ThemeType.bright
+          ? Theme.of(context).extension<CakeTextTheme>()!.titleColor.withOpacity(0.5)
+          : Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+      decoration: TextDecoration.none,
+    );
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(10),
-        color: tileBackgroundColor,
+        color: Theme.of(context).extension<FilterTheme>()!.buttonColor,
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -300,103 +295,147 @@ class AddressTile extends StatelessWidget {
               if (isBatchSending) Text(amount, style: itemTitleTextStyle),
             ],
           ),
-          AddressFormatter.buildSegmentedAddress(
+          buildSegmentedAddress(
             address: address,
-            walletType: walletType,
-            evenTextStyle: Theme.of(context).textTheme.bodySmall!.copyWith(
-                  fontWeight: FontWeight.w600,
-                  decoration: TextDecoration.none,
-                ),
+            evenTextStyle: addressTextStyle,
+            oddTextStyle: itemSubTitleTextStyle,
           ),
         ],
       ),
     );
   }
+
+  Widget buildSegmentedAddress({
+    required String address,
+    int chunkSize = 6,
+    required TextStyle evenTextStyle,
+    required TextStyle oddTextStyle,
+  }) {
+    final spans = <TextSpan>[];
+
+    int index = 0;
+    for (int i = 0; i < address.length; i += chunkSize) {
+      final chunk = address.substring(i, math.min(i + chunkSize, address.length));
+      final style = (index % 2 == 0) ? evenTextStyle : oddTextStyle;
+
+      spans.add(
+        TextSpan(text: '$chunk ', style: style),
+      );
+
+      index++;
+    }
+
+    return RichText(
+      text: TextSpan(children: spans, style: evenTextStyle),
+      overflow: TextOverflow.visible,
+    );
+  }
 }
 
 class AddressExpansionTile extends StatelessWidget {
   const AddressExpansionTile({
     super.key,
     required this.contactType,
+    required this.currentTheme,
     required this.name,
     required this.address,
     required this.amount,
     required this.isBatchSending,
     required this.itemTitleTextStyle,
     required this.itemSubTitleTextStyle,
-    required this.tileBackgroundColor,
-    required this.walletType,
   });
 
   final String contactType;
+  final ThemeBase currentTheme;
   final String name;
   final String address;
   final String amount;
   final bool isBatchSending;
   final TextStyle itemTitleTextStyle;
   final TextStyle itemSubTitleTextStyle;
-  final Color tileBackgroundColor;
-  final WalletType walletType;
 
   @override
   Widget build(BuildContext context) {
-    return Semantics(
-      container: true,
-      label: name,
-      child: Container(
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(10)),
-          color: tileBackgroundColor,
-        ),
-        child: Theme(
-          data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
-          child: Padding(
-            padding: EdgeInsets.symmetric(horizontal: 14, vertical: isBatchSending ? 0 : 8),
-            child: ExpansionTile(
-              childrenPadding: isBatchSending ? const EdgeInsets.only(bottom: 8) : EdgeInsets.zero,
-              tilePadding: EdgeInsets.zero,
-              dense: true,
-              iconColor: Theme.of(context).colorScheme.onSurfaceVariant,
-              visualDensity: VisualDensity.compact,
-              title: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+    final addressTextStyle = TextStyle(
+      fontSize: 12,
+      fontFamily: 'Lato',
+      fontWeight: FontWeight.w600,
+      color: currentTheme.type == ThemeType.bright
+          ? Theme.of(context).extension<CakeTextTheme>()!.titleColor.withOpacity(0.5)
+          : Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+      decoration: TextDecoration.none,
+    );
+
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.all(Radius.circular(10)),
+        color: Theme.of(context).extension<FilterTheme>()!.buttonColor,
+      ),
+      child: Theme(
+        data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
+        child: Padding(
+          padding: EdgeInsets.symmetric(horizontal: 14, vertical: isBatchSending ? 0 : 8),
+          child: ExpansionTile(
+            childrenPadding: isBatchSending ? const EdgeInsets.only(bottom: 8) : EdgeInsets.zero,
+            tilePadding: EdgeInsets.zero,
+            dense: true,
+            visualDensity: VisualDensity.compact,
+            title: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Expanded(child: Text(isBatchSending ? name : contactType, style: itemTitleTextStyle, softWrap: true)),
+                Text(isBatchSending ? amount : name,
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      decoration: TextDecoration.none,
+                    )),
+              ],
+            ),
+            children: [
+              Row(
                 children: [
                   Expanded(
-                    child: Text(
-                      isBatchSending ? name : contactType,
-                      style: itemTitleTextStyle,
-                      softWrap: true,
+                    child: buildSegmentedAddress(
+                      address: address,
+                      evenTextStyle: addressTextStyle,
+                      oddTextStyle: itemSubTitleTextStyle,
                     ),
                   ),
-                  Text(
-                    isBatchSending ? amount : name,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          fontWeight: FontWeight.w600,
-                          decoration: TextDecoration.none,
-                        ),
-                  ),
                 ],
               ),
-              children: [
-                Row(
-                  children: [
-                    Expanded(
-                      child: AddressFormatter.buildSegmentedAddress(
-                        address: address,
-                        walletType: walletType,
-                        evenTextStyle: Theme.of(context).textTheme.bodySmall!.copyWith(
-                              fontWeight: FontWeight.w600,
-                              decoration: TextDecoration.none,
-                            ),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
+            ],
           ),
         ),
       ),
     );
   }
+
+  Widget buildSegmentedAddress({
+    required String address,
+    int chunkSize = 6,
+    required TextStyle evenTextStyle,
+    required TextStyle oddTextStyle,
+  }) {
+    final spans = <TextSpan>[];
+
+    int index = 0;
+    for (int i = 0; i < address.length; i += chunkSize) {
+      final chunk = address.substring(i, math.min(i + chunkSize, address.length));
+      final style = (index % 2 == 0) ? evenTextStyle : oddTextStyle;
+
+      spans.add(
+        TextSpan(text: '$chunk ', style: style),
+      );
+
+      index++;
+    }
+
+    return RichText(
+      text: TextSpan(children: spans, style: evenTextStyle),
+      overflow: TextOverflow.visible,
+    );
+  }
 }
diff --git a/lib/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart b/lib/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart
index 3a6403651..26d25b50d 100644
--- a/lib/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart
+++ b/lib/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart
@@ -1,6 +1,8 @@
-import 'package:auto_size_text/auto_size_text.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
@@ -23,7 +25,7 @@ class LoadingBottomSheet extends BaseBottomSheet {
 }
 
 class InfoBottomSheet extends BaseBottomSheet {
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
   final String? contentImage;
   final Color? contentImageColor;
   final String? content;
@@ -83,15 +85,16 @@ class InfoBottomSheet extends BaseBottomSheet {
                   const Spacer(flex: 2),
                   Expanded(
                     flex: 6,
-                    child: AutoSizeText(
+                    child: Text(
                       content!,
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            decoration: TextDecoration.none,
-                          ),
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        decoration: TextDecoration.none,
+                      ),
                     ),
                   ),
                   const Spacer(flex: 2),
@@ -108,11 +111,13 @@ class InfoBottomSheet extends BaseBottomSheet {
                   Text(
                     'Don’t ask me next time',
                     textAlign: TextAlign.center,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          fontWeight: FontWeight.w500,
-                          color: Theme.of(context).colorScheme.onSurfaceVariant,
-                          decoration: TextDecoration.none,
-                        ),
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      decoration: TextDecoration.none,
+                    ),
                   ),
                 ],
               ),
@@ -137,8 +142,12 @@ class InfoBottomSheet extends BaseBottomSheet {
                   key: leftActionButtonKey,
                   onPressed: actionLeftButton,
                   text: leftButtonText ?? '',
-                  color: Theme.of(context).colorScheme.surfaceContainer,
-                  textColor: Theme.of(context).colorScheme.onSecondaryContainer,
+                  color: currentTheme.type == ThemeType.dark
+                      ? Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor
+                      : Theme.of(context).cardColor,
+                  textColor: currentTheme.type == ThemeType.dark
+                      ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                      : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
                 ),
               ),
             ),
@@ -149,8 +158,10 @@ class InfoBottomSheet extends BaseBottomSheet {
                   key: rightActionButtonKey,
                   onPressed: actionRightButton,
                   text: rightButtonText ?? '',
-                  color: Theme.of(context).colorScheme.primary,
-                  textColor: Theme.of(context).colorScheme.onPrimary,
+                  color: Theme.of(context).primaryColor,
+                  textColor: currentTheme.type == ThemeType.dark
+                      ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                      : Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor,
                 ),
               ),
             ),
@@ -164,8 +175,8 @@ class InfoBottomSheet extends BaseBottomSheet {
           key: actionButtonKey,
           onPressed: actionButton ?? () {},
           text: actionButtonText ?? '',
-          color: Theme.of(context).colorScheme.primary,
-          textColor: Theme.of(context).colorScheme.onPrimary,
+          color: Theme.of(context).primaryColor,
+          textColor: Colors.white,
           isLoading: false,
           isDisabled: false,
         ),
@@ -209,11 +220,11 @@ class _SimpleCheckboxState extends State<SimpleCheckbox> {
           initialValue = value!;
           widget.onChanged?.call(value);
         }),
-        checkColor: Theme.of(context).colorScheme.onSurfaceVariant,
+        checkColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
         activeColor: Colors.transparent,
         materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-        side: WidgetStateBorderSide.resolveWith((states) =>
-            BorderSide(color: Theme.of(context).colorScheme.onSurfaceVariant, width: 1.0)),
+        side: WidgetStateBorderSide.resolveWith((states) => BorderSide(
+            color: Theme.of(context).extension<CakeTextTheme>()!.titleColor, width: 1.0)),
       ),
     );
   }
diff --git a/lib/src/widgets/bottom_sheet/info_steps_bottom_sheet_widget.dart b/lib/src/widgets/bottom_sheet/info_steps_bottom_sheet_widget.dart
deleted file mode 100644
index 8b78b5b37..000000000
--- a/lib/src/widgets/bottom_sheet/info_steps_bottom_sheet_widget.dart
+++ /dev/null
@@ -1,114 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:flutter/material.dart';
-
-import 'base_bottom_sheet_widget.dart';
-
-class InfoStep {
-  final String title;
-  final String description;
-
-  const InfoStep(this.title, this.description);
-}
-
-class InfoStepsBottomSheet extends BaseBottomSheet {
-  final MaterialThemeBase currentTheme;
-  final List<InfoStep> steps;
-
-  InfoStepsBottomSheet({
-    required String titleText,
-    required this.steps,
-    String? titleIconPath,
-    required this.currentTheme,
-  }) : super(titleText: titleText, titleIconPath: titleIconPath);
-
-  @override
-  Widget contentWidget(BuildContext context) => SizedBox(
-        height: 500,
-        child: Column(
-          children: [
-            Expanded(
-              child: SingleChildScrollView(
-                child: Column(
-                  children: steps
-                      .map((step) => Container(
-                            margin: EdgeInsets.only(
-                                bottom: 15, left: 20, right: 20),
-                            padding: EdgeInsets.all(10),
-                            alignment: Alignment.center,
-                            decoration: BoxDecoration(
-                              borderRadius: BorderRadius.circular(10),
-                              color: Theme.of(context).cardColor,
-                            ),
-                            child: Row(
-                              mainAxisSize: MainAxisSize.max,
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: <Widget>[
-                                Expanded(
-                                  child: Padding(
-                                    padding: EdgeInsets.only(left: 16),
-                                    child: Column(
-                                      mainAxisSize: MainAxisSize.max,
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.start,
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: <Widget>[
-                                        Text(
-                                          step.title,
-                                          style: Theme.of(context)
-                                              .textTheme
-                                              .bodyMedium!
-                                              .copyWith(
-                                                fontSize: 20,
-                                                fontWeight: FontWeight.w500,
-                                                color: Theme.of(context)
-                                                    .colorScheme
-                                                    .onSurface,
-                                              ),
-                                        ),
-                                        Padding(
-                                          padding: EdgeInsets.only(top: 5),
-                                          child: Text(
-                                            step.description,
-                                            style: Theme.of(context)
-                                                .textTheme
-                                                .bodyMedium!
-                                                .copyWith(
-                                                  color: Theme.of(context)
-                                                      .colorScheme
-                                                      .onSurfaceVariant,
-                                                ),
-                                          ),
-                                        )
-                                      ],
-                                    ),
-                                  ),
-                                )
-                              ],
-                            ),
-                          ))
-                      .toList(),
-                ),
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.all(16),
-              child: PrimaryButton(
-                text: S.of(context).close,
-                color: Theme.of(context).colorScheme.primary,
-                textColor: currentTheme.isDark
-                    ? Theme.of(context).colorScheme.onSurfaceVariant
-                    : Theme.of(context).colorScheme.onPrimary,
-                onPressed: () => Navigator.of(context).pop(),
-              ),
-            )
-          ],
-        ),
-      );
-
-  @override
-  Widget footerWidget(BuildContext context) => SizedBox.shrink();
-}
diff --git a/lib/src/widgets/cake_image_widget.dart b/lib/src/widgets/cake_image_widget.dart
index 04d298e2e..2038030c0 100644
--- a/lib/src/widgets/cake_image_widget.dart
+++ b/lib/src/widgets/cake_image_widget.dart
@@ -1,98 +1,59 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
 class CakeImageWidget extends StatelessWidget {
-  const CakeImageWidget({
-    super.key,
-    this.imageUrl,
+  CakeImageWidget({
+    required this.imageUrl,
+    Widget? displayOnError,
     this.height,
     this.width,
-    this.fit,
-    this.loadingWidget,
-    this.errorWidget,
-    this.color,
-    this.borderRadius = 24.0,
-  });
+  }) : _displayOnError = displayOnError ?? Icon(Icons.error);
 
   final String? imageUrl;
   final double? height;
   final double? width;
-  final BoxFit? fit;
-  final Widget? loadingWidget;
-  final Widget? errorWidget;
-  final Color? color;
-  final double borderRadius;
+  final Widget? _displayOnError;
 
   @override
   Widget build(BuildContext context) {
-    if (imageUrl == null || imageUrl!.isEmpty) {
-      return _buildErrorWidget(context);
+    try {
+      if (imageUrl == null || imageUrl!.isEmpty) return _displayOnError!;
+
+      if (imageUrl!.contains('assets/images')) {
+        return Image.asset(
+          imageUrl!,
+          height: height,
+          width: width,
+          errorBuilder: (_, __, ___) => Icon(Icons.error),
+        );
+      }
+
+      if (imageUrl!.contains('.svg')) {
+        return SvgPicture.network(
+          imageUrl!,
+          height: height,
+          width: width,
+          placeholderBuilder: (_) => Icon(Icons.error),
+        );
+      }
+
+      return Image.network(
+        imageUrl!,
+        fit: BoxFit.cover,
+        height: height,
+        width: width,
+        loadingBuilder: (BuildContext _, Widget child, ImageChunkEvent? loadingProgress) {
+          if (loadingProgress == null) {
+            return child;
+          } else {
+            return CupertinoActivityIndicator(animating: true);
+          }
+        },
+        errorBuilder: (_, __, ___) => Icon(Icons.error),
+      );
+    } catch (_) {
+      return _displayOnError!;
     }
-
-    final isSvg = imageUrl!.toLowerCase().endsWith('.svg');
-    final isAsset = imageUrl!.startsWith('assets/');
-
-    Widget imageWidget;
-    if (isAsset) {
-      imageWidget = isSvg
-          ? SvgPicture.asset(
-              imageUrl!,
-              height: height,
-              width: width,
-              fit: fit ?? BoxFit.contain,
-            )
-          : Image.asset(
-              imageUrl!,
-              height: height,
-              width: width,
-              fit: fit,
-              color: color,
-            );
-    } else {
-      imageWidget = isSvg
-          ? SvgPicture.network(
-              imageUrl!,
-              height: height,
-              width: width,
-              fit: fit ?? BoxFit.contain,
-              placeholderBuilder: (_) {
-                return loadingWidget ?? const Center(child: CircularProgressIndicator());
-              },
-              errorBuilder: (_, __, ___) => _buildErrorWidget(context),
-            )
-          : Image.network(
-              imageUrl!,
-              height: height,
-              width: width,
-              fit: fit ?? BoxFit.cover,
-              color: color,
-              loadingBuilder: (_, Widget child, ImageChunkEvent? progress) {
-                if (progress == null) return child;
-                return loadingWidget ?? const Center(child: CircularProgressIndicator());
-              },
-              errorBuilder: (_, __, ___) => _buildErrorWidget(context),
-            );
-    }
-
-    return imageWidget;
-  }
-
-  Widget _buildErrorWidget(BuildContext context) {
-    return Container(
-      height: height,
-      width: width,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(borderRadius),
-        color: Theme.of(context).colorScheme.surfaceContainerHighest,
-      ),
-      child: Center(
-        child: errorWidget ??
-            Icon(
-              Icons.error_outline,
-              color: Theme.of(context).colorScheme.error,
-              size: 24,
-            ),
-      ),
-    );
   }
 }
diff --git a/lib/src/widgets/cake_scrollbar.dart b/lib/src/widgets/cake_scrollbar.dart
index 4ce7f0085..bf6604d8e 100644
--- a/lib/src/widgets/cake_scrollbar.dart
+++ b/lib/src/widgets/cake_scrollbar.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
 import 'package:flutter/material.dart';
 
 class CakeScrollbar extends StatelessWidget {
@@ -27,7 +28,8 @@ class CakeScrollbar extends StatelessWidget {
           height: backgroundHeight,
           width: width,
           decoration: BoxDecoration(
-              color: backgroundColor ?? Theme.of(context).colorScheme.surfaceContainerHighest,
+              color: backgroundColor ??
+                  Theme.of(context).extension<CakeScrollbarTheme>()!.trackColor,
               borderRadius: BorderRadius.all(Radius.circular(3))),
           child: Stack(
             children: <Widget>[
@@ -38,7 +40,8 @@ class CakeScrollbar extends StatelessWidget {
                   height: thumbHeight,
                   width: width,
                   decoration: BoxDecoration(
-                      color: thumbColor ?? Theme.of(context).colorScheme.primary,
+                      color: thumbColor ??
+                          Theme.of(context).extension<CakeScrollbarTheme>()!.thumbColor,
                       borderRadius: BorderRadius.all(Radius.circular(3))),
                 ),
               )
diff --git a/lib/src/widgets/check_box_picker.dart b/lib/src/widgets/check_box_picker.dart
index 67aefba14..847b5b1c4 100644
--- a/lib/src/widgets/check_box_picker.dart
+++ b/lib/src/widgets/check_box_picker.dart
@@ -1,7 +1,11 @@
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 
 class CheckBoxPicker extends StatefulWidget {
   CheckBoxPicker({
@@ -39,12 +43,12 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
             child: Text(
               widget.title,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+              style: TextStyle(
                 fontSize: 18,
-                 
+                fontFamily: 'Lato',
                 fontWeight: FontWeight.bold,
                 decoration: TextDecoration.none,
-                color: Theme.of(context).colorScheme.onSurface,
+                color: Colors.white,
               ),
             ),
           ),
@@ -53,7 +57,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
           child: ClipRRect(
             borderRadius: BorderRadius.all(Radius.circular(30)),
             child: Container(
-              color: Theme.of(context).colorScheme.surfaceContainer,
+              color: Theme.of(context).dialogTheme.backgroundColor,
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: MediaQuery.of(context).size.height * 0.65,
@@ -87,14 +91,14 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
 
   Widget itemsList() {
     return Container(
-      color: Theme.of(context).colorScheme.outlineVariant,
+      color: Theme.of(context).extension<PickerTheme>()!.dividerColor,
       child: ListView.separated(
         padding: EdgeInsets.zero,
         controller: controller,
         shrinkWrap: true,
         separatorBuilder: (context, index) => widget.isSeparated
             ? Divider(
-                color: Theme.of(context).colorScheme.outlineVariant,
+                color: Theme.of(context).extension<PickerTheme>()!.dividerColor,
                 height: 1,
               )
             : const SizedBox(),
@@ -116,15 +120,15 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
       },
       child: Container(
         height: 55,
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         padding: EdgeInsets.only(left: 24, right: 24),
         child: Row(
           children: [
             StandardCheckbox(
               value: item.value,
               gradientBackground: true,
-              borderColor: Theme.of(context).colorScheme.outlineVariant,
-              iconColor: Theme.of(context).colorScheme.onPrimary,
+              borderColor: Theme.of(context).dividerColor,
+              iconColor: Colors.white,
               onChanged: (bool? value) {
                 if (value == null) {
                   return;
@@ -139,13 +143,15 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
             widget.displayItem?.call(item) ??
                 Text(
                   item.title,
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        fontWeight: FontWeight.w600,
-                        color: item.isDisabled
-                            ? Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.5)
-                            : Theme.of(context).colorScheme.onSurface,
-                        decoration: TextDecoration.none,
-                      ),
+                  style: TextStyle(
+                    fontSize: 14,
+                    fontFamily: 'Lato',
+                    fontWeight: FontWeight.w600,
+                    color: item.isDisabled
+                        ? Colors.grey.withOpacity(0.5)
+                        : Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                    decoration: TextDecoration.none,
+                  ),
                 )
           ],
         ),
diff --git a/lib/src/widgets/checkbox_widget.dart b/lib/src/widgets/checkbox_widget.dart
index f891de092..a3c78d0cf 100644
--- a/lib/src/widgets/checkbox_widget.dart
+++ b/lib/src/widgets/checkbox_widget.dart
@@ -1,4 +1,8 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+
 class CheckboxWidget extends StatefulWidget {
   CheckboxWidget({required this.value, required this.caption, required this.onChanged});
 
@@ -34,16 +38,20 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
             margin: EdgeInsets.only(right: 10.0),
             decoration: BoxDecoration(
               border: Border.all(
-                color: Theme.of(context).colorScheme.outline,
+                color: value
+                    ? Palette.blueCraiola
+                    : Theme.of(context).extension<FilterTheme>()!.checkboxBoundsColor,
                 width: 1.0,
               ),
-              borderRadius: BorderRadius.all(Radius.circular(8.0)),
-              color: Theme.of(context).colorScheme.surface,
+              borderRadius: BorderRadius.all(
+                Radius.circular(8.0),
+              ),
+              color: Theme.of(context).colorScheme.background,
             ),
             child: value
                 ? Icon(
                     Icons.check,
-                    color: Theme.of(context).colorScheme.primary,
+                    color: Colors.blue,
                     size: 20.0,
                   )
                 : null,
@@ -51,13 +59,15 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
           Expanded(
             child: Text(
               caption,
-              style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                  ),
+              style: TextStyle(
+                fontWeight: FontWeight.bold,
+                fontSize: 14.0,
+                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+              ),
             ),
           )
         ],
-      ),
+      )
     );
   }
 }
diff --git a/lib/src/widgets/dashboard_card_widget.dart b/lib/src/widgets/dashboard_card_widget.dart
index d5b4f8853..6fc660592 100644
--- a/lib/src/widgets/dashboard_card_widget.dart
+++ b/lib/src/widgets/dashboard_card_widget.dart
@@ -1,8 +1,9 @@
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
-import '../../themes/utils/custom_theme_colors.dart';
-
 class DashBoardRoundedCardWidget extends StatelessWidget {
   DashBoardRoundedCardWidget({
     this.onTap,
@@ -19,7 +20,6 @@ class DashBoardRoundedCardWidget extends StatelessWidget {
     super.key,
     this.marginV,
     this.marginH,
-    required this.isDarkTheme,
   });
 
   final VoidCallback? onTap;
@@ -35,29 +35,17 @@ class DashBoardRoundedCardWidget extends StatelessWidget {
   final double? marginH;
   final double? shadowSpread;
   final double? shadowBlur;
-  final bool isDarkTheme;
 
   @override
   Widget build(BuildContext context) {
     return Stack(
       children: [
         Container(
-          margin: EdgeInsets.symmetric(horizontal: marginH ?? 20, vertical: marginV ?? 5),
+          margin: EdgeInsets.symmetric(horizontal: marginH ?? 20, vertical: marginV ?? 8),
+          //padding: EdgeInsets.all(20),
           width: double.infinity,
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(15),
-            gradient: LinearGradient(
-              colors: [
-                isDarkTheme
-                    ? CustomThemeColors.cardGradientColorPrimaryDark
-                    : CustomThemeColors.cardGradientColorPrimaryLight,
-                isDarkTheme
-                    ? CustomThemeColors.cardGradientColorSecondaryDark
-                    : CustomThemeColors.cardGradientColorSecondaryLight,
-              ],
-              begin: Alignment.topCenter,
-              end: Alignment.bottomCenter,
-            ),
+            borderRadius: BorderRadius.circular(customBorder ?? 20),
             // border: Border.all(
             //   color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
             //     width: 1
@@ -71,14 +59,15 @@ class DashBoardRoundedCardWidget extends StatelessWidget {
             //   )
             // ],
           ),
-          child: TextButton(
+          child: OutlinedButton(
             onPressed: onTap,
-            style: TextButton.styleFrom(
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(15),
-              ),
-              padding: EdgeInsets.only(left: 24, top: 24, right: 20, bottom: 24),
-            ),
+            style: OutlinedButton.styleFrom(
+              side: BorderSide(width: 1, color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor),
+                backgroundColor:
+                    Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(customBorder ?? 20)),
+                padding: EdgeInsets.all(24)),
             child: Column(
               children: [
                 Row(
@@ -90,26 +79,29 @@ class DashBoardRoundedCardWidget extends StatelessWidget {
                         children: [
                           Text(
                             title,
-                            style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurface,
-                                  fontWeight: FontWeight.w800,
-                                  fontSize: 24,
-                                ),
+                            style: TextStyle(
+                              color: Theme.of(context)
+                                  .extension<DashboardPageTheme>()!
+                                  .cardTextColor,
+                              fontSize: 24,
+                              fontWeight: FontWeight.w900,
+                            ),
                             softWrap: true,
                           ),
                           SizedBox(height: 5),
                           Text(
                             subTitle,
-                            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                  fontWeight: FontWeight.w500,
-                                ),
+                            style: TextStyle(
+                                color: Theme.of(context)
+                                    .extension<DashboardPageTheme>()!
+                                    .cardTextColor,
+                                fontWeight: FontWeight.w500,
+                                fontFamily: 'Lato'),
                             softWrap: true,
                           ),
                         ],
                       ),
                     ),
-                    Padding(padding: EdgeInsets.only(left: 10)),
                     if (image != null) image! else if (svgPicture != null) svgPicture!,
                     if (icon != null) icon!
                   ],
@@ -129,7 +121,7 @@ class DashBoardRoundedCardWidget extends StatelessWidget {
             child: IconButton(
               icon: Icon(Icons.close),
               onPressed: onClose,
-              //color: Theme.of(context).colorScheme.onSurface,
+              color: Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor,
             ),
           ),
       ],
diff --git a/lib/src/widgets/discount_badge.dart b/lib/src/widgets/discount_badge.dart
index 9d5a26db2..01ccf1fcf 100644
--- a/lib/src/widgets/discount_badge.dart
+++ b/lib/src/widgets/discount_badge.dart
@@ -18,12 +18,13 @@ class DiscountBadge extends StatelessWidget {
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4),
       child: Text(
-        isAmount
-            ? '\$${percentage.toStringAsFixed(2)}'
-            : S.of(context).discount(percentage.toStringAsFixed(2)),
-        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-              fontWeight: FontWeight.w500,
-            ),
+       isAmount ? '\$${percentage.toStringAsFixed(2)}' : S.of(context).discount(percentage.toStringAsFixed(2)),
+        style: TextStyle(
+          color: Colors.white,
+          fontSize: 12,
+          fontWeight: FontWeight.w500,
+          fontFamily: 'Lato',
+        ),
       ),
       decoration: BoxDecoration(
         image: DecorationImage(
diff --git a/lib/src/widgets/gradient_background.dart b/lib/src/widgets/gradient_background.dart
index fd9066ece..591e24289 100644
--- a/lib/src/widgets/gradient_background.dart
+++ b/lib/src/widgets/gradient_background.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:flutter/material.dart';
 
 class GradientBackground extends StatelessWidget {
@@ -9,20 +9,22 @@ class GradientBackground extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.surface,
-        gradient: LinearGradient(
+        decoration: BoxDecoration(
+            gradient: LinearGradient(
           colors: [
-            Theme.of(context).colorScheme.surface,
-            Theme.of(context).brightness == Brightness.dark
-                ? CustomThemeColors.backgroundGradientColorDark
-                : CustomThemeColors.backgroundGradientColorLight,
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .firstGradientBackgroundColor,
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .secondGradientBackgroundColor,
+            Theme.of(context)
+                .extension<DashboardPageTheme>()!
+                .thirdGradientBackgroundColor,
           ],
-          begin: Alignment.topCenter,
-          end: Alignment.bottomCenter,
-        ),
-      ),
-      child: scaffold,
-    );
+          begin: Alignment.topRight,
+          end: Alignment.bottomLeft,
+        )),
+        child: scaffold);
   }
 }
diff --git a/lib/src/widgets/haven_wallet_removal_popup.dart b/lib/src/widgets/haven_wallet_removal_popup.dart
index e4c1767a7..05a38c41e 100644
--- a/lib/src/widgets/haven_wallet_removal_popup.dart
+++ b/lib/src/widgets/haven_wallet_removal_popup.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:flutter/material.dart';
 
 class HavenWalletRemovalPopup extends StatelessWidget {
@@ -22,8 +23,10 @@ class HavenWalletRemovalPopup extends StatelessWidget {
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(30.0),
                   gradient: LinearGradient(colors: [
-                    Theme.of(context).colorScheme.primaryContainer,
-                    Theme.of(context).colorScheme.secondaryContainer,
+                    Theme.of(context).extension<DashboardPageTheme>()!.firstGradientBackgroundColor,
+                    Theme.of(context)
+                        .extension<DashboardPageTheme>()!
+                        .secondGradientBackgroundColor,
                   ], begin: Alignment.centerLeft, end: Alignment.centerRight)),
               child: Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 24.0),
@@ -35,12 +38,12 @@ class HavenWalletRemovalPopup extends StatelessWidget {
                         child: Container(
                           alignment: Alignment.bottomCenter,
                           child: DefaultTextStyle(
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            style: TextStyle(
                               decoration: TextDecoration.none,
                               fontSize: 24.0,
                               fontWeight: FontWeight.bold,
-                               
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
                             ),
                             child: Text("Emergency Notice"),
                           ),
@@ -60,11 +63,13 @@ class HavenWalletRemovalPopup extends StatelessWidget {
                                 ),
                                 child: Text(
                                   "It looks like you have Haven wallets in your list. Haven is getting removed in next release of Cake Wallet, and you currently have Haven in the following wallets:\n\n[${affectedWalletNames.join(", ")}]\n\nPlease move your funds to other wallet, as you will lose access to your Haven funds in next update.\n\nFor assistance, please use the in-app support or email support@cakewallet.com",
-                                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                  style: TextStyle(
                                     decoration: TextDecoration.none,
                                     fontSize: 16.0,
-                                     
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                    fontFamily: 'Lato',
+                                    color: Theme.of(context)
+                                        .extension<DashboardPageTheme>()!
+                                        .textColor,
                                   ),
                                 ),
                               )
diff --git a/lib/src/widgets/introducing_card.dart b/lib/src/widgets/introducing_card.dart
index a03e77053..bd71183fd 100644
--- a/lib/src/widgets/introducing_card.dart
+++ b/lib/src/widgets/introducing_card.dart
@@ -1,12 +1,15 @@
 import 'package:auto_size_text/auto_size_text.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class IntroducingCard extends StatelessWidget {
   IntroducingCard(
-      {required this.borderColor,
-      required this.closeCard,
-      required this.title,
+      {required this.borderColor, 
+      required this.closeCard, 
+      required this.title, 
       required this.subTitle});
 
   final String title;
@@ -17,17 +20,16 @@ class IntroducingCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+      padding: const EdgeInsets.fromLTRB(16,0,16,16),
       child: Container(
         width: double.infinity,
         decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(30.0),
-          border: Border.all(
-            color: borderColor,
-            width: 1,
-          ),
-          color: Theme.of(context).colorScheme.surfaceContainer,
-        ),
+            borderRadius: BorderRadius.circular(30.0),
+            border: Border.all(
+              color: borderColor,
+              width: 1,
+            ),
+            color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -40,28 +42,30 @@ class IntroducingCard extends StatelessWidget {
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      AutoSizeText(
-                        title,
-                        style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+                      AutoSizeText(title ?? '',
+                          style: TextStyle(
+                              fontSize: 24,
+                              fontFamily: 'Lato',
                               fontWeight: FontWeight.bold,
-                              height: 1,
-                            ),
-                        maxLines: 1,
-                        textAlign: TextAlign.center,
-                      ),
+                              color: Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor,
+                              height: 1),
+                          maxLines: 1,
+                          textAlign: TextAlign.center),
                       SizedBox(height: 14),
-                      Text(
-                        subTitle,
-                        textAlign: TextAlign.left,
-                        style: Theme.of(context).textTheme.bodySmall,
-                      ),
+                      Text(subTitle ?? '',
+                          textAlign: TextAlign.left,
+                          style: TextStyle(
+                              fontSize: 12,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor,
+                              height: 1)),
                     ],
                   ),
                 ),
               ),
             ),
             Padding(
-              padding: const EdgeInsets.fromLTRB(0, 16, 16, 0),
+              padding: const EdgeInsets.fromLTRB(0,16,16,0),
               child: Semantics(
                 label: S.of(context).close,
                 child: GestureDetector(
@@ -70,17 +74,14 @@ class IntroducingCard extends StatelessWidget {
                     height: 23,
                     width: 23,
                     decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surfaceContainer,
-                      shape: BoxShape.circle,
-                    ),
+                        color: Colors.white, shape: BoxShape.circle),
                     child: Center(
-                      child: Image.asset(
-                        'assets/images/x.png',
-                        color: Theme.of(context).colorScheme.onSurface,
-                        height: 15,
-                        width: 15,
-                      ),
-                    ),
+                        child: Image.asset(
+                      'assets/images/x.png',
+                      color: Palette.darkBlueCraiola,
+                      height: 15,
+                      width: 15,
+                    )),
                   ),
                 ),
               ),
diff --git a/lib/src/widgets/keyboard_done_button.dart b/lib/src/widgets/keyboard_done_button.dart
index 533ec2d62..828c626b2 100644
--- a/lib/src/widgets/keyboard_done_button.dart
+++ b/lib/src/widgets/keyboard_done_button.dart
@@ -1,22 +1,19 @@
-import 'package:cake_wallet/generated/i18n.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class KeyboardDoneButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    // FIXME: Add translation
     return CupertinoButton(
       padding: EdgeInsets.only(right: 24.0, top: 8.0, bottom: 8.0),
       onPressed: () {
         FocusScope.of(context).requestFocus(FocusNode());
       },
       child: Text(
-        S.of(context).done,
-        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-              color: Theme.of(context).colorScheme.primary,
-              fontWeight: FontWeight.bold,
-            ),
+          'Done',
+          style: TextStyle(color: Colors.blueAccent,fontWeight: FontWeight.bold)
       ),
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/widgets/list_row.dart b/lib/src/widgets/list_row.dart
index 0b0209c06..417c7836b 100644
--- a/lib/src/widgets/list_row.dart
+++ b/lib/src/widgets/list_row.dart
@@ -1,75 +1,70 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class ListRow extends StatelessWidget {
-  ListRow(
-      {required this.title,
-      required this.value,
-      this.titleFontSize = 14,
-      this.valueFontSize = 16,
-      this.image,
-      this.padding,
-      this.color,
-      this.hintTextColor,
-      this.mainTextColor,
-      this.textWidget});
+  ListRow({
+    required this.title,
+    required this.value,
+    this.titleFontSize = 14,
+    this.valueFontSize = 16,
+    this.image,
+    this.padding,
+    this.color,
+    this.hintTextColor,
+    this.mainTextColor
+  });
 
   final String title;
   final String value;
   final double titleFontSize;
   final double valueFontSize;
-  final Widget? image;
+  final Image? image;
   final EdgeInsetsGeometry? padding;
   final Color? color;
   final Color? hintTextColor;
   final Color? mainTextColor;
-  final Widget? textWidget;
-
-  Widget _getTextWidget(BuildContext context) =>
-      textWidget ??
-      Text(
-        value,
-        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-              fontSize: valueFontSize,
-              fontWeight: FontWeight.w500,
-              color: mainTextColor,
-            ),
-      );
 
   @override
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      color: color ?? Theme.of(context).colorScheme.surface,
+      color: color ?? Theme.of(context).colorScheme.background,
       child: Padding(
         padding: padding ?? const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
-        child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
-          Text(
-            title,
-            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                  fontSize: titleFontSize,
-                  fontWeight: FontWeight.w500,
-                  color: hintTextColor,
-                ),
-            textAlign: TextAlign.left,
-          ),
-          Padding(
-            padding: const EdgeInsets.only(top: 12),
-            child: Row(
-              mainAxisSize: MainAxisSize.max,
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                Expanded(child: _getTextWidget(context)),
-                image != null
+        child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(title,
+                  style: TextStyle(
+                      fontSize: titleFontSize,
+                      fontWeight: FontWeight.w500,
+                      color: hintTextColor ?? Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
+                  textAlign: TextAlign.left),
+              Padding(
+                padding: const EdgeInsets.only(top: 12),
+                child: Row(
+                  mainAxisSize: MainAxisSize.max,
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: <Widget>[
+                    Expanded(
+                      child: Text(value,
+                          style: TextStyle(
+                              fontSize: valueFontSize,
+                              fontWeight: FontWeight.w500,
+                              color: mainTextColor ?? Theme.of(context).extension<CakeTextTheme>()!.titleColor)),
+                    ),
+                    image != null
                     ? Padding(
-                        padding: EdgeInsets.only(left: 24),
-                        child: image,
-                      )
+                      padding: EdgeInsets.only(left: 24),
+                      child: image,
+                    )
                     : Offstage()
-              ],
-            ),
-          )
-        ]),
+                  ],
+                ),
+              )
+            ]),
       ),
     );
   }
diff --git a/lib/src/widgets/number_text_fild_widget.dart b/lib/src/widgets/number_text_fild_widget.dart
index 635b86f41..52e7e23cf 100644
--- a/lib/src/widgets/number_text_fild_widget.dart
+++ b/lib/src/widgets/number_text_fild_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -56,16 +57,16 @@ class _NumberTextFieldState extends State<NumberTextField> {
 
   @override
   Widget build(BuildContext context) => TextField(
-        style: textMediumSemiBold(color: Theme.of(context).colorScheme.onSurfaceVariant),
-        enableInteractiveSelection: false,
-        textAlign: TextAlign.center,
-        textAlignVertical: TextAlignVertical.bottom,
-        controller: _controller,
-        focusNode: _focusNode,
-        textInputAction: TextInputAction.done,
-        keyboardType: TextInputType.number,
-        maxLength: widget.max.toString().length + (widget.min.isNegative ? 1 : 0),
-        decoration: InputDecoration(
+      style: textMediumSemiBold(color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+      enableInteractiveSelection: false,
+      textAlign: TextAlign.center,
+      textAlignVertical: TextAlignVertical.bottom,
+      controller: _controller,
+      focusNode: _focusNode,
+      textInputAction: TextInputAction.done,
+      keyboardType: TextInputType.number,
+      maxLength: widget.max.toString().length + (widget.min.isNegative ? 1 : 0),
+      decoration: InputDecoration(
           border: InputBorder.none,
           contentPadding: EdgeInsets.all(0),
           fillColor: Colors.transparent,
@@ -73,50 +74,34 @@ class _NumberTextFieldState extends State<NumberTextField> {
           isDense: true,
           filled: true,
           suffixIconConstraints: BoxConstraints(
-            maxHeight: widget.arrowsHeight,
-            maxWidth: widget.arrowsWidth + widget.contentPadding.right,
-          ),
+              maxHeight: widget.arrowsHeight,
+              maxWidth: widget.arrowsWidth + widget.contentPadding.right),
           prefixIconConstraints: BoxConstraints(
-            maxHeight: widget.arrowsHeight,
-            maxWidth: widget.arrowsWidth + widget.contentPadding.left,
-          ),
+              maxHeight: widget.arrowsHeight,
+              maxWidth: widget.arrowsWidth + widget.contentPadding.left),
           prefixIcon: Material(
-            type: MaterialType.transparency,
-            child: InkWell(
-              child: Container(
-                width: widget.arrowsWidth,
-                alignment: Alignment.bottomCenter,
-                child: Icon(
-                  Icons.arrow_left_outlined,
-                  size: widget.arrowsWidth,
-                ),
-              ),
-              onTap: _canGoDown ? () => _update(false) : null,
-            ),
-          ),
+              type: MaterialType.transparency,
+              child: InkWell(
+                  child: Container(
+                    width: widget.arrowsWidth,
+                      alignment: Alignment.bottomCenter,
+                      child: Icon(Icons.arrow_left_outlined, size: widget.arrowsWidth)),
+                  onTap: _canGoDown ? () => _update(false) : null)),
           suffixIcon: Material(
-            type: MaterialType.transparency,
-            child: InkWell(
-              child: Container(
-                width: widget.arrowsWidth,
-                alignment: Alignment.bottomCenter,
-                child: Icon(
-                  Icons.arrow_right_outlined,
-                  size: widget.arrowsWidth,
-                ),
-              ),
-              onTap: _canGoUp ? () => _update(true) : null,
-            ),
-          ),
-        ),
-        maxLines: 1,
-        onChanged: (value) {
-          final intValue = int.tryParse(value);
-          widget.onChanged?.call(intValue);
-          _updateArrows(intValue);
-        },
-        inputFormatters: [_NumberTextInputFormatter(widget.min, widget.max)],
-      );
+              type: MaterialType.transparency,
+              child: InkWell(
+                  child: Container(
+                    width: widget.arrowsWidth,
+                    alignment: Alignment.bottomCenter,
+                      child: Icon(Icons.arrow_right_outlined, size: widget.arrowsWidth)),
+                  onTap: _canGoUp ? () => _update(true) : null))),
+      maxLines: 1,
+      onChanged: (value) {
+        final intValue = int.tryParse(value);
+        widget.onChanged?.call(intValue);
+        _updateArrows(intValue);
+      },
+      inputFormatters: [_NumberTextInputFormatter(widget.min, widget.max)]);
 
   void _update(bool up) {
     var intValue = int.tryParse(_controller.text);
diff --git a/lib/src/widgets/option_tile.dart b/lib/src/widgets/option_tile.dart
index e5e5ba62d..c26987658 100644
--- a/lib/src/widgets/option_tile.dart
+++ b/lib/src/widgets/option_tile.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
 import 'package:flutter/material.dart';
 
 class OptionTile extends StatelessWidget {
@@ -20,12 +21,13 @@ class OptionTile extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
+      padding: EdgeInsets.only(left: 6, right: 6),
       alignment: Alignment.center,
-      child: ElevatedButton(
+      child: TextButton(
         style: TextButton.styleFrom(
-          backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
-          padding: EdgeInsets.all(24),
+          backgroundColor: Theme.of(context).cardColor,
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+          padding: EdgeInsets.all(24)
         ),
         onPressed: onPressed,
         child: Row(
@@ -44,19 +46,25 @@ class OptionTile extends StatelessWidget {
                   children: <Widget>[
                     Text(
                       title,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 20,
-                            fontWeight: FontWeight.w500,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
+                      style: TextStyle(
+                        fontSize: 20,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context)
+                            .extension<OptionTileTheme>()!
+                            .titleColor,
+                      ),
                     ),
                     Padding(
                       padding: EdgeInsets.only(top: 5),
                       child: Text(
                         description,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            ),
+                        style: TextStyle(
+                          fontSize: 14,
+                          fontWeight: FontWeight.normal,
+                          color: Theme.of(context)
+                              .extension<OptionTileTheme>()!
+                              .descriptionColor,
+                        ),
                       ),
                     )
                   ],
diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart
index b1fa6f5e5..ed5c05be6 100644
--- a/lib/src/widgets/picker.dart
+++ b/lib/src/widgets/picker.dart
@@ -4,13 +4,16 @@ import 'dart:math';
 
 import 'package:cake_wallet/entities/seed_type.dart';
 import 'package:cake_wallet/src/widgets/search_bar_widget.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:flutter/material.dart';
 import 'package:cw_core/currency.dart';
 import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 
+//TODO(David): PickerWidget is intertwined and confusing as is, find a way to optimize?
 class Picker<Item> extends StatefulWidget {
   Picker({
     required this.selectedAtIndex,
@@ -156,12 +159,13 @@ class _PickerState<Item> extends State<Picker<Item>> {
               key: ValueKey('picker_title_text_key'),
               widget.title!,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 18,
-                    fontWeight: FontWeight.bold,
-                    decoration: TextDecoration.none,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+              style: TextStyle(
+                fontSize: 18,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.bold,
+                decoration: TextDecoration.none,
+                color: Colors.white,
+              ),
             ),
           ),
         Padding(
@@ -176,7 +180,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
             child: ClipRRect(
               borderRadius: BorderRadius.all(Radius.circular(30)),
               child: Container(
-                color: Theme.of(context).colorScheme.surface,
+                color: Theme.of(context).dialogTheme.backgroundColor,
                 child: ConstrainedBox(
                   constraints: BoxConstraints(
                     maxHeight: containerHeight,
@@ -185,7 +189,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      if (widget.hintText != null) ...[
+                      if (widget.hintText != null)
                         Padding(
                           padding: const EdgeInsets.all(16),
                           child: SearchBarWidget(
@@ -194,11 +198,10 @@ class _PickerState<Item> extends State<Picker<Item>> {
                             hintText: widget.hintText,
                           ),
                         ),
-                        Divider(
-                          color: Theme.of(context).colorScheme.outlineVariant,
-                          height: 1,
-                        ),
-                      ],
+                      Divider(
+                        color: Theme.of(context).extension<PickerTheme>()!.dividerColor,
+                        height: 1,
+                      ),
                       if (widget.selectedAtIndex != -1 && widget.headerEnabled)
                         buildSelectedItem(widget.selectedAtIndex),
                       Flexible(
@@ -221,10 +224,15 @@ class _PickerState<Item> extends State<Picker<Item>> {
                                       key: ValueKey('picker_descriptinon_text_key'),
                                       widget.description!,
                                       textAlign: TextAlign.center,
-                                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                            fontWeight: FontWeight.w500,
-                                            decoration: TextDecoration.none,
-                                          ),
+                                      style: TextStyle(
+                                        fontSize: 12,
+                                        fontWeight: FontWeight.w500,
+                                        fontFamily: 'Lato',
+                                        decoration: TextDecoration.none,
+                                        color: Theme.of(context)
+                                            .extension<CakeTextTheme>()!
+                                            .titleColor,
+                                      ),
                                     ),
                                   )
                                 : Offstage(),
@@ -259,7 +267,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
             ? 0
             : filteredItems.length;
     return Container(
-      color: Theme.of(context).colorScheme.outlineVariant,
+      color: Theme.of(context).extension<PickerTheme>()!.dividerColor,
       child: widget.isGridView
           ? GridView.builder(
               key: ValueKey('picker_items_grid_view_key'),
@@ -284,7 +292,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
               shrinkWrap: true,
               separatorBuilder: (context, index) => widget.isSeparated
                   ? Divider(
-                      color: Theme.of(context).colorScheme.outlineVariant,
+                      color: Theme.of(context).extension<PickerTheme>()!.dividerColor,
                       height: 1,
                     )
                   : const SizedBox(),
@@ -340,10 +348,13 @@ class _PickerState<Item> extends State<Picker<Item>> {
                     key: ValueKey('picker_items_index_${itemName}_text_key'),
                     widget.displayItem?.call(item) ?? item.toString(),
                     softWrap: true,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          fontWeight: FontWeight.w600,
-                          decoration: TextDecoration.none,
-                        ),
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w600,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      decoration: TextDecoration.none,
+                    ),
                   ),
                 ),
                 if (tag != null)
@@ -356,16 +367,17 @@ class _PickerState<Item> extends State<Picker<Item>> {
                         child: Text(
                           key: ValueKey('picker_items_index_${index}_tag_key'),
                           tag,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 7.0,
-                                color: Theme.of(context).colorScheme.primary,
-                              ),
+                          style: TextStyle(
+                            fontSize: 7.0,
+                            fontFamily: 'Lato',
+                            color: Theme.of(context).extension<CakeScrollbarTheme>()!.thumbColor,
+                          ),
                         ),
                       ),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(6.0),
                         //border: Border.all(color: ),
-                        color: Theme.of(context).colorScheme.surfaceVariant,
+                        color: Theme.of(context).extension<CakeScrollbarTheme>()!.trackColor,
                       ),
                     ),
                   ),
@@ -384,7 +396,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
       },
       child: Container(
         height: isCustomItem ? 95 : 55,
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         padding: EdgeInsets.symmetric(horizontal: 24),
         child: isCustomItem
             ? Column(
@@ -427,12 +439,13 @@ class _PickerState<Item> extends State<Picker<Item>> {
                     key: ValueKey('picker_items_index_${itemName}_selected_item_text_key'),
                     widget.displayItem?.call(item) ?? item.toString(),
                     softWrap: true,
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w700,
-                          color: Theme.of(context).colorScheme.onSurface,
-                          decoration: TextDecoration.none,
-                        ),
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.w700,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      decoration: TextDecoration.none,
+                    ),
                   ),
                 ),
                 if (tag != null)
@@ -444,16 +457,17 @@ class _PickerState<Item> extends State<Picker<Item>> {
                       child: Center(
                         child: Text(
                           tag,
-                          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                fontSize: 7.0,
-                                color: Theme.of(context).colorScheme.primary,
-                              ),
+                          style: TextStyle(
+                            fontSize: 7.0,
+                            fontFamily: 'Lato',
+                            color: Theme.of(context).extension<CakeScrollbarTheme>()!.thumbColor,
+                          ),
                         ),
                       ),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(6.0),
                         //border: Border.all(color: ),
-                        color: Theme.of(context).colorScheme.surfaceVariant,
+                        color: Theme.of(context).extension<CakeScrollbarTheme>()!.trackColor,
                       ),
                     ),
                   ),
@@ -461,7 +475,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
             ),
           ),
         ),
-        Icon(Icons.check_circle, color: Theme.of(context).colorScheme.primary),
+        Icon(Icons.check_circle, color: Theme.of(context).primaryColor),
       ],
     );
 
@@ -472,7 +486,7 @@ class _PickerState<Item> extends State<Picker<Item>> {
       },
       child: Container(
         height: isCustomItem ? 95 : 55,
-        color: Theme.of(context).colorScheme.surface,
+        color: Theme.of(context).dialogTheme.backgroundColor,
         padding: EdgeInsets.symmetric(horizontal: 24),
         child: isCustomItem
             ? Column(
@@ -502,14 +516,12 @@ class _PickerState<Item> extends State<Picker<Item>> {
           child: Center(
             child: Text(
               item.name.substring(0, min(item.name.length, 2)).toUpperCase(),
-              style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                    fontSize: 11,
-                  ),
+              style: TextStyle(fontSize: 11),
             ),
           ),
           decoration: BoxDecoration(
             shape: BoxShape.circle,
-            color: Theme.of(context).colorScheme.surfaceContainer,
+            color: Colors.grey.shade400,
           ),
         );
       }
@@ -519,16 +531,10 @@ class _PickerState<Item> extends State<Picker<Item>> {
   }
 
   Widget buildSlider({required int index, required bool isActivated}) {
-    final isDarkMode = Theme.of(context).brightness == Brightness.dark;
     return Row(
       children: <Widget>[
         Expanded(
           child: Slider(
-            activeColor: Theme.of(context).colorScheme.primary,
-            inactiveColor: isDarkMode
-                ? CustomThemeColors.toggleColorOffStateDark
-                : CustomThemeColors.toggleColorOffStateLight,
-            thumbColor: CustomThemeColors.toggleKnobStateColorLight,
             value: widget.sliderValue == null || widget.sliderValue! < 1 ? 1 : widget.sliderValue!,
             onChanged: isActivated ? widget.onSliderChanged : null,
             min: widget.minValue ?? 1,
diff --git a/lib/src/widgets/picker_inner_wrapper_widget.dart b/lib/src/widgets/picker_inner_wrapper_widget.dart
index c8a5f81e9..2dd61e948 100644
--- a/lib/src/widgets/picker_inner_wrapper_widget.dart
+++ b/lib/src/widgets/picker_inner_wrapper_widget.dart
@@ -1,6 +1,7 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/src/widgets/picker_wrapper_widget.dart';
-import 'package:cake_wallet/utils/responsive_layout_util.dart';
 
 class PickerInnerWrapperWidget extends StatelessWidget {
   PickerInnerWrapperWidget(
@@ -31,21 +32,20 @@ class PickerInnerWrapperWidget extends StatelessWidget {
             child: Text(
               title!,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.bold,
-                    fontSize: 18,
-                    decoration: TextDecoration.none,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+              style: TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                  fontFamily: 'Lato',
+                  decoration: TextDecoration.none,
+                  color: Colors.white),
             ),
           ),
-          SizedBox(height: 8),
           Padding(
             padding: EdgeInsets.symmetric(horizontal: 24),
             child: ClipRRect(
               borderRadius: BorderRadius.all(Radius.circular(14)),
               child: Container(
-                color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                color: Theme.of(context).dialogTheme.backgroundColor,
                 child: ConstrainedBox(
                   constraints: BoxConstraints(
                     maxHeight:
@@ -73,7 +73,7 @@ class PickerInnerWrapperWidget extends StatelessWidget {
           child: ClipRRect(
             borderRadius: BorderRadius.all(Radius.circular(14)),
             child: Container(
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
+              color: Theme.of(context).dialogTheme.backgroundColor,
               child: ConstrainedBox(
                 constraints: BoxConstraints(
                   maxHeight: containerHeight,
diff --git a/lib/src/widgets/primary_button.dart b/lib/src/widgets/primary_button.dart
index b4d8cfdaa..d5800aa5b 100644
--- a/lib/src/widgets/primary_button.dart
+++ b/lib/src/widgets/primary_button.dart
@@ -13,7 +13,6 @@ class PrimaryButton extends StatelessWidget {
     this.isDottedBorder = false,
     this.borderColor = Colors.black,
     this.onDisabledPressed,
-    this.borderRadius,
     super.key,
   });
 
@@ -25,40 +24,33 @@ class PrimaryButton extends StatelessWidget {
   final String text;
   final bool isDisabled;
   final bool isDottedBorder;
-  final BorderRadius? borderRadius;
 
   @override
   Widget build(BuildContext context) {
     final content = ConstrainedBox(
       constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
       child: SizedBox(
-        width: double.infinity,
-        height: 52.0,
-        child: TextButton(
-          onPressed:
-              isDisabled ? (onDisabledPressed != null ? onDisabledPressed : null) : onPressed,
-          style: ButtonStyle(
-            backgroundColor: WidgetStateProperty.all(
-              isDisabled ? color.withOpacity(0.5) : color,
-            ),
-            shape: WidgetStateProperty.all<RoundedRectangleBorder>(
-              RoundedRectangleBorder(
-                borderRadius: borderRadius ?? BorderRadius.circular(12.0),
-              ),
-            ),
-            overlayColor: WidgetStateProperty.all(Colors.transparent),
-          ),
-          child: Text(
-            text,
-            textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-              fontSize: 15.0,
-              fontWeight: FontWeight.w600,
-              color: isDisabled ? textColor.withOpacity(0.5) : textColor,
-            ),
-          ),
-        ),
-      ),
+          width: double.infinity,
+          height: 52.0,
+          child: TextButton(
+            onPressed:
+                isDisabled ? (onDisabledPressed != null ? onDisabledPressed : null) : onPressed,
+            style: ButtonStyle(
+                backgroundColor:
+                    MaterialStateProperty.all(isDisabled ? color.withOpacity(0.5) : color),
+                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                  RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(26.0),
+                  ),
+                ),
+                overlayColor: MaterialStateProperty.all(Colors.transparent)),
+            child: Text(text,
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                    fontSize: 15.0,
+                    fontWeight: FontWeight.w600,
+                    color: isDisabled ? textColor.withOpacity(0.5) : textColor)),
+          )),
     );
 
     return isDottedBorder
@@ -67,7 +59,7 @@ class PrimaryButton extends StatelessWidget {
             dashPattern: [6, 4],
             color: borderColor,
             strokeWidth: 2,
-            radius: Radius.circular(15),
+            radius: Radius.circular(26),
             child: content)
         : content;
   }
@@ -96,52 +88,45 @@ class LoadingPrimaryButton extends StatelessWidget {
     return ConstrainedBox(
       constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
       child: SizedBox(
-        width: double.infinity,
-        height: 52.0,
-        child: TextButton(
-          onPressed: (isLoading || isDisabled)
-              ? null
-              : () {
-                  FocusScope.of(context).unfocus();
-                  onPressed.call();
-                },
-          style: ButtonStyle(
-              backgroundColor: WidgetStateProperty.all(isDisabled ? color.withOpacity(0.5) : color),
-              shape: WidgetStateProperty.all<RoundedRectangleBorder>(
-                RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(12.0),
-                ),
-              )),
-          child: isLoading
-              ? CupertinoActivityIndicator(animating: true, color: textColor)
-              : Text(
-                  text,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                    fontSize: 15.0,
-                    fontWeight: FontWeight.w600,
-                    color: isDisabled ? textColor.withOpacity(0.5) : textColor,
+          width: double.infinity,
+          height: 52.0,
+          child: TextButton(
+            onPressed: (isLoading || isDisabled) ? null : () {
+              FocusScope.of(context).unfocus();
+              onPressed.call();
+            },
+            style: ButtonStyle(
+                backgroundColor:
+                    MaterialStateProperty.all(isDisabled ? color.withOpacity(0.5) : color),
+                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                  RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(26.0),
                   ),
-                ),
-        ),
-      ),
+                )),
+            child: isLoading
+                ? CupertinoActivityIndicator(animating: true)
+                : Text(text,
+                    style: TextStyle(
+                        fontSize: 15.0,
+                        fontWeight: FontWeight.w600,
+                        color: isDisabled ? textColor.withOpacity(0.5) : textColor)),
+          )),
     );
   }
 }
 
 class PrimaryIconButton extends StatelessWidget {
-  const PrimaryIconButton({
-    required this.onPressed,
-    required this.iconData,
-    required this.text,
-    required this.color,
-    required this.borderColor,
-    required this.iconColor,
-    required this.iconBackgroundColor,
-    required this.textColor,
-    this.mainAxisAlignment = MainAxisAlignment.start,
-    this.radius = 12,
-    super.key,
-  });
+  const PrimaryIconButton(
+      {required this.onPressed,
+      required this.iconData,
+      required this.text,
+      required this.color,
+      required this.borderColor,
+      required this.iconColor,
+      required this.iconBackgroundColor,
+      required this.textColor,
+      this.mainAxisAlignment = MainAxisAlignment.start,
+      this.radius = 26, super.key});
 
   final VoidCallback onPressed;
   final IconData iconData;
@@ -164,8 +149,8 @@ class PrimaryIconButton extends StatelessWidget {
           child: TextButton(
             onPressed: onPressed,
             style: ButtonStyle(
-                backgroundColor: WidgetStateProperty.all(color),
-                shape: WidgetStateProperty.all<RoundedRectangleBorder>(
+                backgroundColor: MaterialStateProperty.all(color),
+                shape: MaterialStateProperty.all<RoundedRectangleBorder>(
                   RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(radius),
                   ),
@@ -179,22 +164,14 @@ class PrimaryIconButton extends StatelessWidget {
                       width: 26.0,
                       height: 52.0,
                       decoration: BoxDecoration(shape: BoxShape.circle, color: iconBackgroundColor),
-                      child: Center(
-                        child: Icon(iconData, color: iconColor, size: 22.0),
-                      ),
+                      child: Center(child: Icon(iconData, color: iconColor, size: 22.0)),
                     ),
                   ],
                 ),
                 Container(
                   height: 52.0,
                   child: Center(
-                    child: Text(
-                      text,
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                            fontSize: 16,
-                            color: textColor,
-                          ),
-                    ),
+                    child: Text(text, style: TextStyle(fontSize: 16.0, color: textColor)),
                   ),
                 )
               ],
@@ -211,8 +188,7 @@ class PrimaryImageButton extends StatelessWidget {
       required this.text,
       required this.color,
       required this.textColor,
-      this.borderColor = Colors.transparent,
-      super.key});
+      this.borderColor = Colors.transparent, super.key});
 
   final VoidCallback onPressed;
   final Image image;
@@ -226,36 +202,30 @@ class PrimaryImageButton extends StatelessWidget {
     return ConstrainedBox(
       constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint),
       child: SizedBox(
-        width: double.infinity,
-        height: 52.0,
-        child: ElevatedButton(
-          onPressed: onPressed,
-          style: ButtonStyle(
-              backgroundColor: WidgetStateProperty.all(color),
-              shape: WidgetStateProperty.all<RoundedRectangleBorder>(
-                RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(12.0),
+          width: double.infinity,
+          height: 52.0,
+          child: TextButton(
+              onPressed: onPressed,
+              style: ButtonStyle(
+                  backgroundColor: MaterialStateProperty.all(color),
+                  shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                    RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(26.0),
+                    ),
+                  )),
+              child: Center(
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: <Widget>[
+                    image,
+                    SizedBox(width: 15),
+                    Text(
+                      text,
+                      style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600, color: textColor),
+                    )
+                  ],
                 ),
-              )),
-          child: Center(
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              children: <Widget>[
-                image,
-                SizedBox(width: 15),
-                Text(
-                  text,
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        fontSize: 15,
-                        fontWeight: FontWeight.w600,
-                        color: textColor,
-                      ),
-                )
-              ],
-            ),
-          ),
-        ),
-      ),
+              ))),
     );
   }
 }
diff --git a/lib/src/widgets/provider_optoin_tile.dart b/lib/src/widgets/provider_optoin_tile.dart
index be6873975..85396a97d 100644
--- a/lib/src/widgets/provider_optoin_tile.dart
+++ b/lib/src/widgets/provider_optoin_tile.dart
@@ -1,4 +1,6 @@
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/typography.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
@@ -58,36 +60,40 @@ class ProviderOptionTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final backgroundColor = isSelected
-        ? Theme.of(context).colorScheme.primary
-        : Theme.of(context).colorScheme.surfaceContainer;
+        ? isLightMode
+            ? Theme.of(context).extension<ReceivePageTheme>()!.currentTileBackgroundColor
+            : Theme.of(context).extension<OptionTileTheme>()!.titleColor
+        : Theme.of(context).cardColor;
 
     final textColor = isSelected
-        ? Theme.of(context).colorScheme.onPrimary
-        : Theme.of(context).colorScheme.onSurface;
+        ? isLightMode
+            ? Colors.white
+            : Theme.of(context).cardColor
+        : Theme.of(context).extension<OptionTileTheme>()!.titleColor;
 
     final badgeColor = isSelected
-        ? Theme.of(context).colorScheme.surfaceContainer
-        : Theme.of(context).colorScheme.onSurface;
+        ? Theme.of(context).cardColor
+        : Theme.of(context).extension<OptionTileTheme>()!.titleColor;
 
     final badgeTextColor = isSelected
-        ? Theme.of(context).colorScheme.onSurface
-        : Theme.of(context).colorScheme.surfaceContainer;
+        ? Theme.of(context).extension<OptionTileTheme>()!.titleColor
+        : Theme.of(context).cardColor;
 
     final imagePath = isSelected
-        ? !isLightMode
+        ? isLightMode
             ? darkImagePath
             : lightImagePath
-        : !isLightMode
-            ? darkImagePath
-            : lightImagePath;
+        : isLightMode
+            ? lightImagePath
+            : darkImagePath;
 
     final rightSubTitleIconPath = isSelected
-        ? !isLightMode
+        ? isLightMode
             ? rightSubTitleDarkIconPath
             : rightSubTitleLightIconPath
-        : !isLightMode
-            ? rightSubTitleDarkIconPath
-            : rightSubTitleLightIconPath;
+        : isLightMode
+            ? rightSubTitleLightIconPath
+            : rightSubTitleDarkIconPath;
 
     return GestureDetector(
       onTap: onPressed,
@@ -106,24 +112,15 @@ class ProviderOptionTile extends StatelessWidget {
             children: [
               Row(
                 children: [
-                  getImage(imagePath,
-                      height: imageHeight, width: imageWidth, imageColor: textColor),
+                  getImage(imagePath, height: imageHeight, width: imageWidth),
                   SizedBox(width: 8),
                   Expanded(
                     child: Container(
                       child: Row(
                         children: [
                           Expanded(
-                            child: Text(
-                              title,
-                              style: titleTextStyle ??
-                                  Theme.of(context).textTheme.bodyLarge?.copyWith(
-                                        color: textColor,
-                                        fontWeight: FontWeight.w700,
-                                        fontSize: 18,
-                                      ),
-                            ),
-                          ),
+                              child: Text(title,
+                                  style: titleTextStyle ?? textLargeBold(color: textColor))),
                           Row(
                             children: [
                               if (leadingIcon != null)
@@ -145,26 +142,18 @@ class ProviderOptionTile extends StatelessWidget {
                     rightSubTitleIconPath: rightSubTitleIconPath),
               if (bottomLeftSubTitle != null || bottomRightSubTitle != null)
                 subTitleWidget(
-                  leftSubTitle: bottomLeftSubTitle,
-                  textColor: textColor,
-                  subTitleFontSize: 12,
-                ),
+                    leftSubTitle: bottomLeftSubTitle,
+                    textColor: textColor,
+                    subTitleFontSize: 12),
               if (badges != null && badges!.isNotEmpty)
                 Padding(
                   padding: const EdgeInsets.only(top: 12),
-                  child: Row(
-                    children: [
-                      ...badges!
-                          .map(
-                            (badge) => Badge(
-                              title: badge,
-                              textColor: badgeTextColor,
-                              backgroundColor: badgeColor,
-                            ),
-                          )
-                          .toList()
-                    ],
-                  ),
+                  child: Row(children: [
+                    ...badges!
+                        .map((badge) => Badge(
+                            title: badge, textColor: badgeTextColor, backgroundColor: badgeColor))
+                        .toList()
+                  ]),
                 )
             ],
           ),
@@ -199,19 +188,21 @@ class subTitleWidget extends StatelessWidget {
       children: [
         leftSubTitle != null || subTitleIconPath != null
             ? Row(
-                children: [
-                  if (subTitleIconPath != null && subTitleIconPath!.isNotEmpty)
-                    Padding(
-                      padding: const EdgeInsets.only(right: 6),
-                      child: getImage(subTitleIconPath!),
-                    ),
-                  Text(
-                    leftSubTitle ?? '',
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: subTitleFontSize, fontWeight: FontWeight.w700, color: textColor),
+              children: [
+                if (subTitleIconPath != null && subTitleIconPath!.isNotEmpty)
+                  Padding(
+                    padding: const EdgeInsets.only(right: 6),
+                    child: getImage(subTitleIconPath!),
                   ),
-                ],
-              )
+                Text(
+                  leftSubTitle ?? '',
+                  style: TextStyle(
+                      fontSize: subTitleFontSize,
+                      fontWeight: FontWeight.w700,
+                      color: textColor),
+                ),
+              ],
+            )
             : Offstage(),
         rightSubTitle != null || rightSubTitleIconPath != null
             ? Row(
@@ -223,7 +214,7 @@ class subTitleWidget extends StatelessWidget {
                     ),
                   Text(
                     rightSubTitle ?? '',
-                    style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                    style: TextStyle(
                         fontSize: subTitleFontSize, fontWeight: FontWeight.w700, color: textColor),
                   ),
                 ],
@@ -254,10 +245,11 @@ class Badge extends StatelessWidget {
           alignment: Alignment.center,
           child: Text(
             title,
-            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                  color: textColor,
-                  fontWeight: FontWeight.w600,
-                ),
+            style: TextStyle(
+              color: textColor,
+              fontSize: 12,
+              fontWeight: FontWeight.w600,
+            ),
           ),
         ),
       ),
@@ -266,11 +258,7 @@ class Badge extends StatelessWidget {
 }
 
 Widget getImage(String imagePath, {double? height, double? width, Color? imageColor}) {
-  bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https');
-  if (CakeTor.instance.enabled && isNetworkImage) {
-    imagePath = "assets/images/tor_logo.svg";
-    isNetworkImage = false;
-  }
+  final bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https');
   final bool isSvg = imagePath.endsWith('.svg');
   final double imageHeight = height ?? 35;
   final double imageWidth = width ?? 35;
@@ -289,15 +277,6 @@ Widget getImage(String imagePath, {double? height, double? width, Color? imageCo
                 child: CircularProgressIndicator(),
               ),
             ),
-            errorBuilder: (_, __, ___) {
-              return Container(
-                height: imageHeight,
-                width: imageWidth,
-                child: Center(
-                  child: Icon(Icons.error_outline, color: Colors.grey),
-                ),
-              );
-            },
           )
         : Image.network(
             imagePath,
@@ -324,9 +303,6 @@ Widget getImage(String imagePath, {double? height, double? width, Color? imageCo
               return Container(
                 height: imageHeight,
                 width: imageWidth,
-                child: Center(
-                  child: Icon(Icons.error_outline, color: Colors.grey),
-                ),
               );
             },
           );
@@ -337,7 +313,6 @@ Widget getImage(String imagePath, {double? height, double? width, Color? imageCo
             height: imageHeight,
             width: imageWidth,
             colorFilter: imageColor != null ? ColorFilter.mode(imageColor, BlendMode.srcIn) : null,
-            errorBuilder: (_, __, ___) => Icon(Icons.error, color: Colors.grey),
           )
         : Image.asset(imagePath, height: imageHeight, width: imageWidth);
   }
@@ -398,8 +373,8 @@ class _OptionTilePlaceholderState extends State<OptionTilePlaceholder>
 
   @override
   Widget build(BuildContext context) {
-    final backgroundColor = Theme.of(context).colorScheme.surfaceContainer;
-    final titleColor = Theme.of(context).colorScheme.onSurface.withOpacity(0.4);
+    final backgroundColor = Theme.of(context).cardColor;
+    final titleColor = Theme.of(context).extension<OptionTileTheme>()!.titleColor.withOpacity(0.4);
 
     return widget.errorText != null
         ? Container(
@@ -407,27 +382,25 @@ class _OptionTilePlaceholderState extends State<OptionTilePlaceholder>
             padding: widget.padding ?? EdgeInsets.all(16),
             alignment: Alignment.center,
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.all(
-                Radius.circular(widget.borderRadius ?? 12),
-              ),
+              borderRadius: BorderRadius.all(Radius.circular(widget.borderRadius ?? 12)),
               color: backgroundColor,
             ),
             child: Column(
               children: [
                 Text(
                   widget.errorText!,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        color: titleColor,
-                        fontSize: 16,
-                      ),
+                  style: TextStyle(
+                    color: titleColor,
+                    fontSize: 16,
+                  ),
                 ),
                 if (widget.withSubtitle) SizedBox(height: 8),
                 Text(
                   '',
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        color: titleColor,
-                        fontSize: 16,
-                      ),
+                  style: TextStyle(
+                    color: titleColor,
+                    fontSize: 16,
+                  ),
                 ),
               ],
             ),
diff --git a/lib/src/widgets/search_bar_widget.dart b/lib/src/widgets/search_bar_widget.dart
index 57e053faf..34ebe8560 100644
--- a/lib/src/widgets/search_bar_widget.dart
+++ b/lib/src/widgets/search_bar_widget.dart
@@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
@@ -6,29 +6,41 @@ class SearchBarWidget extends StatelessWidget {
   const SearchBarWidget({
     required this.searchController,
     this.hintText,
+    this.borderRadius = 14,
     super.key,
   });
 
   final TextEditingController searchController;
   final String? hintText;
+  final double borderRadius;
 
   @override
   Widget build(BuildContext context) {
-    return BaseTextFormField(
+    return TextFormField(
       key: ValueKey('search_bar_widget_key'),
       controller: searchController,
-      textStyle: Theme.of(context)
-          .textTheme
-          .bodyMedium!
-          .copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant),
-      hintText: hintText ?? S.of(context).search,
-      placeholderTextStyle: Theme.of(context)
-          .textTheme
-          .bodyMedium!
-          .copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant),
-      prefixIcon: Icon(Icons.search, color: Theme.of(context).colorScheme.primary),
-      alignLabelWithHint: false,
-      contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
+      style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
+      decoration: InputDecoration(
+        hintText: hintText ?? S.of(context).search,
+        hintStyle: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
+        prefixIcon: Icon( Icons.search,
+            color: Theme.of(context).primaryColor),
+        filled: true,
+        fillColor: Theme.of(context).extension<PickerTheme>()!.searchBackgroundFillColor,
+        alignLabelWithHint: false,
+        contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
+        enabledBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(borderRadius),
+            borderSide: BorderSide(
+              color: Theme.of(context).extension<PickerTheme>()!.searchBorderColor ??
+                  Colors.transparent,
+            )),
+        focusedBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(borderRadius),
+            borderSide: const BorderSide(
+              color: Colors.transparent,
+            )),
+      ),
     );
   }
 }
diff --git a/lib/src/widgets/section_divider.dart b/lib/src/widgets/section_divider.dart
index 36d22e685..b0beda089 100644
--- a/lib/src/widgets/section_divider.dart
+++ b/lib/src/widgets/section_divider.dart
@@ -1,29 +1,26 @@
 import 'package:flutter/material.dart';
 
 class SectionDivider extends StatelessWidget {
-  const SectionDivider({required this.direction, this.margin});
+  const SectionDivider({required this.direction});
 
   final Axis direction;
-  final EdgeInsets? margin;
+
   @override
   Widget build(BuildContext context) {
     return Container(
       height: direction == Axis.horizontal ? 1 : null,
       width: direction == Axis.vertical ? 1 : null,
-      color: Theme.of(context).colorScheme.outlineVariant.withOpacity(0.5),
-      margin: margin,
+      color: Theme.of(context).dividerColor,
     );
   }
 }
 
 class HorizontalSectionDivider extends StatelessWidget {
-  const HorizontalSectionDivider({this.margin});
-
-  final EdgeInsets? margin;
+  const HorizontalSectionDivider();
 
   @override
   Widget build(BuildContext context) {
-    return SectionDivider(direction: Axis.horizontal, margin: margin);
+    return SectionDivider(direction: Axis.horizontal);
   }
 }
 
diff --git a/lib/src/widgets/seed_language_picker.dart b/lib/src/widgets/seed_language_picker.dart
index e2b10aa4c..4a63e3092 100644
--- a/lib/src/widgets/seed_language_picker.dart
+++ b/lib/src/widgets/seed_language_picker.dart
@@ -16,7 +16,7 @@ class SeedLanguagePickerOption {
 
 final List<SeedLanguagePickerOption> seedLanguages = [
   SeedLanguagePickerOption('English', S.current.seed_language_english,
-      Image.asset('assets/images/flags/usa.png'), [MoneroSeedType.legacy, MoneroSeedType.polyseed, MoneroSeedType.bip39]),
+      Image.asset('assets/images/flags/usa.png'), [MoneroSeedType.legacy, MoneroSeedType.polyseed]),
   SeedLanguagePickerOption('Chinese (Simplified)', S.current.seed_language_chinese,
       Image.asset('assets/images/flags/chn.png'), [MoneroSeedType.legacy, MoneroSeedType.polyseed]),
   SeedLanguagePickerOption('Chinese (Traditional)', S.current.seed_language_chinese_traditional,
diff --git a/lib/src/widgets/seed_language_selector.dart b/lib/src/widgets/seed_language_selector.dart
index d46aa2701..711bff390 100644
--- a/lib/src/widgets/seed_language_selector.dart
+++ b/lib/src/widgets/seed_language_selector.dart
@@ -10,14 +10,12 @@ class SeedLanguageSelector extends StatefulWidget {
     required this.initialSelected,
     this.seedType = MoneroSeedType.defaultSeedType,
     this.buttonKey,
-    this.borderRadius,
     Key? key,
   }) : super(key: key);
 
   final String initialSelected;
   final MoneroSeedType seedType;
   final Key? buttonKey;
-  final BorderRadius? borderRadius;
 
   @override
   SeedLanguageSelectorState createState() => SeedLanguageSelectorState(selected: initialSelected);
@@ -31,7 +29,6 @@ class SeedLanguageSelectorState extends State<SeedLanguageSelector> {
   @override
   Widget build(BuildContext context) {
     return SelectButton(
-      borderRadius: widget.borderRadius,
       key: widget.buttonKey,
       image: null,
       text:
diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart
index 626736fe6..9b3726afb 100644
--- a/lib/src/widgets/seed_widget.dart
+++ b/lib/src/widgets/seed_widget.dart
@@ -1,6 +1,8 @@
 import 'package:cake_wallet/core/seed_validator.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/validable_annotated_editable_text.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -78,114 +80,78 @@ class SeedWidgetState extends State<SeedWidget> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.start,
-        children: [
+        child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+          Stack(children: [
+            SizedBox(height: 35),
+            if (_showPlaceholder)
+              Positioned(
+                  top: 10,
+                  left: 0,
+                  child: Text(S.of(context).enter_seed_phrase,
+                      style: TextStyle(fontSize: 16.0, color: Theme.of(context).hintColor))),
+            Padding(
+                padding: EdgeInsets.only(right: 40, top: 10),
+                child: ValidatableAnnotatedEditableText(
+                  key: widget.seedTextFieldKey,
+                  cursorColor: Colors.blue,
+                  backgroundCursorColor: Colors.blue,
+                  validStyle: TextStyle(
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      backgroundColor: Colors.transparent,
+                      fontWeight: FontWeight.normal,
+                      fontSize: 16),
+                  invalidStyle: TextStyle(
+                      fontSize: 16,
+                      color: Colors.red,
+                      fontWeight: FontWeight.normal,
+                      backgroundColor: Colors.transparent),
+                  focusNode: focusNode,
+                  controller: controller,
+                  words: words,
+                  normalizeSeed: normalizeSeed,
+                  textStyle: TextStyle(
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      backgroundColor: Colors.transparent,
+                      fontWeight: FontWeight.normal,
+                      fontSize: 16),
+                )),
+            Positioned(
+                top: 0,
+                right: 8,
+                child: Container(
+                    width: 32,
+                    height: 32,
+                    child: InkWell(
+                      key: widget.pasteButtonKey,
+                      onTap: () async => _pasteText(),
+                      child: Container(
+                          padding: EdgeInsets.all(8),
+                          decoration: BoxDecoration(
+                              color: Theme.of(context).hintColor,
+                              borderRadius: BorderRadius.all(Radius.circular(6))),
+                          child: Image.asset('assets/images/paste_ios.png',
+                              color: Theme.of(context)
+                                  .extension<SendPageTheme>()!
+                                  .textFieldButtonIconColor)),
+                    )))
+          ]),
           Container(
-            decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.surfaceContainer,
-              borderRadius: BorderRadius.circular(12),
-            ),
-            child: Stack(
-              children: [
-                Padding(
-                  padding: EdgeInsets.only(left: 12, right: 8, top: 8, bottom: 8),
-                  child: Row(
-                    children: [
-                      Expanded(
-                        child: Stack(
-                          children: [
-                            Container(
-                              constraints: BoxConstraints(minHeight: 40),
-                              child: Align(
-                                alignment: Alignment.centerLeft,
-                                child: ValidatableAnnotatedEditableText(
-                                  key: widget.seedTextFieldKey,
-                                  cursorColor: Theme.of(context).colorScheme.primary,
-                                  backgroundCursorColor: Theme.of(context).colorScheme.primary,
-                                  validStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                    color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                    backgroundColor: Colors.transparent,
-                                    fontWeight: FontWeight.normal,
-                                    fontSize: 16,
-                                  ),
-                                  invalidStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                        color: Theme.of(context).colorScheme.errorContainer,
-                                        backgroundColor: Colors.transparent,
-                                        fontWeight: FontWeight.normal,
-                                        fontSize: 16,
-                                      ),
-                                  focusNode: focusNode,
-                                  controller: controller,
-                                  words: words,
-                                  normalizeSeed: normalizeSeed,
-                                  textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                        backgroundColor: Colors.transparent,
-                                        fontWeight: FontWeight.normal,
-                                        fontSize: 16,
-                                      ),
-                                ),
-                              ),
-                            ),
-                            if (_showPlaceholder)
-                              Positioned.fill(
-                                child: IgnorePointer(
-                                  child: Align(
-                                    alignment: Alignment.centerLeft,
-                                    child: Text(
-                                      S.of(context).enter_seed_phrase,
-                                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                            color: Theme.of(context).colorScheme.onSurfaceVariant,
-                                            fontSize: 16,
-                                          ),
-                                    ),
-                                  ),
-                                ),
-                              ),
-                          ],
-                        ),
-                      ),
-                      Container(
-                        width: 32,
-                        height: 32,
-                        child: InkWell(
-                          key: widget.pasteButtonKey,
-                          onTap: () async => _pasteText(),
-                          child: Container(
-                            padding: EdgeInsets.all(6),
-                            decoration: BoxDecoration(
-                              color: Theme.of(context).colorScheme.surface,
-                              borderRadius: BorderRadius.all(
-                                Radius.circular(6),
-                              ),
-                            ),
-                            child: Image.asset(
-                              'assets/images/paste_ios.png',
-                              color: Theme.of(context).colorScheme.onSurfaceVariant,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
+              margin: EdgeInsets.only(top: 15),
+              height: 1.0,
+              color: Theme.of(context).extension<CakeTextTheme>()!.textfieldUnderlineColor),
+        ]));
   }
 
   Future<void> _pasteText() async {
-    final value = (await Clipboard.getData('text/plain'))?.text?.trim();
+    final value = await Clipboard.getData('text/plain');
 
-    if (value?.isNotEmpty ?? false) {
+    if (value?.text?.isNotEmpty ?? false) {
       setState(() {
         _showPlaceholder = false;
-        controller.text = value!;
+        controller.text = value!.text!;
       });
     }
   }
diff --git a/lib/src/widgets/seedphrase_grid_widget.dart b/lib/src/widgets/seedphrase_grid_widget.dart
index fb6c62d32..4f537c064 100644
--- a/lib/src/widgets/seedphrase_grid_widget.dart
+++ b/lib/src/widgets/seedphrase_grid_widget.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class SeedPhraseGridWidget extends StatelessWidget {
@@ -27,31 +28,35 @@ class SeedPhraseGridWidget extends StatelessWidget {
           alignment: Alignment.center,
           decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(8),
-            color: Theme.of(context).colorScheme.surfaceContainerHighest,
+            color: Theme.of(context).cardColor,
           ),
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               SizedBox(
                 child: Text(
+                  //maxLines: 1,
                   numberCount.toString(),
                   textAlign: TextAlign.center,
-                  style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                        height: 1.9,
-                        fontWeight: FontWeight.w700,
-                        color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5),
-                      ),
+                  style: TextStyle(
+                      fontSize: 12,
+                      height: 1,
+                      fontWeight: FontWeight.w800,
+                      color: Theme.of(context)
+                          .extension<CakeTextTheme>()!
+                          .buttonTextColor
+                          .withOpacity(0.5)),
                 ),
               ),
               const SizedBox(width: 6),
               Expanded(
                 child: Text(
                   '${item[0].toLowerCase()}${item.substring(1)}',
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        height: 1.9,
-                        fontWeight: FontWeight.w700,
-                        color: Theme.of(context).colorScheme.onSurface,
-                      ),
+                  style: TextStyle(
+                      fontSize: 14,
+                      height: 0.8,
+                      fontWeight: FontWeight.w700,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor),
                 ),
               ),
             ],
diff --git a/lib/src/widgets/service_status_tile.dart b/lib/src/widgets/service_status_tile.dart
index b43740c45..f2a079841 100644
--- a/lib/src/widgets/service_status_tile.dart
+++ b/lib/src/widgets/service_status_tile.dart
@@ -1,6 +1,5 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:cake_wallet/entities/service_status.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
@@ -21,9 +20,9 @@ class ServiceStatusTile extends StatelessWidget {
             Expanded(
               child: AutoSizeText(
                 "${status.title}${status.status != null ? " - ${status.status}" : ""}",
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                style: TextStyle(
                   fontSize: 16,
-                   
+                  fontFamily: 'Lato',
                   fontWeight: FontWeight.w800,
                   height: 1,
                 ),
@@ -33,7 +32,7 @@ class ServiceStatusTile extends StatelessWidget {
             ),
             Text(
               _getTimeString(status.date),
-              style: Theme.of(context).textTheme.bodySmall,
+              style: TextStyle(fontSize: 12),
             ),
           ],
         ),
@@ -41,9 +40,7 @@ class ServiceStatusTile extends StatelessWidget {
       leading: RotatedBox(
         child: Icon(
           Icons.info,
-          color: status.status == "resolved"
-              ? CustomThemeColors.syncGreen
-              : Theme.of(context).colorScheme.errorContainer,
+          color: status.status == "resolved" ? Colors.green : Colors.red,
         ),
         quarterTurns: 2,
       ),
diff --git a/lib/src/widgets/services_updates_widget.dart b/lib/src/widgets/services_updates_widget.dart
index eaa50867c..17f231303 100644
--- a/lib/src/widgets/services_updates_widget.dart
+++ b/lib/src/widgets/services_updates_widget.dart
@@ -3,12 +3,13 @@ import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/entities/service_status.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/service_status_tile.dart';
-import 'package:cake_wallet/utils/device_info.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -41,17 +42,16 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {
                 );
               });
         },
-        child: CakeImageWidget(
-          imageUrl: "assets/images/notif.svg",
-          color: Theme.of(context).colorScheme.onSurface,
-          width: DeviceInfo.instance.isDesktop ? 30 : 20,
+        child: SvgPicture.asset(
+          "assets/images/notification_icon.svg",
+          color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+          width: 30,
+          placeholderBuilder: (_) => Icon(Icons.error),
         ),
       );
     }
     return Padding(
-      padding: DeviceInfo.instance.isDesktop
-          ? EdgeInsets.zero
-          : EdgeInsets.only(left: 16, top: 12, right: 8, bottom: 8),
+      padding: const EdgeInsets.all(8.0),
       child: FutureBuilder<ServicesResponse>(
         future: widget.servicesResponse,
         builder: (context, state) {
@@ -66,7 +66,6 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {
                     setState(() => wasOpened = true);
 
                     showModalBottomSheet(
-                      backgroundColor: Theme.of(context).colorScheme.surface,
                       context: context,
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.only(
@@ -82,18 +81,14 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {
                         Widget body;
                         if (state.data!.servicesStatus.isEmpty) {
                           body = Center(
-                            child: Text(
-                              "Everything is up and running as expected",
-                              style: Theme.of(context).textTheme.bodyMedium,
-                            ),
+                            child: Text("Everything is up and running as expected"),
                           );
                         } else {
                           body = SingleChildScrollView(
                             child: Column(
-                              children: state.data!.servicesStatus
-                                  .map((status) => ServiceStatusTile(status))
-                                  .toList(),
-                            ),
+                                children: state.data!.servicesStatus
+                                    .map((status) => ServiceStatusTile(status))
+                                    .toList()),
                           );
                         }
                         return Padding(
@@ -105,26 +100,29 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {
                                 alignment: Alignment.bottomCenter,
                                 child: Padding(
                                   padding: EdgeInsets.symmetric(
-                                    horizontal: 24,
+                                    horizontal: MediaQuery.of(context).size.width / 8,
                                     vertical: 20,
                                   ),
                                   child: PrimaryImageButton(
                                     onPressed: () {
                                       try {
-                                        launchUrl(
-                                            Uri.parse(
-                                              "https://status.cakewallet.com/",
-                                            ),
+                                        launchUrl(Uri.parse("https://status.cakewallet.com/"),
                                             mode: LaunchMode.externalApplication);
                                       } catch (_) {}
                                     },
                                     image: Image.asset(
                                       "assets/images/status_website_image.png",
-                                      color: Theme.of(context).colorScheme.onPrimary,
+                                      color: Theme.of(context).brightness == Brightness.light
+                                          ? Colors.white
+                                          : null,
                                     ),
                                     text: "Status Website",
-                                    color: Theme.of(context).colorScheme.primary,
-                                    textColor: Theme.of(context).colorScheme.onPrimary,
+                                    color: Theme.of(context)
+                                        .extension<WalletListTheme>()!
+                                        .createNewWalletButtonBackgroundColor,
+                                    textColor: Theme.of(context)
+                                        .extension<WalletListTheme>()!
+                                        .restoreWalletButtonTextColor,
                                   ),
                                 ),
                               )
@@ -137,10 +135,11 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {
                 : null,
             child: Stack(
               children: [
-                CakeImageWidget(
-                  imageUrl: "assets/images/notif.svg",
-                  color: Theme.of(context).colorScheme.onSurface,
-                  width: DeviceInfo.instance.isDesktop ? 30 : 20,
+                SvgPicture.asset(
+                  "assets/images/notification_icon.svg",
+                  color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
+                  width: 30,
+                  placeholderBuilder: (_) => Icon(Icons.error),
                 ),
                 if (state.hasData && state.data!.hasUpdates && !wasOpened)
                   Container(
@@ -148,7 +147,7 @@ class _ServicesUpdatesWidgetState extends State<ServicesUpdatesWidget> {
                     width: 7,
                     margin: EdgeInsetsDirectional.only(start: 15),
                     decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.errorContainer,
+                      color: Colors.red,
                       shape: BoxShape.circle,
                     ),
                   ),
diff --git a/lib/src/widgets/setting_action_button.dart b/lib/src/widgets/setting_action_button.dart
index ef2367313..4fd7260f0 100644
--- a/lib/src/widgets/setting_action_button.dart
+++ b/lib/src/widgets/setting_action_button.dart
@@ -1,4 +1,10 @@
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
 
 class SettingActionButton extends StatelessWidget {
   final bool isLastTile;
@@ -27,20 +33,19 @@ class SettingActionButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final isLightMode = Theme.of(context).extension<OptionTileTheme>()?.useDarkImage ?? false;
     Color? color = isSelected
-        ? Theme.of(context).colorScheme.primary
+        ? Theme.of(context).extension<CakeMenuTheme>()!.settingTitleColor
         : selectionActive
-            ? Theme.of(context).colorScheme.primary
-            : Theme.of(context).colorScheme.onSurface;
+        ? Palette.darkBlue
+        : Theme.of(context).extension<CakeMenuTheme>()!.settingTitleColor;
     return Container(
       //padding: EdgeInsets.only(top: 5, left: 15, bottom: 5),
       margin: EdgeInsets.only(top: 10, left: 20, bottom: 0, right: 20),
       child: TextButton(
         style: ButtonStyle(
-          backgroundColor: WidgetStateProperty.all(
-            Theme.of(context).colorScheme.surfaceContainer,
-          ),
-          shape: WidgetStateProperty.all(
+          backgroundColor: MaterialStateProperty.all(isLightMode ? Theme.of(context).cardColor : Colors.black12),
+          shape: MaterialStateProperty.all(
             RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(20),
             ),
@@ -61,23 +66,25 @@ class SettingActionButton extends StatelessWidget {
                 image,
                 height: 16,
                 width: 16,
-                color: Theme.of(context).colorScheme.primary,
+                color: Theme.of(context)
+                    .extension<CakeMenuTheme>()!
+                    .settingActionsIconColor,
               ),
               SizedBox(width: 16),
               Expanded(
                 child: Text(
                   title,
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        color: color,
-                        fontSize: 16,
-                        fontWeight: FontWeight.w800,
-                      ),
+                  style: TextStyle(
+                    color: color,
+                    fontSize: 16,
+                    fontWeight: FontWeight.bold,
+                  ),
                 ),
               ),
-              if (isArrowVisible)
+              if(isArrowVisible)
                 Icon(
                   Icons.arrow_forward_ios,
-                  color: Theme.of(context).colorScheme.primary,
+                  color: Colors.grey,
                   size: 16,
                 )
             ],
@@ -86,4 +93,4 @@ class SettingActionButton extends StatelessWidget {
       ),
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/widgets/setting_actions.dart b/lib/src/widgets/setting_actions.dart
index e170d61e6..d383129cc 100644
--- a/lib/src/widgets/setting_actions.dart
+++ b/lib/src/widgets/setting_actions.dart
@@ -73,11 +73,7 @@ class SettingActions {
     image: 'assets/images/wallet_menu.png',
     onTap: (BuildContext context) {
       Navigator.pop(context);
-      Navigator.of(context).pushNamed(
-        Routes.walletList,
-        arguments: (BuildContext context) =>
-            Navigator.of(context).pushNamedAndRemoveUntil(Routes.dashboard, (route) => false),
-      );
+      Navigator.of(context).pushNamed(Routes.walletList);
     },
   );
 
diff --git a/lib/src/widgets/standard_checkbox.dart b/lib/src/widgets/standard_checkbox.dart
index 64de5337d..2b06ff1c6 100644
--- a/lib/src/widgets/standard_checkbox.dart
+++ b/lib/src/widgets/standard_checkbox.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 import 'package:flutter/material.dart';
 
 class StandardCheckbox extends StatelessWidget {
@@ -16,31 +18,30 @@ class StandardCheckbox extends StatelessWidget {
   final Color? borderColor;
   final Color? iconColor;
   final Color? captionColor;
-  final Function(bool)? onChanged;
+  final Function(bool) onChanged;
 
   @override
   Widget build(BuildContext context) {
     final baseGradient = LinearGradient(colors: [
-      Theme.of(context).colorScheme.primary,
-      Theme.of(context).colorScheme.primary.withOpacity(0.7),
+      Theme.of(context).extension<FilterTheme>()!.checkboxFirstGradientColor,
+      Theme.of(context).extension<FilterTheme>()!.checkboxSecondGradientColor,
     ], begin: Alignment.centerLeft, end: Alignment.centerRight);
 
     final boxBorder = Border.all(
-      color: borderColor ?? Theme.of(context).colorScheme.outline,
-      width: 2.0,
+      color: borderColor ?? Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
+      width: 1.0,
     );
 
     final checkedBoxDecoration = BoxDecoration(
-      gradient: gradientBackground ? baseGradient : null,
-      border: gradientBackground ? null : boxBorder,
-      borderRadius: BorderRadius.all(Radius.circular(8.0)),
-    );
+        gradient: gradientBackground ? baseGradient : null,
+        border: gradientBackground ? null : boxBorder,
+        borderRadius: BorderRadius.all(Radius.circular(8.0)));
 
     final uncheckedBoxDecoration =
         BoxDecoration(border: boxBorder, borderRadius: BorderRadius.all(Radius.circular(8.0)));
 
     return GestureDetector(
-      onTap: onChanged == null ? null : () => onChanged!(!value),
+      onTap: () => onChanged(!value),
       child: Row(
         mainAxisSize: MainAxisSize.min,
         mainAxisAlignment: MainAxisAlignment.start,
@@ -53,7 +54,7 @@ class StandardCheckbox extends StatelessWidget {
             child: value
                 ? Icon(
                     Icons.check,
-                    color: iconColor ?? Theme.of(context).colorScheme.primary,
+                    color: iconColor ?? Theme.of(context).primaryColor,
                     size: 20.0,
                   )
                 : Offstage(),
@@ -65,11 +66,11 @@ class StandardCheckbox extends StatelessWidget {
                 child: Text(
                   caption,
                   softWrap: true,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  style: TextStyle(
                     fontSize: 16.0,
-                     
+                    fontFamily: 'Lato',
                     fontWeight: FontWeight.normal,
-                    color: captionColor ?? Theme.of(context).colorScheme.onSurface,
+                    color: captionColor ?? Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                     decoration: TextDecoration.none,
                   ),
                 ),
diff --git a/lib/src/widgets/standard_expandable_list.dart b/lib/src/widgets/standard_expandable_list.dart
index ea32e888a..d1bcae646 100644
--- a/lib/src/widgets/standard_expandable_list.dart
+++ b/lib/src/widgets/standard_expandable_list.dart
@@ -1,3 +1,5 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:flutter/material.dart';
 
 class StandardExpandableList<T> extends StatelessWidget {
@@ -16,18 +18,21 @@ class StandardExpandableList<T> extends StatelessWidget {
     return Container(
       decoration: decoration ??
           BoxDecoration(
-            color: Theme.of(context).colorScheme.surface,
+            color: Theme.of(context).colorScheme.background,
           ),
       child: Theme(
         data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
         child: ExpansionTile(
-          iconColor: Theme.of(context).colorScheme.onSurface,
-          collapsedIconColor: Theme.of(context).colorScheme.onSurface,
+          iconColor: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+          collapsedIconColor:
+              Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
           title: Text(
             title,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w500,
-                ),
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.w500,
+              color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
+            ),
             textAlign: TextAlign.left,
           ),
           children: expandableItems.map((item) {
@@ -38,10 +43,10 @@ class StandardExpandableList<T> extends StatelessWidget {
                 child: Text(
                   item.toString(),
                   maxLines: 1,
-                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  style: TextStyle(
                       fontSize: 16,
                       fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.primary),
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                 ),
               ),
             );
diff --git a/lib/src/widgets/standard_list.dart b/lib/src/widgets/standard_list.dart
index 8d5270b38..c845301cc 100644
--- a/lib/src/widgets/standard_list.dart
+++ b/lib/src/widgets/standard_list.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/widgets/standard_list_card.dart';
 import 'package:cake_wallet/src/widgets/standard_list_status_row.dart';
 import 'package:flutter/material.dart';
@@ -21,15 +22,16 @@ class StandardListRow extends StatelessWidget {
     final leading = buildLeading(context);
     final trailing = buildTrailing(context);
     return Container(
-      height: 56,
-      padding: EdgeInsets.only(left: 12, right: 12),
+        height: 56,
+        padding: EdgeInsets.only(left: 12, right: 12),
       child: TextButton(
         onPressed: () => onTap?.call(context),
         style: ButtonStyle(
-          //backgroundColor: MaterialStateProperty.all(Theme.of(context).colorScheme.surfaceContainer),
-          shape: WidgetStateProperty.all(
+          //backgroundColor: MaterialStateProperty.all(Theme.of(context).cardColor),
+          shape: MaterialStateProperty.all(
             RoundedRectangleBorder(
-              borderRadius: BorderRadius.all(Radius.circular(10)),
+              borderRadius: BorderRadius.all(Radius.circular(10)
+              ),
             ),
           ),
         ),
@@ -56,10 +58,11 @@ class StandardListRow extends StatelessWidget {
           Expanded(
             child: Text(
               title,
-              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                    color: titleColor(context),
-                    fontWeight: isSelected ? FontWeight.w800 : FontWeight.w400,
-                  ),
+              style: TextStyle(
+                fontSize: 14,
+                fontWeight: FontWeight.normal,
+                color: titleColor(context),
+              ),
             ),
           )
         ],
@@ -69,8 +72,9 @@ class StandardListRow extends StatelessWidget {
 
   Widget? buildTrailing(BuildContext context) => null;
 
-  Color titleColor(BuildContext context) =>
-      isSelected ? Theme.of(context).colorScheme.primary : Theme.of(context).colorScheme.onSurface;
+  Color titleColor(BuildContext context) => isSelected
+      ? Theme.of(context).primaryColor
+      : Theme.of(context).extension<CakeTextTheme>()!.titleColor;
 }
 
 class SectionHeaderListRow extends StatelessWidget {
@@ -80,7 +84,7 @@ class SectionHeaderListRow extends StatelessWidget {
         Container(
           width: double.infinity,
           height: 40,
-          color: Theme.of(context).colorScheme.surface,
+          color: Theme.of(context).colorScheme.background,
         ),
         //StandardListSeparator(padding: EdgeInsets.only(left: 24))
       ]);
diff --git a/lib/src/widgets/standard_list_card.dart b/lib/src/widgets/standard_list_card.dart
index f3a9bed28..c86df0b9d 100644
--- a/lib/src/widgets/standard_list_card.dart
+++ b/lib/src/widgets/standard_list_card.dart
@@ -1,15 +1,16 @@
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 
 class TradeDetailsStandardListCard extends StatelessWidget {
-  TradeDetailsStandardListCard({
-    required this.id,
-    this.extraId,
-    required this.create,
-    required this.pair,
-    required this.onTap,
-    required this.currentTheme,
-  });
+  TradeDetailsStandardListCard(
+      {required this.id,
+      this.extraId,
+      required this.create,
+      required this.pair,
+      required this.onTap,
+      required this.currentTheme});
 
   final String id;
   final String? extraId;
@@ -20,59 +21,70 @@ class TradeDetailsStandardListCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final darkTheme = currentTheme == ThemeType.dark;
+
+    final baseGradient = LinearGradient(colors: [
+      Theme.of(context).extension<ExchangePageTheme>()!.firstGradientTopPanelColor,
+      Theme.of(context).extension<ExchangePageTheme>()!.secondGradientTopPanelColor,
+    ], begin: Alignment.centerLeft, end: Alignment.centerRight);
+
+    final gradient = LinearGradient(colors: [
+      PaletteDark.wildNightBlue,
+      PaletteDark.oceanBlue,
+    ], begin: Alignment.bottomCenter, end: Alignment.topCenter);
+
+    final textColor = Colors.white;
+
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0),
       child: GestureDetector(
         onTap: () => onTap(context),
         child: Container(
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(15.0),
-            color: Theme.of(context).colorScheme.surfaceContainerHighest,
-          ),
+              borderRadius: BorderRadius.circular(15.0),
+              gradient: darkTheme ? gradient : baseGradient),
           child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 16.0),
+            padding:
+                const EdgeInsets.symmetric(horizontal: 20.0, vertical: 16.0),
             child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  id,
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                      ),
-                ),
-                SizedBox(
-                  height: 8,
-                ),
-                if (extraId != null && extraId!.isNotEmpty)
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(id,
+                      style: TextStyle(
+                          fontSize: 16,
+                          fontFamily: 'Lato',
+                          fontWeight: FontWeight.w400,
+                          color: textColor)),
+                  SizedBox(
+                    height: 8,
+                  ),
+                  if (extraId != null && extraId!.isNotEmpty)
                   Padding(
                     padding: const EdgeInsets.only(bottom: 8.0),
-                    child: Text(
-                      extraId!,
-                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    child: Text(extraId!,
+                        style: TextStyle(
                             fontSize: 16,
-                          ),
-                    ),
+                            fontFamily: 'Lato',
+                            fontWeight: FontWeight.w400,
+                            color: textColor)),
                   ),
-                Text(
-                  create,
-                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                        color: Theme.of(context).colorScheme.onSurface,
-                      ),
-                ),
-                SizedBox(
-                  height: 35,
-                ),
-                Text(
-                  pair,
-                  style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                        fontSize: 24,
-                        fontWeight: FontWeight.bold,
-                      ),
-                ),
-              ],
-            ),
+                  Text(create,
+                      style: TextStyle(
+                          fontSize: 12,
+                          fontFamily: 'Lato',
+                          fontWeight: FontWeight.w400,
+                          color: textColor)),
+                  SizedBox(
+                    height: 35,
+                  ),
+                  Text(pair,
+                      style: TextStyle(
+                          fontSize: 24,
+                          fontFamily: 'Lato',
+                          fontWeight: FontWeight.bold,
+                          color: textColor)),
+                ]),
           ),
         ),
       ),
diff --git a/lib/src/widgets/standard_list_status_row.dart b/lib/src/widgets/standard_list_status_row.dart
index 42032593d..e24010358 100644
--- a/lib/src/widgets/standard_list_status_row.dart
+++ b/lib/src/widgets/standard_list_status_row.dart
@@ -1,62 +1,65 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class StandardListStatusRow extends StatelessWidget {
-  StandardListStatusRow({required this.title, required this.value, this.status});
+  StandardListStatusRow({required this.title, required this.value});
 
   final String title;
   final String value;
-  final String? status; // waiting, action required, created, fetching, finished, success
 
   @override
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      color: Theme.of(context).colorScheme.surface,
+      color: Theme.of(context).colorScheme.background,
       child: Padding(
-        padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
-        child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
-          Text(
-            title,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: Theme.of(context).colorScheme.onSurfaceVariant,
-                ),
-            textAlign: TextAlign.left,
-          ),
-          Padding(
-            padding: const EdgeInsets.only(top: 12),
-            child: Container(
-              decoration: BoxDecoration(
-                color: Theme.of(context).colorScheme.surfaceContainerHighest,
-                borderRadius: BorderRadius.circular(30.0),
-              ),
-              child: Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    SyncIndicatorIcon(
-                      boolMode: false,
-                      value: status ?? value,
-                      size: 6,
+        padding:
+            const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
+        child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: <Widget>[
+              Text(title,
+                  style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w500,
+                      color: Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor),
+                  textAlign: TextAlign.left),
+              Padding(
+                padding: const EdgeInsets.only(top: 12),
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: Theme.of(context).extension<AddressTheme>()!.actionButtonColor,
+                    borderRadius: BorderRadius.circular(30.0),
+                  ),
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: <Widget>[
+                        SyncIndicatorIcon(
+                          boolMode: false,
+                          value: value,
+                          size: 6,
+                        ),
+                        SizedBox(
+                          width: 5,
+                        ),
+                        Text(value,
+                            style: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w500,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor))
+                      ],
                     ),
-                    SizedBox(
-                      width: 5,
-                    ),
-                    Text(
-                      value,
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    )
-                  ],
+                  ),
                 ),
-              ),
-            ),
-          )
-        ]),
+              )
+            ]),
       ),
     );
   }
diff --git a/lib/src/widgets/standard_picker_list.dart b/lib/src/widgets/standard_picker_list.dart
index c1c52800c..0e9831420 100644
--- a/lib/src/widgets/standard_picker_list.dart
+++ b/lib/src/widgets/standard_picker_list.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/src/widgets/list_row.dart';
 import 'package:cake_wallet/src/widgets/picker.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 import 'package:flutter/material.dart';
 
 class StandardPickerList<T> extends StatefulWidget {
@@ -67,7 +68,7 @@ class _StandardPickerListState<T> extends State<StandardPickerList<T>> {
             mainAxisAlignment: MainAxisAlignment.center,
             sliderValue: customValue,
             isWrapped: false,
-            borderColor: Theme.of(context).colorScheme.outlineVariant,
+            borderColor: Theme.of(context).extension<PickerTheme>()!.dividerColor,
             onSliderChanged: (newValue) {
               setState(() => customValue = newValue);
               value = widget.onSliderChanged(newValue).toString();
diff --git a/lib/src/widgets/standard_slide_button_widget.dart b/lib/src/widgets/standard_slide_button_widget.dart
index a0ef4eb2f..e777155aa 100644
--- a/lib/src/widgets/standard_slide_button_widget.dart
+++ b/lib/src/widgets/standard_slide_button_widget.dart
@@ -1,5 +1,7 @@
-import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 
 class StandardSlideButton extends StatefulWidget {
@@ -9,14 +11,12 @@ class StandardSlideButton extends StatefulWidget {
     this.buttonText = '',
     this.height = 48.0,
     required this.currentTheme,
-    required this.accessibleNavigationModeButtonText,
   }) : super(key: key);
 
   final VoidCallback onSlideComplete;
   final String buttonText;
   final double height;
-  final MaterialThemeBase currentTheme;
-  final String accessibleNavigationModeButtonText;
+  final ThemeBase currentTheme;
 
   @override
   _StandardSlideButtonState createState() => _StandardSlideButtonState();
@@ -27,80 +27,64 @@ class _StandardSlideButtonState extends State<StandardSlideButton> {
 
   @override
   Widget build(BuildContext context) {
-    final bool accessible = MediaQuery.of(context).accessibleNavigation;
+    return LayoutBuilder(builder: (context, constraints) {
+      final double maxWidth = constraints.maxWidth;
+      const double sideMargin = 4.0;
+      final double effectiveMaxWidth = maxWidth - 2 * sideMargin;
+      const double sliderWidth = 42.0;
 
-    final tileBackgroundColor = Theme.of(context).colorScheme.surfaceContainer;
-
-    return accessible
-        ? PrimaryButton(
-            text: widget.accessibleNavigationModeButtonText,
-            color: Theme.of(context).colorScheme.primary,
-            textColor: Theme.of(context).colorScheme.onPrimary,
-            onPressed: () => widget.onSlideComplete(),
-          )
-        : LayoutBuilder(
-            builder: (context, constraints) {
-              final double maxWidth = constraints.maxWidth;
-              const double sideMargin = 4.0;
-              final double effectiveMaxWidth = maxWidth - 2 * sideMargin;
-              const double sliderWidth = 42.0;
-
-              return Container(
-                height: widget.height,
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(10),
-                  color: tileBackgroundColor,
+      return Container(
+        height: widget.height,
+        decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(10),
+            color: widget.currentTheme.type == ThemeType.light || widget.currentTheme.type == ThemeType.bright
+                ?  Theme.of(context).disabledColor
+                : widget.currentTheme.type == ThemeType.oled ? Colors.black : Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor),
+        child: Stack(
+          alignment: Alignment.centerLeft,
+          children: [
+            Center(
+                child: Text(widget.buttonText,
+                    style: TextStyle(
+                        fontSize: 16,
+                        fontFamily: 'Lato',
+                        fontWeight: FontWeight.w600,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor))),
+            Positioned(
+              left: sideMargin + _dragPosition,
+              child: GestureDetector(
+                onHorizontalDragUpdate: (details) {
+                  setState(() {
+                    _dragPosition += details.delta.dx;
+                    if (_dragPosition < 0) _dragPosition = 0;
+                    if (_dragPosition > effectiveMaxWidth - sliderWidth) {
+                      _dragPosition = effectiveMaxWidth - sliderWidth;
+                    }
+                  });
+                },
+                onHorizontalDragEnd: (details) {
+                  if (_dragPosition >= effectiveMaxWidth - sliderWidth - 10) {
+                    widget.onSlideComplete();
+                  } else {
+                    setState(() => _dragPosition = 0);
+                  }
+                },
+                child: Container(
+                  width: sliderWidth,
+                  height: widget.height - 8,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: widget.currentTheme.type == ThemeType.bright ? Theme.of(context).extension<CakeMenuTheme>()!.backgroundColor : Theme.of(context).extension<FilterTheme>()!.buttonColor,
+                  ),
+                  alignment: Alignment.center,
+                  child: Icon(Icons.arrow_forward,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
                 ),
-                child: Stack(
-                  alignment: Alignment.centerLeft,
-                  children: [
-                    Center(
-                      child: Text(
-                        widget.buttonText,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 16,
-                              fontWeight: FontWeight.w600,
-                            ),
-                      ),
-                    ),
-                    Positioned(
-                      left: sideMargin + _dragPosition,
-                      child: GestureDetector(
-                        onHorizontalDragUpdate: (details) {
-                          setState(() {
-                            _dragPosition += details.delta.dx;
-                            if (_dragPosition < 0) _dragPosition = 0;
-                            if (_dragPosition > effectiveMaxWidth - sliderWidth) {
-                              _dragPosition = effectiveMaxWidth - sliderWidth;
-                            }
-                          });
-                        },
-                        onHorizontalDragEnd: (details) {
-                          if (_dragPosition >= effectiveMaxWidth - sliderWidth - 10) {
-                            widget.onSlideComplete();
-                          } else {
-                            setState(() => _dragPosition = 0);
-                          }
-                        },
-                        child: Container(
-                          width: sliderWidth,
-                          height: widget.height - 8,
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(10),
-                            color: Theme.of(context).colorScheme.primary,
-                          ),
-                          alignment: Alignment.center,
-                          child: Icon(
-                            Icons.arrow_forward,
-                            color: Theme.of(context).colorScheme.onSurface,
-                          ),
-                        ),
-                      ),
-                    )
-                  ],
-                ),
-              );
-            },
-          );
+              ),
+            )
+          ],
+        ),
+      );
+    });
   }
 }
diff --git a/lib/src/widgets/standard_switch.dart b/lib/src/widgets/standard_switch.dart
index 8100263b7..b80d487fe 100644
--- a/lib/src/widgets/standard_switch.dart
+++ b/lib/src/widgets/standard_switch.dart
@@ -1,11 +1,11 @@
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class StandardSwitch extends StatefulWidget {
-  const StandardSwitch({required this.value, required this.onTapped});
+  const StandardSwitch({required this.value, required this.onTaped});
 
   final bool value;
-  final VoidCallback onTapped;
+  final VoidCallback onTaped;
 
   @override
   StandardSwitchState createState() => StandardSwitchState();
@@ -14,11 +14,11 @@ class StandardSwitch extends StatefulWidget {
 class StandardSwitchState extends State<StandardSwitch> {
   @override
   Widget build(BuildContext context) {
-    final isDarkMode = Theme.of(context).brightness == Brightness.dark;
+
     return Semantics(
       toggled: widget.value,
       child: GestureDetector(
-        onTap: widget.onTapped,
+        onTap: widget.onTaped,
         child: AnimatedContainer(
           padding: EdgeInsets.only(left: 2.0, right: 2.0),
           alignment: widget.value ? Alignment.centerRight : Alignment.centerLeft,
@@ -26,24 +26,16 @@ class StandardSwitchState extends State<StandardSwitch> {
           width: 50,
           height: 28,
           decoration: BoxDecoration(
-            color: widget.value
-                ? Theme.of(context).colorScheme.primary
-                : isDarkMode
-                    ? CustomThemeColors.toggleColorOffStateDark
-                    : CustomThemeColors.toggleColorOffStateLight,
-            borderRadius: BorderRadius.all(
-              Radius.circular(14.0),
-            ),
-          ),
+              color: widget.value
+                  ? Theme.of(context).primaryColor
+                  : Theme.of(context).disabledColor,
+              borderRadius: BorderRadius.all(Radius.circular(14.0))),
           child: Container(
             width: 24.0,
             height: 24.0,
             decoration: BoxDecoration(
-              color: isDarkMode
-                  ? Theme.of(context).colorScheme.surface
-                  : CustomThemeColors.toggleKnobStateColorLight,
-              shape: BoxShape.circle,
-            ),
+                color: Colors.white,
+                shape: BoxShape.circle),
           ),
         ),
       ),
diff --git a/lib/src/widgets/template_tile.dart b/lib/src/widgets/template_tile.dart
index 879288ce7..8f8d5e771 100644
--- a/lib/src/widgets/template_tile.dart
+++ b/lib/src/widgets/template_tile.dart
@@ -1,5 +1,7 @@
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 
 class TemplateTile extends StatefulWidget {
   TemplateTile({
@@ -20,83 +22,87 @@ class TemplateTile extends StatefulWidget {
   final bool? hasMultipleRecipients;
 
   @override
-  TemplateTileState createState() => TemplateTileState(to, amount, from, onTap, onRemove);
+  TemplateTileState createState() => TemplateTileState(
+      to,
+      amount,
+      from,
+      onTap,
+      onRemove
+  );
 }
 
 class TemplateTileState extends State<TemplateTile> {
-  TemplateTileState(this.to, this.amount, this.from, this.onTap, this.onRemove);
+  TemplateTileState(
+      this.to,
+      this.amount,
+      this.from,
+      this.onTap,
+      this.onRemove
+      );
 
   final String to;
   final String amount;
   final String from;
   final VoidCallback onTap;
   final VoidCallback onRemove;
+  final trash = Image.asset('assets/images/trash.png', height: 16, width: 16, color: Colors.white);
 
   bool isRemovable = false;
 
   @override
   Widget build(BuildContext context) {
-    final toIcon = Image.asset(
-      'assets/images/to_icon.png',
-      color: Theme.of(context).colorScheme.onSurface,
-    );
+    final color = isRemovable
+        ? Colors.white
+        : Theme.of(context).extension<SendPageTheme>()!.templateTitleColor;
+    final toIcon = Image.asset('assets/images/to_icon.png', color: color);
 
     final content = Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      mainAxisSize: MainAxisSize.min,
-      children: widget.hasMultipleRecipients ?? false
-          ? [
-              Text(
-                to,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.onSurface,
-                    ),
-              ),
-            ]
-          : [
-              Text(
-                amount,
-                style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: Theme.of(context).colorScheme.onSurface,
-                    ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(left: 5),
-                child: Text(
-                  from,
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                        color: Theme.of(context).colorScheme.onSurface,
-                      ),
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(left: 5),
-                child: toIcon,
-              ),
-              Padding(
-                padding: EdgeInsets.only(left: 5),
-                child: Text(
+        mainAxisAlignment: MainAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: widget.hasMultipleRecipients ?? false
+            ? [
+                Text(
                   to,
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                  style: TextStyle(
+                      fontSize: 16, fontWeight: FontWeight.w600, color: color),
+                ),
+              ]
+            : [
+                Text(
+                  amount,
+                  style: TextStyle(
+                      fontSize: 16, fontWeight: FontWeight.w600, color: color),
+                ),
+                Padding(
+                  padding: EdgeInsets.only(left: 5),
+                  child: Text(
+                    from,
+                    style: TextStyle(
                         fontSize: 16,
                         fontWeight: FontWeight.w600,
-                        color: Theme.of(context).colorScheme.onSurface,
-                      ),
+                        color: color),
+                  ),
                 ),
-              ),
-            ],
-    );
+                Padding(
+                  padding: EdgeInsets.only(left: 5),
+                  child: toIcon,
+                ),
+                Padding(
+                  padding: EdgeInsets.only(left: 5),
+                  child: Text(
+                    to,
+                    style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w600,
+                        color: color),
+                  ),
+                ),
+              ]);
 
     final tile = Container(
         padding: EdgeInsets.only(right: 10),
         child: ClipRRect(
-          borderRadius: BorderRadius.all(Radius.circular(12)),
+          borderRadius: BorderRadius.all(Radius.circular(20)),
           child: GestureDetector(
             onTap: onTap,
             onLongPress: () {
@@ -107,51 +113,47 @@ class TemplateTileState extends State<TemplateTile> {
             child: Container(
               height: 40,
               padding: EdgeInsets.only(left: 24, right: 24),
-              color: Theme.of(context).colorScheme.surfaceContainerHighest,
+              color: Theme.of(context).extension<SendPageTheme>()!.templateBackgroundColor,
               child: content,
             ),
           ),
-        ));
+        )
+    );
 
     final removableTile = Container(
-      padding: EdgeInsets.only(right: 10),
-      child: ClipRRect(
-        borderRadius: BorderRadius.all(Radius.circular(12)),
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
-            GestureDetector(
-              onTap: () {
-                setState(() {
-                  isRemovable = false;
-                });
-              },
-              child: Container(
-                height: 40,
-                padding: EdgeInsets.only(left: 24, right: 10),
-                color: CustomThemeColors.syncYellow,
-                child: content,
-              ),
-            ),
-            GestureDetector(
-              onTap: onRemove,
-              child: Container(
-                height: 40,
-                width: 44,
-                color: Theme.of(context).colorScheme.errorContainer,
-                child: Center(
-                  child: Image.asset(
-                    'assets/images/trash.png',
-                    height: 16,
-                    width: 16,
-                    color: Theme.of(context).colorScheme.onErrorContainer,
+        padding: EdgeInsets.only(right: 10),
+        child: ClipRRect(
+            borderRadius: BorderRadius.all(Radius.circular(20)),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                GestureDetector(
+                  onTap: () {
+                    setState(() {
+                      isRemovable = false;
+                    });
+                  },
+                  child: Container(
+                    height: 40,
+                    padding: EdgeInsets.only(left: 24, right: 10),
+                    color: Colors.orange,
+                    child: content,
                   ),
                 ),
-              ),
+                GestureDetector(
+                  onTap: onRemove,
+                  child: Container(
+                    height: 40,
+                    width: 44,
+                    color: Palette.darkRed,
+                    child: Center(
+                      child: trash,
+                    ),
+                  ),
+                )
+              ],
             )
-          ],
-        ),
-      ),
+        )
     );
 
     return isRemovable ? removableTile : tile;
diff --git a/lib/src/widgets/text_info_box.dart b/lib/src/widgets/text_info_box.dart
index 0a14af6d9..8a4149c55 100644
--- a/lib/src/widgets/text_info_box.dart
+++ b/lib/src/widgets/text_info_box.dart
@@ -1,3 +1,4 @@
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:flutter/material.dart';
 
 class TextInfoBox extends StatelessWidget {
@@ -14,7 +15,7 @@ class TextInfoBox extends StatelessWidget {
       padding: const EdgeInsets.all(12),
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(8),
-        color: Theme.of(context).colorScheme.surfaceContainer,
+        color: Theme.of(context).cardColor,
       ),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -22,27 +23,27 @@ class TextInfoBox extends StatelessWidget {
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(
-                title,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+              Text(title,
+                  style: TextStyle(
+                      fontSize: 14,
                       fontWeight: FontWeight.w500,
-                      color: Theme.of(context).colorScheme.onSurface.withOpacity(0.5),
-                    ),
-              ),
+                      color: Theme.of(context)
+                          .extension<CakeTextTheme>()!
+                          .buttonTextColor
+                          .withOpacity(0.5))),
               GestureDetector(
-                onTap: onCopy != null ? () => onCopy!(context) : null,
-                child: Icon(Icons.copy, size: 13, color: Theme.of(context).colorScheme.onSurface),
-              ),
+                  onTap: onCopy != null ? () => onCopy!(context) : null,
+                  child: Icon(Icons.copy,
+                      size: 13,
+                      color: Theme.of(context).textTheme.bodyLarge?.color?.withOpacity(0.7))),
             ],
           ),
           const SizedBox(height: 4),
-          Text(
-            value,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+          Text(value,
+              style: TextStyle(
+                  fontSize: 16,
                   fontWeight: FontWeight.w500,
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-          ),
+                  color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor)),
         ],
       ),
     );
diff --git a/lib/src/widgets/trail_button.dart b/lib/src/widgets/trail_button.dart
index 8122fe30d..5e4d1bdf6 100644
--- a/lib/src/widgets/trail_button.dart
+++ b/lib/src/widgets/trail_button.dart
@@ -1,7 +1,12 @@
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:flutter/material.dart';
+import 'package:cake_wallet/palette.dart';
 
 class TrailButton extends StatelessWidget {
-  TrailButton({required this.caption, required this.onPressed, this.textColor});
+  TrailButton({
+    required this.caption,
+    required this.onPressed,
+    this.textColor});
 
   final String caption;
   final VoidCallback onPressed;
@@ -14,18 +19,17 @@ class TrailButton extends StatelessWidget {
       highlightColor: Colors.transparent,
       splashColor: Colors.transparent,
       child: TextButton(
-        // FIX-ME: ignored padding
-        //padding: EdgeInsets.all(0),
-        child: Text(
-          caption,
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+          // FIX-ME: ignored padding
+          //padding: EdgeInsets.all(0),
+          child: Text(
+            caption,
+            style: TextStyle(
+                color: textColor ??
+                    Theme.of(context).extension<ExchangePageTheme>()!.hintTextColor,
                 fontWeight: FontWeight.w600,
-                color: textColor ?? Theme.of(context).colorScheme.primary,
-                height: 1.8,
-              ),
-        ),
-        onPressed: onPressed,
-      ),
+                fontSize: 14),
+          ),
+          onPressed: onPressed),
     );
   }
 }
diff --git a/lib/src/widgets/validable_annotated_editable_text.dart b/lib/src/widgets/validable_annotated_editable_text.dart
index 7a01506d7..77f19fee0 100644
--- a/lib/src/widgets/validable_annotated_editable_text.dart
+++ b/lib/src/widgets/validable_annotated_editable_text.dart
@@ -41,42 +41,39 @@ class ValidatableAnnotatedEditableText extends EditableText {
     required this.words,
     this.normalizeSeed = false,
     TextStyle textStyle = const TextStyle(
-      color: Colors.black,
-      backgroundColor: Colors.transparent,
-      fontWeight: FontWeight.normal,
-      fontSize: 16,
-    ),
+        color: Colors.black,
+        backgroundColor: Colors.transparent,
+        fontWeight: FontWeight.normal,
+        fontSize: 16),
     TextSelectionControls? selectionControls,
     Color? selectionColor,
     ValueChanged<String>? onChanged,
     ValueChanged<String>? onSubmitted,
   }) : super(
-          maxLines: null,
-          key: key,
-          focusNode: focusNode,
-          controller: controller,
-          cursorColor: cursorColor,
-          style: validStyle,
-          keyboardType: TextInputType.visiblePassword,
-          autocorrect: false,
-          autofocus: false,
-          selectionColor: selectionColor,
-          selectionControls: selectionControls,
-          backgroundCursorColor: backgroundCursorColor,
-          onChanged: onChanged,
-          onSubmitted: onSubmitted,
-          
-          toolbarOptions: const ToolbarOptions(
-            copy: true,
-            cut: true,
-            paste: true,
-            selectAll: true,
-          ),
-          enableSuggestions: false,
-          enableInteractiveSelection: true,
-          showSelectionHandles: true,
-          showCursor: true,
-        );
+            maxLines: null,
+            key: key,
+            focusNode: focusNode,
+            controller: controller,
+            cursorColor: cursorColor,
+            style: validStyle,
+            keyboardType: TextInputType.visiblePassword,
+            autocorrect: false,
+            autofocus: false,
+            selectionColor: selectionColor,
+            selectionControls: selectionControls,
+            backgroundCursorColor: backgroundCursorColor,
+            onChanged: onChanged,
+            onSubmitted: onSubmitted,
+            toolbarOptions: const ToolbarOptions(
+              copy: true,
+              cut: true,
+              paste: true,
+              selectAll: true,
+            ),
+            enableSuggestions: false,
+            enableInteractiveSelection: true,
+            showSelectionHandles: true,
+            showCursor: true);
 
   final bool normalizeSeed;
   final List<String> words;
@@ -84,12 +81,14 @@ class ValidatableAnnotatedEditableText extends EditableText {
   final TextStyle invalidStyle;
 
   @override
-  ValidatableAnnotatedEditableTextState createState() => ValidatableAnnotatedEditableTextState();
+  ValidatableAnnotatedEditableTextState createState() =>
+      ValidatableAnnotatedEditableTextState();
 }
 
 class ValidatableAnnotatedEditableTextState extends EditableTextState {
   @override
-  ValidatableAnnotatedEditableText get widget => super.widget as ValidatableAnnotatedEditableText;
+  ValidatableAnnotatedEditableText get widget =>
+      super.widget as ValidatableAnnotatedEditableText;
 
   List<Annotation> getRanges() {
     final result = <Annotation>[];
@@ -101,12 +100,9 @@ class ValidatableAnnotatedEditableTextState extends EditableTextState {
           final ranges = range(word, text);
           final isValid = validate(word);
 
-          return ranges.map(
-            (range) => Annotation(
+          return ranges.map((range) => Annotation(
               style: isValid ? widget.validStyle : widget.invalidStyle,
-              range: range,
-            ),
-          );
+              range: range));
         })
         .expand((e) => e)
         .toList();
@@ -118,20 +114,14 @@ class ValidatableAnnotatedEditableTextState extends EditableTextState {
 
       if (prev == null) {
         annotation = Annotation(
-          range: TextRange(start: 0, end: item.range.start),
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-            backgroundColor: Colors.transparent,
-          ),
-        );
+            range: TextRange(start: 0, end: item.range.start),
+            style: TextStyle(
+                color: Colors.black, backgroundColor: Colors.transparent));
       } else if (prev.range.end < item.range.start) {
         annotation = Annotation(
-          range: TextRange(start: prev.range.end, end: item.range.start),
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-            color: Theme.of(context).colorScheme.onError,
-            backgroundColor: Colors.transparent,
-          ),
-        );
+            range: TextRange(start: prev.range.end, end: item.range.start),
+            style: TextStyle(
+                color: Colors.red, backgroundColor: Colors.transparent));
       }
 
       if (annotation != null) {
@@ -142,15 +132,9 @@ class ValidatableAnnotatedEditableTextState extends EditableTextState {
     }
 
     if (result.length > 0 && result.last.range.end < text.length) {
-      result.add(
-        Annotation(
+      result.add(Annotation(
           range: TextRange(start: result.last.range.end, end: text.length),
-          style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-            color: Theme.of(context).colorScheme.onSurfaceVariant,
-            backgroundColor: Colors.transparent,
-          ),
-        ),
-      );
+          style: TextStyle(backgroundColor: Colors.transparent)));
     }
 
     return result;
@@ -184,16 +168,11 @@ class ValidatableAnnotatedEditableTextState extends EditableTextState {
 
     if (ranges.isNotEmpty) {
       return TextSpan(
-        style: widget.style,
-        children: ranges
-            .map(
-              (item) => TextSpan(
-                style: item.style,
-                text: item.range.textInside(text),
-              ),
-            )
-            .toList(),
-      );
+          style: widget.style,
+          children: ranges
+              .map((item) => TextSpan(
+                  style: item.style, text: item.range.textInside(text)))
+              .toList());
     }
 
     return TextSpan(style: widget.style, text: text);
diff --git a/lib/src/widgets/vulnerable_seeds_popup.dart b/lib/src/widgets/vulnerable_seeds_popup.dart
index 2326360ae..1fcf474ee 100644
--- a/lib/src/widgets/vulnerable_seeds_popup.dart
+++ b/lib/src/widgets/vulnerable_seeds_popup.dart
@@ -1,5 +1,6 @@
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/src/widgets/alert_close_button.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:flutter/material.dart';
 
 class VulnerableSeedsPopup extends StatelessWidget {
@@ -22,8 +23,10 @@ class VulnerableSeedsPopup extends StatelessWidget {
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(30.0),
                   gradient: LinearGradient(colors: [
-                    Theme.of(context).colorScheme.primaryContainer,
-                    Theme.of(context).colorScheme.secondaryContainer,
+                    Theme.of(context).extension<DashboardPageTheme>()!.firstGradientBackgroundColor,
+                    Theme.of(context)
+                        .extension<DashboardPageTheme>()!
+                        .secondGradientBackgroundColor,
                   ], begin: Alignment.centerLeft, end: Alignment.centerRight)),
               child: Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 24.0),
@@ -35,12 +38,12 @@ class VulnerableSeedsPopup extends StatelessWidget {
                         child: Container(
                           alignment: Alignment.bottomCenter,
                           child: DefaultTextStyle(
-                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            style: TextStyle(
                               decoration: TextDecoration.none,
                               fontSize: 24.0,
                               fontWeight: FontWeight.bold,
-                               
-                              color: Theme.of(context).colorScheme.onSurface,
+                              fontFamily: 'Lato',
+                              color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
                             ),
                             child: Text("Emergency Notice"),
                           ),
@@ -60,12 +63,13 @@ class VulnerableSeedsPopup extends StatelessWidget {
                                 ),
                                 child: Text(
                                   "Your Bitcoin wallet(s) below use a legacy seed format that is vulnerable, which MAY result in you losing money from these wallet(s) if no action is taken.\nWe recommend that you IMMEDIATELY create wallet(s) in Cake Wallet and immediately transfer the funds to these wallet(s).\nVulnerable wallet name(s):\n\n[${affectedWalletNames.join(", ")}]\n\nFor assistance, please use the in-app support or email support@cakewallet.com",
-                                  style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                  style: TextStyle(
                                     decoration: TextDecoration.none,
                                     fontSize: 16.0,
-                                     
+                                    fontFamily: 'Lato',
                                     color: Theme.of(context)
-                                        .colorScheme.onSurface,
+                                        .extension<DashboardPageTheme>()!
+                                        .textColor,
                                   ),
                                 ),
                               )
diff --git a/lib/src/widgets/warning_box_widget.dart b/lib/src/widgets/warning_box_widget.dart
index 416420a10..02d688956 100644
--- a/lib/src/widgets/warning_box_widget.dart
+++ b/lib/src/widgets/warning_box_widget.dart
@@ -1,45 +1,47 @@
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/utils/custom_theme_colors.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:flutter/material.dart';
 
 class WarningBox extends StatelessWidget {
-  const WarningBox({required this.content, required this.currentTheme, Key? key}) : super(key: key);
+  const WarningBox({required this.content, required this.currentTheme, Key? key})
+      : super(key: key);
 
   final String content;
-  final MaterialThemeBase currentTheme;
+  final ThemeBase currentTheme;
 
   @override
   Widget build(BuildContext context) {
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
       decoration: BoxDecoration(
-        color: currentTheme.isDark
-            ? CustomThemeColors.warningContainerColorDark
-            : CustomThemeColors.warningContainerColorLight,
-        borderRadius: BorderRadius.all(Radius.circular(12)),
-        border: Border.all(
-          color: currentTheme.isDark
-              ? CustomThemeColors.warningOutlineColorDark
-              : CustomThemeColors.warningOutlineColorLight,
-          width: 2.0,
-        ),
-      ),
+          color: currentTheme.type == ThemeType.dark
+              ? Color.fromRGBO(132, 110, 64, 1)
+              : Color.fromRGBO(194, 165, 94, 1),
+          borderRadius: BorderRadius.all(Radius.circular(12)),
+          border: Border.all(
+            color: currentTheme.type == ThemeType.dark
+                ? Color.fromRGBO(177, 147, 41, 1)
+                : Color.fromRGBO(125, 122, 15, 1),
+            width: 2.0,
+          )),
       child: Row(
         children: [
           Icon(
             Icons.warning_amber_rounded,
             size: 64,
-            color: Theme.of(context).colorScheme.onSurface,
+            color: Colors.white.withOpacity(0.75),
           ),
           SizedBox(width: 6),
           Expanded(
             child: Text(
               content,
               textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                    fontWeight: FontWeight.w800,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
+              style: TextStyle(
+                fontSize: 12,
+                fontWeight: FontWeight.w800,
+                color: currentTheme.type == ThemeType.dark
+                    ? Colors.white.withOpacity(0.75)
+                    : Colors.white.withOpacity(0.85),
+              ),
             ),
           ),
         ],
diff --git a/lib/store/app_store.dart b/lib/store/app_store.dart
index 44f1807e3..ff3ba0535 100644
--- a/lib/store/app_store.dart
+++ b/lib/store/app_store.dart
@@ -1,9 +1,7 @@
-
+import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/reactions/wallet_connect.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/walletkit_service.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:cw_core/wallet_type.dart';
@@ -26,8 +24,7 @@ abstract class AppStoreBase with Store {
       {required this.authenticationStore,
       required this.walletList,
       required this.settingsStore,
-      required this.nodeListStore,
-      required this.themeStore});
+      required this.nodeListStore});
 
   AuthenticationStore authenticationStore;
 
@@ -40,8 +37,6 @@ abstract class AppStoreBase with Store {
 
   NodeListStore nodeListStore;
 
-  ThemeStore themeStore;
-
   @action
   Future<void> changeCurrentWallet(
       WalletBase<Balance, TransactionHistoryBase<TransactionInfo>, TransactionInfo> wallet) async {
@@ -51,9 +46,9 @@ abstract class AppStoreBase with Store {
     this.wallet!.setExceptionHandler(ExceptionHandler.onError);
 
     if (isWalletConnectCompatibleChain(wallet.type)) {
-      await getIt.get<WalletKitService>().onDispose();
-      getIt.get<WalletKitService>().create();
-      await getIt.get<WalletKitService>().init();
+      await getIt.get<Web3WalletService>().onDispose();
+      getIt.get<Web3WalletService>().create();
+      await getIt.get<Web3WalletService>().init();
     }
     getIt.get<SharedPreferences>().setString(PreferencesKey.currentWalletName, wallet.name);
     getIt
diff --git a/lib/store/dashboard/payjoin_transactions_store.dart b/lib/store/dashboard/payjoin_transactions_store.dart
deleted file mode 100644
index 9a22921bf..000000000
--- a/lib/store/dashboard/payjoin_transactions_store.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'dart:async';
-
-import 'package:cake_wallet/view_model/dashboard/payjoin_transaction_list_item.dart';
-import 'package:cw_core/payjoin_session.dart';
-import 'package:flutter/foundation.dart';
-import 'package:hive/hive.dart';
-import 'package:mobx/mobx.dart';
-
-part 'payjoin_transactions_store.g.dart';
-
-class PayjoinTransactionsStore = PayjoinTransactionsStoreBase
-    with _$PayjoinTransactionsStore;
-
-abstract class PayjoinTransactionsStoreBase with Store {
-  PayjoinTransactionsStoreBase({
-    required this.payjoinSessionSource,
-  }) : transactions = <PayjoinTransactionListItem>[] {
-    payjoinSessionSource.watch().listen((_) => updateTransactionList());
-    updateTransactionList();
-  }
-
-  Box<PayjoinSession> payjoinSessionSource;
-
-  @observable
-  List<PayjoinTransactionListItem> transactions;
-
-  @action
-  Future<void> updateTransactionList() async {
-    final updatedTransactions = <PayjoinTransactionListItem>[];
-    payjoinSessionSource.toMap().forEach((dynamic key, PayjoinSession session) {
-      if ([
-            PayjoinSessionStatus.inProgress.name,
-            PayjoinSessionStatus.success.name,
-            PayjoinSessionStatus.unrecoverable.name
-          ].contains(session.status) &&
-          session.inProgressSince != null) {
-        updatedTransactions.add(PayjoinTransactionListItem(
-          sessionId: key as String,
-          session: session,
-          key: ValueKey('payjoin_transaction_list_item_${key}_key'),
-        ));
-      }
-    });
-
-    transactions = updatedTransactions;
-  }
-}
diff --git a/lib/store/dashboard/transaction_filter_store.dart b/lib/store/dashboard/transaction_filter_store.dart
index 81888109c..f28f7e915 100644
--- a/lib/store/dashboard/transaction_filter_store.dart
+++ b/lib/store/dashboard/transaction_filter_store.dart
@@ -1,8 +1,6 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
-import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/anonpay_transaction_list_item.dart';
-import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/transaction_direction.dart';
 import 'package:cake_wallet/view_model/dashboard/transaction_list_item.dart';
@@ -12,13 +10,11 @@ part 'transaction_filter_store.g.dart';
 class TransactionFilterStore = TransactionFilterStoreBase with _$TransactionFilterStore;
 
 abstract class TransactionFilterStoreBase with Store {
-  TransactionFilterStoreBase(this._appStore)
+  TransactionFilterStoreBase()
       : displayIncoming = true,
         displayOutgoing = true,
         displaySilentPayments = true;
 
-  final AppStore _appStore;
-
   @observable
   bool displayIncoming;
 
@@ -91,15 +87,13 @@ abstract class TransactionFilterStoreBase with Store {
 
         if (allowed && (!displayAll)) {
           if (item is TransactionListItem) {
-            final canShowSilentPayment = _appStore.wallet?.type == WalletType.bitcoin &&
-                (bitcoin?.txIsReceivedSilentPayment(item.transaction) ?? false);
-
             allowed =
                 (displayOutgoing && item.transaction.direction == TransactionDirection.outgoing) ||
                     (displayIncoming &&
                         item.transaction.direction == TransactionDirection.incoming &&
-                        !canShowSilentPayment) ||
-                    (displaySilentPayments && canShowSilentPayment);
+                        !(bitcoin?.txIsReceivedSilentPayment(item.transaction) ?? false)) ||
+                    (displaySilentPayments &&
+                        (bitcoin?.txIsReceivedSilentPayment(item.transaction) ?? false));
           } else if (item is AnonpayTransactionListItem) {
             allowed = displayIncoming;
           }
diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart
index 958f682fe..5f6b415b9 100644
--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
-import 'package:cake_wallet/core/utilities.dart';
 import 'package:cake_wallet/decred/decred.dart';
 import 'package:cake_wallet/bitcoin_cash/bitcoin_cash.dart';
 import 'package:cake_wallet/core/secure_storage.dart';
@@ -13,33 +12,40 @@ import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
 import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/cake_2fa_preset_options.dart';
 import 'package:cake_wallet/entities/country.dart';
-import 'package:cake_wallet/entities/default_settings_migration.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/entities/language_service.dart';
 import 'package:cake_wallet/entities/pin_code_required_duration.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/entities/provider_types.dart';
 import 'package:cake_wallet/entities/secret_store_key.dart';
 import 'package:cake_wallet/entities/seed_phrase_length.dart';
 import 'package:cake_wallet/entities/seed_type.dart';
 import 'package:cake_wallet/entities/sort_balance_types.dart';
 import 'package:cake_wallet/entities/wallet_list_order_types.dart';
 import 'package:cake_wallet/ethereum/ethereum.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
 import 'package:cake_wallet/zano/zano.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cake_wallet/exchange/provider/trocador_exchange_provider.dart';
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/polygon/polygon.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/utils/package_info.dart';
 import 'package:cake_wallet/view_model/settings/sync_mode.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';
+import 'package:cake_wallet/wownero/wownero.dart';
 import 'package:cw_core/node.dart';
 import 'package:cw_core/set_app_secure_native.dart';
+import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_daemon/flutter_daemon.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
@@ -64,7 +70,6 @@ abstract class SettingsStoreBase with Store {
       required NanoSeedType initialNanoSeedType,
       required bool initialAppSecure,
       required bool initialDisableTrade,
-      required bool initialDisableAutomaticExchangeStatusUpdates,
       required FilterListOrderType initialWalletListOrder,
       required FilterListOrderType initialContactListOrder,
       required bool initialDisableBulletin,
@@ -76,11 +81,11 @@ abstract class SettingsStoreBase with Store {
       required bool initialUseTOTP2FA,
       required int initialFailedTokenTrial,
       required ExchangeApiMode initialExchangeStatus,
+      required ThemeBase initialTheme,
       required int initialPinLength,
       required String initialLanguageCode,
       required SyncMode initialSyncMode,
       required bool initialSyncAll,
-      required bool initialBuiltinTor,
       // required String initialCurrentLocale,
       required this.appVersion,
       required this.deviceName,
@@ -118,8 +123,6 @@ abstract class SettingsStoreBase with Store {
       required this.lookupsOpenAlias,
       required this.lookupsENS,
       required this.lookupsWellKnown,
-      required this.usePayjoin,
-      required this.showPayjoinCard,
       required this.customBitcoinFeeRate,
       required this.silentPaymentsCardDisplay,
       required this.silentPaymentsAlwaysScan,
@@ -158,7 +161,6 @@ abstract class SettingsStoreBase with Store {
         numberOfFailedTokenTrials = initialFailedTokenTrial,
         isAppSecure = initialAppSecure,
         disableTradeOption = initialDisableTrade,
-        disableAutomaticExchangeStatusUpdates = initialDisableAutomaticExchangeStatusUpdates,
         disableBulletin = initialDisableBulletin,
         walletListOrder = initialWalletListOrder,
         contactListOrder = initialContactListOrder,
@@ -167,6 +169,7 @@ abstract class SettingsStoreBase with Store {
         shouldShowMarketPlaceInDashboard = initialShouldShowMarketPlaceInDashboard,
         showAddressBookPopupEnabled = initialShowAddressBookPopupEnabled,
         exchangeStatus = initialExchangeStatus,
+        currentTheme = initialTheme,
         pinCodeLength = initialPinLength,
         languageCode = initialLanguageCode,
         shouldRequireTOTP2FAForAccessingWallet = initialShouldRequireTOTP2FAForAccessingWallet,
@@ -185,7 +188,6 @@ abstract class SettingsStoreBase with Store {
             initialShouldRequireTOTP2FAForAllSecurityAndBackupSettings,
         currentSyncMode = initialSyncMode,
         currentSyncAll = initialSyncAll,
-        currentBuiltinTor = initialBuiltinTor,
         priority = ObservableMap<WalletType, TransactionPriority>() {
     //this.nodes = ObservableMap<WalletType, Node>.of(nodes);
 
@@ -310,10 +312,7 @@ abstract class SettingsStoreBase with Store {
 
     reaction((_) => disableTradeOption,
         (bool disableTradeOption) => sharedPreferences.setBool(PreferencesKey.disableTradeOption, disableTradeOption));
-
-    reaction((_) => disableAutomaticExchangeStatusUpdates,
-        (bool disableAutomaticExchangeStatusUpdates) => sharedPreferences.setBool(PreferencesKey.disableAutomaticExchangeStatusUpdates, disableAutomaticExchangeStatusUpdates));
-
+    
     reaction(
         (_) => disableBulletin,
         (bool disableBulletin) =>
@@ -364,6 +363,9 @@ abstract class SettingsStoreBase with Store {
         (FiatApiMode mode) =>
             sharedPreferences.setInt(PreferencesKey.currentFiatApiModeKey, mode.serialize()));
 
+    reaction((_) => currentTheme,
+        (ThemeBase theme) => sharedPreferences.setInt(PreferencesKey.currentTheme, theme.raw));
+
     reaction(
         (_) => numberOfFailedTokenTrials,
         (int failedTokenTrail) =>
@@ -406,11 +408,6 @@ abstract class SettingsStoreBase with Store {
       sharedPreferences.setBool(PreferencesKey.syncAllKey, syncAll);
     });
 
-    reaction((_) => currentBuiltinTor, (bool builtinTor) {
-      sharedPreferences.setBool(PreferencesKey.builtinTorKey, builtinTor);
-    });
-
-
     reaction(
         (_) => exchangeStatus,
         (ExchangeApiMode mode) =>
@@ -488,16 +485,6 @@ abstract class SettingsStoreBase with Store {
         (bool looksUpWellKnown) =>
             _sharedPreferences.setBool(PreferencesKey.lookupsWellKnown, looksUpWellKnown));
 
-    reaction(
-        (_) => usePayjoin,
-        (bool usePayjoin) =>
-            _sharedPreferences.setBool(PreferencesKey.usePayjoin, usePayjoin));
-
-    reaction(
-        (_) => showPayjoinCard,
-        (bool showPayjoinCard) => _sharedPreferences.setBool(
-            PreferencesKey.showPayjoinCard, showPayjoinCard));
-
     // secure storage keys:
     reaction(
         (_) => allowBiometricalAuthentication,
@@ -625,8 +612,6 @@ abstract class SettingsStoreBase with Store {
         _saveCurrentPowNode(change.newValue!, change.key!);
       }
     });
-
-
   }
 
   static const defaultPinLength = 4;
@@ -687,9 +672,6 @@ abstract class SettingsStoreBase with Store {
   @observable
   bool disableTradeOption;
 
-  @observable
-  bool disableAutomaticExchangeStatusUpdates;
-
   @observable
   FilterListOrderType contactListOrder;
 
@@ -750,6 +732,9 @@ abstract class SettingsStoreBase with Store {
   @observable
   ExchangeApiMode exchangeStatus;
 
+  @observable
+  ThemeBase currentTheme;
+
   @observable
   int pinCodeLength;
 
@@ -759,6 +744,9 @@ abstract class SettingsStoreBase with Store {
   @observable
   SeedPhraseLength seedPhraseLength;
 
+  @computed
+  ThemeData get theme => currentTheme.themeData;
+
   @observable
   String languageCode;
 
@@ -816,21 +804,12 @@ abstract class SettingsStoreBase with Store {
   @observable
   bool lookupsWellKnown;
 
-  @observable
-  bool usePayjoin;
-
-  @observable
-  bool showPayjoinCard;
-
   @observable
   SyncMode currentSyncMode;
 
   @observable
   bool currentSyncAll;
 
-  @observable
-  bool currentBuiltinTor;
-
   String appVersion;
 
   String deviceName;
@@ -898,7 +877,8 @@ abstract class SettingsStoreBase with Store {
       required Box<Node> powNodeSource,
       required bool isBitcoinBuyEnabled,
       FiatCurrency initialFiatCurrency = FiatCurrency.usd,
-      BalanceDisplayMode initialBalanceDisplayMode = BalanceDisplayMode.availableBalance}) async {
+      BalanceDisplayMode initialBalanceDisplayMode = BalanceDisplayMode.availableBalance,
+      ThemeBase? initialTheme}) async {
     final sharedPreferences = await getIt.getAsync<SharedPreferences>();
     final secureStorage = await getIt.get<SecureStorage>();
     final currentFiatCurrency = FiatCurrency.deserialize(
@@ -974,7 +954,6 @@ abstract class SettingsStoreBase with Store {
         sharedPreferences.getBool(PreferencesKey.shouldSaveRecipientAddressKey) ?? false;
     final isAppSecure = sharedPreferences.getBool(PreferencesKey.isAppSecureKey) ?? false;
     final disableTradeOption = sharedPreferences.getBool(PreferencesKey.disableTradeOption) ?? false;
-    final disableAutomaticExchangeStatusUpdates = sharedPreferences.getBool(PreferencesKey.disableAutomaticExchangeStatusUpdates) ?? false;
     final disableBulletin = sharedPreferences.getBool(PreferencesKey.disableBulletinKey) ?? false;
     final walletListOrder =
         FilterListOrderType.values[sharedPreferences.getInt(PreferencesKey.walletListOrder) ?? 0];
@@ -995,6 +974,16 @@ abstract class SettingsStoreBase with Store {
     final exchangeStatus = ExchangeApiMode.deserialize(
         raw: sharedPreferences.getInt(PreferencesKey.exchangeStatusKey) ??
             ExchangeApiMode.enabled.raw);
+    final bool isNewInstall = sharedPreferences.getBool(PreferencesKey.isNewInstall) ?? true;
+    final int defaultTheme;
+    if (isNewInstall) {
+      defaultTheme = isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.brightTheme.raw;
+    } else {
+      defaultTheme = ThemeType.bright.index;
+    }
+    final savedTheme = initialTheme ??
+        ThemeList.deserialize(
+            raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ?? defaultTheme);
     final actionListDisplayMode = ObservableList<ActionListDisplayMode>();
     actionListDisplayMode.addAll(deserializeActionlistDisplayModes(
         sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ?? defaultActionsMode));
@@ -1022,8 +1011,6 @@ abstract class SettingsStoreBase with Store {
     final lookupsOpenAlias = sharedPreferences.getBool(PreferencesKey.lookupsOpenAlias) ?? true;
     final lookupsENS = sharedPreferences.getBool(PreferencesKey.lookupsENS) ?? true;
     final lookupsWellKnown = sharedPreferences.getBool(PreferencesKey.lookupsWellKnown) ?? true;
-    final usePayjoin = sharedPreferences.getBool(PreferencesKey.usePayjoin) ?? false;
-    final showPayjoinCard = sharedPreferences.getBool(PreferencesKey.showPayjoinCard) ?? true;
     final customBitcoinFeeRate = sharedPreferences.getInt(PreferencesKey.customBitcoinFeeRate) ?? 1;
     final silentPaymentsCardDisplay =
         sharedPreferences.getBool(PreferencesKey.silentPaymentsCardDisplay) ?? true;
@@ -1051,6 +1038,7 @@ abstract class SettingsStoreBase with Store {
         sharedPreferences.getInt(PreferencesKey.currentLitecoinElectrumSererIdKey);
     final bitcoinCashElectrumServerId =
         sharedPreferences.getInt(PreferencesKey.currentBitcoinCashNodeIdKey);
+    final havenNodeId = sharedPreferences.getInt(PreferencesKey.currentHavenNodeIdKey);
     final ethereumNodeId = sharedPreferences.getInt(PreferencesKey.currentEthereumNodeIdKey);
     final polygonNodeId = sharedPreferences.getInt(PreferencesKey.currentPolygonNodeIdKey);
     final nanoNodeId = sharedPreferences.getInt(PreferencesKey.currentNanoNodeIdKey);
@@ -1060,35 +1048,20 @@ abstract class SettingsStoreBase with Store {
     final wowneroNodeId = sharedPreferences.getInt(PreferencesKey.currentWowneroNodeIdKey);
     final zanoNodeId = sharedPreferences.getInt(PreferencesKey.currentZanoNodeIdKey);
     final decredNodeId = sharedPreferences.getInt(PreferencesKey.currentDecredNodeIdKey);
-
-    /// get the selected node, if null, then use the default
-    final moneroNode = nodeSource.get(nodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == newCakeWalletMoneroUri);
-    final bitcoinElectrumServer = nodeSource.get(bitcoinElectrumServerId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == newCakeWalletBitcoinUri);
-    final litecoinElectrumServer = nodeSource.get(litecoinElectrumServerId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == cakeWalletLitecoinElectrumUri);
-    final ethereumNode = nodeSource.get(ethereumNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == ethereumDefaultNodeUri);
-    final polygonNode = nodeSource.get(polygonNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == polygonDefaultNodeUri);
-    final bitcoinCashElectrumServer = nodeSource.get(bitcoinCashElectrumServerId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == cakeWalletBitcoinCashDefaultNodeUri);
-    final nanoNode = nodeSource.get(nanoNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == nanoDefaultNodeUri);
-    final decredNode = nodeSource.get(decredNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == decredDefaultUri);
-    final nanoPowNode = powNodeSource.get(nanoPowNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == nanoDefaultPowNodeUri);
-    final solanaNode = nodeSource.get(solanaNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == solanaDefaultNodeUri);
-    final tronNode = nodeSource.get(tronNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == tronDefaultNodeUri);
-    final wowneroNode = nodeSource.get(wowneroNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == wowneroDefaultNodeUri);
-    final zanoNode = nodeSource.get(zanoNodeId) ??
-        nodeSource.values.firstWhereOrNull((e) => e.uriRaw == zanoDefaultNodeUri);
-
+    final moneroNode = nodeSource.get(nodeId);
+    final bitcoinElectrumServer = nodeSource.get(bitcoinElectrumServerId);
+    final litecoinElectrumServer = nodeSource.get(litecoinElectrumServerId);
+    final havenNode = nodeSource.get(havenNodeId);
+    final ethereumNode = nodeSource.get(ethereumNodeId);
+    final polygonNode = nodeSource.get(polygonNodeId);
+    final bitcoinCashElectrumServer = nodeSource.get(bitcoinCashElectrumServerId);
+    final nanoNode = nodeSource.get(nanoNodeId);
+    final decredNode = nodeSource.get(decredNodeId);
+    final nanoPowNode = powNodeSource.get(nanoPowNodeId);
+    final solanaNode = nodeSource.get(solanaNodeId);
+    final tronNode = nodeSource.get(tronNodeId);
+    final wowneroNode = nodeSource.get(wowneroNodeId);
+    final zanoNode = nodeSource.get(zanoNodeId);
     final packageInfo = await PackageInfo.fromPlatform();
     final deviceName = await _getDeviceName() ?? '';
     final shouldShowYatPopup = sharedPreferences.getBool(PreferencesKey.shouldShowYatPopup) ?? true;
@@ -1134,6 +1107,10 @@ abstract class SettingsStoreBase with Store {
       nodes[WalletType.litecoin] = litecoinElectrumServer;
     }
 
+    if (havenNode != null) {
+      nodes[WalletType.haven] = havenNode;
+    }
+
     if (ethereumNode != null) {
       nodes[WalletType.ethereum] = ethereumNode;
     }
@@ -1178,7 +1155,6 @@ abstract class SettingsStoreBase with Store {
       return element.type.index == (sharedPreferences.getInt(PreferencesKey.syncModeKey) ?? 2); // default to 2 - daily sync
     });
     final savedSyncAll = sharedPreferences.getBool(PreferencesKey.syncAllKey) ?? true;
-    final builtinTor = sharedPreferences.getBool(PreferencesKey.builtinTorKey) ?? false;
 
     // migrated to secure:
     final timeOutDuration = await SecureKey.getInt(
@@ -1293,7 +1269,6 @@ abstract class SettingsStoreBase with Store {
       initialNanoSeedType: nanoSeedType,
       initialAppSecure: isAppSecure,
       initialDisableTrade: disableTradeOption,
-      initialDisableAutomaticExchangeStatusUpdates: disableAutomaticExchangeStatusUpdates,
       initialDisableBulletin: disableBulletin,
       initialWalletListOrder: walletListOrder,
       initialWalletListAscending: walletListAscending,
@@ -1306,6 +1281,7 @@ abstract class SettingsStoreBase with Store {
       initialTotpSecretKey: totpSecretKey,
       initialFailedTokenTrial: tokenTrialNumber,
       initialExchangeStatus: exchangeStatus,
+      initialTheme: savedTheme,
       actionlistDisplayMode: actionListDisplayMode,
       initialPinLength: pinLength,
       pinTimeOutDuration: pinCodeTimeOutDuration,
@@ -1327,8 +1303,6 @@ abstract class SettingsStoreBase with Store {
       lookupsOpenAlias: lookupsOpenAlias,
       lookupsENS: lookupsENS,
       lookupsWellKnown: lookupsWellKnown,
-      usePayjoin: usePayjoin,
-      showPayjoinCard: showPayjoinCard,
       customBitcoinFeeRate: customBitcoinFeeRate,
       silentPaymentsCardDisplay: silentPaymentsCardDisplay,
       silentPaymentsAlwaysScan: silentPaymentsAlwaysScan,
@@ -1364,7 +1338,6 @@ abstract class SettingsStoreBase with Store {
       initialSyncAll: savedSyncAll,
       shouldShowYatPopup: shouldShowYatPopup,
       shouldShowRepWarning: shouldShowRepWarning,
-      initialBuiltinTor: builtinTor,
     );
   }
 
@@ -1458,7 +1431,6 @@ abstract class SettingsStoreBase with Store {
         sharedPreferences.getInt(PreferencesKey.failedTotpTokenTrials) ?? numberOfFailedTokenTrials;
     isAppSecure = sharedPreferences.getBool(PreferencesKey.isAppSecureKey) ?? isAppSecure;
     disableTradeOption = sharedPreferences.getBool(PreferencesKey.disableTradeOption) ?? disableTradeOption;
-    disableAutomaticExchangeStatusUpdates = sharedPreferences.getBool(PreferencesKey.disableAutomaticExchangeStatusUpdates) ?? disableAutomaticExchangeStatusUpdates;
     disableBulletin =
         sharedPreferences.getBool(PreferencesKey.disableBulletinKey) ?? disableBulletin;
     walletListOrder =
@@ -1476,6 +1448,9 @@ abstract class SettingsStoreBase with Store {
     exchangeStatus = ExchangeApiMode.deserialize(
         raw: sharedPreferences.getInt(PreferencesKey.exchangeStatusKey) ??
             ExchangeApiMode.enabled.raw);
+    currentTheme = ThemeList.deserialize(
+        raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ??
+            (isMoneroOnly ? ThemeList.moneroDarkTheme.raw : ThemeList.brightTheme.raw));
     actionlistDisplayMode = ObservableList<ActionListDisplayMode>();
     actionlistDisplayMode.addAll(deserializeActionlistDisplayModes(
         sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ?? defaultActionsMode));
diff --git a/lib/store/yat/yat_store.dart b/lib/store/yat/yat_store.dart
index 6b73c6211..964b96db3 100644
--- a/lib/store/yat/yat_store.dart
+++ b/lib/store/yat/yat_store.dart
@@ -5,8 +5,12 @@ import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/balance.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:cake_wallet/store/app_store.dart';
+import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/wallet_type.dart';
+import 'dart:convert';
+import 'package:cake_wallet/store/yat/yat_exception.dart';
+import 'package:http/http.dart';
 import 'dart:async';
 
 part 'yat_store.g.dart';
diff --git a/lib/themes/README.md b/lib/themes/README.md
deleted file mode 100644
index c516c8c37..000000000
--- a/lib/themes/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Material 3 Theming System
-
-This directory contains the Material 3 (M3) theming implementation for Cake Wallet. The theming system is now fully based on Material 3 color tokens and patterns, with all custom theme extensions removed for simplicity, maintainability, and compliance with Material Design 3 guidelines.
-
-## Directory Structure
-
-```
-lib/themes/
-├── core/                # Theme state management and base theme logic
-├── theme_classes/       # Light and dark theme data definitions
-├── extensions/          # (Optional) Theme extensions for specific widgets/pages
-├── utils/               # Utilities for theme management
-└── README.md            # This file
-```
-
-## Key Features
-
-- Material 3 color system with semantic color tokens
-- Dynamic color support (when available)
-- MobX-based state management
-- Simplified theme management
-- Consistent design language across the app
-
-## Usage
-
-### Accessing Theme Colors
-
-```dart
-final colorScheme = Theme.of(context).colorScheme;
-final primaryColor = colorScheme.primary;
-final onSurfaceVariant = colorScheme.onSurfaceVariant;
-```
-
-### Available Color Tokens
-
-Material 3 provides a comprehensive set of semantic color tokens that adapt to light/dark themes:
-
-- `primary` / `onPrimary`
-- `secondary` / `onSecondary`
-- `tertiary` / `onTertiary`
-- `error` / `onError`
-- `background` / `onBackground`
-- `surface` / `onSurface`
-- `surfaceVariant` / `onSurfaceVariant`
-- `outline`, `outlineVariant`
-- ...and more (see Flutter's ColorScheme)
-
-### Theme Management
-
-Theme mode state (light/dark/system) and switching is handled via MobX stores in `core/`. Use the provided store to get/set the current theme mode and listen for changes.
-
-```dart
-// Example: Getting the current theme mode
-final themeStore = ... // Obtain from provider or context
-final isDark = themeStore.isDark;
-
-// Example: Switching theme mode
-await themeStore.setThemeMode(ThemeMode.dark);
-```
-
-## Best Practices
-
-1. **Always use semantic color tokens** from `ColorScheme` instead of hardcoded colors.
-2. **Leverage Material 3 components** wherever possible for consistency and accessibility.
-3. **Use the MobX theme store** for all theme-related state and switching.
-4. **Test in both light and dark modes** to ensure good contrast and appearance.
-5. **Keep any theme extensions minimal and focused** (if used at all).
-6. **Do not reintroduce custom theme extensions** unless absolutely necessary and not covered by Material 3.
-
-## Adding or Modifying Themes
-
-- To update theme colors, edit the files in `theme_classes/` (e.g., `light_theme.dart`, `dark_theme.dart`).
-- To add a new theme variant, create a new file in `theme_classes/` and update the MobX store in `core/` to support it.
-- For widget-specific theming, prefer using Material 3's built-in tokens. Only use a theme extension if there is no Material 3 equivalent.
-
-## Contributing
-
-- Follow Material 3 color system and accessibility guidelines.
-- Ensure proper contrast ratios for accessibility.
-- Test all changes in both light and dark modes.
-- Update this documentation if you add new color tokens or theme variants.
-- Keep theme files organized and focused. 
\ No newline at end of file
diff --git a/lib/themes/bitcoin_dark_theme.dart b/lib/themes/bitcoin_dark_theme.dart
new file mode 100644
index 000000000..f8b842ae8
--- /dev/null
+++ b/lib/themes/bitcoin_dark_theme.dart
@@ -0,0 +1,14 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/monero_dark_theme.dart';
+import 'package:flutter/material.dart';
+
+class BitcoinDarkTheme extends MoneroDarkTheme {
+  BitcoinDarkTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.bitcoin_dark_theme;
+  @override
+  Color get primaryColor => Palette.bitcoinOrange;
+}
+
diff --git a/lib/themes/bitcoin_light_theme.dart b/lib/themes/bitcoin_light_theme.dart
new file mode 100644
index 000000000..14a694221
--- /dev/null
+++ b/lib/themes/bitcoin_light_theme.dart
@@ -0,0 +1,13 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/monero_light_theme.dart';
+import 'package:flutter/material.dart';
+
+class BitcoinLightTheme extends MoneroLightTheme {
+  BitcoinLightTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.bitcoin_light_theme;
+  @override
+  Color get primaryColor => Palette.bitcoinOrange;
+}
diff --git a/lib/themes/bright_theme.dart b/lib/themes/bright_theme.dart
new file mode 100644
index 000000000..42510a389
--- /dev/null
+++ b/lib/themes/bright_theme.dart
@@ -0,0 +1,126 @@
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/order_theme.dart';
+import 'package:cake_wallet/themes/extensions/placeholder_theme.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/themes/light_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:flutter/material.dart';
+
+class BrightTheme extends LightTheme {
+  BrightTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.bright_theme;
+  @override
+  ThemeType get type => ThemeType.bright;
+  @override
+  Color get primaryColor => Palette.moderateSlateBlue;
+  @override
+  Color get containerColor => Palette.moderateLavender;
+
+  @override
+  DashboardPageTheme get dashboardPageTheme =>
+      super.dashboardPageTheme.copyWith(
+          firstGradientBackgroundColor: Palette.blueCraiola,
+          secondGradientBackgroundColor: Palette.pinkFlamingo,
+          thirdGradientBackgroundColor: Palette.redHat,
+          pageTitleTextColor: Colors.white,
+          mainActionsIconColor: Colors.white,
+          textColor: Colors.white,
+          cardTextColor: Colors.white,
+          indicatorDotTheme: IndicatorDotTheme(
+              indicatorColor: Colors.white.withOpacity(0.5),
+              activeIndicatorColor: Colors.white));
+
+  @override
+  SyncIndicatorTheme get syncIndicatorStyle =>
+      super.syncIndicatorStyle.copyWith(
+          textColor: Colors.white,
+          syncedBackgroundColor: Colors.white.withOpacity(0.2),
+          notSyncedBackgroundColor: Colors.white.withOpacity(0.15));
+
+  @override
+  ExchangePageTheme get exchangePageTheme => super.exchangePageTheme.copyWith(
+      secondGradientBottomPanelColor: Palette.pinkFlamingo.withOpacity(0.7),
+      firstGradientBottomPanelColor: Palette.blueCraiola.withOpacity(0.7),
+      secondGradientTopPanelColor: Palette.pinkFlamingo,
+      firstGradientTopPanelColor: Palette.blueCraiola);
+
+  @override
+  NewWalletTheme get newWalletTheme => super.newWalletTheme.copyWith(
+      hintTextColor: Palette.darkGray,
+      underlineColor: Palette.periwinkleCraiola);
+
+  @override
+  BalancePageTheme get balancePageTheme => super
+      .balancePageTheme
+      .copyWith(labelTextColor: Colors.white.withOpacity(0.5));
+
+  @override
+  CakeMenuTheme get menuTheme =>
+      super.menuTheme.copyWith(headerSecondGradientColor: Palette.pinkFlamingo);
+
+  @override
+  FilterTheme get filterTheme => super.filterTheme.copyWith(
+      checkboxSecondGradientColor: Palette.pinkFlamingo,
+      checkboxBackgroundColor: Colors.white,
+      buttonColor: Palette.darkGray.withOpacity(0.2),
+      iconColor: Colors.white);
+
+  @override
+  WalletListTheme get walletListTheme => super.walletListTheme.copyWith(
+      createNewWalletButtonBackgroundColor: Palette.moderateSlateBlue);
+
+  @override
+  OrderTheme get orderTheme => OrderTheme(iconColor: Colors.white);
+
+  @override
+  SendPageTheme get sendPageTheme => super.sendPageTheme.copyWith(
+      templateBackgroundColor: Palette.shadowWhite,
+      templateDottedBorderColor: Palette.shadowWhite,
+      secondGradientColor: Palette.pinkFlamingo);
+
+  @override
+  PlaceholderTheme get placeholderTheme =>
+      PlaceholderTheme(color: Colors.white.withOpacity(0.5));
+
+  @override
+  TransactionTradeTheme get transactionTradeTheme => super
+      .transactionTradeTheme
+      .copyWith(rowsColor: Colors.white.withOpacity(0.2));
+
+  @override
+  ReceivePageTheme get receivePageTheme => super.receivePageTheme.copyWith(
+        currentTileBackgroundColor: Palette.moderateSlateBlue,
+        tilesBackgroundColor: Colors.white,
+        iconsBackgroundColor: Palette.lavender,
+        amountBottomBorderColor: Colors.white.withOpacity(0.5),
+        amountHintTextColor: Colors.white,
+      );
+
+  @override
+  QRCodeTheme get qrCodeTheme => super
+      .qrCodeTheme
+      .copyWith(qrWidgetCopyButtonColor: Colors.white.withOpacity(0.4));
+
+  @override
+  CakeTextTheme get cakeTextTheme => super.cakeTextTheme.copyWith(
+      buttonSecondaryTextColor: super.cakeTextTheme.secondaryTextColor,
+      buttonTextColor: super.cakeTextTheme.titleColor,
+      addressButtonBorderColor: Colors.white.withOpacity(0.4),
+      dateSectionRowColor: Colors.white.withOpacity(0.5));
+}
diff --git a/lib/themes/cake_dark_theme.dart b/lib/themes/cake_dark_theme.dart
new file mode 100644
index 000000000..262ee1d64
--- /dev/null
+++ b/lib/themes/cake_dark_theme.dart
@@ -0,0 +1,24 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/monero_dark_theme.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+
+class CakeDarkTheme extends MoneroDarkTheme {
+  CakeDarkTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.cake_dark_theme;
+  @override
+  Color get primaryColor => PaletteDark.cakeBlue;
+
+  @override
+  CakeMenuTheme get menuTheme => super.menuTheme.copyWith(
+      headerFirstGradientColor: PaletteDark.darkBlue,
+      headerSecondGradientColor: containerColor,
+      backgroundColor: containerColor,
+      subnameTextColor: Colors.grey,
+      dividerColor: colorScheme.secondaryContainer,
+      iconColor: Colors.white,
+      settingActionsIconColor: colorScheme.secondaryContainer);
+}
\ No newline at end of file
diff --git a/lib/themes/core/material_base_theme.dart b/lib/themes/core/material_base_theme.dart
deleted file mode 100644
index 3b99f464e..000000000
--- a/lib/themes/core/material_base_theme.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-import 'package:flutter/material.dart';
-
-enum ThemeType { light, dark }
-
-/// Abstract base class for theme data in the app.
-/// This class defines the contract that all theme implementations must follow.
-abstract class MaterialThemeBase {
-  int get raw;
-
-  String get title;
-
-  ThemeMode get themeMode;
-
-  ThemeType get type;
-
-  Color get errorColor;
-
-  Color get surfaceColor;
-
-  Color get primaryColor;
-
-  Color get secondaryColor;
-
-  Brightness get brightness;
-
-  ColorScheme get colorScheme;
-
-  Color get tertiaryColor;
-
-  TextTheme get textTheme;
-
-  ThemeData get themeData;
-
-  bool get isDark => brightness == Brightness.dark;
-}
diff --git a/lib/themes/core/theme_store.dart b/lib/themes/core/theme_store.dart
deleted file mode 100644
index 687e24e64..000000000
--- a/lib/themes/core/theme_store.dart
+++ /dev/null
@@ -1,174 +0,0 @@
-import 'package:cake_wallet/entities/preferences_key.dart';
-import 'package:cake_wallet/utils/device_info.dart';
-import 'package:cake_wallet/utils/responsive_layout_util.dart';
-import 'package:flutter/material.dart';
-import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/themes/utils/theme_list.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-import 'material_base_theme.dart';
-
-part 'theme_store.g.dart';
-
-/// MobX store for managing theme state
-class ThemeStore = ThemeStoreBase with _$ThemeStore;
-
-abstract class ThemeStoreBase with Store {
-  @observable
-  MaterialThemeBase _currentTheme = ThemeList.lightTheme;
-
-  @observable
-  ThemeMode _themeMode = ThemeMode.system;
-
-  @computed
-  MaterialThemeBase get currentTheme => _currentTheme;
-
-  @computed
-  ThemeMode get themeMode => _themeMode;
-
-  @computed
-  bool get isDarkMode => _currentTheme.isDark;
-
-  late SharedPreferences sharedPreferences;
-
-  @action
-  Future<void> setTheme(MaterialThemeBase theme) async {
-    if (_currentTheme == theme) return;
-
-    _currentTheme = theme;
-    await sharedPreferences.setInt(PreferencesKey.currentTheme, theme.raw);
-  }
-
-  @action
-  Future<void> setThemeMode(ThemeMode mode) async {
-    if (_themeMode == mode) return;
-
-    _themeMode = mode;
-
-    await _saveThemeModeToPrefs(mode);
-
-    if (mode == ThemeMode.system) {
-      setTheme(getThemeFromSystem());
-    }
-  }
-
-  Future<void> _saveThemeModeToPrefs(ThemeMode mode) async {
-    await sharedPreferences.setString(PreferencesKey.themeMode, mode.toString());
-  }
-
-  /// Loads the saved theme preferences
-  Future<void> loadThemePreferences() async {
-    sharedPreferences = await SharedPreferences.getInstance();
-
-    await _loadThemeMode();
-    await _loadAndSetTheme();
-
-    _setupThemeReaction();
-  }
-
-  /// Loads the saved theme mode from SharedPreferences
-  Future<void> _loadThemeMode() async {
-    final savedThemeMode = sharedPreferences.getString(PreferencesKey.themeMode);
-    if (savedThemeMode != null) {
-      _themeMode = ThemeMode.values.firstWhere(
-        (mode) => mode.toString() == savedThemeMode,
-        orElse: () => ThemeMode.system,
-      );
-    }
-  }
-
-  /// Loads and sets the appropriate theme based on platform and installation status
-  Future<void> _loadAndSetTheme() async {
-    final bool isNewInstall = sharedPreferences.getBool(PreferencesKey.isNewInstall) ?? true;
-
-    bool shouldUseMobileTheme =
-        responsiveLayoutUtil.shouldRenderMobileUI && DeviceInfo.instance.isMobile;
-
-    if (shouldUseMobileTheme) {
-      await _handleMobileTheme(isNewInstall);
-    } else {
-      await _handleNonMobileTheme();
-    }
-  }
-
-  /// Handles theme loading for non-mobile platforms
-  Future<void> _handleNonMobileTheme() async {
-    await setTheme(ThemeList.darkTheme);
-    await setThemeMode(ThemeMode.dark);
-  }
-
-  /// Handles theme loading for mobile platforms
-  Future<void> _handleMobileTheme(bool isNewInstall) async {
-    if (isNewInstall) {
-      await _setSystemTheme(isNewInstall: isNewInstall);
-    } else {
-      await loadSavedTheme();
-    }
-  }
-
-  /// Loads the saved theme from SharedPreferences
-  Future<void> loadSavedTheme({bool isFromBackup = false}) async {
-    try {
-      final savedTheme = sharedPreferences.getInt(PreferencesKey.currentTheme);
-      if (savedTheme == null) {
-        await _setSystemTheme();
-        return;
-      }
-
-      final theme = ThemeList.deserialize(raw: savedTheme);
-
-      final newThemeMode = _getThemeModeOnStartUp(theme, isFromBackup);
-
-      if (newThemeMode == ThemeMode.system) {
-        await _setSystemTheme();
-        return;
-      }
-
-      if (_themeMode != newThemeMode) {
-        await setThemeMode(newThemeMode);
-      }
-
-      if (_currentTheme != theme) {
-        await setTheme(theme);
-      }
-    } catch (e) {
-      await _setSystemTheme();
-    }
-  }
-
-  Future<void> _setSystemTheme({bool isNewInstall = false}) async {
-    final systemTheme = getThemeFromSystem();
-
-    if (_currentTheme != systemTheme) {
-      await setTheme(systemTheme);
-    }
-
-    if (isNewInstall) {
-      await _saveThemeModeToPrefs(ThemeMode.system);
-    }
-
-    if (_themeMode != ThemeMode.system) {
-      await setThemeMode(ThemeMode.system);
-    }
-  }
-
-  ThemeMode _getThemeModeOnStartUp(MaterialThemeBase theme, bool isFromBackup) {
-    if (isFromBackup || _themeMode != ThemeMode.system) {
-      return theme.isDark ? ThemeMode.dark : ThemeMode.light;
-    }
-
-    return ThemeMode.system;
-  }
-
-  void _setupThemeReaction() {
-    reaction(
-      (_) => currentTheme,
-      (MaterialThemeBase theme) => sharedPreferences.setInt(PreferencesKey.currentTheme, theme.raw),
-    );
-  }
-
-  MaterialThemeBase getThemeFromSystem() {
-    final systemBrightness = WidgetsBinding.instance.platformDispatcher.platformBrightness;
-    return systemBrightness == Brightness.dark ? ThemeList.darkTheme : ThemeList.lightTheme;
-  }
-}
diff --git a/lib/themes/dark_theme.dart b/lib/themes/dark_theme.dart
new file mode 100644
index 000000000..4e18628fa
--- /dev/null
+++ b/lib/themes/dark_theme.dart
@@ -0,0 +1,232 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/alert_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:cake_wallet/themes/extensions/info_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
+import 'package:cake_wallet/themes/extensions/order_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/placeholder_theme.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/support_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:flutter/material.dart';
+
+class DarkTheme extends ThemeBase {
+  DarkTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.dark_theme;
+  @override
+  ThemeType get type => ThemeType.dark;
+  @override
+  Brightness get brightness => Brightness.dark;
+  @override
+  Color get backgroundColor => PaletteDark.backgroundColor;
+  @override
+  Color get primaryColor => Palette.blueCraiola;
+  @override
+  Color get primaryTextColor => Colors.white;
+  @override
+  Color get containerColor => PaletteDark.nightBlue;
+  @override
+  Color get dialogBackgroundColor => PaletteDark.darkNightBlue;
+
+  @override
+  CakeScrollbarTheme get scrollbarTheme => CakeScrollbarTheme(
+      thumbColor: PaletteDark.wildBlueGrey, trackColor: PaletteDark.violetBlue);
+
+  @override
+  SyncIndicatorTheme get syncIndicatorStyle => SyncIndicatorTheme(
+      textColor: PaletteDark.wildBlue,
+      syncedBackgroundColor: PaletteDark.lightNightBlue,
+      notSyncedIconColor: PaletteDark.orangeYellow,
+      notSyncedBackgroundColor: PaletteDark.oceanBlue);
+
+  @override
+  KeyboardTheme get keyboardTheme =>
+      KeyboardTheme(keyboardBarColor: PaletteDark.granite);
+
+  @override
+  PinCodeTheme get pinCodeTheme => PinCodeTheme(
+      indicatorsColor: PaletteDark.indicatorVioletBlue,
+      switchColor: PaletteDark.lightPurpleBlue);
+
+  @override
+  SupportPageTheme get supportPageTheme =>
+      SupportPageTheme(iconColor: Colors.white);
+
+  @override
+  ExchangePageTheme get exchangePageTheme => ExchangePageTheme(
+      hintTextColor: PaletteDark.lightBlueGrey,
+      dividerCodeColor: PaletteDark.deepVioletBlue,
+      qrCodeColor: primaryTextColor,
+      buttonBackgroundColor: PaletteDark.deepVioletBlue,
+      textFieldButtonColor: PaletteDark.moderateBlue,
+      textFieldBorderBottomPanelColor: PaletteDark.moderateVioletBlue,
+      textFieldBorderTopPanelColor: PaletteDark.blueGrey,
+      secondGradientBottomPanelColor: PaletteDark.darkNightBlue,
+      firstGradientBottomPanelColor: PaletteDark.darkNightBlue,
+      secondGradientTopPanelColor: PaletteDark.wildVioletBlue,
+      firstGradientTopPanelColor: PaletteDark.wildVioletBlue,
+      receiveAmountColor: PaletteDark.darkCyanBlue);
+
+  @override
+  NewWalletTheme get newWalletTheme => NewWalletTheme(
+      hintTextColor: PaletteDark.cyanBlue,
+      underlineColor: PaletteDark.darkGrey);
+
+  @override
+  AddressTheme get addressTheme =>
+      AddressTheme(actionButtonColor: PaletteDark.nightBlue);
+
+  @override
+  DashboardPageTheme get dashboardPageTheme =>
+      super.dashboardPageTheme.copyWith(
+          cardTextColor: super.dashboardPageTheme.textColor,
+          indicatorDotTheme: IndicatorDotTheme(
+              indicatorColor: PaletteDark.cyanBlue,
+              activeIndicatorColor: Colors.white));
+
+  @override
+  BalancePageTheme get balancePageTheme => BalancePageTheme(
+      textColor: dashboardPageTheme.textColor,
+      labelTextColor: PaletteDark.cyanBlue);
+
+  @override
+  CakeMenuTheme get menuTheme => CakeMenuTheme(
+      headerFirstGradientColor: PaletteDark.deepPurpleBlue,
+      headerSecondGradientColor: PaletteDark.deepPurpleBlue,
+      backgroundColor: PaletteDark.deepPurpleBlue,
+      subnameTextColor: PaletteDark.darkCyanBlue,
+      dividerColor: PaletteDark.darkOceanBlue,
+      settingTitleColor: receivePageTheme.tilesTextColor,
+      settingActionsIconColor: PaletteDark.pigeonBlue,
+      iconColor: PaletteDark.darkCyanBlue);
+
+  @override
+  FilterTheme get filterTheme => FilterTheme(
+      checkboxFirstGradientColor: PaletteDark.darkNightBlue,
+      checkboxSecondGradientColor: PaletteDark.darkNightBlue,
+      checkboxBoundsColor: PaletteDark.wildVioletBlue,
+      checkboxBackgroundColor: PaletteDark.wildVioletBlue.withOpacity(0.3),
+      titlesColor: Colors.white,
+      buttonColor: PaletteDark.oceanBlue,
+      iconColor: PaletteDark.wildBlue);
+
+  @override
+  WalletListTheme get walletListTheme => WalletListTheme(
+      restoreWalletButtonTextColor: Palette.darkBlueCraiola,
+      createNewWalletButtonBackgroundColor: Colors.white);
+
+  @override
+  InfoTheme get infoTheme => InfoTheme(textColor: Palette.darkLavender);
+
+  @override
+  PickerTheme get pickerTheme => PickerTheme(
+      dividerColor: PaletteDark.dividerColor,
+      searchTextColor: cakeTextTheme.textfieldUnderlineColor,
+      searchBackgroundFillColor: addressTheme.actionButtonColor);
+
+  @override
+  AlertTheme get alertTheme => AlertTheme(
+      backdropColor: PaletteDark.darkNightBlue.withOpacity(0.75),
+      leftButtonTextColor: Palette.alizarinRed);
+
+  @override
+  OrderTheme get orderTheme => OrderTheme(iconColor: Colors.white);
+
+  @override
+  SendPageTheme get sendPageTheme => SendPageTheme(
+      templateTitleColor: PaletteDark.cyanBlue,
+      templateBackgroundColor: PaletteDark.darkVioletBlue,
+      templateNewTextColor: PaletteDark.darkCyanBlue,
+      templateDottedBorderColor: PaletteDark.darkCyanBlue,
+      templateSelectedCurrencyBackgroundColor: primaryColor,
+      templateSelectedCurrencyTitleColor: Colors.white,
+      estimatedFeeColor: Colors.white,
+      textFieldButtonIconColor: PaletteDark.gray,
+      textFieldButtonColor: PaletteDark.buttonNightBlue,
+      textFieldHintColor: PaletteDark.darkCyanBlue,
+      textFieldBorderColor: PaletteDark.lightVioletBlue,
+      secondGradientColor: PaletteDark.darkNightBlue,
+      firstGradientColor: PaletteDark.darkNightBlue,
+      indicatorDotColor: PaletteDark.cyanBlue);
+
+  @override
+  SeedWidgetTheme get seedWidgetTheme =>
+      SeedWidgetTheme(hintTextColor: PaletteDark.darkCyanBlue);
+
+  @override
+  PlaceholderTheme get placeholderTheme => PlaceholderTheme(color: Colors.grey);
+
+  @override
+  TransactionTradeTheme get transactionTradeTheme => TransactionTradeTheme(
+      detailsTitlesColor: PaletteDark.lightBlueGrey,
+      rowsColor: PaletteDark.wildNightBlue);
+
+  @override
+  CakeTextTheme get cakeTextTheme => CakeTextTheme(
+      secondaryTextColor: PaletteDark.darkCyanBlue,
+      textfieldUnderlineColor: PaletteDark.darkOceanBlue,
+      titleColor: Colors.white,
+      addressButtonBorderColor: PaletteDark.nightBlue,
+      dateSectionRowColor: PaletteDark.darkCyanBlue);
+
+  @override
+  AccountListTheme get accountListTheme => AccountListTheme(
+      currentAccountBackgroundColor: dialogBackgroundColor,
+      currentAccountTextColor: primaryColor,
+      currentAccountAmountColor: receivePageTheme.iconsColor,
+      tilesAmountColor: receivePageTheme.iconsColor,
+      tilesBackgroundColor: PaletteDark.darkOceanBlue,
+      tilesTextColor: Colors.white);
+
+  @override
+  ReceivePageTheme get receivePageTheme => ReceivePageTheme(
+      currentTileBackgroundColor: PaletteDark.lightOceanBlue,
+      currentTileTextColor: Palette.blueCraiola,
+      tilesBackgroundColor: PaletteDark.nightBlue,
+      tilesTextColor: Colors.white,
+      iconsBackgroundColor: PaletteDark.distantNightBlue,
+      iconsColor: Colors.white,
+      amountBottomBorderColor: PaletteDark.darkGrey,
+      amountHintTextColor: PaletteDark.cyanBlue);
+
+  @override
+  QRCodeTheme get qrCodeTheme => QRCodeTheme(
+      qrCodeColor: PaletteDark.lightBlueGrey,
+      qrWidgetCopyButtonColor: PaletteDark.lightBlueGrey);
+
+  @override
+  OptionTileTheme get optionTileTheme => OptionTileTheme(
+      titleColor: primaryTextColor, descriptionColor: primaryTextColor, useDarkImage: false);
+
+  @override
+  ThemeData get themeData => super.themeData.copyWith(
+      dividerColor: PaletteDark.dividerColor,
+      hintColor: PaletteDark.pigeonBlue,
+      disabledColor: PaletteDark.deepVioletBlue,
+      dialogTheme: super
+          .themeData
+          .dialogTheme
+          .copyWith(backgroundColor: PaletteDark.nightBlue));
+}
diff --git a/lib/themes/extensions/account_list_theme.dart b/lib/themes/extensions/account_list_theme.dart
new file mode 100644
index 000000000..7f2641e33
--- /dev/null
+++ b/lib/themes/extensions/account_list_theme.dart
@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+
+class AccountListTheme extends ThemeExtension<AccountListTheme> {
+  final Color tilesTextColor;
+  final Color tilesAmountColor;
+  final Color tilesBackgroundColor;
+  final Color currentAccountBackgroundColor;
+  final Color currentAccountTextColor;
+  final Color currentAccountAmountColor;
+
+  AccountListTheme(
+      {required this.tilesTextColor,
+      required this.tilesAmountColor,
+      required this.tilesBackgroundColor,
+      required this.currentAccountBackgroundColor,
+      required this.currentAccountTextColor,
+      required this.currentAccountAmountColor});
+
+  @override
+  AccountListTheme copyWith(
+          {Color? tilesTextColor,
+          Color? tilesAmountColor,
+          Color? tilesBackgroundColor,
+          Color? currentAccountBackgroundColor,
+          Color? currentAccountTextColor,
+          Color? currentAccountAmountColor}) =>
+      AccountListTheme(
+          tilesTextColor: tilesTextColor ?? this.tilesTextColor,
+          tilesAmountColor: tilesAmountColor ?? this.tilesAmountColor,
+          tilesBackgroundColor:
+              tilesBackgroundColor ?? this.tilesBackgroundColor,
+          currentAccountBackgroundColor: currentAccountBackgroundColor ??
+              this.currentAccountBackgroundColor,
+          currentAccountTextColor:
+              currentAccountTextColor ?? this.currentAccountTextColor,
+          currentAccountAmountColor:
+              currentAccountAmountColor ?? this.currentAccountAmountColor);
+
+  @override
+  AccountListTheme lerp(ThemeExtension<AccountListTheme>? other, double t) {
+    if (other is! AccountListTheme) {
+      return this;
+    }
+
+    return AccountListTheme(
+        tilesTextColor: Color.lerp(tilesTextColor, other.tilesTextColor, t)!,
+        tilesAmountColor:
+            Color.lerp(tilesAmountColor, other.tilesAmountColor, t)!,
+        tilesBackgroundColor:
+            Color.lerp(tilesBackgroundColor, other.tilesBackgroundColor, t)!,
+        currentAccountBackgroundColor: Color.lerp(currentAccountBackgroundColor,
+            other.currentAccountBackgroundColor, t)!,
+        currentAccountTextColor: Color.lerp(
+            currentAccountTextColor, other.currentAccountTextColor, t)!,
+        currentAccountAmountColor: Color.lerp(
+            currentAccountAmountColor, other.currentAccountAmountColor, t)!);
+  }
+}
diff --git a/lib/themes/extensions/address_theme.dart b/lib/themes/extensions/address_theme.dart
new file mode 100644
index 000000000..cabc8d87f
--- /dev/null
+++ b/lib/themes/extensions/address_theme.dart
@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+
+class AddressTheme extends ThemeExtension<AddressTheme> {
+  final Color actionButtonColor;
+
+  AddressTheme({required this.actionButtonColor});
+
+  @override
+  AddressTheme copyWith({Color? actionButtonColor}) => AddressTheme(
+      actionButtonColor: actionButtonColor ?? this.actionButtonColor);
+
+  @override
+  AddressTheme lerp(ThemeExtension<AddressTheme>? other, double t) {
+    if (other is! AddressTheme) {
+      return this;
+    }
+
+    return AddressTheme(
+      actionButtonColor:
+          Color.lerp(actionButtonColor, other.actionButtonColor, t) ??
+              actionButtonColor,
+    );
+  }
+}
diff --git a/lib/themes/extensions/alert_theme.dart b/lib/themes/extensions/alert_theme.dart
new file mode 100644
index 000000000..3794124f3
--- /dev/null
+++ b/lib/themes/extensions/alert_theme.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+class AlertTheme extends ThemeExtension<AlertTheme> {
+  final Color leftButtonTextColor;
+  final Color backdropColor;
+
+  AlertTheme({required this.leftButtonTextColor, required this.backdropColor});
+
+  @override
+  AlertTheme copyWith({Color? leftButtonTextColor, Color? backdropColor}) =>
+      AlertTheme(
+          leftButtonTextColor: leftButtonTextColor ?? this.leftButtonTextColor,
+          backdropColor: backdropColor ?? this.backdropColor);
+
+  @override
+  AlertTheme lerp(ThemeExtension<AlertTheme>? other, double t) {
+    if (other is! AlertTheme) {
+      return this;
+    }
+
+    return AlertTheme(
+        leftButtonTextColor:
+            Color.lerp(leftButtonTextColor, other.leftButtonTextColor, t) ??
+                leftButtonTextColor,
+        backdropColor:
+            Color.lerp(backdropColor, other.backdropColor, t) ?? backdropColor);
+  }
+}
diff --git a/lib/themes/extensions/balance_page_theme.dart b/lib/themes/extensions/balance_page_theme.dart
new file mode 100644
index 000000000..508514f93
--- /dev/null
+++ b/lib/themes/extensions/balance_page_theme.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+
+class BalancePageTheme extends ThemeExtension<BalancePageTheme> {
+  final Color textColor;
+  final Color labelTextColor;
+  final Color balanceAmountColor;
+  final Color assetTitleColor;
+  final Color cardBorderColor;
+
+  BalancePageTheme(
+      {required this.labelTextColor,
+      required this.textColor,
+      Color? balanceAmountColor,
+      Color? assetTitleColor,
+      this.cardBorderColor = Colors.transparent})
+      : this.balanceAmountColor = balanceAmountColor ?? textColor,
+        this.assetTitleColor = assetTitleColor ?? textColor;
+
+  @override
+  BalancePageTheme copyWith(
+          {Color? textColor,
+          Color? labelTextColor,
+          Color? balanceAmountColor,
+          Color? assetTitleColor,
+          Color? cardBorderColor}) =>
+      BalancePageTheme(
+          textColor: textColor ?? this.textColor,
+          labelTextColor: labelTextColor ?? this.labelTextColor,
+          balanceAmountColor: balanceAmountColor ?? this.balanceAmountColor,
+          assetTitleColor: assetTitleColor ?? this.assetTitleColor,
+          cardBorderColor: cardBorderColor ?? this.cardBorderColor);
+
+  @override
+  BalancePageTheme lerp(ThemeExtension<BalancePageTheme>? other, double t) {
+    if (other is! BalancePageTheme) {
+      return this;
+    }
+
+    return BalancePageTheme(
+        textColor: Color.lerp(textColor, other.textColor, t) ?? textColor,
+        labelTextColor: Color.lerp(labelTextColor, other.labelTextColor, t) ??
+            labelTextColor,
+        balanceAmountColor:
+            Color.lerp(balanceAmountColor, other.balanceAmountColor, t) ??
+                balanceAmountColor,
+        assetTitleColor:
+            Color.lerp(assetTitleColor, other.assetTitleColor, t) ??
+                assetTitleColor,
+        cardBorderColor:
+            Color.lerp(cardBorderColor, other.cardBorderColor, t) ??
+                cardBorderColor);
+  }
+}
diff --git a/lib/themes/extensions/cake_scrollbar_theme.dart b/lib/themes/extensions/cake_scrollbar_theme.dart
new file mode 100644
index 000000000..5aeeafa25
--- /dev/null
+++ b/lib/themes/extensions/cake_scrollbar_theme.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+class CakeScrollbarTheme extends ThemeExtension<CakeScrollbarTheme> {
+  final Color thumbColor;
+  final Color trackColor;
+
+  CakeScrollbarTheme({required this.thumbColor, required this.trackColor});
+
+  @override
+  Object get type => CakeScrollbarTheme;
+
+  @override
+  CakeScrollbarTheme copyWith({Color? thumbColor, Color? trackColor}) =>
+      CakeScrollbarTheme(
+          thumbColor: thumbColor ?? this.thumbColor,
+          trackColor: trackColor ?? this.trackColor);
+
+  @override
+  CakeScrollbarTheme lerp(ThemeExtension<CakeScrollbarTheme>? other, double t) {
+    if (other is! CakeScrollbarTheme) {
+      return this;
+    }
+
+    return CakeScrollbarTheme(
+        thumbColor: Color.lerp(thumbColor, other.thumbColor, t) ?? thumbColor,
+        trackColor: Color.lerp(trackColor, other.trackColor, t) ?? trackColor);
+  }
+}
diff --git a/lib/themes/extensions/cake_text_theme.dart b/lib/themes/extensions/cake_text_theme.dart
new file mode 100644
index 000000000..31cd77e44
--- /dev/null
+++ b/lib/themes/extensions/cake_text_theme.dart
@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+
+class CakeTextTheme extends ThemeExtension<CakeTextTheme> {
+  final Color secondaryTextColor;
+  final Color textfieldUnderlineColor;
+  final Color titleColor;
+  final Color addressButtonBorderColor;
+  final Color dateSectionRowColor;
+  final Color buttonTextColor;
+  final Color buttonSecondaryTextColor;
+
+  CakeTextTheme(
+      {required this.secondaryTextColor,
+      required this.textfieldUnderlineColor,
+      required this.titleColor,
+      required this.addressButtonBorderColor,
+      required this.dateSectionRowColor,
+      Color? buttonTextColor,
+      Color? buttonSecondaryTextColor})
+      : buttonTextColor = buttonTextColor ?? titleColor,
+        buttonSecondaryTextColor =
+            buttonSecondaryTextColor ?? secondaryTextColor;
+
+  @override
+  CakeTextTheme copyWith(
+          {Color? secondaryTextColor,
+          Color? textfieldUnderlineColor,
+          Color? titleColor,
+          Color? addressButtonBorderColor,
+          Color? dateSectionRowColor,
+          Color? buttonTextColor,
+          Color? buttonSecondaryTextColor}) =>
+      CakeTextTheme(
+          secondaryTextColor: secondaryTextColor ?? this.secondaryTextColor,
+          textfieldUnderlineColor:
+              textfieldUnderlineColor ?? this.textfieldUnderlineColor,
+          titleColor: titleColor ?? this.titleColor,
+          addressButtonBorderColor:
+              addressButtonBorderColor ?? this.addressButtonBorderColor,
+          dateSectionRowColor: dateSectionRowColor ?? this.dateSectionRowColor,
+          buttonTextColor: buttonTextColor ?? this.buttonTextColor,
+          buttonSecondaryTextColor:
+              buttonSecondaryTextColor ?? this.buttonSecondaryTextColor);
+
+  @override
+  CakeTextTheme lerp(ThemeExtension<CakeTextTheme>? other, double t) {
+    if (other is! CakeTextTheme) {
+      return this;
+    }
+
+    return CakeTextTheme(
+        secondaryTextColor:
+            Color.lerp(secondaryTextColor, other.secondaryTextColor, t)!,
+        textfieldUnderlineColor: Color.lerp(
+            textfieldUnderlineColor, other.textfieldUnderlineColor, t)!,
+        titleColor: Color.lerp(titleColor, other.titleColor, t)!,
+        addressButtonBorderColor: Color.lerp(
+            addressButtonBorderColor, other.addressButtonBorderColor, t)!,
+        dateSectionRowColor:
+            Color.lerp(dateSectionRowColor, other.dateSectionRowColor, t)!,
+        buttonTextColor: Color.lerp(buttonTextColor, other.buttonTextColor, t)!,
+        buttonSecondaryTextColor: Color.lerp(
+            buttonSecondaryTextColor, other.buttonSecondaryTextColor, t)!);
+  }
+}
diff --git a/lib/themes/extensions/dashboard_page_theme.dart b/lib/themes/extensions/dashboard_page_theme.dart
new file mode 100644
index 000000000..8d0195e62
--- /dev/null
+++ b/lib/themes/extensions/dashboard_page_theme.dart
@@ -0,0 +1,79 @@
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:flutter/material.dart';
+
+class DashboardPageTheme extends ThemeExtension<DashboardPageTheme> {
+  final Color firstGradientBackgroundColor;
+  final Color secondGradientBackgroundColor;
+  final Color thirdGradientBackgroundColor;
+  final Color textColor;
+  final Color cardTextColor;
+  final Color pageTitleTextColor;
+  final Color mainActionsIconColor;
+
+  final IndicatorDotTheme indicatorDotTheme;
+
+  DashboardPageTheme(
+      {required this.firstGradientBackgroundColor,
+      required this.secondGradientBackgroundColor,
+      required this.thirdGradientBackgroundColor,
+      required this.textColor,
+      required this.indicatorDotTheme,
+      Color? mainActionsIconColor,
+      Color? pageTitleTextColor,
+      Color? cardTextColor})
+      : pageTitleTextColor = pageTitleTextColor ?? textColor,
+        mainActionsIconColor = mainActionsIconColor ?? textColor,
+        cardTextColor = cardTextColor ?? textColor;
+
+  @override
+  DashboardPageTheme copyWith(
+          {Color? firstGradientBackgroundColor,
+          Color? secondGradientBackgroundColor,
+          Color? thirdGradientBackgroundColor,
+          Color? textColor,
+          IndicatorDotTheme? indicatorDotTheme,
+          Color? pageTitleTextColor,
+          Color? mainActionsIconColor,
+          Color? cardTextColor}) =>
+      DashboardPageTheme(
+          firstGradientBackgroundColor:
+              firstGradientBackgroundColor ?? this.firstGradientBackgroundColor,
+          secondGradientBackgroundColor: secondGradientBackgroundColor ??
+              this.secondGradientBackgroundColor,
+          thirdGradientBackgroundColor:
+              thirdGradientBackgroundColor ?? this.thirdGradientBackgroundColor,
+          textColor: textColor ?? this.textColor,
+          indicatorDotTheme: indicatorDotTheme ?? this.indicatorDotTheme,
+          pageTitleTextColor: pageTitleTextColor ?? this.pageTitleTextColor,
+          mainActionsIconColor:
+              mainActionsIconColor ?? this.mainActionsIconColor,
+          cardTextColor: cardTextColor ?? this.cardTextColor);
+
+  @override
+  DashboardPageTheme lerp(ThemeExtension<DashboardPageTheme>? other, double t) {
+    if (other is! DashboardPageTheme) {
+      return this;
+    }
+
+    return DashboardPageTheme(
+        firstGradientBackgroundColor: Color.lerp(firstGradientBackgroundColor,
+                other.firstGradientBackgroundColor, t) ??
+            firstGradientBackgroundColor,
+        secondGradientBackgroundColor: Color.lerp(secondGradientBackgroundColor,
+                other.secondGradientBackgroundColor, t) ??
+            secondGradientBackgroundColor,
+        thirdGradientBackgroundColor: Color.lerp(thirdGradientBackgroundColor,
+                other.thirdGradientBackgroundColor, t) ??
+            thirdGradientBackgroundColor,
+        textColor: Color.lerp(textColor, other.textColor, t) ?? textColor,
+        indicatorDotTheme: indicatorDotTheme.lerp(other.indicatorDotTheme, t),
+        pageTitleTextColor:
+            Color.lerp(pageTitleTextColor, other.pageTitleTextColor, t) ??
+                pageTitleTextColor,
+        mainActionsIconColor:
+            Color.lerp(mainActionsIconColor, other.mainActionsIconColor, t) ??
+                mainActionsIconColor,
+        cardTextColor:
+            Color.lerp(cardTextColor, other.cardTextColor, t) ?? cardTextColor);
+  }
+}
diff --git a/lib/themes/extensions/exchange_page_theme.dart b/lib/themes/extensions/exchange_page_theme.dart
new file mode 100644
index 000000000..9c35312a1
--- /dev/null
+++ b/lib/themes/extensions/exchange_page_theme.dart
@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+
+class ExchangePageTheme extends ThemeExtension<ExchangePageTheme> {
+  final Color hintTextColor;
+  final Color receiveAmountColor;
+  final Color firstGradientTopPanelColor;
+  final Color secondGradientTopPanelColor;
+  final Color firstGradientBottomPanelColor;
+  final Color secondGradientBottomPanelColor;
+  final Color textFieldBorderTopPanelColor;
+  final Color textFieldBorderBottomPanelColor;
+  final Color textFieldButtonColor;
+  final Color buttonBackgroundColor;
+  final Color qrCodeColor;
+  final Color dividerCodeColor;
+
+  ExchangePageTheme(
+      {required this.hintTextColor,
+      required this.receiveAmountColor,
+      required this.firstGradientTopPanelColor,
+      required this.secondGradientTopPanelColor,
+      required this.firstGradientBottomPanelColor,
+      required this.secondGradientBottomPanelColor,
+      required this.textFieldBorderTopPanelColor,
+      required this.textFieldBorderBottomPanelColor,
+      required this.textFieldButtonColor,
+      required this.buttonBackgroundColor,
+      required this.qrCodeColor,
+      required this.dividerCodeColor});
+
+  @override
+  ExchangePageTheme copyWith({
+    Color? hintTextColor,
+    Color? receiveAmountColor,
+    Color? firstGradientTopPanelColor,
+    Color? secondGradientTopPanelColor,
+    Color? firstGradientBottomPanelColor,
+    Color? secondGradientBottomPanelColor,
+    Color? textFieldBorderTopPanelColor,
+    Color? textFieldBorderBottomPanelColor,
+    Color? textFieldButtonColor,
+    Color? buttonBackgroundColor,
+    Color? qrCodeColor,
+    Color? dividerCodeColor,
+  }) =>
+      ExchangePageTheme(
+          hintTextColor: hintTextColor ?? this.hintTextColor,
+          receiveAmountColor: receiveAmountColor ?? this.receiveAmountColor,
+          firstGradientTopPanelColor:
+              firstGradientTopPanelColor ?? this.firstGradientTopPanelColor,
+          secondGradientTopPanelColor:
+              secondGradientTopPanelColor ?? this.secondGradientTopPanelColor,
+          firstGradientBottomPanelColor: firstGradientBottomPanelColor ??
+              this.firstGradientBottomPanelColor,
+          secondGradientBottomPanelColor: secondGradientBottomPanelColor ??
+              this.secondGradientBottomPanelColor,
+          textFieldBorderTopPanelColor:
+              textFieldBorderTopPanelColor ?? this.textFieldBorderTopPanelColor,
+          textFieldBorderBottomPanelColor: textFieldBorderBottomPanelColor ??
+              this.textFieldBorderBottomPanelColor,
+          textFieldButtonColor:
+              textFieldButtonColor ?? this.textFieldButtonColor,
+          buttonBackgroundColor:
+              buttonBackgroundColor ?? this.buttonBackgroundColor,
+          qrCodeColor: qrCodeColor ?? this.qrCodeColor,
+          dividerCodeColor: dividerCodeColor ?? this.dividerCodeColor);
+
+  @override
+  ExchangePageTheme lerp(ThemeExtension<ExchangePageTheme>? other, double t) {
+    if (other is! ExchangePageTheme) {
+      return this;
+    }
+
+    return ExchangePageTheme(
+        hintTextColor: Color.lerp(hintTextColor, other.hintTextColor, t) ?? hintTextColor,
+        receiveAmountColor: Color.lerp(receiveAmountColor, other.receiveAmountColor, t) ?? receiveAmountColor,
+        firstGradientTopPanelColor: Color.lerp(firstGradientTopPanelColor, other.firstGradientTopPanelColor, t) ?? firstGradientTopPanelColor,
+        secondGradientTopPanelColor: Color.lerp(secondGradientTopPanelColor, other.secondGradientTopPanelColor, t) ?? secondGradientTopPanelColor,
+        firstGradientBottomPanelColor: Color.lerp(firstGradientBottomPanelColor, other.firstGradientBottomPanelColor, t) ?? firstGradientBottomPanelColor,
+        secondGradientBottomPanelColor: Color.lerp(secondGradientBottomPanelColor, other.secondGradientBottomPanelColor, t) ?? secondGradientBottomPanelColor,
+        textFieldBorderTopPanelColor: Color.lerp(textFieldBorderTopPanelColor, other.textFieldBorderTopPanelColor, t) ?? textFieldBorderTopPanelColor,
+        textFieldBorderBottomPanelColor: Color.lerp(textFieldBorderBottomPanelColor, other.textFieldBorderBottomPanelColor, t) ?? textFieldBorderBottomPanelColor,
+        textFieldButtonColor: Color.lerp(textFieldButtonColor, other.textFieldButtonColor, t) ?? textFieldButtonColor,
+        buttonBackgroundColor: Color.lerp(buttonBackgroundColor, other.buttonBackgroundColor, t) ?? buttonBackgroundColor,
+        qrCodeColor: Color.lerp(qrCodeColor, other.qrCodeColor, t) ?? qrCodeColor,
+        dividerCodeColor: Color.lerp(dividerCodeColor, other.dividerCodeColor, t) ?? dividerCodeColor);
+  }
+}
diff --git a/lib/themes/extensions/filter_theme.dart b/lib/themes/extensions/filter_theme.dart
new file mode 100644
index 000000000..a2106f648
--- /dev/null
+++ b/lib/themes/extensions/filter_theme.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+
+class FilterTheme extends ThemeExtension<FilterTheme> {
+  final Color checkboxFirstGradientColor;
+  final Color checkboxSecondGradientColor;
+  final Color checkboxBoundsColor;
+  final Color checkboxBackgroundColor;
+  final Color titlesColor;
+  final Color buttonColor;
+  final Color iconColor;
+
+  FilterTheme(
+      {required this.checkboxFirstGradientColor,
+      required this.checkboxSecondGradientColor,
+      required this.checkboxBoundsColor,
+      required this.checkboxBackgroundColor,
+      required this.titlesColor,
+      required this.buttonColor,
+      required this.iconColor});
+
+  @override
+  FilterTheme copyWith({
+    Color? checkboxFirstGradientColor,
+    Color? checkboxSecondGradientColor,
+    Color? checkboxBoundsColor,
+    Color? checkboxBackgroundColor,
+    Color? titlesColor,
+    Color? buttonColor,
+    Color? iconColor,
+  }) =>
+      FilterTheme(
+          checkboxFirstGradientColor:
+              checkboxFirstGradientColor ?? this.checkboxFirstGradientColor,
+          checkboxSecondGradientColor:
+              checkboxSecondGradientColor ?? this.checkboxSecondGradientColor,
+          checkboxBoundsColor: checkboxBoundsColor ?? this.checkboxBoundsColor,
+          checkboxBackgroundColor:
+              checkboxBackgroundColor ?? this.checkboxBackgroundColor,
+          titlesColor: titlesColor ?? this.titlesColor,
+          buttonColor: buttonColor ?? this.buttonColor,
+          iconColor: iconColor ?? this.iconColor);
+
+  @override
+  FilterTheme lerp(ThemeExtension<FilterTheme>? other, double t) {
+    if (other is! FilterTheme) {
+      return this;
+    }
+
+    return FilterTheme(
+        checkboxFirstGradientColor: Color.lerp(checkboxFirstGradientColor,
+                other.checkboxFirstGradientColor, t) ??
+            this.checkboxFirstGradientColor,
+        checkboxSecondGradientColor: Color.lerp(checkboxSecondGradientColor,
+                other.checkboxSecondGradientColor, t) ??
+            this.checkboxSecondGradientColor,
+        checkboxBoundsColor:
+            Color.lerp(checkboxBoundsColor, other.checkboxBoundsColor, t) ??
+                this.checkboxBoundsColor,
+        checkboxBackgroundColor: Color.lerp(
+                checkboxBackgroundColor, other.checkboxBackgroundColor, t) ??
+            this.checkboxBackgroundColor,
+        titlesColor:
+            Color.lerp(titlesColor, other.titlesColor, t) ?? this.titlesColor,
+        buttonColor:
+            Color.lerp(buttonColor, other.buttonColor, t) ?? this.buttonColor,
+        iconColor: Color.lerp(iconColor, other.iconColor, t) ?? this.iconColor);
+  }
+}
diff --git a/lib/themes/extensions/indicator_dot_theme.dart b/lib/themes/extensions/indicator_dot_theme.dart
new file mode 100644
index 000000000..f7f482ad6
--- /dev/null
+++ b/lib/themes/extensions/indicator_dot_theme.dart
@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+class IndicatorDotTheme extends ThemeExtension<IndicatorDotTheme> {
+  final Color indicatorColor;
+  final Color activeIndicatorColor;
+
+  IndicatorDotTheme(
+      {required this.indicatorColor, required this.activeIndicatorColor});
+
+  @override
+  IndicatorDotTheme copyWith(
+          {Color? indicatorColor, Color? actionButtonColor}) =>
+      IndicatorDotTheme(
+          indicatorColor: indicatorColor ?? this.indicatorColor,
+          activeIndicatorColor: actionButtonColor ?? this.activeIndicatorColor);
+
+  @override
+  IndicatorDotTheme lerp(ThemeExtension<IndicatorDotTheme>? other, double t) {
+    if (other is! IndicatorDotTheme) {
+      return this;
+    }
+
+    return IndicatorDotTheme(
+        indicatorColor: Color.lerp(indicatorColor, other.indicatorColor, t) ??
+            indicatorColor,
+        activeIndicatorColor:
+            Color.lerp(activeIndicatorColor, other.activeIndicatorColor, t) ??
+                activeIndicatorColor);
+  }
+}
diff --git a/lib/themes/extensions/info_theme.dart b/lib/themes/extensions/info_theme.dart
new file mode 100644
index 000000000..aaf9952ea
--- /dev/null
+++ b/lib/themes/extensions/info_theme.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+class InfoTheme extends ThemeExtension<InfoTheme> {
+  final Color textColor;
+
+  InfoTheme({required this.textColor});
+
+  @override
+  InfoTheme copyWith({Color? textColor}) =>
+      InfoTheme(textColor: textColor ?? this.textColor);
+
+  @override
+  InfoTheme lerp(ThemeExtension<InfoTheme>? other, double t) {
+    if (other is! InfoTheme) {
+      return this;
+    }
+
+    return InfoTheme(
+        textColor: Color.lerp(textColor, other.textColor, t) ?? textColor);
+  }
+}
diff --git a/lib/themes/extensions/keyboard_theme.dart b/lib/themes/extensions/keyboard_theme.dart
new file mode 100644
index 000000000..316b7a370
--- /dev/null
+++ b/lib/themes/extensions/keyboard_theme.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+class KeyboardTheme extends ThemeExtension<KeyboardTheme> {
+  final Color keyboardBarColor;
+
+  KeyboardTheme({required this.keyboardBarColor});
+
+  @override
+  Object get type => KeyboardTheme;
+
+  @override
+  KeyboardTheme copyWith({Color? keyboardBarColor}) => KeyboardTheme(
+      keyboardBarColor: keyboardBarColor ?? this.keyboardBarColor);
+
+  @override
+  KeyboardTheme lerp(ThemeExtension<KeyboardTheme>? other, double t) {
+    if (other is! KeyboardTheme) {
+      return this;
+    }
+
+    return KeyboardTheme(
+        keyboardBarColor:
+            Color.lerp(keyboardBarColor, other.keyboardBarColor, t) ??
+                keyboardBarColor);
+  }
+}
diff --git a/lib/themes/extensions/menu_theme.dart b/lib/themes/extensions/menu_theme.dart
new file mode 100644
index 000000000..e0a79dac2
--- /dev/null
+++ b/lib/themes/extensions/menu_theme.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+
+class CakeMenuTheme extends ThemeExtension<CakeMenuTheme> {
+  final Color headerFirstGradientColor;
+  final Color headerSecondGradientColor;
+  final Color subnameTextColor;
+  final Color dividerColor;
+  final Color backgroundColor;
+  final Color iconColor;
+  final Color settingActionsIconColor;
+  final Color settingTitleColor;
+
+  CakeMenuTheme(
+      {required this.headerFirstGradientColor,
+      required this.headerSecondGradientColor,
+      required this.backgroundColor,
+      required this.subnameTextColor,
+      required this.dividerColor,
+      required this.iconColor,
+      required this.settingActionsIconColor,
+      required this.settingTitleColor});
+
+  @override
+  CakeMenuTheme copyWith(
+          {Color? headerFirstGradientColor,
+          Color? headerSecondGradientColor,
+          Color? backgroundColor,
+          Color? subnameTextColor,
+          Color? dividerColor,
+          Color? iconColor,
+          Color? settingActionsIconColor,
+          Color? settingTitleColor}) =>
+      CakeMenuTheme(
+          headerFirstGradientColor:
+              headerFirstGradientColor ?? this.headerFirstGradientColor,
+          headerSecondGradientColor:
+              headerSecondGradientColor ?? this.headerSecondGradientColor,
+          backgroundColor: backgroundColor ?? this.backgroundColor,
+          subnameTextColor: subnameTextColor ?? this.subnameTextColor,
+          dividerColor: dividerColor ?? this.dividerColor,
+          iconColor: iconColor ?? this.iconColor,
+          settingActionsIconColor:
+              settingActionsIconColor ?? this.settingActionsIconColor,
+          settingTitleColor: settingTitleColor ?? this.settingTitleColor);
+
+  @override
+  CakeMenuTheme lerp(ThemeExtension<CakeMenuTheme>? other, double t) {
+    if (other is! CakeMenuTheme) {
+      return this;
+    }
+
+    return CakeMenuTheme(
+        headerFirstGradientColor: Color.lerp(
+                headerFirstGradientColor, other.headerFirstGradientColor, t) ??
+            headerFirstGradientColor,
+        headerSecondGradientColor: Color.lerp(headerSecondGradientColor,
+                other.headerSecondGradientColor, t) ??
+            headerSecondGradientColor,
+        backgroundColor:
+            Color.lerp(backgroundColor, other.backgroundColor, t) ??
+                backgroundColor,
+        subnameTextColor:
+            Color.lerp(subnameTextColor, other.subnameTextColor, t) ??
+                subnameTextColor,
+        dividerColor:
+            Color.lerp(dividerColor, other.dividerColor, t) ?? dividerColor,
+        iconColor: Color.lerp(iconColor, other.iconColor, t) ?? iconColor,
+        settingActionsIconColor: Color.lerp(
+                settingActionsIconColor, other.settingActionsIconColor, t) ??
+            settingActionsIconColor, 
+        settingTitleColor: Color.lerp(
+                settingTitleColor, other.settingTitleColor, t) ??
+            settingTitleColor);
+  }
+}
diff --git a/lib/themes/extensions/new_wallet_theme.dart b/lib/themes/extensions/new_wallet_theme.dart
new file mode 100644
index 000000000..7e06818ff
--- /dev/null
+++ b/lib/themes/extensions/new_wallet_theme.dart
@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+class NewWalletTheme extends ThemeExtension<NewWalletTheme> {
+  final Color hintTextColor;
+  final Color underlineColor;
+
+  NewWalletTheme({required this.hintTextColor, required this.underlineColor});
+
+  @override
+  Object get type => NewWalletTheme;
+
+  @override
+  NewWalletTheme copyWith({Color? hintTextColor, Color? underlineColor}) =>
+      NewWalletTheme(
+          hintTextColor: hintTextColor ?? this.hintTextColor,
+          underlineColor: underlineColor ?? this.underlineColor);
+
+  @override
+  NewWalletTheme lerp(ThemeExtension<NewWalletTheme>? other, double t) {
+    if (other is! NewWalletTheme) {
+      return this;
+    }
+
+    return NewWalletTheme(
+        hintTextColor:
+            Color.lerp(hintTextColor, other.hintTextColor, t) ?? hintTextColor,
+        underlineColor: Color.lerp(underlineColor, other.underlineColor, t) ??
+            underlineColor);
+  }
+}
diff --git a/lib/themes/extensions/option_tile_theme.dart b/lib/themes/extensions/option_tile_theme.dart
new file mode 100644
index 000000000..6c125a4ac
--- /dev/null
+++ b/lib/themes/extensions/option_tile_theme.dart
@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+class OptionTileTheme extends ThemeExtension<OptionTileTheme> {
+  final Color titleColor;
+  final Color descriptionColor;
+  final bool useDarkImage;
+
+  OptionTileTheme(
+      {required this.titleColor, required this.descriptionColor, this.useDarkImage = false});
+
+  @override
+  OptionTileTheme copyWith({Color? titleColor, Color? descriptionColor, bool? useDarkImage}) =>
+      OptionTileTheme(
+          titleColor: titleColor ?? this.titleColor,
+          descriptionColor: descriptionColor ?? this.descriptionColor,
+          useDarkImage: useDarkImage ?? this.useDarkImage);
+
+  @override
+  OptionTileTheme lerp(ThemeExtension<OptionTileTheme>? other, double t) {
+    if (other is! OptionTileTheme) {
+      return this;
+    }
+
+    return OptionTileTheme(
+        titleColor: Color.lerp(titleColor, other.titleColor, t) ?? titleColor,
+        descriptionColor:
+            Color.lerp(descriptionColor, other.descriptionColor, t) ?? descriptionColor,
+        useDarkImage: other.useDarkImage);
+  }
+}
diff --git a/lib/themes/extensions/order_theme.dart b/lib/themes/extensions/order_theme.dart
new file mode 100644
index 000000000..2c58fe477
--- /dev/null
+++ b/lib/themes/extensions/order_theme.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+class OrderTheme extends ThemeExtension<OrderTheme> {
+  final Color iconColor;
+
+  OrderTheme({required this.iconColor});
+
+  @override
+  OrderTheme copyWith({Color? iconColor}) =>
+      OrderTheme(iconColor: iconColor ?? this.iconColor);
+
+  @override
+  OrderTheme lerp(ThemeExtension<OrderTheme>? other, double t) {
+    if (other is! OrderTheme) {
+      return this;
+    }
+
+    return OrderTheme(
+        iconColor: Color.lerp(iconColor, other.iconColor, t) ?? iconColor);
+  }
+}
diff --git a/lib/themes/extensions/picker_theme.dart b/lib/themes/extensions/picker_theme.dart
new file mode 100644
index 000000000..58c7fa3ff
--- /dev/null
+++ b/lib/themes/extensions/picker_theme.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+
+class PickerTheme extends ThemeExtension<PickerTheme> {
+  final Color dividerColor;
+  final Color? searchIconColor;
+  final Color searchBackgroundFillColor;
+  final Color searchTextColor;
+  final Color? searchHintColor;
+  final Color? searchBorderColor;
+
+  PickerTheme(
+      {required this.dividerColor,
+      this.searchIconColor,
+      required this.searchBackgroundFillColor,
+      required this.searchTextColor,
+      this.searchHintColor,
+      this.searchBorderColor});
+
+  @override
+  PickerTheme copyWith(
+          {Color? dividerColor,
+          Color? searchIconColor,
+          Color? searchBackgroundFillColor,
+          Color? searchTextColor,
+          Color? searchHintColor,
+          Color? searchBorderColor}) =>
+      PickerTheme(
+          dividerColor: dividerColor ?? this.dividerColor,
+          searchIconColor: searchIconColor ?? this.searchIconColor,
+          searchBackgroundFillColor: searchBackgroundFillColor ?? this.searchBackgroundFillColor,
+          searchTextColor: searchTextColor ?? this.searchTextColor,
+          searchHintColor: searchHintColor ?? this.searchHintColor,
+          searchBorderColor: searchBorderColor ?? this.searchBorderColor);
+
+  @override
+  PickerTheme lerp(ThemeExtension<PickerTheme>? other, double t) {
+    if (other is! PickerTheme) {
+      return this;
+    }
+
+    return PickerTheme(
+        dividerColor: Color.lerp(dividerColor, other.dividerColor, t) ?? dividerColor,
+        searchIconColor: Color.lerp(searchIconColor, other.searchIconColor, t) ?? searchIconColor,
+        searchBackgroundFillColor:
+            Color.lerp(searchBackgroundFillColor, other.searchBackgroundFillColor, t) ??
+                searchBackgroundFillColor,
+        searchTextColor: Color.lerp(searchTextColor, other.searchTextColor, t) ?? searchTextColor,
+        searchHintColor: Color.lerp(searchHintColor, other.searchHintColor, t) ?? searchHintColor,
+        searchBorderColor:
+            Color.lerp(searchBorderColor, other.searchBorderColor, t) ?? searchBorderColor);
+  }
+}
diff --git a/lib/themes/extensions/pin_code_theme.dart b/lib/themes/extensions/pin_code_theme.dart
new file mode 100644
index 000000000..e1b3f005f
--- /dev/null
+++ b/lib/themes/extensions/pin_code_theme.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+class PinCodeTheme extends ThemeExtension<PinCodeTheme> {
+  final Color indicatorsColor;
+  final Color switchColor;
+
+  PinCodeTheme({required this.indicatorsColor, required this.switchColor});
+
+  @override
+  PinCodeTheme copyWith({Color? indicatorsColor, Color? switchColor}) =>
+      PinCodeTheme(
+          indicatorsColor: indicatorsColor ?? this.indicatorsColor,
+          switchColor: switchColor ?? this.switchColor);
+
+  @override
+  PinCodeTheme lerp(ThemeExtension<PinCodeTheme>? other, double t) {
+    if (other is! PinCodeTheme) {
+      return this;
+    }
+
+    return PinCodeTheme(
+        indicatorsColor:
+            Color.lerp(indicatorsColor, other.indicatorsColor, t) ??
+                indicatorsColor,
+        switchColor:
+            Color.lerp(switchColor, other.switchColor, t) ?? switchColor);
+  }
+}
diff --git a/lib/themes/extensions/placeholder_theme.dart b/lib/themes/extensions/placeholder_theme.dart
new file mode 100644
index 000000000..14470a9c9
--- /dev/null
+++ b/lib/themes/extensions/placeholder_theme.dart
@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+
+class PlaceholderTheme extends ThemeExtension<PlaceholderTheme> {
+  final Color color;
+
+  PlaceholderTheme({required this.color});
+
+  @override
+  PlaceholderTheme copyWith({Color? color}) =>
+      PlaceholderTheme(color: color ?? this.color);
+
+  @override
+  PlaceholderTheme lerp(ThemeExtension<PlaceholderTheme>? other, double t) {
+    if (other is! PlaceholderTheme) {
+      return this;
+    }
+
+    return PlaceholderTheme(color: Color.lerp(color, other.color, t) ?? color);
+  }
+}
diff --git a/lib/themes/extensions/qr_code_theme.dart b/lib/themes/extensions/qr_code_theme.dart
new file mode 100644
index 000000000..7b6554553
--- /dev/null
+++ b/lib/themes/extensions/qr_code_theme.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+class QRCodeTheme extends ThemeExtension<QRCodeTheme> {
+  final Color qrCodeColor;
+  final Color qrWidgetCopyButtonColor;
+
+  QRCodeTheme(
+      {required this.qrCodeColor, required this.qrWidgetCopyButtonColor});
+
+  @override
+  QRCodeTheme copyWith({Color? qrCodeColor, Color? qrWidgetCopyButtonColor}) =>
+      QRCodeTheme(
+          qrCodeColor: qrCodeColor ?? this.qrCodeColor,
+          qrWidgetCopyButtonColor:
+              qrWidgetCopyButtonColor ?? this.qrWidgetCopyButtonColor);
+
+  @override
+  QRCodeTheme lerp(ThemeExtension<QRCodeTheme>? other, double t) {
+    if (other is! QRCodeTheme) {
+      return this;
+    }
+
+    return QRCodeTheme(
+        qrCodeColor: Color.lerp(qrCodeColor, other.qrCodeColor, t)!,
+        qrWidgetCopyButtonColor: Color.lerp(
+            qrWidgetCopyButtonColor, other.qrWidgetCopyButtonColor, t)!);
+  }
+}
diff --git a/lib/themes/extensions/receive_page_theme.dart b/lib/themes/extensions/receive_page_theme.dart
new file mode 100644
index 000000000..0974598d9
--- /dev/null
+++ b/lib/themes/extensions/receive_page_theme.dart
@@ -0,0 +1,70 @@
+import 'package:flutter/material.dart';
+
+class ReceivePageTheme extends ThemeExtension<ReceivePageTheme> {
+  final Color currentTileBackgroundColor;
+  final Color currentTileTextColor;
+  final Color tilesBackgroundColor;
+  final Color tilesTextColor;
+  final Color iconsBackgroundColor;
+  final Color iconsColor;
+  final Color amountBottomBorderColor;
+  final Color amountHintTextColor;
+
+  ReceivePageTheme(
+      {required this.currentTileBackgroundColor,
+      required this.currentTileTextColor,
+      required this.tilesBackgroundColor,
+      required this.tilesTextColor,
+      required this.iconsBackgroundColor,
+      required this.iconsColor,
+      required this.amountBottomBorderColor,
+      required this.amountHintTextColor});
+
+  @override
+  ReceivePageTheme copyWith(
+          {Color? currentTileBackgroundColor,
+          Color? currentTileTextColor,
+          Color? tilesBackgroundColor,
+          Color? tilesTextColor,
+          Color? iconsBackgroundColor,
+          Color? iconsColor,
+          Color? amountBottomBorderColor,
+          Color? amountHintTextColor}) =>
+      ReceivePageTheme(
+          currentTileBackgroundColor:
+              currentTileBackgroundColor ?? this.currentTileBackgroundColor,
+          currentTileTextColor:
+              currentTileTextColor ?? this.currentTileTextColor,
+          tilesBackgroundColor:
+              tilesBackgroundColor ?? this.tilesBackgroundColor,
+          tilesTextColor: tilesTextColor ?? this.tilesTextColor,
+          iconsBackgroundColor:
+              iconsBackgroundColor ?? this.iconsBackgroundColor,
+          iconsColor: iconsColor ?? this.iconsColor,
+          amountBottomBorderColor:
+              amountBottomBorderColor ?? this.amountBottomBorderColor,
+          amountHintTextColor: amountHintTextColor ?? this.amountHintTextColor);
+
+  @override
+  ReceivePageTheme lerp(ThemeExtension<ReceivePageTheme>? other, double t) {
+    if (other is! ReceivePageTheme) {
+      return this;
+    }
+
+    return ReceivePageTheme(
+        currentTileBackgroundColor: Color.lerp(
+            currentTileBackgroundColor, other.currentTileBackgroundColor, t)!,
+        currentTileTextColor:
+            Color.lerp(currentTileTextColor, other.currentTileTextColor, t)!,
+        tilesBackgroundColor:
+            Color.lerp(tilesBackgroundColor, other.tilesBackgroundColor, t)!,
+        tilesTextColor: Color.lerp(tilesTextColor, other.tilesTextColor, t)!,
+        iconsBackgroundColor:
+            Color.lerp(iconsBackgroundColor, other.iconsBackgroundColor, t)!,
+        iconsColor: Color.lerp(iconsColor, other.iconsColor, t)!,
+        amountBottomBorderColor: Color.lerp(
+            amountBottomBorderColor, other.amountBottomBorderColor, t)!,
+        amountHintTextColor:
+            Color.lerp(amountHintTextColor, other.amountHintTextColor, t)!);
+  }
+}
diff --git a/lib/themes/extensions/seed_widget_theme.dart b/lib/themes/extensions/seed_widget_theme.dart
new file mode 100644
index 000000000..9ac20db55
--- /dev/null
+++ b/lib/themes/extensions/seed_widget_theme.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+class SeedWidgetTheme extends ThemeExtension<SeedWidgetTheme> {
+  final Color hintTextColor;
+
+  SeedWidgetTheme({required this.hintTextColor});
+
+  @override
+  SeedWidgetTheme copyWith({Color? hintTextColor}) =>
+      SeedWidgetTheme(hintTextColor: hintTextColor ?? this.hintTextColor);
+
+  @override
+  SeedWidgetTheme lerp(ThemeExtension<SeedWidgetTheme>? other, double t) {
+    if (other is! SeedWidgetTheme) {
+      return this;
+    }
+
+    return SeedWidgetTheme(
+        hintTextColor:
+            Color.lerp(hintTextColor, other.hintTextColor, t) ?? hintTextColor);
+  }
+}
diff --git a/lib/themes/extensions/send_page_theme.dart b/lib/themes/extensions/send_page_theme.dart
new file mode 100644
index 000000000..79aca77f9
--- /dev/null
+++ b/lib/themes/extensions/send_page_theme.dart
@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+
+class SendPageTheme extends ThemeExtension<SendPageTheme> {
+  final Color templateTitleColor;
+  final Color templateBackgroundColor;
+  final Color templateNewTextColor;
+  final Color templateSelectedCurrencyBackgroundColor;
+  final Color templateSelectedCurrencyTitleColor;
+  final Color templateDottedBorderColor;
+  final Color estimatedFeeColor;
+  final Color textFieldButtonIconColor;
+  final Color textFieldButtonColor;
+  final Color textFieldHintColor;
+  final Color textFieldBorderColor;
+  final Color firstGradientColor;
+  final Color secondGradientColor;
+  final Color indicatorDotColor;
+
+  SendPageTheme(
+      {required this.templateTitleColor,
+      required this.templateBackgroundColor,
+      required this.templateNewTextColor,
+      required this.templateSelectedCurrencyBackgroundColor,
+      required this.templateSelectedCurrencyTitleColor,
+      required this.templateDottedBorderColor,
+      required this.estimatedFeeColor,
+      required this.textFieldButtonIconColor,
+      required this.textFieldButtonColor,
+      required this.textFieldHintColor,
+      required this.textFieldBorderColor,
+      required this.firstGradientColor,
+      required this.secondGradientColor,
+      required this.indicatorDotColor});
+
+  @override
+  SendPageTheme copyWith(
+          {Color? templateTitleColor,
+          Color? templateBackgroundColor,
+          Color? templateNewTextColor,
+          Color? templateSelectedCurrencyBackgroundColor,
+          Color? templateSelectedCurrencyTitleColor,
+          Color? templateDottedBorderColor,
+          Color? estimatedFeeColor,
+          Color? textFieldButtonIconColor,
+          Color? textFieldButtonColor,
+          Color? textFieldHintColor,
+          Color? textFieldBorderColor,
+          Color? firstGradientColor,
+          Color? secondGradientColor,
+          Color? indicatorDotColor}) =>
+      SendPageTheme(
+          templateTitleColor: templateTitleColor ?? this.templateTitleColor,
+          templateBackgroundColor:
+              templateBackgroundColor ?? this.templateBackgroundColor,
+          templateNewTextColor:
+              templateNewTextColor ?? this.templateNewTextColor,
+          templateSelectedCurrencyBackgroundColor:
+              templateSelectedCurrencyBackgroundColor ??
+                  this.templateSelectedCurrencyBackgroundColor,
+          templateSelectedCurrencyTitleColor:
+              templateSelectedCurrencyTitleColor ??
+                  this.templateSelectedCurrencyTitleColor,
+          templateDottedBorderColor:
+              templateDottedBorderColor ?? this.templateDottedBorderColor,
+          estimatedFeeColor: estimatedFeeColor ?? this.estimatedFeeColor,
+          textFieldButtonIconColor:
+              textFieldButtonIconColor ?? this.textFieldButtonIconColor,
+          textFieldButtonColor:
+              textFieldButtonColor ?? this.textFieldButtonColor,
+          textFieldHintColor: textFieldHintColor ?? this.textFieldHintColor,
+          textFieldBorderColor:
+              textFieldBorderColor ?? this.textFieldBorderColor,
+          firstGradientColor: firstGradientColor ?? this.firstGradientColor,
+          secondGradientColor: secondGradientColor ?? this.secondGradientColor,
+          indicatorDotColor: indicatorDotColor ?? this.indicatorDotColor);
+
+  @override
+  SendPageTheme lerp(ThemeExtension<SendPageTheme>? other, double t) {
+    if (other is! SendPageTheme) {
+      return this;
+    }
+
+    return SendPageTheme(
+        templateTitleColor:
+            Color.lerp(templateTitleColor, other.templateTitleColor, t)!,
+        templateBackgroundColor: Color.lerp(
+            templateBackgroundColor, other.templateBackgroundColor, t)!,
+        templateNewTextColor:
+            Color.lerp(templateNewTextColor, other.templateNewTextColor, t)!,
+        templateSelectedCurrencyBackgroundColor: Color.lerp(
+            templateSelectedCurrencyBackgroundColor,
+            other.templateSelectedCurrencyBackgroundColor,
+            t)!,
+        templateSelectedCurrencyTitleColor: Color.lerp(
+            templateSelectedCurrencyTitleColor,
+            other.templateSelectedCurrencyTitleColor,
+            t)!,
+        templateDottedBorderColor: Color.lerp(
+            templateDottedBorderColor, other.templateDottedBorderColor, t)!,
+        estimatedFeeColor:
+            Color.lerp(estimatedFeeColor, other.estimatedFeeColor, t)!,
+        textFieldButtonIconColor: Color.lerp(
+            textFieldButtonIconColor, other.textFieldButtonIconColor, t)!,
+        textFieldButtonColor:
+            Color.lerp(textFieldButtonColor, other.textFieldButtonColor, t)!,
+        textFieldHintColor:
+            Color.lerp(textFieldHintColor, other.textFieldHintColor, t)!,
+        textFieldBorderColor:
+            Color.lerp(textFieldBorderColor, other.textFieldBorderColor, t)!,
+        firstGradientColor:
+            Color.lerp(firstGradientColor, other.firstGradientColor, t)!,
+        secondGradientColor:
+            Color.lerp(secondGradientColor, other.secondGradientColor, t)!,
+        indicatorDotColor:
+            Color.lerp(indicatorDotColor, other.indicatorDotColor, t)!);
+  }
+}
diff --git a/lib/themes/extensions/support_page_theme.dart b/lib/themes/extensions/support_page_theme.dart
new file mode 100644
index 000000000..1b4a4117c
--- /dev/null
+++ b/lib/themes/extensions/support_page_theme.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+class SupportPageTheme extends ThemeExtension<SupportPageTheme> {
+  final Color iconColor;
+
+  SupportPageTheme({required this.iconColor});
+
+  @override
+  SupportPageTheme copyWith({Color? iconColor}) =>
+      SupportPageTheme(iconColor: iconColor ?? this.iconColor);
+
+  @override
+  SupportPageTheme lerp(ThemeExtension<SupportPageTheme>? other, double t) {
+    if (other is! SupportPageTheme) {
+      return this;
+    }
+
+    return SupportPageTheme(
+        iconColor: Color.lerp(iconColor, other.iconColor, t) ?? iconColor);
+  }
+}
diff --git a/lib/themes/extensions/sync_indicator_theme.dart b/lib/themes/extensions/sync_indicator_theme.dart
new file mode 100644
index 000000000..b523a646a
--- /dev/null
+++ b/lib/themes/extensions/sync_indicator_theme.dart
@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+
+class SyncIndicatorTheme extends ThemeExtension<SyncIndicatorTheme> {
+  final Color textColor;
+  final Color syncedBackgroundColor;
+  final Color notSyncedIconColor;
+  final Color notSyncedBackgroundColor;
+
+  SyncIndicatorTheme(
+      {required this.textColor,
+      required this.syncedBackgroundColor,
+      required this.notSyncedIconColor,
+      required this.notSyncedBackgroundColor});
+
+  @override
+  SyncIndicatorTheme copyWith({
+    Color? textColor,
+    Color? syncedBackgroundColor,
+    Color? notSyncedIconColor,
+    Color? notSyncedBackgroundColor,
+  }) =>
+      SyncIndicatorTheme(
+          textColor: textColor ?? this.textColor,
+          syncedBackgroundColor:
+              syncedBackgroundColor ?? this.syncedBackgroundColor,
+          notSyncedIconColor: notSyncedIconColor ?? this.notSyncedIconColor,
+          notSyncedBackgroundColor:
+              notSyncedBackgroundColor ?? this.notSyncedBackgroundColor);
+
+  @override
+  SyncIndicatorTheme lerp(ThemeExtension<SyncIndicatorTheme>? other, double t) {
+    if (other is! SyncIndicatorTheme) {
+      return this;
+    }
+
+    return SyncIndicatorTheme(
+        textColor: Color.lerp(textColor, other.textColor, t) ?? textColor,
+        syncedBackgroundColor:
+            Color.lerp(syncedBackgroundColor, other.syncedBackgroundColor, t) ??
+                syncedBackgroundColor,
+        notSyncedIconColor:
+            Color.lerp(notSyncedIconColor, other.notSyncedIconColor, t) ??
+                notSyncedIconColor,
+        notSyncedBackgroundColor: Color.lerp(
+                notSyncedBackgroundColor, other.notSyncedBackgroundColor, t) ??
+            notSyncedBackgroundColor);
+  }
+}
diff --git a/lib/themes/extensions/theme_type_images.dart b/lib/themes/extensions/theme_type_images.dart
new file mode 100644
index 000000000..39461e702
--- /dev/null
+++ b/lib/themes/extensions/theme_type_images.dart
@@ -0,0 +1,14 @@
+import 'package:cake_wallet/themes/theme_base.dart';
+
+extension ThemeTypeImages on ThemeType {
+  String get walletGroupImage {
+    switch (this) {
+      case ThemeType.bright:
+        return 'assets/images/wallet_group_bright.png';
+      case ThemeType.light:
+        return 'assets/images/wallet_group_light.png';
+      default:
+        return 'assets/images/wallet_group_dark.png';
+    }
+  }
+}
diff --git a/lib/themes/extensions/transaction_trade_theme.dart b/lib/themes/extensions/transaction_trade_theme.dart
new file mode 100644
index 000000000..d912a8850
--- /dev/null
+++ b/lib/themes/extensions/transaction_trade_theme.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+
+class TransactionTradeTheme extends ThemeExtension<TransactionTradeTheme> {
+  final Color detailsTitlesColor;
+  final Color rowsColor;
+
+  TransactionTradeTheme(
+      {required this.detailsTitlesColor, required this.rowsColor});
+
+  @override
+  TransactionTradeTheme copyWith(
+          {Color? detailsTitlesColor, Color? rowsColor}) =>
+      TransactionTradeTheme(
+          detailsTitlesColor: detailsTitlesColor ?? this.detailsTitlesColor,
+          rowsColor: rowsColor ?? this.rowsColor);
+
+  @override
+  TransactionTradeTheme lerp(
+      ThemeExtension<TransactionTradeTheme>? other, double t) {
+    if (other is! TransactionTradeTheme) {
+      return this;
+    }
+
+    return TransactionTradeTheme(
+        detailsTitlesColor:
+            Color.lerp(detailsTitlesColor, other.detailsTitlesColor, t)!,
+        rowsColor: Color.lerp(rowsColor, other.rowsColor, t)!);
+  }
+}
diff --git a/lib/themes/extensions/wallet_list_theme.dart b/lib/themes/extensions/wallet_list_theme.dart
new file mode 100644
index 000000000..aac3a193a
--- /dev/null
+++ b/lib/themes/extensions/wallet_list_theme.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+
+class WalletListTheme extends ThemeExtension<WalletListTheme> {
+  final Color restoreWalletButtonTextColor;
+  final Color createNewWalletButtonBackgroundColor;
+
+  WalletListTheme(
+      {required this.restoreWalletButtonTextColor,
+      required this.createNewWalletButtonBackgroundColor});
+
+  @override
+  WalletListTheme copyWith(
+          {Color? restoreWalletButtonTextColor,
+          Color? createNewWalletButtonBackgroundColor}) =>
+      WalletListTheme(
+          restoreWalletButtonTextColor:
+              restoreWalletButtonTextColor ?? this.restoreWalletButtonTextColor,
+          createNewWalletButtonBackgroundColor:
+              createNewWalletButtonBackgroundColor ??
+                  this.createNewWalletButtonBackgroundColor);
+
+  @override
+  WalletListTheme lerp(ThemeExtension<WalletListTheme>? other, double t) {
+    if (other is! WalletListTheme) {
+      return this;
+    }
+
+    return WalletListTheme(
+        restoreWalletButtonTextColor: Color.lerp(restoreWalletButtonTextColor,
+                other.restoreWalletButtonTextColor, t) ??
+            restoreWalletButtonTextColor,
+        createNewWalletButtonBackgroundColor: Color.lerp(
+                createNewWalletButtonBackgroundColor,
+                other.createNewWalletButtonBackgroundColor,
+                t) ??
+            createNewWalletButtonBackgroundColor);
+  }
+}
diff --git a/lib/themes/high_contrast_theme.dart b/lib/themes/high_contrast_theme.dart
new file mode 100644
index 000000000..bef959a70
--- /dev/null
+++ b/lib/themes/high_contrast_theme.dart
@@ -0,0 +1,115 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/monero_light_theme.dart';
+import 'package:flutter/material.dart';
+
+class HighContrastTheme extends MoneroLightTheme {
+  HighContrastTheme({required int raw}) : super(raw: raw) {
+    colorScheme = ColorScheme.fromSwatch(
+        primarySwatch: Colors.grey,
+        accentColor: primaryColor,
+        backgroundColor: Colors.white,
+        cardColor: containerColor,
+        brightness: Brightness.light);
+  }
+
+  @override
+  String get title => S.current.high_contrast_theme;
+  @override
+  Color get primaryColor => Colors.black;
+  @override
+  Color get containerColor => Palette.highContrastGray;
+  @override
+  Color get primaryTextColor => colorScheme.onBackground;
+  @override
+  Color get dialogBackgroundColor => Colors.white;
+
+  @override
+  CakeTextTheme get cakeTextTheme => super.cakeTextTheme.copyWith(
+      buttonTextColor: Colors.white, buttonSecondaryTextColor: Colors.white.withOpacity(0.5));
+
+  @override
+  SyncIndicatorTheme get syncIndicatorStyle => super
+      .syncIndicatorStyle
+      .copyWith(textColor: colorScheme.background, syncedBackgroundColor: containerColor);
+
+  @override
+  BalancePageTheme get balancePageTheme => super.balancePageTheme.copyWith(
+      textColor: Colors.white,
+      labelTextColor: Colors.grey,
+      assetTitleColor: Colors.white,
+      balanceAmountColor: Colors.white);
+
+  @override
+  DashboardPageTheme get dashboardPageTheme => super.dashboardPageTheme.copyWith(
+      textColor: Colors.black,
+      cardTextColor: Colors.white,
+      mainActionsIconColor: Colors.white,
+      indicatorDotTheme:
+          IndicatorDotTheme(indicatorColor: Colors.grey, activeIndicatorColor: Colors.black));
+
+  @override
+  ExchangePageTheme get exchangePageTheme => super.exchangePageTheme.copyWith(
+      firstGradientTopPanelColor: primaryColor, firstGradientBottomPanelColor: containerColor);
+
+  @override
+  SendPageTheme get sendPageTheme => super.sendPageTheme.copyWith(
+      templateTitleColor: Colors.white,
+      templateBackgroundColor: Colors.black,
+      firstGradientColor: primaryColor);
+
+  @override
+  AddressTheme get addressTheme => super.addressTheme.copyWith(actionButtonColor: Colors.grey);
+
+  @override
+  FilterTheme get filterTheme => super.filterTheme.copyWith(iconColor: Colors.white);
+
+  @override
+  CakeMenuTheme get menuTheme => super.menuTheme.copyWith(
+      settingTitleColor: Colors.black,
+      headerFirstGradientColor: containerColor,
+      iconColor: Colors.white);
+
+  @override
+  PickerTheme get pickerTheme => super.pickerTheme.copyWith(
+      searchIconColor: primaryColor,
+      searchHintColor: primaryColor,
+      searchTextColor: primaryColor,
+      searchBackgroundFillColor: Colors.white,
+      searchBorderColor: primaryColor);
+
+  @override
+  AccountListTheme get accountListTheme => super.accountListTheme.copyWith(
+      tilesTextColor: Colors.black,
+      tilesBackgroundColor: Colors.white,
+      currentAccountBackgroundColor: containerColor,
+      currentAccountTextColor: Colors.white,
+      currentAccountAmountColor: Colors.white);
+
+  @override
+  ReceivePageTheme get receivePageTheme => super.receivePageTheme.copyWith(
+      tilesTextColor: Colors.white, iconsBackgroundColor: Colors.grey, iconsColor: Colors.black);
+
+  @override
+  OptionTileTheme get optionTileTheme => OptionTileTheme(
+      titleColor: Colors.white, descriptionColor: Colors.white, useDarkImage: false);
+
+  @override
+  ThemeData get themeData => super.themeData.copyWith(
+      disabledColor: Colors.grey,
+      dialogTheme: super.themeData.dialogTheme.copyWith(backgroundColor: Colors.white));
+}
diff --git a/lib/themes/light_theme.dart b/lib/themes/light_theme.dart
new file mode 100644
index 000000000..492b2c145
--- /dev/null
+++ b/lib/themes/light_theme.dart
@@ -0,0 +1,230 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/alert_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:cake_wallet/themes/extensions/info_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
+import 'package:cake_wallet/themes/extensions/order_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/placeholder_theme.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/support_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:flutter/material.dart';
+
+class LightTheme extends ThemeBase {
+  LightTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.light_theme;
+  @override
+  ThemeType get type => ThemeType.light;
+  @override
+  Brightness get brightness => Brightness.light;
+  @override
+  Color get backgroundColor => Colors.white;
+  @override
+  Color get primaryColor => Palette.protectiveBlue;
+  @override
+  Color get primaryTextColor => Palette.darkBlueCraiola;
+  @override
+  Color get containerColor => Palette.blueAlice;
+  @override
+  Color get dialogBackgroundColor => Colors.white;
+
+  @override
+  CakeScrollbarTheme get scrollbarTheme => CakeScrollbarTheme(
+      thumbColor: Palette.moderatePurpleBlue,
+      trackColor: Palette.periwinkleCraiola);
+
+  @override
+  SyncIndicatorTheme get syncIndicatorStyle => SyncIndicatorTheme(
+      textColor: Palette.darkBlueCraiola,
+      syncedBackgroundColor: Palette.blueAlice,
+      notSyncedIconColor: Palette.shineOrange,
+      notSyncedBackgroundColor: Palette.blueAlice.withOpacity(0.75));
+
+  @override
+  KeyboardTheme get keyboardTheme =>
+      KeyboardTheme(keyboardBarColor: Palette.dullGray);
+
+  @override
+  PinCodeTheme get pinCodeTheme => PinCodeTheme(
+      indicatorsColor: Palette.darkGray, switchColor: Palette.darkGray);
+
+  @override
+  SupportPageTheme get supportPageTheme =>
+      SupportPageTheme(iconColor: Colors.black);
+
+  @override
+  ExchangePageTheme get exchangePageTheme => ExchangePageTheme(
+      hintTextColor: Colors.white.withOpacity(0.4),
+      dividerCodeColor: Palette.wildPeriwinkle,
+      qrCodeColor: primaryTextColor,
+      buttonBackgroundColor: containerColor,
+      textFieldButtonColor: Colors.white.withOpacity(0.2),
+      textFieldBorderBottomPanelColor: Colors.white.withOpacity(0.5),
+      textFieldBorderTopPanelColor: Colors.white.withOpacity(0.5),
+      secondGradientBottomPanelColor: Palette.blueGreyCraiola.withOpacity(0.7),
+      firstGradientBottomPanelColor: Palette.blueCraiola.withOpacity(0.7),
+      secondGradientTopPanelColor: Palette.blueGreyCraiola,
+      firstGradientTopPanelColor: Palette.blueCraiola,
+      receiveAmountColor: Palette.niagara);
+
+  @override
+  NewWalletTheme get newWalletTheme => NewWalletTheme(
+      hintTextColor: Palette.darkGray,
+      underlineColor: Palette.periwinkleCraiola);
+
+  @override
+  AddressTheme get addressTheme =>
+      AddressTheme(actionButtonColor: Palette.shadowWhite);
+
+  @override
+  DashboardPageTheme get dashboardPageTheme =>
+      super.dashboardPageTheme.copyWith(
+          cardTextColor: super.dashboardPageTheme.textColor,
+          indicatorDotTheme: IndicatorDotTheme(
+              indicatorColor: PaletteDark.darkCyanBlue.withOpacity(0.67),
+              activeIndicatorColor: PaletteDark.darkNightBlue));
+
+  @override
+  BalancePageTheme get balancePageTheme => BalancePageTheme(
+      textColor: dashboardPageTheme.textColor,
+      labelTextColor: Palette.darkBlueCraiola.withOpacity(0.67));
+
+  @override
+  CakeMenuTheme get menuTheme => CakeMenuTheme(
+      headerFirstGradientColor: Palette.blueCraiola,
+      headerSecondGradientColor: Palette.blueGreyCraiola,
+      backgroundColor: Colors.white,
+      subnameTextColor: Colors.white,
+      dividerColor: Palette.wildLavender,
+      iconColor: Colors.white,
+      settingTitleColor: receivePageTheme.tilesTextColor,
+      settingActionsIconColor: Palette.gray);
+
+  @override
+  FilterTheme get filterTheme => FilterTheme(
+      checkboxFirstGradientColor: Palette.blueCraiola,
+      checkboxSecondGradientColor: Palette.blueGreyCraiola,
+      checkboxBoundsColor: Palette.wildPeriwinkle,
+      checkboxBackgroundColor: Colors.white,
+      titlesColor: Palette.darkGray,
+      buttonColor: Palette.blueAlice,
+      iconColor: PaletteDark.wildBlue);
+
+  @override
+  WalletListTheme get walletListTheme => WalletListTheme(
+      restoreWalletButtonTextColor: Colors.white,
+      createNewWalletButtonBackgroundColor: Palette.protectiveBlue);
+
+  @override
+  InfoTheme get infoTheme => InfoTheme(textColor: Palette.darkBlueCraiola);
+
+  @override
+  PickerTheme get pickerTheme => PickerTheme(
+      dividerColor: Palette.periwinkleCraiola,
+      searchTextColor: cakeTextTheme.textfieldUnderlineColor,
+      searchBackgroundFillColor: addressTheme.actionButtonColor);
+
+  @override
+  AlertTheme get alertTheme => AlertTheme(
+      backdropColor: PaletteDark.darkNightBlue.withOpacity(0.75),
+      leftButtonTextColor: Palette.brightOrange);
+
+  @override
+  OrderTheme get orderTheme => OrderTheme(iconColor: Colors.black);
+
+  @override
+  SendPageTheme get sendPageTheme => SendPageTheme(
+      templateTitleColor: Palette.darkBlueCraiola,
+      templateBackgroundColor: Palette.blueAlice,
+      templateNewTextColor: Palette.darkBlueCraiola,
+      templateDottedBorderColor: Palette.moderateLavender,
+      templateSelectedCurrencyBackgroundColor: Colors.white,
+      templateSelectedCurrencyTitleColor: primaryColor,
+      estimatedFeeColor: Colors.white.withOpacity(0.5),
+      textFieldButtonIconColor: Colors.white,
+      textFieldButtonColor: Colors.white.withOpacity(0.2),
+      textFieldHintColor: Colors.white.withOpacity(0.5),
+      textFieldBorderColor: Colors.white.withOpacity(0.5),
+      secondGradientColor: Palette.blueGreyCraiola,
+      firstGradientColor: Palette.blueCraiola,
+      indicatorDotColor: PaletteDark.darkCyanBlue.withOpacity(0.67));
+
+  @override
+  SeedWidgetTheme get seedWidgetTheme =>
+      SeedWidgetTheme(hintTextColor: Palette.darkGray);
+
+  @override
+  PlaceholderTheme get placeholderTheme =>
+      PlaceholderTheme(color: PaletteDark.darkCyanBlue);
+
+  @override
+  TransactionTradeTheme get transactionTradeTheme => TransactionTradeTheme(
+      detailsTitlesColor: Palette.darkGray, rowsColor: Palette.blueAlice);
+
+  @override
+  CakeTextTheme get cakeTextTheme => CakeTextTheme(
+      secondaryTextColor: PaletteDark.pigeonBlue,
+      textfieldUnderlineColor: Palette.wildPeriwinkle,
+      titleColor: Palette.violetBlue,
+      addressButtonBorderColor: Palette.blueAlice,
+      dateSectionRowColor: PaletteDark.darkCyanBlue);
+
+  @override
+  AccountListTheme get accountListTheme => AccountListTheme(
+      currentAccountBackgroundColor: dialogBackgroundColor,
+      currentAccountTextColor: primaryColor,
+      currentAccountAmountColor: receivePageTheme.iconsColor,
+      tilesBackgroundColor: Colors.white,
+      tilesAmountColor: receivePageTheme.iconsColor,
+      tilesTextColor: Palette.violetBlue);
+
+  @override
+  ReceivePageTheme get receivePageTheme => ReceivePageTheme(
+      currentTileBackgroundColor: Palette.blueCraiola,
+      currentTileTextColor: Colors.white,
+      tilesBackgroundColor: Palette.blueAlice,
+      tilesTextColor: Palette.darkBlueCraiola,
+      iconsBackgroundColor: Palette.moderateLavender,
+      iconsColor: PaletteDark.lightBlueGrey,
+      amountBottomBorderColor: Palette.darkBlueCraiola,
+      amountHintTextColor: Palette.darkBlueCraiola);
+
+  @override
+  QRCodeTheme get qrCodeTheme => QRCodeTheme(
+      qrCodeColor: Colors.white,
+      qrWidgetCopyButtonColor: PaletteDark.lightBlueGrey);
+
+  @override
+  OptionTileTheme get optionTileTheme => OptionTileTheme(
+      titleColor: primaryTextColor, descriptionColor: primaryTextColor, useDarkImage: true);
+
+  @override
+  ThemeData get themeData => super.themeData.copyWith(
+      dividerColor: Palette.paleBlue,
+      hintColor: Palette.gray,
+      disabledColor: Palette.darkGray,
+      dialogTheme:
+          super.themeData.dialogTheme.copyWith(backgroundColor: Colors.white));
+}
diff --git a/lib/themes/matrix_green_theme.dart b/lib/themes/matrix_green_theme.dart
new file mode 100644
index 000000000..30e294415
--- /dev/null
+++ b/lib/themes/matrix_green_theme.dart
@@ -0,0 +1,14 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/monero_dark_theme.dart';
+import 'package:flutter/material.dart';
+
+class MatrixGreenTheme extends MoneroDarkTheme {
+  MatrixGreenTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.matrix_green_dark_theme;
+  @override
+  Color get primaryColor => PaletteDark.matrixGreen;
+}
+
diff --git a/lib/themes/monero_dark_theme.dart b/lib/themes/monero_dark_theme.dart
new file mode 100644
index 000000000..53f11716b
--- /dev/null
+++ b/lib/themes/monero_dark_theme.dart
@@ -0,0 +1,197 @@
+import 'package:cake_wallet/themes/dark_theme.dart';
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/alert_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:cake_wallet/themes/extensions/info_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:flutter/material.dart';
+
+class MoneroDarkTheme extends DarkTheme {
+  MoneroDarkTheme({required int raw}) : super(raw: raw);
+
+  @override
+  ThemeType get type => ThemeType.oled;
+  @override
+  String get title => S.current.monero_dark_theme;
+  @override
+  Color get backgroundColor => Colors.black;
+  @override
+  Color get primaryColor => PaletteDark.moneroOrange;
+  @override
+  Color get containerColor => PaletteDark.moneroCard;
+  @override
+  Color get dialogBackgroundColor => containerColor;
+
+  @override
+  CakeScrollbarTheme get scrollbarTheme =>
+      super.scrollbarTheme.copyWith(thumbColor: Colors.grey);
+
+  @override
+  SyncIndicatorTheme get syncIndicatorStyle =>
+      super.syncIndicatorStyle.copyWith(
+          textColor: Colors.white,
+          notSyncedBackgroundColor: Colors.grey.withOpacity(0.2),
+          syncedBackgroundColor: containerColor);
+
+  @override
+  PinCodeTheme get pinCodeTheme => super
+      .pinCodeTheme
+      .copyWith(indicatorsColor: primaryColor, switchColor: Colors.grey);
+
+  @override
+  ExchangePageTheme get exchangePageTheme => super.exchangePageTheme.copyWith(
+      hintTextColor: Colors.grey,
+      qrCodeColor: primaryTextColor,
+      buttonBackgroundColor: colorScheme.surfaceVariant,
+      textFieldButtonColor: colorScheme.onInverseSurface,
+      textFieldBorderBottomPanelColor: colorScheme.surfaceVariant,
+      textFieldBorderTopPanelColor: colorScheme.surfaceVariant,
+      secondGradientBottomPanelColor: containerColor,
+      firstGradientBottomPanelColor: containerColor,
+      secondGradientTopPanelColor: colorScheme.surface,
+      firstGradientTopPanelColor: colorScheme.surface,
+      receiveAmountColor: colorScheme.surfaceVariant);
+
+  @override
+  NewWalletTheme get newWalletTheme => super
+      .newWalletTheme
+      .copyWith(hintTextColor: Colors.grey, underlineColor: Colors.grey);
+
+  @override
+  AddressTheme get addressTheme =>
+      super.addressTheme.copyWith(actionButtonColor: containerColor);
+
+  @override
+  DashboardPageTheme get dashboardPageTheme =>
+      super.dashboardPageTheme.copyWith(
+          pageTitleTextColor: primaryColor,
+          mainActionsIconColor: primaryColor,
+          indicatorDotTheme: IndicatorDotTheme(
+              indicatorColor: colorScheme.secondaryContainer,
+              activeIndicatorColor: colorScheme.inversePrimary));
+  @override
+  BalancePageTheme get balancePageTheme => super.balancePageTheme.copyWith(
+      cardBorderColor: primaryColor.withOpacity(0.2),
+      labelTextColor: Colors.grey,
+      balanceAmountColor: primaryColor,
+      assetTitleColor: primaryColor);
+
+  @override
+  CakeMenuTheme get menuTheme => super.menuTheme.copyWith(
+      headerFirstGradientColor: primaryColor,
+      headerSecondGradientColor: containerColor,
+      backgroundColor: containerColor,
+      subnameTextColor: Colors.grey,
+      dividerColor: colorScheme.secondaryContainer,
+      iconColor: Colors.white,
+      settingActionsIconColor: colorScheme.secondaryContainer);
+
+  @override
+  FilterTheme get filterTheme => super.filterTheme.copyWith(
+      checkboxFirstGradientColor: colorScheme.secondaryContainer,
+      checkboxSecondGradientColor: colorScheme.inversePrimary,
+      checkboxBoundsColor: PaletteDark.wildVioletBlue,
+      checkboxBackgroundColor: PaletteDark.wildVioletBlue.withOpacity(0.3),
+      buttonColor: containerColor,
+      iconColor: Colors.grey);
+
+  @override
+  WalletListTheme get walletListTheme => super.walletListTheme.copyWith(
+      restoreWalletButtonTextColor: Colors.white,
+      createNewWalletButtonBackgroundColor: primaryColor);
+
+  @override
+  InfoTheme get infoTheme => super.infoTheme.copyWith(textColor: Colors.grey);
+
+  @override
+  PickerTheme get pickerTheme =>
+      super.pickerTheme.copyWith(dividerColor: Colors.grey.withOpacity(0.5));
+
+  @override
+  SendPageTheme get sendPageTheme => super.sendPageTheme.copyWith(
+      templateNewTextColor:
+          dashboardPageTheme.indicatorDotTheme.activeIndicatorColor,
+      templateTitleColor: primaryTextColor,
+      templateBackgroundColor: containerColor,
+      templateDottedBorderColor: colorScheme.primaryContainer,
+      templateSelectedCurrencyTitleColor: Colors.black,
+      textFieldButtonIconColor: colorScheme.inverseSurface,
+      textFieldButtonColor: colorScheme.onInverseSurface,
+      textFieldHintColor: Colors.grey.withOpacity(0.5),
+      textFieldBorderColor: Colors.grey.withOpacity(0.5),
+      secondGradientColor: containerColor,
+      firstGradientColor: containerColor,
+      indicatorDotColor: dashboardPageTheme.indicatorDotTheme.indicatorColor);
+
+  @override
+  SeedWidgetTheme get seedWidgetTheme =>
+      super.seedWidgetTheme.copyWith(hintTextColor: Colors.grey);
+
+  @override
+  TransactionTradeTheme get transactionTradeTheme => super
+      .transactionTradeTheme
+      .copyWith(detailsTitlesColor: Colors.grey, rowsColor: containerColor);
+
+  @override
+  CakeTextTheme get cakeTextTheme => super.cakeTextTheme.copyWith(
+      secondaryTextColor: Colors.grey,
+      addressButtonBorderColor: primaryColor.withOpacity(0.2),
+      dateSectionRowColor: Colors.grey,
+      textfieldUnderlineColor: Colors.grey.withOpacity(0.5));
+
+  @override
+  AccountListTheme get accountListTheme =>
+      super.accountListTheme.copyWith(tilesBackgroundColor: containerColor);
+
+  @override
+  ReceivePageTheme get receivePageTheme => super.receivePageTheme.copyWith(
+      currentTileBackgroundColor: primaryColor,
+      currentTileTextColor: Colors.white,
+      tilesBackgroundColor: containerColor,
+      iconsBackgroundColor: colorScheme.onInverseSurface,
+      iconsColor: colorScheme.inverseSurface,
+      amountBottomBorderColor: Colors.grey,
+      amountHintTextColor: Colors.grey);
+
+  @override
+  QRCodeTheme get qrCodeTheme => QRCodeTheme(
+      qrCodeColor: Colors.grey, qrWidgetCopyButtonColor: Colors.grey);
+
+  @override
+  AlertTheme get alertTheme => super
+      .alertTheme
+      .copyWith(backdropColor: colorScheme.surface.withOpacity(0.75));
+
+  @override
+  ThemeData get themeData => super.themeData.copyWith(
+      dividerColor: pickerTheme.dividerColor,
+      hintColor: Colors.grey,
+      dialogTheme:
+          super.themeData.dialogTheme.copyWith(backgroundColor: containerColor),
+      appBarTheme: super.themeData.appBarTheme.copyWith(
+          titleTextStyle: super
+              .themeData
+              .appBarTheme
+              .titleTextStyle!
+              .copyWith(color: primaryColor)));
+}
diff --git a/lib/themes/monero_light_theme.dart b/lib/themes/monero_light_theme.dart
new file mode 100644
index 000000000..cf046e736
--- /dev/null
+++ b/lib/themes/monero_light_theme.dart
@@ -0,0 +1,159 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/alert_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:cake_wallet/themes/light_theme.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:flutter/material.dart';
+
+class MoneroLightTheme extends LightTheme {
+  MoneroLightTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.monero_light_theme;
+  @override
+  Color get primaryColor => Palette.moneroOrange;
+  @override
+  Color get containerColor => Palette.moneroLightOrange;
+  @override
+  Color get primaryTextColor => colorScheme.onPrimaryContainer;
+  @override
+  Color get dialogBackgroundColor => containerColor;
+
+  @override
+  SyncIndicatorTheme get syncIndicatorStyle =>
+      super.syncIndicatorStyle.copyWith(
+          textColor: primaryTextColor,
+          syncedBackgroundColor: colorScheme.primaryContainer,
+          notSyncedBackgroundColor: containerColor.withOpacity(0.75));
+
+  @override
+  ExchangePageTheme get exchangePageTheme => super.exchangePageTheme.copyWith(
+      qrCodeColor: primaryTextColor,
+      buttonBackgroundColor: containerColor,
+      secondGradientBottomPanelColor: primaryColor.withOpacity(0.7),
+      firstGradientBottomPanelColor: colorScheme.primary.withOpacity(0.7),
+      secondGradientTopPanelColor: primaryColor,
+      firstGradientTopPanelColor: colorScheme.primary,
+      textFieldBorderBottomPanelColor: colorScheme.surfaceVariant,
+      textFieldBorderTopPanelColor: colorScheme.surfaceVariant,
+      receiveAmountColor: colorScheme.surfaceVariant);
+
+  @override
+  NewWalletTheme get newWalletTheme => super.newWalletTheme.copyWith(
+      hintTextColor: colorScheme.secondary,
+      underlineColor: colorScheme.secondary);
+
+  @override
+  AddressTheme get addressTheme =>
+      super.addressTheme.copyWith(actionButtonColor: containerColor);
+
+  @override
+  DashboardPageTheme get dashboardPageTheme =>
+      super.dashboardPageTheme.copyWith(
+          indicatorDotTheme: IndicatorDotTheme(
+              indicatorColor: colorScheme.secondaryContainer,
+              activeIndicatorColor: colorScheme.inversePrimary));
+  @override
+  BalancePageTheme get balancePageTheme => super.balancePageTheme.copyWith(
+      textColor: primaryTextColor.withOpacity(0.67),
+      labelTextColor: colorScheme.secondary);
+
+  @override
+  CakeMenuTheme get menuTheme => super.menuTheme.copyWith(
+      headerFirstGradientColor: colorScheme.primary,
+      headerSecondGradientColor: primaryColor,
+      dividerColor: colorScheme.secondaryContainer,
+      iconColor: colorScheme.secondaryContainer,
+      settingActionsIconColor: colorScheme.secondary);
+
+  @override
+  FilterTheme get filterTheme => super.filterTheme.copyWith(
+      checkboxFirstGradientColor: colorScheme.secondaryContainer,
+      checkboxSecondGradientColor: colorScheme.inversePrimary,
+      checkboxBoundsColor: PaletteDark.wildVioletBlue,
+      checkboxBackgroundColor: PaletteDark.wildVioletBlue.withOpacity(0.3),
+      buttonColor: containerColor,
+      iconColor: colorScheme.secondary);
+
+  @override
+  WalletListTheme get walletListTheme => super.walletListTheme.copyWith(
+      restoreWalletButtonTextColor: Colors.white,
+      createNewWalletButtonBackgroundColor: primaryColor);
+
+  @override
+  SendPageTheme get sendPageTheme => super.sendPageTheme.copyWith(
+      templateTitleColor: primaryTextColor,
+      templateBackgroundColor: containerColor,
+      templateNewTextColor: primaryTextColor,
+      templateDottedBorderColor: colorScheme.primaryContainer,
+      secondGradientColor: primaryColor,
+      firstGradientColor: colorScheme.primary,
+      indicatorDotColor: dashboardPageTheme.indicatorDotTheme.indicatorColor);
+
+  @override
+  SeedWidgetTheme get seedWidgetTheme =>
+      super.seedWidgetTheme.copyWith(hintTextColor: colorScheme.secondary);
+
+  @override
+  TransactionTradeTheme get transactionTradeTheme =>
+      super.transactionTradeTheme.copyWith(
+          detailsTitlesColor: colorScheme.secondary, rowsColor: containerColor);
+
+  @override
+  CakeTextTheme get cakeTextTheme => super.cakeTextTheme.copyWith(
+      titleColor: primaryTextColor,
+      secondaryTextColor: colorScheme.secondary,
+      addressButtonBorderColor: primaryColor.withOpacity(0.2),
+      dateSectionRowColor: colorScheme.secondary,
+      textfieldUnderlineColor: colorScheme.secondary.withOpacity(0.5));
+
+  @override
+  AccountListTheme get accountListTheme =>
+      super.accountListTheme.copyWith(tilesBackgroundColor: containerColor);
+
+  @override
+  ReceivePageTheme get receivePageTheme => super.receivePageTheme.copyWith(
+      currentTileBackgroundColor: primaryColor,
+      tilesBackgroundColor: containerColor,
+      tilesTextColor: primaryTextColor,
+      iconsBackgroundColor: colorScheme.surfaceVariant,
+      iconsColor: colorScheme.onSurfaceVariant,
+      amountBottomBorderColor: primaryTextColor,
+      amountHintTextColor: primaryTextColor,
+      currentTileTextColor: Colors.white);
+
+  @override
+  QRCodeTheme get qrCodeTheme => super
+      .qrCodeTheme
+      .copyWith(qrWidgetCopyButtonColor: colorScheme.secondary);
+
+  @override
+  AlertTheme get alertTheme => super
+      .alertTheme
+      .copyWith(backdropColor: colorScheme.inverseSurface.withOpacity(0.75));
+
+  @override
+  ThemeData get themeData => super.themeData.copyWith(
+      dividerColor: pickerTheme.dividerColor,
+      hintColor: colorScheme.secondary,
+      dialogTheme: super
+          .themeData
+          .dialogTheme
+          .copyWith(backgroundColor: containerColor));
+}
diff --git a/lib/themes/red_dark_theme.dart b/lib/themes/red_dark_theme.dart
new file mode 100644
index 000000000..d378fc66a
--- /dev/null
+++ b/lib/themes/red_dark_theme.dart
@@ -0,0 +1,13 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/monero_dark_theme.dart';
+import 'package:flutter/material.dart';
+
+class RedDarkTheme extends MoneroDarkTheme {
+  RedDarkTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.red_dark_theme;
+  @override
+  Color get primaryColor => PaletteDark.red;
+}
\ No newline at end of file
diff --git a/lib/themes/red_light_theme.dart b/lib/themes/red_light_theme.dart
new file mode 100644
index 000000000..47a995a11
--- /dev/null
+++ b/lib/themes/red_light_theme.dart
@@ -0,0 +1,13 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/palette.dart';
+import 'package:cake_wallet/themes/monero_light_theme.dart';
+import 'package:flutter/material.dart';
+
+class RedLightTheme extends MoneroLightTheme {
+  RedLightTheme({required int raw}) : super(raw: raw);
+
+  @override
+  String get title => S.current.red_light_theme;
+  @override
+  Color get primaryColor => Palette.darkRed;
+}
\ No newline at end of file
diff --git a/lib/themes/theme_base.dart b/lib/themes/theme_base.dart
new file mode 100644
index 000000000..ad5807db0
--- /dev/null
+++ b/lib/themes/theme_base.dart
@@ -0,0 +1,161 @@
+import 'package:cake_wallet/themes/extensions/account_list_theme.dart';
+import 'package:cake_wallet/themes/extensions/address_theme.dart';
+import 'package:cake_wallet/themes/extensions/alert_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_scrollbar_theme.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:cake_wallet/themes/extensions/indicator_dot_theme.dart';
+import 'package:cake_wallet/themes/extensions/info_theme.dart';
+import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';
+import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/themes/extensions/option_tile_theme.dart';
+import 'package:cake_wallet/themes/extensions/order_theme.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
+import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/placeholder_theme.dart';
+import 'package:cake_wallet/themes/extensions/qr_code_theme.dart';
+import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/seed_widget_theme.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/support_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
+import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
+import 'package:flutter/material.dart';
+
+enum ThemeType { light, bright, dark, oled}
+
+abstract class ThemeBase {
+  ThemeBase({required this.raw}) {
+    colorScheme = ColorScheme.fromSeed(
+        brightness: brightness,
+        seedColor: primaryColor,
+        background: backgroundColor);
+  }
+
+  final int raw;
+  String get title;
+  ThemeType get type;
+
+  @override
+  String toString() {
+    return title;
+  }
+
+  Brightness get brightness;
+  Color get backgroundColor;
+  Color get primaryColor;
+  Color get primaryTextColor;
+  Color get containerColor;
+  Color get dialogBackgroundColor;
+
+  ColorScheme colorScheme = ColorScheme.light();
+
+  ThemeData get generatedThemeData => ThemeData.from(
+      colorScheme: colorScheme,
+      textTheme: TextTheme().apply(fontFamily: 'Lato'));
+
+  DashboardPageTheme get dashboardPageTheme => DashboardPageTheme(
+      firstGradientBackgroundColor: backgroundColor,
+      secondGradientBackgroundColor: backgroundColor,
+      thirdGradientBackgroundColor: backgroundColor,
+      textColor: primaryTextColor,
+      indicatorDotTheme: IndicatorDotTheme(
+          indicatorColor: primaryColor, activeIndicatorColor: backgroundColor));
+
+  CakeScrollbarTheme get scrollbarTheme;
+
+  SyncIndicatorTheme get syncIndicatorStyle;
+
+  KeyboardTheme get keyboardTheme;
+
+  PinCodeTheme get pinCodeTheme;
+
+  SupportPageTheme get supportPageTheme;
+
+  ExchangePageTheme get exchangePageTheme;
+
+  NewWalletTheme get newWalletTheme;
+
+  BalancePageTheme get balancePageTheme;
+
+  AddressTheme get addressTheme;
+
+  CakeMenuTheme get menuTheme;
+
+  FilterTheme get filterTheme;
+
+  WalletListTheme get walletListTheme;
+
+  InfoTheme get infoTheme;
+
+  PickerTheme get pickerTheme;
+
+  AlertTheme get alertTheme;
+
+  OrderTheme get orderTheme;
+
+  SendPageTheme get sendPageTheme;
+
+  SeedWidgetTheme get seedWidgetTheme;
+
+  PlaceholderTheme get placeholderTheme;
+
+  TransactionTradeTheme get transactionTradeTheme;
+
+  CakeTextTheme get cakeTextTheme;
+
+  AccountListTheme get accountListTheme;
+
+  ReceivePageTheme get receivePageTheme;
+
+  QRCodeTheme get qrCodeTheme;
+
+  OptionTileTheme get optionTileTheme;
+
+  ThemeData get themeData => generatedThemeData.copyWith(
+      primaryColor: primaryColor,
+      cardColor: containerColor,
+      dialogBackgroundColor: dialogBackgroundColor,
+      extensions: [
+        dashboardPageTheme,
+        scrollbarTheme,
+        syncIndicatorStyle,
+        keyboardTheme,
+        pinCodeTheme,
+        supportPageTheme,
+        exchangePageTheme,
+        newWalletTheme,
+        balancePageTheme,
+        addressTheme,
+        menuTheme,
+        filterTheme,
+        walletListTheme,
+        infoTheme,
+        pickerTheme,
+        alertTheme,
+        orderTheme,
+        sendPageTheme,
+        seedWidgetTheme,
+        placeholderTheme,
+        transactionTradeTheme,
+        cakeTextTheme,
+        accountListTheme,
+        receivePageTheme,
+        qrCodeTheme,
+        optionTileTheme
+      ],
+      scrollbarTheme: generatedThemeData.scrollbarTheme.copyWith(
+          thumbColor: MaterialStateProperty.all(scrollbarTheme.thumbColor),
+          trackColor: MaterialStateProperty.all(scrollbarTheme.trackColor),
+          radius: Radius.circular(3),
+          thickness: MaterialStateProperty.all(6),
+          thumbVisibility: MaterialStateProperty.all(true),
+          crossAxisMargin: 6),
+      appBarTheme: generatedThemeData.appBarTheme.copyWith(
+          titleTextStyle: TextStyle(color: cakeTextTheme.titleColor)));
+}
diff --git a/lib/themes/theme_classes/dark_theme.dart b/lib/themes/theme_classes/dark_theme.dart
deleted file mode 100644
index 911800a5c..000000000
--- a/lib/themes/theme_classes/dark_theme.dart
+++ /dev/null
@@ -1,234 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-
-class DarkTheme extends MaterialThemeBase {
-  @override
-  Brightness get brightness => Brightness.dark;
-
-  @override
-  ThemeMode get themeMode => ThemeMode.dark;
-
-  @override
-  Color get primaryColor => const Color(0xFF91B0FF);
-
-  @override
-  Color get secondaryColor => const Color(0xFFA1B9FF);
-
-  @override
-  Color get errorColor => const Color(0xFFFFB4AB);
-
-  @override
-  Color get surfaceColor => const Color(0xFF1B284A);
-
-  @override
-  Color get tertiaryColor => const Color(0xFF162028);
-
-  @override
-  ColorScheme get colorScheme => ColorScheme.dark(
-        primary: primaryColor,
-        onPrimary: const Color(0xFF002860),
-        primaryContainer: const Color(0xFF004C9E),
-        onPrimaryContainer: const Color(0xFFFFF3F0),
-        secondary: secondaryColor,
-        onSecondary: const Color(0xFF0C1C58),
-        secondaryContainer: const Color(0xFF1A3C6C),
-        onSecondaryContainer: const Color(0xFFBACBFF),
-        tertiary: tertiaryColor,
-        onTertiary: const Color(0xFF2B373F),
-        tertiaryContainer: const Color(0xFF1F2832),
-        onTertiaryContainer: const Color(0xFFA8B3C6),
-        error: errorColor,
-        onError: const Color(0xFFB71919),
-        errorContainer: const Color(0xFFC53636),
-        onErrorContainer: const Color(0xFFFFDAD6),
-        surface: surfaceColor,
-        onSurface: const Color(0xFFD7E2F7),
-        onSurfaceVariant: const Color(0xFF8C9FBB),
-        surfaceContainerLowest: Color(0xFF171C30),
-        surfaceContainerLow: Color(0xFF2D385C),
-        surfaceContainer: Color(0xFF24335B),
-        surfaceContainerHigh: Color(0xFF212C47),
-        surfaceContainerHighest: Color(0xFF2A3B67),
-        outline: const Color(0xFF9EACC1),
-        outlineVariant: const Color(0xFF3E5579),
-      );
-  static const String fontFamily = 'Lato';
-  @override
-  TextTheme get textTheme => TextTheme(
-        displayLarge: TextStyle(
-          fontSize: 57,
-          fontWeight: FontWeight.w400,
-          letterSpacing: -0.25,
-          color: colorScheme.onSurface,
-        ),
-        displayMedium: TextStyle(
-          fontSize: 45,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        displaySmall: TextStyle(
-          fontSize: 36,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        headlineLarge: TextStyle(
-          fontSize: 32,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        headlineMedium: TextStyle(
-          fontSize: 28,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        headlineSmall: TextStyle(
-          fontSize: 24,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        titleLarge: TextStyle(
-          fontSize: 22,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        titleMedium: TextStyle(
-          fontSize: 16,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.15,
-          color: colorScheme.onSurface,
-        ),
-        titleSmall: TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.1,
-          color: colorScheme.onSurface,
-        ),
-        bodyLarge: TextStyle(
-          fontSize: 16,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0.5,
-          color: colorScheme.onSurface,
-        ),
-        bodyMedium: TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0.25,
-          color: colorScheme.onSurface,
-        ),
-        bodySmall: TextStyle(
-          fontSize: 12,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0.4,
-          color: colorScheme.onSurface,
-        ),
-        labelLarge: TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.1,
-          color: colorScheme.onSurface,
-        ),
-        labelMedium: TextStyle(
-          fontSize: 12,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.5,
-          color: colorScheme.onSurface,
-        ),
-        labelSmall: TextStyle(
-          fontSize: 10,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.5,
-          color: colorScheme.onSurface,
-        ),
-      );
-
-  @override
-  ThemeData get themeData => ThemeData(
-        useMaterial3: true,
-        fontFamily: fontFamily,
-        brightness: brightness,
-        colorScheme: colorScheme,
-        textTheme: textTheme,
-        appBarTheme: AppBarTheme(
-          backgroundColor: colorScheme.surface,
-          foregroundColor: colorScheme.onSurface,
-          elevation: 0,
-        ),
-        cardTheme: CardTheme(
-          color: colorScheme.surface,
-          elevation: 1,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-          ),
-        ),
-        elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
-            backgroundColor: colorScheme.primary,
-            foregroundColor: colorScheme.onPrimary,
-            elevation: 0,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(10),
-            ),
-          ),
-        ),
-        outlinedButtonTheme: OutlinedButtonThemeData(
-          style: OutlinedButton.styleFrom(
-            foregroundColor: colorScheme.primary,
-            side: BorderSide(color: colorScheme.outline),
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(10),
-            ),
-          ),
-        ),
-        textButtonTheme: TextButtonThemeData(
-          style: TextButton.styleFrom(
-            foregroundColor: colorScheme.primary,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(10),
-            ),
-          ),
-        ),
-        inputDecorationTheme: InputDecorationTheme(
-          filled: true,
-          fillColor: colorScheme.surfaceContainer,
-          border: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide.none,
-          ),
-          enabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide.none,
-          ),
-          focusedBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide(color: colorScheme.primary),
-          ),
-          errorBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide(color: colorScheme.error),
-          ),
-          focusedErrorBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide(color: colorScheme.error),
-          ),
-          disabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide.none,
-          ),
-        ),
-      );
-
-  @override
-  String get title => 'Dark Theme';
-
-  @override
-  ThemeType get type => ThemeType.dark;
-
-  @override
-  int get raw => 1;
-}
diff --git a/lib/themes/theme_classes/light_theme.dart b/lib/themes/theme_classes/light_theme.dart
deleted file mode 100644
index c0613e53a..000000000
--- a/lib/themes/theme_classes/light_theme.dart
+++ /dev/null
@@ -1,231 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-
-class LightTheme extends MaterialThemeBase {
-  @override
-  Brightness get brightness => Brightness.light;
-
-  @override
-  ThemeMode get themeMode => ThemeMode.light;
-
-  @override
-  Color get primaryColor => const Color(0xFF4EBEFF);
-
-  @override
-  Color get secondaryColor => const Color(0xFF625C64);
-
-  @override
-  Color get tertiaryColor => const Color(0xFFBFCBDE);
-
-  @override
-  Color get errorColor => const Color(0xFFBA1A1A);
-
-  @override
-  Color get surfaceColor => const Color(0xFFEFEFF8);
-
-  @override
-  ColorScheme get colorScheme => ColorScheme.light(
-        primary: primaryColor,
-        onPrimary: const Color(0xFFFFFFFF),
-        primaryContainer: const Color(0xFF403747),
-        onPrimaryContainer: const Color(0xFFD5C8DC),
-        secondary: secondaryColor,
-        onSecondary: const Color(0xFFFFFFFF),
-        secondaryContainer: const Color(0xFFE1E4EA),
-        onSecondaryContainer: const Color(0xFF4C474E),
-        tertiary: tertiaryColor,
-        onTertiary: const Color(0xFFFFFFFF),
-        tertiaryContainer: const Color(0xFF35404A),
-        onTertiaryContainer: const Color(0xFFC5D7E5),
-        error: errorColor,
-        onError: const Color(0xFFFFFFFF),
-        errorContainer: const Color(0xFFFFBDBD),
-        onErrorContainer: const Color(0xFFE43D3D),
-        surface: surfaceColor,
-        onSurface: const Color(0xFF312938),
-        onSurfaceVariant: const Color(0xFF6C6772),
-        surfaceContainerLowest: Color(0xFFE4E4E4),
-        surfaceContainerLow: Color(0xFFECECED),
-        surfaceContainer: Color(0xFFFBFBFD),
-        surfaceContainerHigh: Color(0xFFFDFDFE),
-        surfaceContainerHighest: Color(0xFFFFFFFF),
-        outline: const Color(0xFF7B757C),
-        outlineVariant: const Color(0xFFCBC4CB),
-      );
-
-  @override
-  TextTheme get textTheme => TextTheme(
-        displayLarge: TextStyle(
-          fontSize: 57,
-          fontWeight: FontWeight.w400,
-          letterSpacing: -0.25,
-          color: colorScheme.onSurface,
-        ),
-        displayMedium: TextStyle(
-          fontSize: 45,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        displaySmall: TextStyle(
-          fontSize: 36,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        headlineLarge: TextStyle(
-          fontSize: 32,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        headlineMedium: TextStyle(
-          fontSize: 28,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        headlineSmall: TextStyle(
-          fontSize: 24,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        titleLarge: TextStyle(
-          fontSize: 22,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0,
-          color: colorScheme.onSurface,
-        ),
-        titleMedium: TextStyle(
-          fontSize: 16,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.15,
-          color: colorScheme.onSurface,
-        ),
-        titleSmall: TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.1,
-          color: colorScheme.onSurface,
-        ),
-        bodyLarge: TextStyle(
-          fontSize: 16,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0.5,
-          color: colorScheme.onSurface,
-        ),
-        bodyMedium: TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0.25,
-          color: colorScheme.onSurface,
-        ),
-        bodySmall: TextStyle(
-          fontSize: 12,
-          fontWeight: FontWeight.w400,
-          letterSpacing: 0.4,
-          color: colorScheme.onSurface,
-        ),
-        labelLarge: TextStyle(
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.1,
-          color: colorScheme.onSurface,
-        ),
-        labelMedium: TextStyle(
-          fontSize: 12,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.5,
-          color: colorScheme.onSurface,
-        ),
-        labelSmall: TextStyle(
-          fontSize: 11,
-          fontWeight: FontWeight.w500,
-          letterSpacing: 0.5,
-          color: colorScheme.onSurface,
-        ),
-      );
-
-  static const String fontFamily = 'Lato';
-  @override
-  ThemeData get themeData => ThemeData(
-        useMaterial3: true,
-        brightness: brightness,
-        colorScheme: colorScheme,
-        fontFamily: fontFamily,
-        textTheme: textTheme,
-        appBarTheme: AppBarTheme(
-          backgroundColor: colorScheme.surface,
-          foregroundColor: colorScheme.onSurface,
-          elevation: 0,
-        ),
-        cardTheme: CardTheme(
-          color: colorScheme.surface,
-          elevation: 1,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(12),
-          ),
-        ),
-        elevatedButtonTheme: ElevatedButtonThemeData(
-          style: ElevatedButton.styleFrom(
-            backgroundColor: colorScheme.primary,
-            foregroundColor: colorScheme.onPrimary,
-            elevation: 0,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(20),
-            ),
-          ),
-        ),
-        outlinedButtonTheme: OutlinedButtonThemeData(
-          style: OutlinedButton.styleFrom(
-            foregroundColor: colorScheme.primary,
-            side: BorderSide(color: colorScheme.outline),
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(20),
-            ),
-          ),
-        ),
-        textButtonTheme: TextButtonThemeData(
-          style: TextButton.styleFrom(
-            foregroundColor: colorScheme.primary,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(20),
-            ),
-          ),
-        ),
-        inputDecorationTheme: InputDecorationTheme(
-          filled: true,
-          fillColor: colorScheme.surfaceContainer,
-          border: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide.none,
-          ),
-          enabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide.none,
-          ),
-          focusedBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide(color: colorScheme.primary),
-          ),
-          errorBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide(color: colorScheme.error),
-          ),
-          focusedErrorBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(10),
-            borderSide: BorderSide(color: colorScheme.error),
-          ),
-        ),
-      );
-
-  @override
-  String get title => 'Light Theme';
-
-  @override
-  ThemeType get type => ThemeType.light;
-
-  @override
-  int get raw => 0;
-}
diff --git a/lib/themes/theme_list.dart b/lib/themes/theme_list.dart
new file mode 100644
index 000000000..3ca7346b3
--- /dev/null
+++ b/lib/themes/theme_list.dart
@@ -0,0 +1,75 @@
+import 'package:cake_wallet/themes/bright_theme.dart';
+import 'package:cake_wallet/themes/dark_theme.dart';
+import 'package:cake_wallet/themes/light_theme.dart';
+import 'package:cake_wallet/themes/monero_light_theme.dart';
+import 'package:cake_wallet/themes/monero_dark_theme.dart';
+import 'package:cake_wallet/themes/cake_dark_theme.dart';
+import 'package:cake_wallet/themes/matrix_green_theme.dart';
+import 'package:cake_wallet/themes/bitcoin_dark_theme.dart';
+import 'package:cake_wallet/themes/bitcoin_light_theme.dart';
+import 'package:cake_wallet/themes/high_contrast_theme.dart';
+import 'package:cake_wallet/themes/red_dark_theme.dart';
+import 'package:cake_wallet/themes/red_light_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
+
+class ThemeList {
+  static final all = [
+    cakeDarkTheme,
+    darkTheme,
+    lightTheme,
+    moneroDarkTheme,
+    moneroLightTheme,
+    brightTheme,
+    bitcoinDarkTheme,
+    bitcoinLightTheme,
+    matrixGreenTheme,
+    redDarkTheme,
+    redLightTheme,
+    highContrastTheme,
+  ];
+
+  static final lightTheme = LightTheme(raw: 0);
+  static final brightTheme = BrightTheme(raw: 1);
+  static final darkTheme = DarkTheme(raw: 2);
+  static final moneroDarkTheme = MoneroDarkTheme(raw: 3);
+  static final moneroLightTheme = MoneroLightTheme(raw: 4);
+  static final matrixGreenTheme = MatrixGreenTheme(raw: 5);
+  static final bitcoinDarkTheme = BitcoinDarkTheme(raw: 6);
+  static final bitcoinLightTheme = BitcoinLightTheme(raw: 7);
+  static final highContrastTheme = HighContrastTheme(raw: 8);
+  static final redLightTheme = RedLightTheme(raw: 9);
+  static final redDarkTheme = RedDarkTheme(raw: 10);
+  static final cakeDarkTheme = CakeDarkTheme(raw: 11);
+
+  static ThemeBase deserialize({required int raw}) {
+    switch (raw) {
+      case 0:
+        return lightTheme;
+      case 1:
+        return brightTheme;
+      case 2:
+        return darkTheme;
+      case 3:
+        return moneroDarkTheme;
+      case 4:
+        return moneroLightTheme;
+      case 5:
+        return matrixGreenTheme;
+      case 6:
+        return bitcoinDarkTheme;
+      case 7:
+        return bitcoinLightTheme;
+      case 8:
+        return highContrastTheme;
+      case 9:
+        return redLightTheme;
+      case 10:
+        return redDarkTheme;
+      case 11:
+        return cakeDarkTheme;
+      default:
+        throw Exception(
+            'Unexpected token raw: $raw for deserialization of ThemeBase');
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/themes/utils/custom_theme_colors.dart b/lib/themes/utils/custom_theme_colors.dart
deleted file mode 100644
index 54f823fc7..000000000
--- a/lib/themes/utils/custom_theme_colors.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'dart:ui';
-
-class CustomThemeColors {
-  static const syncGreen = Color(0xFFFF12A439);
-  static const syncYellow = Color(0xFFFFFB84E);
-
-  static const warningOutlineColorDark = Color(0xFFFFB84E);
-  static const warningContainerColorDark = Color(0xFF8E5800);
-  static const warningContainerColorLight = Color(0xFFFFCC00);
-  static const warningOutlineColorLight = Color(0xFF312938);
-
-  static const backgroundGradientColorDark = Color(0xFF0F1A36);
-  static const backgroundGradientColorLight = Color(0xFFE7E7FD);
-
-  static const cardGradientColorPrimaryDark = Color(0xFF2B3A67);
-  static const cardGradientColorPrimaryLight = Color(0xFFFFFFFF);
-  static const cardGradientColorSecondaryDark = Color(0xFF1C2A4F);
-  static const cardGradientColorSecondaryLight = Color(0xFFF3F3FF);
-
-  static const toggleKnobStateColorLight = Color(0xFFFFFFFF);
-  static const toggleColorOffStateLight = Color(0xFFCACAE7);
-  static const toggleColorOffStateDark = Color(0xFF3A4F88);
-}
diff --git a/lib/themes/utils/theme_list.dart b/lib/themes/utils/theme_list.dart
deleted file mode 100644
index 32c6805a7..000000000
--- a/lib/themes/utils/theme_list.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
-import 'package:cake_wallet/themes/theme_classes/dark_theme.dart';
-import 'package:cake_wallet/themes/theme_classes/light_theme.dart';
-
-class ThemeList {
-  static final all = [
-    darkTheme,
-    lightTheme,
-  ];
-
-  static final lightTheme = LightTheme();
-  static final darkTheme = DarkTheme();
-
-  static MaterialThemeBase deserialize({required int raw}) {
-    switch (raw) {
-      case 0:
-      case 2:
-      case 4:
-      case 5:
-      case 7:
-      case 10:
-      case 11:
-        return lightTheme;
-      case 1:
-      case 3:
-      case 6:
-      case 8:
-      case 9:
-      default:
-        return darkTheme;
-    }
-  }
-}
diff --git a/lib/themes/utils/theme_provider.dart b/lib/themes/utils/theme_provider.dart
deleted file mode 100644
index 89cf05d85..000000000
--- a/lib/themes/utils/theme_provider.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'package:cake_wallet/themes/core/theme_store.dart';
-import 'package:cake_wallet/themes/utils/theme_list.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-
-/// A widget that provides theme management to its descendants.
-/// This widget would wrap the [MaterialApp] in the widget tree.
-class ThemeProvider extends StatelessWidget {
-  final ThemeStore themeStore;
-  final MaterialApp Function(BuildContext, ThemeData, ThemeData?, ThemeMode) materialAppBuilder;
-
-  const ThemeProvider({
-    Key? key,
-    required this.themeStore,
-    required this.materialAppBuilder,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Observer(
-      builder: (_) {
-        final theme = themeStore.currentTheme.themeData;
-        final darkTheme = ThemeList.darkTheme.themeData;
-        final themeMode = themeStore.themeMode;
-
-        return materialAppBuilder(context, theme, darkTheme, themeMode);
-      },
-    );
-  }
-}
diff --git a/lib/tron/cw_tron.dart b/lib/tron/cw_tron.dart
index 395129b8f..2726e873d 100644
--- a/lib/tron/cw_tron.dart
+++ b/lib/tron/cw_tron.dart
@@ -84,7 +84,6 @@ class CWTron extends Tron {
       decimal: token.decimals,
       enabled: token.enabled,
       iconPath: token.iconPath,
-      isPotentialScam: token.isPotentialScam,
     );
     await (wallet as TronWallet).addTronToken(tronToken);
   }
@@ -138,10 +137,4 @@ class CWTron extends Tron {
   List<String> getDefaultTokenContractAddresses() {
     return DefaultTronTokens().initialTronTokens.map((e) => e.contractAddress).toList();
   }
-
-  @override
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) {
-    final tronWallet = wallet as TronWallet;
-    return tronWallet.tronTokenCurrencies.any((element) => element.contractAddress == contractAddress);
-  }
 }
diff --git a/lib/twitter/twitter_api.dart b/lib/twitter/twitter_api.dart
index cccf769ad..5acb00e2a 100644
--- a/lib/twitter/twitter_api.dart
+++ b/lib/twitter/twitter_api.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/twitter/twitter_user.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 
 class TwitterApi {
   static const twitterBearerToken = secrets.twitterBearerToken;
@@ -23,14 +23,13 @@ class TwitterApi {
         path: userPath + userName,
         queryParameters: queryParams);
 
-    final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers).catchError((error) {
+    final response = await http.get(uri, headers: headers).catchError((error) {
       throw Exception('HTTP request failed: $error');
     });
 
     if (response.statusCode != 200) {
       throw Exception('Unexpected http status: ${response.statusCode}');
     }
-    
 
     final Map<String, dynamic> responseJSON = jsonDecode(response.body) as Map<String, dynamic>;
     if (responseJSON['errors'] != null &&
diff --git a/lib/utils/address_formatter.dart b/lib/utils/address_formatter.dart
deleted file mode 100644
index f2083c772..000000000
--- a/lib/utils/address_formatter.dart
+++ /dev/null
@@ -1,161 +0,0 @@
-import 'package:cw_core/wallet_type.dart';
-import 'package:flutter/widgets.dart';
-import 'dart:math' as math;
-
-class AddressFormatter {
-  static Widget buildSegmentedAddress({
-    required String address,
-    WalletType? walletType,
-    required TextStyle evenTextStyle,
-    TextStyle? oddTextStyle,
-    TextAlign? textAlign,
-    bool shouldTruncate = false,
-  }) {
-
-    final cleanAddress = address.replaceAll('bitcoincash:', '');
-    final isMWEB = address.startsWith('ltcmweb');
-    final chunkSize = walletType != null ? _getChunkSize(walletType) : 4;
-
-    if (shouldTruncate) {
-      return _buildTruncatedAddress(
-        address: cleanAddress,
-        isMWEB: isMWEB,
-        chunkSize: chunkSize,
-        evenTextStyle: evenTextStyle,
-        oddTextStyle: oddTextStyle ?? evenTextStyle.copyWith(color: evenTextStyle.color!.withAlpha(150)),
-        textAlign: textAlign,
-      );
-    } else {
-      return _buildFullSegmentedAddress(
-        address: cleanAddress,
-        isMWEB: isMWEB,
-        chunkSize: chunkSize,
-        evenTextStyle: evenTextStyle,
-        oddTextStyle: oddTextStyle ?? evenTextStyle.copyWith(color: evenTextStyle.color!.withAlpha(128)),
-        textAlign: textAlign,
-      );
-    }
-  }
-
-  static Widget _buildFullSegmentedAddress({
-    required String address,
-    required bool isMWEB,
-    required int chunkSize,
-    required TextStyle evenTextStyle,
-    required TextStyle oddTextStyle,
-    TextAlign? textAlign,
-  }) {
-
-    final chunks = <String>[];
-
-    if (isMWEB) {
-      const mwebDisplayPrefix = 'ltcmweb';
-      chunks.add(mwebDisplayPrefix);
-      final startIndex = mwebDisplayPrefix.length;
-      for (int i = startIndex; i < address.length; i += chunkSize) {
-        final chunk = address.substring(
-          i,
-          math.min(i + chunkSize, address.length),
-        );
-        chunks.add(chunk);
-      }
-    } else {
-      for (int i = 0; i < address.length; i += chunkSize) {
-        final chunk = address.substring(
-          i,
-          math.min(i + chunkSize, address.length),
-        );
-        chunks.add(chunk);
-      }
-    }
-
-    final spans = <TextSpan>[];
-    for (int i = 0; i < chunks.length; i++) {
-      final style = (i % 2 == 0) ? evenTextStyle : oddTextStyle;
-      spans.add(TextSpan(text: '${chunks[i]} ', style: style));
-    }
-
-    return RichText(
-      text: TextSpan(children: spans),
-      textAlign: textAlign ?? TextAlign.start,
-      overflow: TextOverflow.visible,
-    );
-  }
-
-  static Widget _buildTruncatedAddress({
-    required String address,
-    required bool isMWEB,
-    required int chunkSize,
-    required TextStyle evenTextStyle,
-    required TextStyle oddTextStyle,
-    TextAlign? textAlign,
-  }) {
-
-    if (isMWEB) {
-      const fixedPrefix = 'ltcmweb';
-      final secondChunkStart = fixedPrefix.length;
-      const chunkSize = 4;
-      final secondChunk = address.substring(
-        secondChunkStart,
-        math.min(secondChunkStart + chunkSize, address.length),
-      );
-      final lastChunk = address.substring(address.length - chunkSize);
-
-      final spans = <TextSpan>[
-        TextSpan(text: '$fixedPrefix ', style: evenTextStyle),
-        TextSpan(text: '$secondChunk ', style: oddTextStyle),
-        TextSpan(text: '... ', style: oddTextStyle),
-        TextSpan(text: lastChunk, style: evenTextStyle),
-      ];
-
-      return RichText(
-        text: TextSpan(children: spans),
-        textAlign: textAlign ?? TextAlign.start,
-        overflow: TextOverflow.visible,
-      );
-    } else {
-      final int digitCount = chunkSize;
-
-      if (address.length <= 2 * digitCount) {
-        return _buildFullSegmentedAddress(
-          address: address,
-          isMWEB: isMWEB,
-          chunkSize: chunkSize,
-          evenTextStyle: evenTextStyle,
-          oddTextStyle: oddTextStyle,
-          textAlign: textAlign,
-        );
-      }
-
-      final String firstPart = address.substring(0, digitCount);
-      final String secondPart =
-      address.substring(digitCount, digitCount * 2);
-      final String lastPart =
-      address.substring(address.length - digitCount);
-
-      final spans = <TextSpan>[
-        TextSpan(text: '$firstPart ', style: evenTextStyle),
-        TextSpan(text: '$secondPart ', style: oddTextStyle),
-        TextSpan(text: '... ', style: oddTextStyle),
-        TextSpan(text: lastPart, style: evenTextStyle),
-      ];
-
-      return RichText(
-        text: TextSpan(children: spans),
-        textAlign: textAlign ?? TextAlign.start,
-        overflow: TextOverflow.visible,
-      );
-    }
-  }
-
-  static int _getChunkSize(WalletType walletType) {
-    switch (walletType) {
-      case WalletType.monero:
-      case WalletType.wownero:
-      case WalletType.zano:
-        return 6;
-      default:
-        return 4;
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/utils/exception_handler.dart b/lib/utils/exception_handler.dart
index 0f80fa737..547ffa571 100644
--- a/lib/utils/exception_handler.dart
+++ b/lib/utils/exception_handler.dart
@@ -4,10 +4,8 @@ import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/main.dart';
-import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/utils/package_info.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cw_core/root_dir.dart';
@@ -17,12 +15,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mailer/flutter_mailer.dart';
+import 'package:cake_wallet/utils/package_info.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class ExceptionHandler {
   static bool _hasError = false;
-  static const _coolDownDurationInDays =
-      bool.fromEnvironment('hasDevOptions', defaultValue: kDebugMode) ? 0 : 7;
+  static const _coolDownDurationInDays = 7;
   static File? _file;
 
   static Future<void> _saveException(String? error, StackTrace? stackTrace,
@@ -114,8 +112,6 @@ class ExceptionHandler {
   }
 
   static Future<void> onError(FlutterErrorDetails errorDetails) async {
-    if (await onLedgerError(errorDetails)) return;
-
     if (kDebugMode || kProfileMode) {
       FlutterError.presentError(errorDetails);
       printV(errorDetails.toString());
@@ -186,57 +182,6 @@ class ExceptionHandler {
     _hasError = false;
   }
 
-  static const List<String> _ledgerErrors = [
-    'Wrong Device Status',
-    'PlatformException(133, Failed to write: (Unknown Error: 133), null, null)',
-    'PlatformException(IllegalArgument, Unknown deviceId:',
-    'ServiceNotSupportedException(ConnectionType.ble, Required service not supported. Write characteristic: false, Notify characteristic: false)',
-    'Exception: 6e01', // Wrong App
-    'Exception: 6d02',
-    'Exception: 6511',
-    'Exception: 6e00',
-    'Exception: 6985',
-    'Exception: 5515',
-  ];
-
-  static bool isLedgerError(Object exception) =>
-      _ledgerErrors.any((element) => exception.toString().contains(element));
-
-  static Future<bool> onLedgerError(FlutterErrorDetails errorDetails) async {
-    if (!isLedgerError(errorDetails.exception)) return false;
-
-    String? interpretErrorCode(String errorCode) {
-      if (errorCode.contains("6985")) {
-        return S.current.ledger_error_tx_rejected_by_user;
-      } else if (errorCode.contains("5515")) {
-        return S.current.ledger_error_device_locked;
-      } else
-      if (["6e01", "6d02", "6511", "6e00"].any((e) => errorCode.contains(e))) {
-        return S.current.ledger_error_wrong_app;
-      }
-      return null;
-    }
-
-    printV(errorDetails.exception);
-
-    if (navigatorKey.currentContext != null) {
-      await showPopUp<void>(
-        context: navigatorKey.currentContext!,
-        builder: (context) => AlertWithOneAction(
-          alertTitle: "Ledger Error",
-          alertContent:
-              interpretErrorCode(errorDetails.exception.toString()) ??
-                  S.of(context).ledger_connection_error,
-          buttonText: S.of(context).close,
-          buttonAction: () => Navigator.of(context).pop(),
-        ),
-      );
-    }
-
-    _hasError = false;
-    return true;
-  }
-
   /// Ignore User related errors or system errors
   static bool _ignoreError(String error) =>
       _ignoredErrors.any((element) => error.contains(element));
@@ -273,28 +218,18 @@ class ExceptionHandler {
     "invalid password",
     "NetworkImage._loadAsync",
     "SSLV3_ALERT_BAD_RECORD_MAC",
-    "PlatformException(already_active, File picker is already active",
-    // SVG-related errors
-    "SvgParser",
-    "SVG parsing error",
-    "Invalid SVG",
-    "SVG format error",
-    "SvgPicture",
     // Temporary ignored, More context: Flutter secure storage reads the values as null some times
     // probably when the device was locked and then opened on Cake
     // this is solved by a restart of the app
     // just ignoring until we find a solution to this issue or migrate from flutter secure storage
     "core/auth_service.dart:64",
     "core/key_service.dart:14",
-    "core/wallet_loading_service.dart:139",
-    "Wrong Device Status: 0x5515 (UNKNOWN)",
+    "core/wallet_loading_service.dart:131",
   ];
 
   static Future<void> _addDeviceInfo(File file) async {
     final packageInfo = await PackageInfo.fromPlatform();
     final currentVersion = packageInfo.version;
-    final appName = packageInfo.appName;
-    final package = packageInfo.packageName;
 
     final deviceInfoPlugin = DeviceInfoPlugin();
     Map<String, dynamic> deviceInfo = {};
@@ -317,7 +252,7 @@ class ExceptionHandler {
     }
 
     await file.writeAsString(
-      "App Version: $currentVersion\nApp Name: $appName\nPackage: $package\n\nDevice Info $deviceInfo\n\n",
+      "App Version: $currentVersion\n\nDevice Info $deviceInfo\n\n",
       mode: FileMode.append,
     );
   }
diff --git a/lib/utils/feature_flag.dart b/lib/utils/feature_flag.dart
index b9314bc6e..6e829d474 100644
--- a/lib/utils/feature_flag.dart
+++ b/lib/utils/feature_flag.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/foundation.dart';
-import 'dart:io';
 
 class FeatureFlag {
   static const bool isCakePayEnabled = false;
   static const bool isExolixEnabled = true;
+  static const bool isInAppTorEnabled = false;
   static const bool isBackgroundSyncEnabled = true;
-  static final bool isInAppTorEnabled = (Platform.isAndroid);
   static const int verificationWordsCount = kDebugMode ? 0 : 2;
-  static const bool hasDevOptions = bool.fromEnvironment('hasDevOptions', defaultValue: kDebugMode);
 }
\ No newline at end of file
diff --git a/lib/utils/image_utill.dart b/lib/utils/image_utill.dart
index 40dde7020..746fde453 100644
--- a/lib/utils/image_utill.dart
+++ b/lib/utils/image_utill.dart
@@ -1,17 +1,13 @@
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
 class ImageUtil {
   static Widget getImageFromPath({required String imagePath, double? height, double? width}) {
-    bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https');
-    if (CakeTor.instance.enabled && isNetworkImage) {
-      imagePath = "assets/images/tor_logo.svg";
-      isNetworkImage = false;
-    }
+    final bool isNetworkImage = imagePath.startsWith('http') || imagePath.startsWith('https');
     final bool isSvg = imagePath.endsWith('.svg');
     final double _height = height ?? 35;
     final double _width = width ?? 35;
+
     if (isNetworkImage) {
       return isSvg
           ? SvgPicture.network(
@@ -26,15 +22,6 @@ class ImageUtil {
                   child: CircularProgressIndicator(),
                 ),
               ),
-              errorBuilder: (_, __, ___) {
-                return Container(
-                  height: _height,
-                  width: _width,
-                  child: Center(
-                    child: Icon(Icons.error_outline, color: Colors.grey),
-                  ),
-                );
-              },
             )
           : Image.network(
               key: ValueKey(imagePath),
@@ -63,9 +50,6 @@ class ImageUtil {
                 return Container(
                   height: _height,
                   width: _width,
-                  child: Center(
-                    child: Icon(Icons.error_outline, color: Colors.grey),
-                  ),
                 );
               },
             );
@@ -76,7 +60,6 @@ class ImageUtil {
               height: _height,
               width: _width,
               placeholderBuilder: (_) => Icon(Icons.error),
-              errorBuilder: (_, __, ___) => Icon(Icons.error),
               key: ValueKey(imagePath),
             )
           : Image.asset(
diff --git a/lib/utils/payment_request.dart b/lib/utils/payment_request.dart
index 61889cc2f..42b1d0ff6 100644
--- a/lib/utils/payment_request.dart
+++ b/lib/utils/payment_request.dart
@@ -1,8 +1,8 @@
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/nano/nano.dart';
 
 class PaymentRequest {
-  PaymentRequest(this.address, this.amount, this.note, this.scheme, this.pjUri,
-      {this.callbackUrl, this.callbackMessage});
+  PaymentRequest(this.address, this.amount, this.note, this.scheme, {this.callbackUrl, this.callbackMessage});
 
   factory PaymentRequest.fromUri(Uri? uri) {
     var address = "";
@@ -12,13 +12,8 @@ class PaymentRequest {
     String? walletType;
     String? callbackUrl;
     String? callbackMessage;
-    String? pjUri;
 
     if (uri != null) {
-      if (uri.queryParameters['pj'] != null) {
-        pjUri = uri.toString();
-      }
-
       address = uri.queryParameters['address'] ?? uri.path;
       amount = uri.queryParameters['tx_amount'] ?? uri.queryParameters['amount'] ?? "";
       note = uri.queryParameters['tx_description'] ?? uri.queryParameters['message'] ?? "";
@@ -47,7 +42,6 @@ class PaymentRequest {
       amount,
       note,
       scheme,
-      pjUri,
       callbackUrl: callbackUrl,
       callbackMessage: callbackMessage,
     );
@@ -57,7 +51,6 @@ class PaymentRequest {
   final String amount;
   final String note;
   final String scheme;
-  final String? pjUri;
   final String? callbackUrl;
   final String? callbackMessage;
 }
diff --git a/lib/utils/show_bar.dart b/lib/utils/show_bar.dart
index 1db7f69de..1480b58ac 100644
--- a/lib/utils/show_bar.dart
+++ b/lib/utils/show_bar.dart
@@ -3,37 +3,38 @@ import 'package:flutter/material.dart';
 
 Future<T?> showBar<T>(BuildContext context, String messageText,
     {bool isDark = false,
-    Duration? duration =
-        const Duration(seconds: 1), // pass explicitly by null to make the duration indefinite
+    Duration? duration = const Duration(seconds: 1), // pass explicitly by null to make the duration indefinite
     bool isDismissible = true,
     String? titleText}) async {
   final bar = Flushbar<T>(
     boxShadows: [
       BoxShadow(
-        color: Theme.of(context).colorScheme.surface,
+        color: Colors.black.withOpacity(0.09),
         blurRadius: 8,
         offset: Offset(0, 2),
       )
     ],
-    backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
+    backgroundColor: isDark ? Colors.black : Colors.white,
     borderRadius: BorderRadius.circular(35),
     margin: EdgeInsets.all(50),
     titleText: titleText != null
         ? Text(
             titleText,
             textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 24.0,
-                ),
+            style: TextStyle(
+              color: isDark ? Colors.white : Colors.black,
+              fontWeight: FontWeight.bold,
+              fontSize: 24.0,
+            ),
           )
         : null,
     messageText: Text(
       messageText,
       textAlign: TextAlign.center,
-      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            fontSize: 16,
-          ),
+      style: TextStyle(
+        color: isDark ? Colors.white : Colors.black,
+        fontSize: 16,
+      ),
     ),
     duration: duration,
     isDismissible: isDismissible,
@@ -44,32 +45,24 @@ Future<T?> showBar<T>(BuildContext context, String messageText,
   return bar.show(context);
 }
 
-Flushbar<T> createBar<T>(
-  String text,
-  BuildContext context, {
-  bool isDark = false,
-  Duration? duration =
-      const Duration(seconds: 1), // pass explicitly by null to make the duration indefinite
-  bool isDismissible = true,
-}) {
+Flushbar<T> createBar<T>(String text,
+    {bool isDark = false,
+    Duration? duration = const Duration(seconds: 1), // pass explicitly by null to make the duration indefinite
+    bool isDismissible = true}) {
   return Flushbar<T>(
     boxShadows: [
       BoxShadow(
-        color: Theme.of(context).colorScheme.surface,
+        color: Colors.black.withOpacity(0.09),
         blurRadius: 8,
         offset: Offset(0, 2),
       )
     ],
-    backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
+    backgroundColor: isDark ? Colors.black : Colors.white,
     borderRadius: BorderRadius.circular(35),
     margin: EdgeInsets.all(50),
-    messageText: Text(
-      text,
-      textAlign: TextAlign.center,
-      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            color: Theme.of(context).colorScheme.onSurface,
-          ),
-    ),
+    messageText: Text(text,
+        textAlign: TextAlign.center,
+        style: TextStyle(color: isDark ? Colors.white : Colors.black)),
     duration: duration,
     isDismissible: isDismissible,
     flushbarPosition: FlushbarPosition.TOP,
diff --git a/lib/utils/tor.dart b/lib/utils/tor.dart
deleted file mode 100644
index 233e998eb..000000000
--- a/lib/utils/tor.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-import 'dart:async';
-
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:flutter/material.dart';
-
-bool didTorStart = false;
-Future<void> ensureTorStopped({required BuildContext? context}) async {
-  if (!didTorStart) {
-    printV("Tor hasn't been initialized yet, so it can't be stopped.");
-    return;
-  }
-  BuildContext? dialogContext;
-  if (context != null) dialogContext = await showFullscreenDialog(context);
-  didTorStart = false;
-  printV("Stopping tor");
-  await CakeTor.instance.stop();
-  printV("Tor stopped");
-  if (context != null) dismissFullscreenDialog(dialogContext!);
-}
-
-Future<void> ensureTorStarted({required BuildContext? context}) async {
-  if (didTorStart) {
-    printV("Tor has already started");
-    return;
-  }
-  BuildContext? dialogContext;
-  if (context != null) dialogContext = await showFullscreenDialog(context);
-  didTorStart = true;
-  printV("Starting tor");
-  // var rootToken = RootIsolateToken.instance!;
-  // await Isolate.run(() async {
-  //   BackgroundIsolateBinaryMessenger.ensureInitialized(rootToken);
-  //   await CakeTor.instance.start();
-  // });
-  // second start is fast but populates the values on current thread
-  await CakeTor.instance.start();
-  printV("Tor started");
-  while (!CakeTor.instance.started) {
-    printV("Waiting for tor to start (part 1)");
-    await Future.delayed(const Duration(seconds: 1));
-  }
-  while (CakeTor.instance.port == -1) {
-    printV("Waiting for tor to start (listening on port)");
-    await Future.delayed(const Duration(seconds: 1));
-  }
-  printV("Tor started on port ${CakeTor.instance.port}");
-  if (context != null) dismissFullscreenDialog(dialogContext!);
-}
-
-Future<BuildContext> showFullscreenDialog(BuildContext context) async {
-  BuildContext? dialogContext;
-  unawaited(
-    showDialog(
-      context: context,
-      barrierDismissible: false,
-      builder: (context) {
-        dialogContext = context;
-        return PopScope(
-        canPop: false,
-        child: Container(
-          color: Colors.transparent,
-          child: Center(
-            child: CircularProgressIndicator(
-              color: Colors.white,
-            ),
-            ),
-          ),
-        );
-      },
-    ),
-  );
-  await Future.delayed(const Duration(seconds: 1));
-  return dialogContext!;
-}
-
-Future<void> dismissFullscreenDialog(BuildContext context) async {
-  await Future.delayed(const Duration(seconds: 1));
-  Navigator.of(context).pop();
-}
\ No newline at end of file
diff --git a/lib/view_model/anon_invoice_page_view_model.dart b/lib/view_model/anon_invoice_page_view_model.dart
index 05467bd71..39992dca7 100644
--- a/lib/view_model/anon_invoice_page_view_model.dart
+++ b/lib/view_model/anon_invoice_page_view_model.dart
@@ -107,24 +107,20 @@ abstract class AnonInvoicePageViewModelBase with Store {
         return;
       }
     }
-    try {
-      final result = await anonPayApi.createInvoice(AnonPayRequest(
-        cryptoCurrency: cryptoCurrency,
-        address: address,
-        amount: amount.isEmpty ? null : amount,
-        description: description,
-        email: receipientEmail,
-        name: receipientName,
-        fiatEquivalent:
-        selectedCurrency is FiatCurrency ? (selectedCurrency as FiatCurrency).raw : null,
-      ));
+    final result = await anonPayApi.createInvoice(AnonPayRequest(
+      cryptoCurrency: cryptoCurrency,
+      address: address,
+      amount: amount.isEmpty ? null : amount,
+      description: description,
+      email: receipientEmail,
+      name: receipientName,
+      fiatEquivalent:
+          selectedCurrency is FiatCurrency ? (selectedCurrency as FiatCurrency).raw : null,
+    ));
 
-      _anonpayInvoiceInfoSource.add(result);
+    _anonpayInvoiceInfoSource.add(result);
 
-      state = ExecutedSuccessfullyState(payload: result);
-    } catch (e) {
-      state = FailureState(e.toString());
-    }
+    state = ExecutedSuccessfullyState(payload: result);
   }
 
   @action
@@ -160,16 +156,12 @@ abstract class AnonInvoicePageViewModelBase with Store {
   }
 
   Future<void> _fetchLimits() async {
-    try {
-      final limit = await anonPayApi.fetchLimits(
-        cryptoCurrency: cryptoCurrency,
-        fiatCurrency: selectedCurrency is FiatCurrency ? selectedCurrency as FiatCurrency : null,
-      );
-      minimum = limit.min;
-      maximum = limit.max != null ? limit.max! / 4 : null;
-    } catch (e) {
-      state = FailureState(e.toString());
-    }
+    final limit = await anonPayApi.fetchLimits(
+      cryptoCurrency: cryptoCurrency,
+      fiatCurrency: selectedCurrency is FiatCurrency ? selectedCurrency as FiatCurrency : null,
+    );
+    minimum = limit.min;
+    maximum = limit.max != null ? limit.max! / 4 : null;
   }
 
   @computed
diff --git a/lib/view_model/anonpay_details_view_model.dart b/lib/view_model/anonpay_details_view_model.dart
index ee44d4b37..e83b939cd 100644
--- a/lib/view_model/anonpay_details_view_model.dart
+++ b/lib/view_model/anonpay_details_view_model.dart
@@ -7,7 +7,7 @@ import 'package:cake_wallet/src/screens/trade_details/track_trade_list_item.dart
 import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.dart';
 import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
 import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/date_formatter.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -25,7 +25,7 @@ abstract class AnonpayDetailsViewModelBase with Store {
   AnonpayDetailsViewModelBase(
       {required this.anonPayApi,
       required AnonpayInvoiceInfo anonpayInvoiceInfo,
-      required this.themeStore})
+      required this.settingsStore})
       : items = ObservableList<StandartListItem>(),
         invoiceDetail = anonpayInvoiceInfo {
     _updateItems();
@@ -34,7 +34,7 @@ abstract class AnonpayDetailsViewModelBase with Store {
   }
 
   final AnonPayApi anonPayApi;
-  final ThemeStore themeStore;
+  final SettingsStore settingsStore;
   final AnonpayInvoiceInfo invoiceDetail;
 
   final ObservableList<StandartListItem> items;
diff --git a/lib/view_model/buy/buy_sell_view_model.dart b/lib/view_model/buy/buy_sell_view_model.dart
index fbc091ef3..436f66905 100644
--- a/lib/view_model/buy/buy_sell_view_model.dart
+++ b/lib/view_model/buy/buy_sell_view_model.dart
@@ -12,8 +12,10 @@ import 'package:cake_wallet/entities/provider_types.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cw_core/crypto_currency.dart';
+import 'package:cw_core/currency_for_wallet_type.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
@@ -40,7 +42,7 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
         sortedRecommendedQuotes = ObservableList<Quote>(),
         sortedQuotes = ObservableList<Quote>(),
         paymentMethods = ObservableList<PaymentMethod>(),
-        _appStore = appStore,
+        settingsStore = appStore.settingsStore,
         super(appStore: appStore) {
     const excludeFiatCurrencies = [];
     const excludeCryptoCurrencies = [];
@@ -59,17 +61,21 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
   late Timer bestRateSync;
 
   List<BuyProvider> get availableBuyProviders {
-    final providerTypes = ProvidersHelper.getAvailableBuyProviderTypes();
+    final providerTypes = ProvidersHelper.getAvailableBuyProviderTypes(
+        walletTypeForCurrency(cryptoCurrency) ?? wallet.type);
     return providerTypes
         .map((type) => ProvidersHelper.getProviderByType(type))
+        .where((provider) => provider != null)
         .cast<BuyProvider>()
         .toList();
   }
 
   List<BuyProvider> get availableSellProviders {
-    final providerTypes = ProvidersHelper.getAvailableSellProviderTypes();
+    final providerTypes = ProvidersHelper.getAvailableSellProviderTypes(
+        walletTypeForCurrency(cryptoCurrency) ?? wallet.type);
     return providerTypes
         .map((type) => ProvidersHelper.getProviderByType(type))
+        .where((provider) => provider != null)
         .cast<BuyProvider>()
         .toList();
   }
@@ -79,7 +85,7 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
     cryptoCurrency = wallet.currency;
   }
 
-  bool get isDarkTheme => _appStore.themeStore.currentTheme.isDark;
+  bool get isDarkTheme => settingsStore.currentTheme.type == ThemeType.dark;
 
   double get amount {
     final formattedFiatAmount = double.tryParse(fiatAmount) ?? 200.0;
@@ -89,7 +95,7 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
     return isBuyAction ? formattedFiatAmount : formattedCryptoAmount;
   }
 
-  AppStore _appStore;
+  SettingsStore settingsStore;
 
   Quote? bestRateQuote;
 
@@ -165,7 +171,7 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
   @action
   void reset() {
     cryptoCurrency = wallet.currency;
-    fiatCurrency = _appStore.settingsStore.fiatCurrency;
+    fiatCurrency = settingsStore.fiatCurrency;
     isCryptoCurrencyAddressEnabled = !(cryptoCurrency == wallet.currency);
     _initialize();
   }
@@ -204,12 +210,9 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
 
     final enteredAmount = double.tryParse(amount.replaceAll(',', '.')) ?? 0;
 
-    if (!isReadyToTrade && !isBuySellQuotFailed) {
+    if (!isReadyToTrade) {
       cryptoAmount = S.current.fetching;
       return;
-    } else if (isBuySellQuotFailed) {
-      cryptoAmount = '';
-      return;
     }
 
     if (bestRateQuote != null) {
@@ -235,12 +238,8 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
 
     final enteredAmount = double.tryParse(amount.replaceAll(',', '.')) ?? 0;
 
-    if (!isReadyToTrade && !isBuySellQuotFailed) {
+    if (!isReadyToTrade) {
       fiatAmount = S.current.fetching;
-      return;
-    } else if (isBuySellQuotFailed) {
-      fiatAmount = '';
-      return;
     }
 
     if (bestRateQuote != null) {
@@ -358,23 +357,14 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
           onTimeout: () => [],
         )));
 
-    final List<PaymentMethod> tempPaymentMethods = [];
-
+    final Map<PaymentType, PaymentMethod> uniquePaymentMethods = {};
     for (var methods in result) {
       for (var method in methods) {
-        final alreadyExists = tempPaymentMethods.any((m) {
-          return m.paymentMethodType == method.paymentMethodType &&
-              m.customTitle == method.customTitle;
-        });
-
-        if (!alreadyExists) {
-          tempPaymentMethods.add(method);
-        }
+        uniquePaymentMethods[method.paymentMethodType] = method;
       }
     }
 
-    paymentMethods = ObservableList<PaymentMethod>.of(tempPaymentMethods);
-
+    paymentMethods = ObservableList<PaymentMethod>.of(uniquePaymentMethods.values);
     if (paymentMethods.isNotEmpty) {
       paymentMethods.insert(0, PaymentMethod.all());
       selectedPaymentMethod = paymentMethods.first;
@@ -389,22 +379,7 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
   Future<void> calculateBestRate() async {
     buySellQuotState = BuySellQuotLoading();
 
-    final List<BuyProvider> validProviders = providerList.where((provider) {
-      if (isBuyAction) {
-        return provider.supportedCryptoList.any((pair) =>
-        pair.from == cryptoCurrency && pair.to == fiatCurrency);
-      } else {
-        return provider.supportedFiatList.any((pair) =>
-        pair.from == fiatCurrency && pair.to == cryptoCurrency);
-      }
-    }).toList();
-
-    if (validProviders.isEmpty) {
-      buySellQuotState = BuySellQuotFailed();
-      return;
-    }
-
-    final result = await Future.wait<List<Quote>?>(validProviders.map((element) => element
+    final result = await Future.wait<List<Quote>?>(providerList.map((element) => element
         .fetchQuote(
           cryptoCurrency: cryptoCurrency,
           fiatCurrency: fiatCurrency,
@@ -412,7 +387,6 @@ abstract class BuySellViewModelBase extends WalletChangeListenerViewModel with S
           paymentType: selectedPaymentMethod?.paymentMethodType,
           isBuyAction: isBuyAction,
           walletAddress: wallet.walletAddresses.address,
-          customPaymentMethodType: selectedPaymentMethod?.customPaymentMethodType,
         )
         .timeout(
           Duration(seconds: 10),
diff --git a/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart b/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart
index e777813c7..442bd51b4 100644
--- a/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart
+++ b/lib/view_model/cake_pay/cake_pay_cards_list_view_model.dart
@@ -6,7 +6,6 @@ import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/view_model/dashboard/filter_item.dart';
-import 'package:cw_core/utils/print_verbose.dart';
 import 'package:mobx/mobx.dart';
 
 part 'cake_pay_cards_list_view_model.g.dart';
@@ -136,11 +135,7 @@ abstract class CakePayCardsListViewModelBase with Store {
 
 
   Future<void> getCountries() async {
-    try {
-      availableCountries = await cakePayService.getCountries();
-    } catch (e) {
-      printV(e);
-    }
+    availableCountries = await cakePayService.getCountries();
   }
 
   @action
@@ -149,21 +144,17 @@ abstract class CakePayCardsListViewModelBase with Store {
     int? currentPage,
   }) async {
     vendorsState = CakePayVendorLoadingState();
-    try {
-      searchString = text ?? '';
-      var newVendors = await cakePayService.getVendors(
-          country: Country.getCakePayName(selectedCountry),
-          page: currentPage ?? page,
-          search: searchString,
-          giftCards: displayGiftCards,
-          prepaidCards: displayPrepaidCards,
-          custom: displayCustomValueCards,
-          onDemand: displayDenominationsCards);
+    searchString = text ?? '';
+    var newVendors = await cakePayService.getVendors(
+        country: Country.getCakePayName(selectedCountry),
+        page: currentPage ?? page,
+        search: searchString,
+        giftCards: displayGiftCards,
+        prepaidCards: displayPrepaidCards,
+        custom: displayCustomValueCards,
+        onDemand: displayDenominationsCards);
 
-      cakePayVendors = CakePayVendorList = newVendors;
-    } catch (e) {
-      printV(e);
-    }
+    cakePayVendors = CakePayVendorList = newVendors;
     vendorsState = CakePayVendorLoadedState();
   }
 
diff --git a/lib/view_model/contact_list/contact_view_model.dart b/lib/view_model/contact_list/contact_view_model.dart
index 2030cf03e..efa1f09f4 100644
--- a/lib/view_model/contact_list/contact_view_model.dart
+++ b/lib/view_model/contact_list/contact_view_model.dart
@@ -57,11 +57,7 @@ abstract class ContactViewModelBase with Store {
       state = IsExecutingState();
       final now = DateTime.now();
 
-      final nameExists = _contact == null
-          ? doesContactNameExist(name)
-          : doesContactNameExist(name) && _contact.original.name != name;
-
-      if (nameExists) {
+      if (doesContactNameExist(name)) {
         state = FailureState(S.current.contact_name_exists);
         return;
       }
diff --git a/lib/view_model/dashboard/balance_view_model.dart b/lib/view_model/dashboard/balance_view_model.dart
index ea9272a5c..ef5676138 100644
--- a/lib/view_model/dashboard/balance_view_model.dart
+++ b/lib/view_model/dashboard/balance_view_model.dart
@@ -229,7 +229,7 @@ abstract class BalanceViewModelBase with Store {
                 formattedAssetTitle: _formatterAsset(key)));
       }
       final fiatCurrency = settingsStore.fiatCurrency;
-      final price = key.isPotentialScam ? 0.0 : fiatConvertationStore.prices[key] ?? 0;
+      final price = fiatConvertationStore.prices[key] ?? 0;
 
       // if (price == null) {
       //   throw Exception('Price is null for: $key');
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index eab0c8572..29ccedef2 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -4,6 +4,7 @@ import 'dart:io' show Platform;
 
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/core/background_sync.dart';
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
 import 'package:cake_wallet/entities/balance_display_mode.dart';
@@ -13,16 +14,11 @@ import 'package:cake_wallet/entities/service_status.dart';
 import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/monero/monero.dart';
-import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:cake_wallet/utils/tor.dart';
 import 'package:cake_wallet/wownero/wownero.dart' as wow;
 import 'package:cake_wallet/nano/nano.dart';
 import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/dashboard/orders_store.dart';
-import 'package:cake_wallet/store/dashboard/payjoin_transactions_store.dart';
 import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
@@ -34,11 +30,9 @@ import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/filter_item.dart';
 import 'package:cake_wallet/view_model/dashboard/formatted_item_list.dart';
 import 'package:cake_wallet/view_model/dashboard/order_list_item.dart';
-import 'package:cake_wallet/view_model/dashboard/payjoin_transaction_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/trade_list_item.dart';
 import 'package:cake_wallet/view_model/dashboard/transaction_list_item.dart';
 import 'package:cake_wallet/view_model/settings/sync_mode.dart';
-import 'package:cake_wallet/wownero/wownero.dart' as wow;
 import 'package:cryptography/cryptography.dart';
 import 'package:cw_core/balance.dart';
 import 'package:cw_core/cake_hive.dart';
@@ -52,14 +46,14 @@ import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:eth_sig_util/util/utils.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_daemon/flutter_daemon.dart';
+import 'package:http/http.dart' as http;
 import 'package:mobx/mobx.dart';
-import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:cake_wallet/core/trade_monitor.dart';
+import '../../themes/theme_base.dart';
 
 part 'dashboard_view_model.g.dart';
 
@@ -68,7 +62,6 @@ class DashboardViewModel = DashboardViewModelBase with _$DashboardViewModel;
 abstract class DashboardViewModelBase with Store {
   DashboardViewModelBase(
       {required this.balanceViewModel,
-      required this.tradeMonitor,
       required this.appStore,
       required this.tradesStore,
       required this.tradeFilterStore,
@@ -77,7 +70,6 @@ abstract class DashboardViewModelBase with Store {
       required this.yatStore,
       required this.ordersStore,
       required this.anonpayTransactionsStore,
-      required this.payjoinTransactionsStore,
       required this.sharedPreferences,
       required this.keyService})
       : hasTradeAction = true,
@@ -169,8 +161,8 @@ abstract class DashboardViewModelBase with Store {
             FilterItem(
                 value: () => tradeFilterStore.displaySwapTrade,
                 caption: ExchangeProviderDescription.swapTrade.title,
-                onChanged: () =>
-                    tradeFilterStore.toggleDisplayExchange(ExchangeProviderDescription.swapTrade)),
+                onChanged: () => tradeFilterStore
+                    .toggleDisplayExchange(ExchangeProviderDescription.swapTrade)),
           ]
         },
         subname = '',
@@ -188,7 +180,7 @@ abstract class DashboardViewModelBase with Store {
     isShowThirdYatIntroduction = false;
     unawaited(isBackgroundSyncEnabled());
     unawaited(isBatteryOptimizationEnabled());
-    unawaited(_loadConstraints());
+
     final _wallet = wallet;
 
     if (_wallet.type == WalletType.monero) {
@@ -274,28 +266,37 @@ abstract class DashboardViewModelBase with Store {
     reaction((_) => appStore.wallet, (wallet) {
       _onWalletChange(wallet);
       _checkMweb();
-      showDecredInfoCard = wallet?.type == WalletType.decred &&
-          sharedPreferences.getBool(PreferencesKey.showDecredInfoCard) != false;
-
-      tradeMonitor.stopTradeMonitoring();
-      tradeMonitor.monitorActiveTrades(wallet!.id);
+      showDecredInfoCard = wallet?.type == WalletType.decred;
     });
 
     _transactionDisposer?.reaction.dispose();
-    _transactionDisposer = reaction((_) {
-      final length = appStore.wallet!.transactionHistory.transactions.length;
-      if (length == 0) {
-        return 0;
-      }
-      int confirmations = 1;
-      if (![WalletType.solana, WalletType.tron].contains(wallet.type)) {
-        try {
-          confirmations =
-              appStore.wallet!.transactionHistory.transactions.values.first.confirmations + 1;
-        } catch (_) {}
-      }
-      return length * confirmations;
-    }, _transactionDisposerCallback);
+
+    _transactionDisposer = reaction(
+            (_) => appStore.wallet!.transactionHistory.transactions.values.toList(),
+            (List<TransactionInfo> txs) {
+
+          transactions.clear();
+
+          transactions.addAll(
+            txs.where((tx) {
+              if (wallet.type == WalletType.monero) {
+                return monero!.getTransactionInfoAccountId(tx) == monero!.getCurrentAccount(wallet).id;
+              }
+              if (wallet.type == WalletType.wownero) {
+                return wow.wownero!.getTransactionInfoAccountId(tx) == wow.wownero!.getCurrentAccount(wallet).id;
+              }
+              return true;
+            }).map(
+                  (tx) => TransactionListItem(
+                transaction: tx,
+                balanceViewModel: balanceViewModel,
+                settingsStore: appStore.settingsStore,
+                key: ValueKey('${wallet.type.name}_transaction_history_item_${tx.id}_key'),
+              ),
+            ),
+          );
+        }
+    );
 
     if (hasSilentPayments) {
       silentPaymentsScanningActive = bitcoin!.getScanningActive(wallet);
@@ -307,52 +308,6 @@ abstract class DashboardViewModelBase with Store {
 
     _checkMweb();
     reaction((_) => settingsStore.mwebAlwaysScan, (bool value) => _checkMweb());
-
-    reaction((_) => tradesStore.trades, (_) => tradeMonitor.monitorActiveTrades(wallet.id));
-
-    tradeMonitor.monitorActiveTrades(wallet.id);
-  }
-
-  bool _isTransactionDisposerCallbackRunning = false;
-
-  void _transactionDisposerCallback(int _) async {
-    // Simple check to prevent the callback from being called multiple times in the same frame
-    if (_isTransactionDisposerCallbackRunning) return;
-    _isTransactionDisposerCallbackRunning = true;
-    await Future.delayed(Duration.zero);
-
-    try {
-      final currentAccountId = wallet.type == WalletType.monero
-          ? monero!.getCurrentAccount(wallet).id
-          : wallet.type == WalletType.wownero
-              ? wow.wownero!.getCurrentAccount(wallet).id
-              : null;
-      final List<TransactionInfo> relevantTxs = [];
-
-      for (final tx in appStore.wallet!.transactionHistory.transactions.values) {
-        bool isRelevant = true;
-        if (wallet.type == WalletType.monero) {
-          isRelevant = monero!.getTransactionInfoAccountId(tx) == currentAccountId;
-        } else if (wallet.type == WalletType.wownero) {
-          isRelevant = wow.wownero!.getTransactionInfoAccountId(tx) == currentAccountId;
-        }
-
-        if (isRelevant) {
-          relevantTxs.add(tx);
-        }
-      }
-      // printV("Transaction disposer callback (relevantTxs: ${relevantTxs.length} current: ${transactions.length})");
-
-      transactions.clear();
-      transactions.addAll(relevantTxs.map((tx) => TransactionListItem(
-            transaction: tx,
-            balanceViewModel: balanceViewModel,
-            settingsStore: appStore.settingsStore,
-            key: ValueKey('${wallet.type.name}_transaction_history_item_${tx.id}_key'),
-          )));
-    } finally {
-      _isTransactionDisposerCallbackRunning = false;
-    }
   }
 
   void _checkMweb() {
@@ -383,8 +338,6 @@ abstract class DashboardViewModelBase with Store {
   @observable
   bool isShowThirdYatIntroduction;
 
-  @computed
-  bool get isDarkTheme => appStore.themeStore.currentTheme.isDark;
   @computed
   String get address => wallet.walletAddresses.address;
 
@@ -426,15 +379,10 @@ abstract class DashboardViewModelBase with Store {
       ordersStore.orders.where((item) => item.order.walletId == wallet.id).toList();
 
   @computed
-  List<AnonpayTransactionListItem> get anonpayTransactions => anonpayTransactionsStore.transactions
+  List<AnonpayTransactionListItem> get anonpayTransactons => anonpayTransactionsStore.transactions
       .where((item) => item.transaction.walletId == wallet.id)
       .toList();
 
-  @computed
-  List<PayjoinTransactionListItem> get payjoinTransactions => payjoinTransactionsStore.transactions
-      .where((item) => item.session.walletId == wallet.id)
-      .toList();
-
   @computed
   double get price => balanceViewModel.price;
 
@@ -447,24 +395,10 @@ abstract class DashboardViewModelBase with Store {
     final _items = <ActionListItem>[];
 
     _items.addAll(
-        transactionFilterStore.filtered(transactions: [...transactions, ...anonpayTransactions]));
+        transactionFilterStore.filtered(transactions: [...transactions, ...anonpayTransactons]));
     _items.addAll(tradeFilterStore.filtered(trades: trades, wallet: wallet));
     _items.addAll(orders);
 
-    if (payjoinTransactions.isNotEmpty) {
-      final _payjoinTransactions = payjoinTransactions;
-      _items.forEach((e) {
-        if (e is TransactionListItem &&
-            _payjoinTransactions.any((t) => t.session.txId == e.transaction.id)) {
-          _payjoinTransactions.firstWhere((t) => t.session.txId == e.transaction.id).transaction =
-              e.transaction;
-        }
-      });
-      _items.addAll(_payjoinTransactions);
-      _items.removeWhere((e) => (e is TransactionListItem &&
-          _payjoinTransactions.any((t) => t.session.txId == e.transaction.id)));
-    }
-
     return formattedItemsList(_items);
   }
 
@@ -518,8 +452,7 @@ abstract class DashboardViewModelBase with Store {
       // to not cause work duplication, this will do the job as well, it will be slightly less precise
       // about what happened - but still enough.
       // if (keys['privateSpendKey'] == List.generate(64, (index) => "0").join("")) "Private spend key is 0",
-      if (keys['privateViewKey'] == List.generate(64, (index) => "0").join("") &&
-          !wallet.isHardwareWallet)
+      if (keys['privateViewKey'] == List.generate(64, (index) => "0").join("") && !wallet.isHardwareWallet)
         "private view key is 0",
       // if (keys['publicSpendKey'] == List.generate(64, (index) => "0").join("")) "public spend key is 0",
       if (keys['publicViewKey'] == List.generate(64, (index) => "0").join(""))
@@ -569,12 +502,6 @@ abstract class DashboardViewModelBase with Store {
   @observable
   late bool showDecredInfoCard;
 
-  @computed
-  bool get showPayjoinCard =>
-      wallet.type == WalletType.bitcoin &&
-      settingsStore.showPayjoinCard &&
-      !settingsStore.usePayjoin;
-
   @observable
   bool backgroundSyncEnabled = false;
 
@@ -588,90 +515,6 @@ abstract class DashboardViewModelBase with Store {
     return resp;
   }
 
-  @observable
-  late bool backgroundSyncNotificationsEnabled =
-      sharedPreferences.getBool(PreferencesKey.backgroundSyncNotificationsEnabled) ?? false;
-
-  @action
-  Future<void> setBackgroundSyncNotificationsEnabled(bool value) async {
-    if (!value) {
-      backgroundSyncNotificationsEnabled = false;
-      sharedPreferences.setBool(PreferencesKey.backgroundSyncNotificationsEnabled, false);
-      return;
-    }
-    PermissionStatus permissionStatus = await Permission.notification.status;
-    if (permissionStatus != PermissionStatus.granted) {
-      final resp = await Permission.notification.request();
-      if (resp == PermissionStatus.denied) {
-        throw Exception("Notification permission denied");
-      }
-    }
-    backgroundSyncNotificationsEnabled = value;
-    await sharedPreferences.setBool(PreferencesKey.backgroundSyncNotificationsEnabled, value);
-  }
-
-  bool get hasBgsyncNetworkConstraints => Platform.isAndroid;
-  bool get hasBgsyncBatteryNotLowConstraints => Platform.isAndroid;
-  bool get hasBgsyncChargingConstraints => Platform.isAndroid;
-  bool get hasBgsyncDeviceIdleConstraints => Platform.isAndroid;
-
-  @observable
-  bool backgroundSyncNetworkUnmetered = false;
-
-  @observable
-  bool backgroundSyncBatteryNotLow = false;
-
-  @observable
-  bool backgroundSyncCharging = false;
-
-  @observable
-  bool backgroundSyncDeviceIdle = false;
-
-  Future<void> _loadConstraints() async {
-    if (Platform.isAndroid) {
-      backgroundSyncNetworkUnmetered = await FlutterDaemon().getNetworkType();
-      backgroundSyncBatteryNotLow = await FlutterDaemon().getBatteryNotLow();
-      backgroundSyncCharging = await FlutterDaemon().getRequiresCharging();
-      backgroundSyncDeviceIdle = await FlutterDaemon().getDeviceIdle();
-    }
-  }
-
-  @action
-  Future<void> setBackgroundSyncNetworkUnmetered(bool value) async {
-    backgroundSyncNetworkUnmetered = value;
-    await FlutterDaemon().setNetworkType(value);
-    if (await isBackgroundSyncEnabled()) {
-      await enableBackgroundSync();
-    }
-  }
-
-  @action
-  Future<void> setBackgroundSyncBatteryNotLow(bool value) async {
-    backgroundSyncBatteryNotLow = value;
-    await FlutterDaemon().setBatteryNotLow(value);
-    if (await isBackgroundSyncEnabled()) {
-      await enableBackgroundSync();
-    }
-  }
-
-  @action
-  Future<void> setBackgroundSyncCharging(bool value) async {
-    backgroundSyncCharging = value;
-    await FlutterDaemon().setRequiresCharging(value);
-    if (await isBackgroundSyncEnabled()) {
-      await enableBackgroundSync();
-    }
-  }
-
-  @action
-  Future<void> setBackgroundSyncDeviceIdle(bool value) async {
-    backgroundSyncDeviceIdle = value;
-    await FlutterDaemon().setDeviceIdle(value);
-    if (await isBackgroundSyncEnabled()) {
-      await enableBackgroundSync();
-    }
-  }
-
   bool get hasBatteryOptimization => Platform.isAndroid;
 
   @observable
@@ -710,8 +553,7 @@ abstract class DashboardViewModelBase with Store {
       disableBackgroundSync();
       return;
     }
-    final resp = await FlutterDaemon()
-        .startBackgroundSync(settingsStore.currentSyncMode.frequency.inMinutes);
+    final resp = await FlutterDaemon().startBackgroundSync(settingsStore.currentSyncMode.frequency.inMinutes);
     printV("Background sync enabled: $resp");
     backgroundSyncEnabled = true;
   }
@@ -729,18 +571,28 @@ abstract class DashboardViewModelBase with Store {
   @action
   double getShadowSpread() {
     double spread = 0;
-    if (!appStore.themeStore.currentTheme.isDark)
+    if (settingsStore.currentTheme.type == ThemeType.bright)
+      spread = 0;
+    else if (settingsStore.currentTheme.type == ThemeType.light)
+      spread = 0;
+    else if (settingsStore.currentTheme.type == ThemeType.dark)
+      spread = 0;
+    else if (settingsStore.currentTheme.type == ThemeType.oled)
       spread = 0;
-    else if (appStore.themeStore.currentTheme.isDark) spread = 0;
     return spread;
   }
 
   @action
   double getShadowBlur() {
     double blur = 0;
-    if (!appStore.themeStore.currentTheme.isDark)
+    if (settingsStore.currentTheme.type == ThemeType.bright)
+      blur = 0;
+    else if (settingsStore.currentTheme.type == ThemeType.light)
+      blur = 0;
+    else if (settingsStore.currentTheme.type == ThemeType.dark)
+      blur = 0;
+    else if (settingsStore.currentTheme.type == ThemeType.oled)
       blur = 0;
-    else if (appStore.themeStore.currentTheme.isDark) blur = 0;
     return blur;
   }
 
@@ -772,22 +624,8 @@ abstract class DashboardViewModelBase with Store {
     sharedPreferences.setBool(PreferencesKey.showDecredInfoCard, false);
   }
 
-  @action
-  void dismissPayjoin() {
-    settingsStore.showPayjoinCard = false;
-  }
-
-  @action
-  void enablePayjoin() {
-    settingsStore.usePayjoin = true;
-    settingsStore.showPayjoinCard = false;
-    bitcoin!.updatePayjoinState(wallet, true);
-  }
-
   BalanceViewModel balanceViewModel;
 
-  TradeMonitor tradeMonitor;
-
   AppStore appStore;
 
   SettingsStore settingsStore;
@@ -804,8 +642,6 @@ abstract class DashboardViewModelBase with Store {
 
   TransactionFilterStore transactionFilterStore;
 
-  PayjoinTransactionsStore payjoinTransactionsStore;
-
   Map<String, List<FilterItem>> filterItems;
 
   bool get isBuyEnabled => settingsStore.isBitcoinBuyEnabled;
@@ -951,20 +787,32 @@ abstract class DashboardViewModelBase with Store {
 
     _transactionDisposer?.reaction.dispose();
 
-    _transactionDisposer = reaction((_) {
-      final length = appStore.wallet!.transactionHistory.transactions.length;
-      if (length == 0) {
-        return 0;
-      }
-      int confirmations = 1;
-      if (![WalletType.solana, WalletType.tron].contains(wallet.type)) {
-        try {
-          confirmations =
-              appStore.wallet!.transactionHistory.transactions.values.first.confirmations + 1;
-        } catch (_) {}
-      }
-      return length * confirmations;
-    }, _transactionDisposerCallback);
+    _transactionDisposer = reaction(
+            (_) => appStore.wallet!.transactionHistory.transactions.values.toList(),
+            (List<TransactionInfo> txs) {
+
+          transactions.clear();
+          
+          transactions.addAll(
+            txs.where((tx) {
+              if (wallet.type == WalletType.monero) {
+                return monero!.getTransactionInfoAccountId(tx) == monero!.getCurrentAccount(wallet).id;
+              }
+              if (wallet.type == WalletType.wownero) {
+                return wow.wownero!.getTransactionInfoAccountId(tx) == wow.wownero!.getCurrentAccount(wallet).id;
+              }
+              return true;
+            }).map(
+                  (tx) => TransactionListItem(
+                transaction: tx,
+                balanceViewModel: balanceViewModel,
+                settingsStore: appStore.settingsStore,
+                key: ValueKey('${wallet.type.name}_transaction_history_item_${tx.id}_key'),
+              ),
+            ),
+          );
+        }
+    );
   }
 
   @action
@@ -1031,39 +879,6 @@ abstract class DashboardViewModelBase with Store {
   @computed
   bool get syncAll => settingsStore.currentSyncAll;
 
-  @computed
-  bool get builtinTor => settingsStore.currentBuiltinTor;
-
-  @action
-  void setBuiltinTor(bool value, BuildContext context) {
-    if (value) {
-      unawaited(showPopUp<bool>(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertWithOneAction(
-              alertTitle: S.of(context).tor_connection,
-              alertContent: S.of(context).tor_experimental,
-              buttonText: S.of(context).ok,
-              buttonAction: () => Navigator.of(context).pop(true),
-            );
-          },
-        ),
-      );
-    }
-    settingsStore.currentBuiltinTor = value;
-    if (value) {
-      unawaited(ensureTorStarted(context: context).then((_) async {
-        if (settingsStore.currentBuiltinTor == false) return; // return when tor got disabled in the meantime;
-        await wallet.connectToNode(node: appStore.settingsStore.getCurrentNode(wallet.type));
-      }));
-    } else {
-      unawaited(ensureTorStopped(context: context).then((_) async {
-        if (settingsStore.currentBuiltinTor == true) return; // return when tor got enabled in the meantime;
-        await wallet.connectToNode(node: appStore.settingsStore.getCurrentNode(wallet.type));
-      }));
-    }
-  }
-  
   @action
   void setSyncAll(bool value) => settingsStore.currentSyncAll = value;
 
@@ -1110,31 +925,17 @@ abstract class DashboardViewModelBase with Store {
     }
   }
 
-  static ServicesResponse? cachedServicesResponse; 
-
   Future<ServicesResponse> getServicesStatus() async {
-    if (cachedServicesResponse != null) {
-      return cachedServicesResponse!;
-    }
-    cachedServicesResponse = await _getServicesStatus();
-    return cachedServicesResponse!;
-  }
-
-  Future<ServicesResponse> _getServicesStatus() async {
     try {
       if (isEnabledBulletinAction) {
-        final res = await ProxyWrapper().get(
-          clearnetUri: Uri.https(
-            "service-api.cakewallet.com",
-            "/v1/active-notices",
-            {'key': secrets.fiatApiKey},
-          ),
-          onionUri: Uri.http(
-            "jpirgl4lrwzjgdqj2nsv3g7twhp2efzty5d3cnypktyczzqfc5qcwwyd.onion",
-            "/v1/active-notices",
-            {'key': secrets.fiatApiKey},
-          ),
+        final uri = Uri.https(
+          "service-api.cakewallet.com",
+          "/v1/active-notices",
+          {'key': secrets.fiatApiKey},
         );
+
+        final res = await http.get(uri);
+
         if (res.statusCode < 200 || res.statusCode >= 300) {
           throw res.body;
         }
diff --git a/lib/view_model/dashboard/dropdown_filter_item_widget.dart b/lib/view_model/dashboard/dropdown_filter_item_widget.dart
index 45464b597..20bf54887 100644
--- a/lib/view_model/dashboard/dropdown_filter_item_widget.dart
+++ b/lib/view_model/dashboard/dropdown_filter_item_widget.dart
@@ -1,4 +1,5 @@
 import 'package:auto_size_text/auto_size_text.dart';
+import 'package:cake_wallet/themes/extensions/picker_theme.dart';
 import 'package:flutter/material.dart';
 
 class DropdownFilterList extends StatefulWidget {
@@ -42,11 +43,11 @@ class _DropdownFilterListState extends State<DropdownFilterList> {
             child: Column(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
-                Icon(Icons.arrow_drop_down, color: Theme.of(context).colorScheme.onSurfaceVariant),
+                Icon(Icons.arrow_drop_down, color: Theme.of(context).extension<PickerTheme>()!.searchIconColor),
               ],
             ),
           ),
-          dropdownColor: Theme.of(context).colorScheme.surfaceContainerHighest,
+          dropdownColor: Theme.of(context).extension<PickerTheme>()!.searchBackgroundFillColor,
           borderRadius: BorderRadius.circular(10),
           items: widget.items
               .map((item) => DropdownMenuItem<String>(
diff --git a/lib/view_model/dashboard/home_settings_view_model.dart b/lib/view_model/dashboard/home_settings_view_model.dart
index fdf4d75a5..4a85ec89a 100644
--- a/lib/view_model/dashboard/home_settings_view_model.dart
+++ b/lib/view_model/dashboard/home_settings_view_model.dart
@@ -12,7 +12,6 @@ import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/solana/solana.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/tron/tron.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
 import 'package:cake_wallet/zano/zano.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -20,6 +19,7 @@ import 'package:cw_core/erc20_token.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
+import 'package:http/http.dart' as http;
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
 part 'home_settings_view_model.g.dart';
@@ -83,7 +83,6 @@ abstract class HomeSettingsViewModelBase with Store {
           decimal: token.decimals,
           contractAddress: contractAddress,
           iconPath: token.iconPath,
-          isPotentialScam: token.isPotentialScam,
         );
 
         await ethereum!.addErc20Token(_balanceViewModel.wallet, erc20token);
@@ -96,7 +95,6 @@ abstract class HomeSettingsViewModelBase with Store {
           decimal: token.decimals,
           contractAddress: contractAddress,
           iconPath: token.iconPath,
-          isPotentialScam: token.isPotentialScam,
         );
         await polygon!.addErc20Token(_balanceViewModel.wallet, polygonToken);
       }
@@ -126,31 +124,6 @@ abstract class HomeSettingsViewModelBase with Store {
     }
   }
 
-  @action
-  bool checkIfTokenIsAlreadyAdded(String contractAddress) {
-    if (_balanceViewModel.wallet.type == WalletType.ethereum) {
-      return ethereum!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress);
-    }
-
-    if (_balanceViewModel.wallet.type == WalletType.polygon) {
-      return polygon!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress);
-    }
-
-    if (_balanceViewModel.wallet.type == WalletType.solana) {
-      return solana!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress);
-    }
-
-    if (_balanceViewModel.wallet.type == WalletType.tron) {
-      return tron!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress);
-    }
-
-    if (_balanceViewModel.wallet.type == WalletType.zano) {
-      return zano!.isTokenAlreadyAdded(_balanceViewModel.wallet, contractAddress);
-    }
-
-    return false;
-  }
-
   @action
   Future<void> deleteToken(CryptoCurrency token) async {
     try {
@@ -246,8 +219,7 @@ abstract class HomeSettingsViewModelBase with Store {
     }
 
     // check if the contractAddress is in the defaultTokenAddresses
-    bool isInWhitelist = defaultTokenAddresses
-        .any((element) => element.toLowerCase() == contractAddress.toLowerCase());
+    bool isInWhitelist = defaultTokenAddresses.any((element) => element == contractAddress);
     return isInWhitelist;
   }
 
@@ -265,14 +237,14 @@ abstract class HomeSettingsViewModelBase with Store {
     );
 
     try {
-      final response = await ProxyWrapper().get(
-        clearnetUri: uri,
+      final response = await http.get(
+        uri,
         headers: {
           "Accept": "application/json",
           "X-API-Key": secrets.moralisApiKey,
         },
       );
-      
+
       final decodedResponse = jsonDecode(response.body);
 
       final tokenInfo = Erc20TokenInfoMoralis.fromJson(decodedResponse[0] as Map<String, dynamic>);
@@ -322,20 +294,19 @@ abstract class HomeSettingsViewModelBase with Store {
     required bool isEthereum,
   }) async {
     final uri = Uri.https(
-      "api.etherscan.io",
-      "/v2/api",
+      isEthereum ? "api.etherscan.io" : "api.polygonscan.com",
+      "/api",
       {
-        "chainid": isEthereum ? "1" : "137",
         "module": "token",
         "action": "tokeninfo",
         "contractaddress": contractAddress,
-        "apikey": secrets.etherScanApiKey,
+        "apikey": isEthereum ? secrets.etherScanApiKey : secrets.polygonScanApiKey,
       },
     );
 
     try {
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await http.get(uri);
+
       final decodedResponse = jsonDecode(response.body) as Map<String, dynamic>;
 
       if (decodedResponse['status'] != '1') {
@@ -364,20 +335,18 @@ abstract class HomeSettingsViewModelBase with Store {
     required bool isEthereum,
   }) async {
     final uri = Uri.https(
-      "api.etherscan.io",
-      "/v2/api",
+      isEthereum ? "api.etherscan.io" : "api.polygonscan.com",
+      "/api",
       {
-        "chainid": isEthereum ? "1" : "137",
         "module": "contract",
         "action": "getsourcecode",
         "address": contractAddress,
-        "apikey": secrets.etherScanApiKey,
+        "apikey": isEthereum ? secrets.etherScanApiKey : secrets.polygonScanApiKey,
       },
     );
 
     try {
-      final response = await ProxyWrapper().get(clearnetUri: uri);
-      
+      final response = await http.get(uri);
 
       final decodedResponse = jsonDecode(response.body) as Map<String, dynamic>;
 
diff --git a/lib/view_model/dashboard/nft_view_model.dart b/lib/view_model/dashboard/nft_view_model.dart
index 733cb4f47..b0474604b 100644
--- a/lib/view_model/dashboard/nft_view_model.dart
+++ b/lib/view_model/dashboard/nft_view_model.dart
@@ -1,13 +1,12 @@
 import 'dart:convert';
 import 'dart:developer';
 
+import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
 import 'package:cake_wallet/entities/solana_nft_asset_model.dart';
-import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/reactions/wallet_connect.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/services/bottom_sheet_service.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/bottom_sheet/bottom_sheet_message_display_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
 import 'package:cw_core/wallet_type.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:http/http.dart' as http;
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
@@ -23,7 +22,11 @@ abstract class NFTViewModelBase with Store {
       : isLoading = false,
         isImportNFTLoading = false,
         nftAssetByWalletModels = ObservableList(),
-        solanaNftAssetModels = ObservableList();
+        solanaNftAssetModels = ObservableList() {
+    getNFTAssetByWallet();
+
+    reaction((_) => appStore.wallet, (_) => getNFTAssetByWallet());
+  }
 
   final AppStore appStore;
   final BottomSheetService bottomSheetService;
@@ -76,20 +79,17 @@ abstract class NFTViewModelBase with Store {
     }
 
     try {
-      if (isLoading) return;
-
       isLoading = true;
 
-      final response = await ProxyWrapper().get(
-        clearnetUri: uri,
+      final response = await http.get(
+        uri,
         headers: {
           "Accept": "application/json",
           "X-API-Key": secrets.moralisApiKey,
         },
       );
-      
 
-      final decodedResponse = jsonDecode(response.body) as Map<String, dynamic>;
+      final decodedResponse = jsonDecode(response.body);
 
       if (walletType == WalletType.solana) {
         final results = await Future.wait(
@@ -113,16 +113,17 @@ abstract class NFTViewModelBase with Store {
 
         nftAssetByWalletModels.addAll(result);
       }
+
+      isLoading = false;
     } catch (e) {
+      isLoading = false;
       log(e.toString());
       bottomSheetService.queueBottomSheet(
         isModalDismissible: true,
         widget: BottomSheetMessageDisplayWidget(
-          message: S.current.moralis_nft_error,
+          message: e.toString(),
         ),
       );
-    } finally {
-      isLoading = false;
     }
   }
 
@@ -132,14 +133,14 @@ abstract class NFTViewModelBase with Store {
       '/nft/$chainName/$address/metadata',
     );
 
-    final response = await ProxyWrapper().get(
-      clearnetUri: uri,
+    final response = await http.get(
+      uri,
       headers: {
         "Accept": "application/json",
         "X-API-Key": secrets.moralisApiKey,
       },
     );
-    
+
     final decodedResponse = jsonDecode(response.body) as Map<String, dynamic>;
 
     return SolanaNFTAssetModel.fromJson(decodedResponse);
@@ -172,14 +173,15 @@ abstract class NFTViewModelBase with Store {
             "normalizeMetadata": "true",
           },
         );
-        final response = await ProxyWrapper().get(
-          clearnetUri: uri,
+
+        final response = await http.get(
+          uri,
           headers: {
             "Accept": "application/json",
             "X-API-Key": secrets.moralisApiKey,
           },
         );
-        
+
         final decodedResponse = jsonDecode(response.body) as Map<String, dynamic>;
 
         final nftAsset = NFTAssetModel.fromJson(decodedResponse);
diff --git a/lib/view_model/dashboard/payjoin_transaction_list_item.dart b/lib/view_model/dashboard/payjoin_transaction_list_item.dart
deleted file mode 100644
index 9605ab8fa..000000000
--- a/lib/view_model/dashboard/payjoin_transaction_list_item.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/view_model/dashboard/action_list_item.dart';
-import 'package:cw_core/payjoin_session.dart';
-import 'package:cw_core/transaction_info.dart';
-
-class PayjoinTransactionListItem extends ActionListItem {
-  PayjoinTransactionListItem({
-    required this.sessionId,
-    required this.session,
-    required super.key,
-  });
-
-  final String sessionId;
-  final PayjoinSession session;
-  TransactionInfo? transaction;
-
-  @override
-  DateTime get date => session.inProgressSince!;
-
-  String get status {
-    switch (session.status) {
-      case 'success':
-        if (transaction?.isPending == false) return S.current.successful;
-        return S.current.payjoin_request_awaiting_tx;
-      case 'inProgress':
-        return S.current.payjoin_request_in_progress;
-      case 'unrecoverable':
-        return S.current.error;
-      default:
-        return session.status;
-    }
-  }
-}
diff --git a/lib/view_model/dev/background_sync_logs_view_model.dart b/lib/view_model/dev/background_sync_logs_view_model.dart
deleted file mode 100644
index a448dadb5..000000000
--- a/lib/view_model/dev/background_sync_logs_view_model.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-import 'package:flutter_daemon/flutter_daemon.dart';
-import 'package:mobx/mobx.dart';
-
-part 'background_sync_logs_view_model.g.dart';
-class BackgroundSyncLogsViewModel = BackgroundSyncLogsViewModelBase with _$BackgroundSyncLogsViewModel;
-
-abstract class BackgroundSyncLogsViewModelBase with Store {
-  final FlutterDaemon _daemon = FlutterDaemon();
-
-  @observable
-  LogData? logData;
-
-  @observable
-  bool isLoading = false;
-
-  @observable
-  String? error;
-
-  @computed
-  List<LogEntry> get logs => logData?.logs ?? [];
-
-  @computed
-  List<LogSession> get sessions => logData?.sessions ?? [];
-
-  @action
-  Future<void> loadLogs() async {
-    isLoading = true;
-    error = null;
-    
-    try {
-      logData = await _daemon.getLogs();
-    } catch (e) {
-      error = e.toString();
-    } finally {
-      isLoading = false;
-    }
-  }
-
-  @action
-  Future<void> clearLogs() async {
-    await _daemon.clearLogs();
-    await loadLogs();
-  }
-} 
\ No newline at end of file
diff --git a/lib/view_model/dev/network_requests_view_model.dart b/lib/view_model/dev/network_requests_view_model.dart
deleted file mode 100644
index 401ddc6d2..000000000
--- a/lib/view_model/dev/network_requests_view_model.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart';
-import 'package:mobx/mobx.dart';
-
-part 'network_requests_view_model.g.dart';
-
-class NetworkRequestsViewModel = NetworkRequestsViewModelBase with _$NetworkRequestsViewModel;
-
-abstract class NetworkRequestsViewModelBase with Store {
-  @observable
-  List<MemoryProxyLoggerEntry> logs = MemoryProxyLogger.logs;
-
-  @action
-  Future<void> loadLogs() async {
-    logs = MemoryProxyLogger.logs;
-  }
-} 
\ No newline at end of file
diff --git a/lib/view_model/dev/secure_preferences.dart b/lib/view_model/dev/secure_preferences.dart
deleted file mode 100644
index 379022f89..000000000
--- a/lib/view_model/dev/secure_preferences.dart
+++ /dev/null
@@ -1,75 +0,0 @@
-import 'package:cake_wallet/core/secure_storage.dart';
-import 'package:cake_wallet/entities/encrypt.dart';
-import 'package:mobx/mobx.dart';
-
-part 'secure_preferences.g.dart';
-
-class DevSecurePreferences = DevSecurePreferencesBase with _$DevSecurePreferences;
-
-enum PreferenceType {
-  unknown,
-  string,
-  int,
-  double,
-  bool,
-  listString
-}
-
-abstract class DevSecurePreferencesBase with Store {
-  DevSecurePreferencesBase() {
-    secureStorageShared.readAll().then((value) {
-      values = value;
-    });
-  }
-
-  @observable
-  Map<String, String> values = {};
-
-  @computed
-  List<String> get keys => values.keys.toList()..sort();
-
-  @action
-  Future<void> delete(String key) async {
-    
-  }
-
-  dynamic get(String key) {
-    if (!values.containsKey(key)) {
-      return null;
-    }
-    if (!key.startsWith("MONERO_WALLET_")) return values[key]!;
-    try {
-      final decodedPassword = decodeWalletPassword(password: values[key]!);
-      return values[key]! + "\n\nDecoded: $decodedPassword";
-    } catch (e) {
-      return values[key]! +"\n$e";
-    }
-  }
-
-  Future<void> set(String key, PreferenceType type, dynamic value) async {
-    
-  }
-
-  PreferenceType getPreferenceType(String key) {
-    if (!values.containsKey(key)) {
-      return PreferenceType.unknown;
-    }
-    final value = values[key];
-    if (value is String) {
-      return PreferenceType.string;
-    }
-    if (value is bool) {
-      return PreferenceType.bool;
-    }
-    if (value is int) {
-      return PreferenceType.int;
-    }
-    if (value is double) {
-      return PreferenceType.double;
-    }
-    if (value is List<String>) {
-      return PreferenceType.listString;
-    }
-    return PreferenceType.unknown;
-  }
-}
diff --git a/lib/view_model/dev/send_network_requests_view_model.dart b/lib/view_model/dev/send_network_requests_view_model.dart
deleted file mode 100644
index 1eb3bffc9..000000000
--- a/lib/view_model/dev/send_network_requests_view_model.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:cw_core/utils/proxy_logger/memory_proxy_logger.dart';
-import 'package:mobx/mobx.dart';
-
-part 'send_network_requests_view_model.g.dart';
-
-class SendNetworkRequestsViewModel = SendNetworkRequestsViewModelBase with _$SendNetworkRequestsViewModel;
-
-abstract class SendNetworkRequestsViewModelBase with Store {
-  @observable
-  List<MemoryProxyLoggerEntry> logs = MemoryProxyLogger.logs;
-
-  @action
-  Future<void> loadLogs() async {
-    logs = MemoryProxyLogger.logs;
-  }
-} 
\ No newline at end of file
diff --git a/lib/view_model/dev/shared_preferences.dart b/lib/view_model/dev/shared_preferences.dart
deleted file mode 100644
index 4c6be7d15..000000000
--- a/lib/view_model/dev/shared_preferences.dart
+++ /dev/null
@@ -1,92 +0,0 @@
-import 'package:mobx/mobx.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-part 'shared_preferences.g.dart';
-
-class DevSharedPreferences = DevSharedPreferencesBase with _$DevSharedPreferences;
-
-enum PreferenceType {
-  unknown,
-  string,
-  int,
-  double,
-  bool,
-  listString
-}
-
-abstract class DevSharedPreferencesBase with Store {
-  DevSharedPreferencesBase() {
-    SharedPreferences.getInstance().then((value) {
-      sharedPreferences = value;
-    });
-  }
-
-  @observable
-  SharedPreferences? sharedPreferences;
-
-  @computed
-  List<String> get keys => (sharedPreferences?.getKeys().toList()?..sort()) ?? [];
-
-  @action
-  Future<void> delete(String key) async {
-    if (sharedPreferences == null) {
-      return;
-    }
-    await sharedPreferences!.remove(key);
-  }
-
-  dynamic get(String key) {
-    if (sharedPreferences == null) {
-      return null;
-    }
-    return sharedPreferences!.get(key);
-  }
-
-  Future<void> set(String key, PreferenceType type, dynamic value) async {
-    if (sharedPreferences == null) {
-      return;
-    }
-    switch (type) {
-      case PreferenceType.string:
-        await sharedPreferences!.setString(key, value as String);
-        break;
-      case PreferenceType.bool:
-        await sharedPreferences!.setBool(key, value as bool);
-        break;
-      case PreferenceType.int:
-        await sharedPreferences!.setInt(key, value as int);
-        break;
-      case PreferenceType.double:
-        await sharedPreferences!.setDouble(key, value as double);
-        break;
-      case PreferenceType.listString:
-        await sharedPreferences!.setStringList(key, List<String>.from(value as Iterable<dynamic>));
-        break;
-      default:
-        throw Exception("Unknown preference type: $type");
-    }
-  }
-
-  PreferenceType getPreferenceType(String key) {
-    if (sharedPreferences == null) {
-      return PreferenceType.unknown;
-    }
-    final value = sharedPreferences!.get(key);
-    if (value is String) {
-      return PreferenceType.string;
-    }
-    if (value is bool) {
-      return PreferenceType.bool;
-    }
-    if (value is int) {
-      return PreferenceType.int;
-    }
-    if (value is double) {
-      return PreferenceType.double;
-    }
-    if (value is List<String>) {
-      return PreferenceType.listString;
-    }
-    return PreferenceType.unknown;
-  }
-}
diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart
index 76a49e1d5..fc7a5429b 100644
--- a/lib/view_model/exchange/exchange_trade_view_model.dart
+++ b/lib/view_model/exchange/exchange_trade_view_model.dart
@@ -96,12 +96,11 @@ abstract class ExchangeTradeViewModelBase with Store {
   bool isSendable;
 
   @computed
-  String get extraInfo => switch (trade.from) {
-    CryptoCurrency.xlm => '\n\n' + S.current.xlm_extra_info,
-    CryptoCurrency.xrp => '\n\n' + S.current.xrp_extra_info,
-    CryptoCurrency.ton => '\n\n' + S.current.ton_extra_info,
-    _ => ''
-  };
+  String get extraInfo => trade.from == CryptoCurrency.xlm
+      ? '\n\n' + S.current.xlm_extra_info
+      : trade.from == CryptoCurrency.xrp
+          ? '\n\n' + S.current.xrp_extra_info
+          : '';
 
   @computed
   String get pendingTransactionFiatAmountValueFormatted => sendViewModel.isFiatDisabled
@@ -204,12 +203,12 @@ abstract class ExchangeTradeViewModelBase with Store {
     ]);
 
     if (trade.extraId != null) {
-      final shouldAddExtraId = trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm || trade.from == CryptoCurrency.ton;
+      final shouldAddExtraId = trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm;
 
       if (shouldAddExtraId) {
         final title = trade.from == CryptoCurrency.xrp
             ? S.current.destination_tag
-            : trade.from == CryptoCurrency.xlm || trade.from == CryptoCurrency.ton
+            : trade.from == CryptoCurrency.xlm
                 ? S.current.memo
                 : S.current.extra_id;
 
@@ -218,8 +217,13 @@ abstract class ExchangeTradeViewModelBase with Store {
             title: title,
             data: '${trade.extraId}',
             isCopied: true,
-            isReceiveDetail: !shouldAddExtraId,
-            isExternalSendDetail: shouldAddExtraId
+            isReceiveDetail: (trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm)
+                ? false
+                : true,
+            isExternalSendDetail:
+                (trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm)
+                    ? true
+                    : false,
           ),
         );
       }
diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart
index 91cffe367..8b7349e9a 100644
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@@ -7,7 +7,6 @@ import 'package:cake_wallet/core/create_trade_result.dart';
 import 'package:cake_wallet/exchange/provider/chainflip_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/letsexchange_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/stealth_ex_exchange_provider.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cake_wallet/view_model/send/fees_view_model.dart';
 import 'package:cake_wallet/exchange/provider/xoswap_exchange_provider.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -17,12 +16,15 @@ import 'package:cw_core/unspent_coin_type.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:hive/hive.dart';
+import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';
 import 'package:mobx/mobx.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/bitcoin_cash/bitcoin_cash.dart';
+import 'package:cake_wallet/decred/decred.dart';
 import 'package:cake_wallet/core/wallet_change_listener_view_model.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
@@ -37,6 +39,7 @@ import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/swaptrade_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';
+import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
 import 'package:cake_wallet/exchange/provider/trocador_exchange_provider.dart';
 import 'package:cake_wallet/exchange/trade.dart';
@@ -178,6 +181,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
   List<ExchangeProvider> get _allProviders => [
         ChangeNowExchangeProvider(settingsStore: _settingsStore),
         SideShiftExchangeProvider(),
+        SimpleSwapExchangeProvider(),
         ThorChainExchangeProvider(tradesStore: trades),
         ChainflipExchangeProvider(tradesStore: trades),
         if (FeatureFlag.isExolixEnabled) ExolixExchangeProvider(),
@@ -939,6 +943,8 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
   }
 
   Future<bool> _isContractAddress(String chainName, String contractAddress) async {
+    final httpClient = http.Client();
+
     final uri = Uri.https(
       'deep-index.moralis.io',
       '/api/v2.2/erc20/metadata',
@@ -949,14 +955,13 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
     );
 
     try {
-      final response = await ProxyWrapper().get(
-        clearnetUri: uri,
+      final response = await httpClient.get(
+        uri,
         headers: {
           "Accept": "application/json",
           "X-API-Key": secrets.moralisApiKey,
         },
       );
-      
 
       final decodedResponse = jsonDecode(response.body)[0] as Map<String, dynamic>;
 
diff --git a/lib/view_model/hardware_wallet/ledger_view_model.dart b/lib/view_model/hardware_wallet/ledger_view_model.dart
index 132a5deb9..4f80aa698 100644
--- a/lib/view_model/hardware_wallet/ledger_view_model.dart
+++ b/lib/view_model/hardware_wallet/ledger_view_model.dart
@@ -96,8 +96,7 @@ abstract class LedgerViewModelBase with Store {
     if (!Platform.isIOS) await ledgerPlusUSB.stopScanning();
   }
 
-  Future<bool> connectLedger(sdk.LedgerDevice device, WalletType type) async {
-    if (_isConnecting) return false;
+  Future<void> connectLedger(sdk.LedgerDevice device, WalletType type) async {
     _isConnecting = true;
     _connectingWalletType = type;
     if (isConnected) {
@@ -111,25 +110,17 @@ abstract class LedgerViewModelBase with Store {
         : ledgerPlusUSB;
 
     if (_connectionChangeSubscription == null) {
-      _connectionChangeSubscription = ledger
-          .deviceStateChanges(device.id)
-          .listen(_connectionChangeListener);
+      _connectionChangeSubscription =
+          ledger.deviceStateChanges.listen(_connectionChangeListener);
     }
 
-    try {
-      _connection = await ledger.connect(device);
-      _isConnecting = false;
-      return true;
-    } catch (e) {
-      printV(e);
-    }
+    _connection = await ledger.connect(device);
     _isConnecting = false;
-    return false;
   }
 
   StreamSubscription<sdk.BleConnectionState>? _connectionChangeSubscription;
   sdk.LedgerConnection? _connection;
-  bool _isConnecting = false;
+  bool _isConnecting = true;
   WalletType? _connectingWalletType;
 
   void _connectionChangeListener(sdk.BleConnectionState event) {
@@ -146,9 +137,7 @@ abstract class LedgerViewModelBase with Store {
             allowChangeWallet: true,
             isReconnect: true,
             onConnectDevice: (context, ledgerVM) async {
-              if (context.mounted) {
-                Navigator.of(context).pop();
-              }
+              Navigator.of(context).pop();
             },
           ),
         );
@@ -177,14 +166,17 @@ abstract class LedgerViewModelBase with Store {
   }
 
   String? interpretErrorCode(String errorCode) {
-    if (errorCode.contains("6985")) {
-      return S.current.ledger_error_tx_rejected_by_user;
-    } else if (errorCode.contains("5515")) {
-      return S.current.ledger_error_device_locked;
-    } else
-    if (["6e01", "6a87", "6d02", "6511", "6e00"].any((e) => errorCode.contains(e))) {
-      return S.current.ledger_error_wrong_app;
+    switch (errorCode) {
+      case "6985":
+        return S.current.ledger_error_tx_rejected_by_user;
+      case "5515":
+        return S.current.ledger_error_device_locked;
+      case "6d02": // UNKNOWN_APDU
+      case "6511":
+      case "6e00":
+        return S.current.ledger_error_wrong_app;
+      default:
+        return null;
     }
-    return null;
   }
 }
diff --git a/lib/view_model/integrations/deuro_view_model.dart b/lib/view_model/integrations/deuro_view_model.dart
deleted file mode 100644
index eca3c2376..000000000
--- a/lib/view_model/integrations/deuro_view_model.dart
+++ /dev/null
@@ -1,134 +0,0 @@
-import 'dart:math';
-
-import 'package:cake_wallet/core/execution_state.dart';
-import 'package:cake_wallet/ethereum/ethereum.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
-import 'package:cw_core/pending_transaction.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:mobx/mobx.dart';
-
-part 'deuro_view_model.g.dart';
-
-class DEuroViewModel = DEuroViewModelBase with _$DEuroViewModel;
-
-abstract class DEuroViewModelBase with Store {
-  final AppStore _appStore;
-
-  DEuroViewModelBase(this._appStore) {
-    reloadInterestRate();
-    reloadSavingsUserData();
-  }
-
-  @observable
-  String savingsBalance = '0.00';
-
-  @observable
-  ExecutionState state = InitialExecutionState();
-
-  @observable
-  String interestRate = '0';
-
-  @observable
-  String accruedInterest = '0.00';
-
-  @observable
-  BigInt approvedTokens = BigInt.zero;
-
-  @computed
-  bool get isEnabled => approvedTokens > BigInt.zero;
-
-  @observable
-  PendingTransaction? transaction = null;
-
-  @observable
-  PendingTransaction? approvalTransaction = null;
-
-  @action
-  Future<void> reloadSavingsUserData() async {
-    final savingsBalanceRaw = ethereum!.getDEuroSavingsBalance(_appStore.wallet!);
-    final accruedInterestRaw = ethereum!.getDEuroAccruedInterest(_appStore.wallet!);
-
-    approvedTokens = await ethereum!.getDEuroSavingsApproved(_appStore.wallet!);
-
-    savingsBalance = ethereum!
-        .formatterEthereumAmountToDouble(amount: await savingsBalanceRaw)
-        .toStringAsFixed(6);
-    accruedInterest = ethereum!
-        .formatterEthereumAmountToDouble(amount: await accruedInterestRaw)
-        .toStringAsFixed(6);
-  }
-
-  @action
-  Future<void> reloadInterestRate() async {
-    final interestRateRaw = await ethereum!.getDEuroInterestRate(_appStore.wallet!);
-
-    interestRate = (interestRateRaw / BigInt.from(10000)).toString();
-  }
-
-  @action
-  Future<void> prepareApproval() async {
-    try {
-      state = TransactionCommitting();
-      final priority = _appStore.settingsStore.priority[WalletType.ethereum]!;
-      approvalTransaction = await ethereum!.enableDEuroSaving(_appStore.wallet!, priority);
-      state = InitialExecutionState();
-    } catch (e) {
-      state = FailureState(e.toString());
-    }
-  }
-
-  @action
-  Future<void> prepareSavingsEdit(String amountRaw, bool isAdding) async {
-    try {
-      state = TransactionCommitting();
-      final amount = BigInt.from(num.parse(amountRaw) * pow(10, 18));
-      final priority = _appStore.settingsStore.priority[WalletType.ethereum]!;
-      transaction = await (isAdding
-          ? ethereum!.addDEuroSaving(_appStore.wallet!, amount, priority)
-          : ethereum!.removeDEuroSaving(_appStore.wallet!, amount, priority));
-      state = InitialExecutionState();
-    } catch (e) {
-      state = FailureState(e.toString());
-    }
-  }
-
-  Future<void> prepareCollectInterest() => prepareSavingsEdit(accruedInterest, false);
-
-  @action
-  Future<void> commitTransaction() async {
-    if (transaction != null) {
-      try {
-        state = TransactionCommitting();
-        await transaction!.commit();
-        transaction = null;
-        reloadSavingsUserData();
-        state = TransactionCommitted();
-      } catch (e) {
-        state = FailureState(e.toString());
-      }
-    }
-  }
-
-  @action
-  Future<void> commitApprovalTransaction() async {
-    if (approvalTransaction != null) {
-      try {
-        state = TransactionCommitting();
-        await approvalTransaction!.commit();
-        approvalTransaction = null;
-        reloadSavingsUserData();
-        state = TransactionCommitted();
-      } catch (e) {
-        state = FailureState(e.toString());
-      }
-    }
-  }
-
-  @action
-  void dismissTransaction() {
-    transaction = null;
-    approvalTransaction = null;
-    state = InitialExecutionState();
-  }
-}
diff --git a/lib/view_model/link_view_model.dart b/lib/view_model/link_view_model.dart
index 1a89943d4..27f0c0560 100644
--- a/lib/view_model/link_view_model.dart
+++ b/lib/view_model/link_view_model.dart
@@ -81,16 +81,14 @@ class LinkViewModel {
   }
 
   Future<void> _errorToast(String message, {double fontSize = 16}) async {
-    try {
-      await Fluttertoast.showToast(
-        msg: message,
-        toastLength: Toast.LENGTH_LONG,
-        gravity: ToastGravity.SNACKBAR,
-        backgroundColor: Colors.black,
-        textColor: Colors.white,
-        fontSize: fontSize,
-      );
-    } catch (_) {}
+    Fluttertoast.showToast(
+      msg: message,
+      toastLength: Toast.LENGTH_LONG,
+      gravity: ToastGravity.SNACKBAR,
+      backgroundColor: Colors.black,
+      textColor: Colors.white,
+      fontSize: fontSize,
+    );
   }
 
   Future<void> handleLink() async {
diff --git a/lib/view_model/monero_account_list/monero_account_list_view_model.dart b/lib/view_model/monero_account_list/monero_account_list_view_model.dart
index 37b28980a..4ecffcfb3 100644
--- a/lib/view_model/monero_account_list/monero_account_list_view_model.dart
+++ b/lib/view_model/monero_account_list/monero_account_list_view_model.dart
@@ -1,5 +1,3 @@
-import 'package:cake_wallet/entities/balance_display_mode.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/wallet_type.dart';
@@ -14,9 +12,7 @@ class MoneroAccountListViewModel = MoneroAccountListViewModelBase
     with _$MoneroAccountListViewModel;
 
 abstract class MoneroAccountListViewModelBase with Store {
-  MoneroAccountListViewModelBase(this._wallet,this.settingsStore) : scrollOffsetFromTop = 0;
-
-  final SettingsStore settingsStore;
+  MoneroAccountListViewModelBase(this._wallet) : scrollOffsetFromTop = 0;
 
   @observable
   double scrollOffsetFromTop;
@@ -30,14 +26,13 @@ abstract class MoneroAccountListViewModelBase with Store {
 
   @computed
   List<AccountListItem> get accounts {
-    final hideBalance = settingsStore.balanceDisplayMode == BalanceDisplayMode.hiddenBalance;
     if (_wallet.type == WalletType.monero) {
       return monero
         !.getAccountList(_wallet)
         .accounts.map((acc) => AccountListItem(
             label: acc.label,
             id: acc.id,
-            balance: hideBalance ? '●●●●●●' : acc.balance,
+            balance: acc.balance,
             isSelected: acc.id == monero!.getCurrentAccount(_wallet).id))
         .toList();
     }
@@ -48,7 +43,7 @@ abstract class MoneroAccountListViewModelBase with Store {
         .accounts.map((acc) => AccountListItem(
             label: acc.label,
             id: acc.id,
-            balance: hideBalance ? '●●●●●●' : acc.balance,
+            balance: acc.balance,
             isSelected: acc.id == wownero!.getCurrentAccount(_wallet).id))
         .toList();
     }
diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index 78544aa82..8fbe174e3 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,7 +1,7 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
@@ -59,9 +59,6 @@ abstract class NodeCreateOrEditViewModelBase with Store {
   @observable
   bool useSocksProxy;
 
-  @computed
-  bool get usesEmbeddedProxy => CakeTor.instance.started;
-
   @observable
   String socksProxyAddress;
 
diff --git a/lib/view_model/node_list/node_list_view_model.dart b/lib/view_model/node_list/node_list_view_model.dart
index 9cd9ce959..9df5f2980 100644
--- a/lib/view_model/node_list/node_list_view_model.dart
+++ b/lib/view_model/node_list/node_list_view_model.dart
@@ -1,7 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/utils/mobx.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -39,7 +38,7 @@ abstract class NodeListViewModelBase with Store {
 
   String getAlertContent(String uri) =>
       S.current.change_current_node(uri) +
-      '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + (CakeTor.instance.enabled ? '' : S.current.orbot_running_alert) : ''}';
+      '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + S.current.orbot_running_alert : ''}';
 
   final ObservableList<Node> nodes;
   final SettingsStore settingsStore;
diff --git a/lib/view_model/node_list/pow_node_list_view_model.dart b/lib/view_model/node_list/pow_node_list_view_model.dart
index 5100676f4..5467be31a 100644
--- a/lib/view_model/node_list/pow_node_list_view_model.dart
+++ b/lib/view_model/node_list/pow_node_list_view_model.dart
@@ -1,7 +1,6 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/utils/mobx.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -39,7 +38,7 @@ abstract class PowNodeListViewModelBase with Store {
 
   String getAlertContent(String uri) =>
       S.current.change_current_node(uri) +
-      '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + (CakeTor.instance.enabled ? '' : S.current.orbot_running_alert) : ''}';
+      '${uri.endsWith('.onion') || uri.contains('.onion:') ? '\n' + S.current.orbot_running_alert : ''}';
 
   final ObservableList<Node> nodes;
   final SettingsStore settingsStore;
diff --git a/lib/view_model/payjoin_details_view_model.dart b/lib/view_model/payjoin_details_view_model.dart
deleted file mode 100644
index 7d63aaae3..000000000
--- a/lib/view_model/payjoin_details_view_model.dart
+++ /dev/null
@@ -1,136 +0,0 @@
-import 'dart:async';
-
-import 'package:cake_wallet/bitcoin/bitcoin.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.dart';
-import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
-import 'package:cake_wallet/src/screens/transaction_details/blockexplorer_list_item.dart';
-import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
-import 'package:cake_wallet/src/screens/transaction_details/transaction_details_list_item.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
-import 'package:cake_wallet/utils/date_formatter.dart';
-import 'package:cw_core/payjoin_session.dart';
-import 'package:cw_core/transaction_info.dart';
-import 'package:flutter/widgets.dart';
-import 'package:hive_flutter/hive_flutter.dart';
-import 'package:mobx/mobx.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-part 'payjoin_details_view_model.g.dart';
-
-class PayjoinDetailsViewModel = PayjoinDetailsViewModelBase
-    with _$PayjoinDetailsViewModel;
-
-abstract class PayjoinDetailsViewModelBase with Store {
-  PayjoinDetailsViewModelBase(
-    this.payjoinSessionId,
-    this.transactionInfo, {
-    required this.payjoinSessionSource,
-    required this.themeStore,
-  })  : items = ObservableList<StandartListItem>(),
-        payjoinSession = payjoinSessionSource.get(payjoinSessionId)! {
-    listener = payjoinSessionSource.watch().listen((e) {
-      if (e.key == payjoinSessionId) _updateItems();
-    });
-    _updateItems();
-  }
-
-  final Box<PayjoinSession> payjoinSessionSource;
-  final ThemeStore themeStore;
-  final String payjoinSessionId;
-  final TransactionInfo? transactionInfo;
-
-  @observable
-  late PayjoinSession payjoinSession;
-
-  final ObservableList<TransactionDetailsListItem> items;
-
-  late final StreamSubscription<BoxEvent> listener;
-
-  Timer? timer;
-
-  @action
-  void _updateItems() {
-    final dateFormat = DateFormatter.withCurrentLocal();
-    items.clear();
-    items.addAll([
-      DetailsListStatusItem(
-        title: S.current.status,
-        value: _getStatusString(),
-        status: payjoinSession.status,
-      ),
-      TradeDetailsListCardItem(
-        id: "${payjoinSession.isSenderSession ? S.current.outgoing : S.current.incoming} Payjoin",
-        createdAt:
-            dateFormat.format(payjoinSession.inProgressSince!).toString(),
-        pair:
-            '${bitcoin!.formatterBitcoinAmountToString(amount: payjoinSession.amount.toInt())} BTC',
-        onTap: (_) {},
-      ),
-      if (payjoinSession.error?.isNotEmpty == true)
-        StandartListItem(
-          title: S.current.error,
-          value: payjoinSession.error!,
-        ),
-      if (payjoinSession.txId?.isNotEmpty == true && transactionInfo != null) ...[
-        StandartListItem(
-          title: S.current.transaction_details_transaction_id,
-          value: payjoinSession.txId!,
-          key: ValueKey('standard_list_item_transaction_details_id_key'),
-        ),
-        BlockExplorerListItem(
-          title: S.current.view_in_block_explorer,
-          value: '${S.current.view_transaction_on}mempool.space',
-          onTap: () async {
-            try {
-              final uri = Uri.parse('https://mempool.cakewallet.com/tx/${payjoinSession.txId!}');
-              if (await canLaunchUrl(uri))
-                await launchUrl(uri, mode: LaunchMode.externalApplication);
-            } catch (e) {}
-          },
-          key: ValueKey('block_explorer_list_item_wallet_type_key'),
-        )
-      ]
-    ]);
-
-    if (transactionInfo != null) {
-      items.addAll([
-        StandartListItem(
-          title: S.current.transaction_details_date,
-          value: dateFormat.format(transactionInfo!.date),
-          key: ValueKey('standard_list_item_transaction_details_date_key'),
-        ),
-        StandartListItem(
-          title: S.current.confirmations,
-          value: transactionInfo!.confirmations.toString(),
-          key: ValueKey('standard_list_item_transaction_confirmations_key'),
-        ),
-        StandartListItem(
-          title: S.current.transaction_details_height,
-          value: '${transactionInfo!.height}',
-          key: ValueKey('standard_list_item_transaction_details_height_key'),
-        ),
-        if (transactionInfo!.feeFormatted()?.isNotEmpty ?? false)
-          StandartListItem(
-            title: S.current.transaction_details_fee,
-            value: transactionInfo!.feeFormatted()!,
-            key: ValueKey('standard_list_item_transaction_details_fee_key'),
-          ),
-      ]);
-    }
-  }
-
-  String _getStatusString() {
-    switch (payjoinSession.status) {
-      case 'success':
-        if (transactionInfo?.isPending == false) return S.current.successful;
-        return S.current.payjoin_request_awaiting_tx;
-      case 'inProgress':
-        return S.current.payjoin_request_in_progress;
-      case 'unrecoverable':
-        return S.current.error;
-      default:
-        return payjoinSession.status;
-    }
-  }
-}
diff --git a/lib/view_model/restore/wallet_restore_from_qr_code.dart b/lib/view_model/restore/wallet_restore_from_qr_code.dart
index 530ba1725..c8ff81acc 100644
--- a/lib/view_model/restore/wallet_restore_from_qr_code.dart
+++ b/lib/view_model/restore/wallet_restore_from_qr_code.dart
@@ -74,10 +74,7 @@ class WalletRestoreFromQRCode {
   static String? _extractAddressFromUrl(String rawString, WalletType type) {
     try {
       return AddressResolver.extractAddressByType(
-        raw: rawString,
-        type: walletTypeToCryptoCurrency(type),
-        requireSurroundingWhitespaces: false,
-      );
+          raw: rawString, type: walletTypeToCryptoCurrency(type));
     } catch (_) {
       return null;
     }
diff --git a/lib/view_model/restore_from_backup_view_model.dart b/lib/view_model/restore_from_backup_view_model.dart
index f51fd8988..1c3dc5048 100644
--- a/lib/view_model/restore_from_backup_view_model.dart
+++ b/lib/view_model/restore_from_backup_view_model.dart
@@ -7,6 +7,7 @@ import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/main.dart';
 import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/core/backup_service.dart';
 import 'package:cw_core/node.dart';
 import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
@@ -43,27 +44,19 @@ abstract class RestoreFromBackupViewModelBase with Store {
 
       final file = File(filePath);
 
-      try {
-        await backupService.importBackupFile(file, password);
-      } catch (e) {
-        if (e.toString().contains("unknown_backup_version")) {
-          state = FailureState('This is not a valid backup file, please make sure you have selected the correct one');
-        } else {
-          state = FailureState(e.toString());
-        }
-      }
+      
+      await backupService.importBackupFile(file, password);
 
       try {
         await initializeAppAtRoot(reInitializing: true);
       } catch (e, s) {
-        state = FailureState('Failed app initialization, please try again');
-        ExceptionHandler.onError(FlutterErrorDetails(exception: e, stack: s, silent: true));
+        throw Exception('failed_app_initialization: $e $s');
       }
 
       final store = getIt.get<AppStore>();
       ReactionDisposer? reaction;
       await store.settingsStore.reload(nodeSource: getIt.get<Box<Node>>());
-      await store.themeStore.loadSavedTheme(isFromBackup: true);
+
       reaction = autorun((_) {
         final wallet = store.wallet;
 
diff --git a/lib/view_model/send/output.dart b/lib/view_model/send/output.dart
index 6c3588404..a59bf5852 100644
--- a/lib/view_model/send/output.dart
+++ b/lib/view_model/send/output.dart
@@ -250,7 +250,7 @@ abstract class OutputBase with Store {
       sendAll = false;
     }
 
-    cryptoAmount = amount.replaceAll(',', '.');
+    cryptoAmount = amount;
     _updateFiatAmount();
   }
 
@@ -294,26 +294,37 @@ abstract class OutputBase with Store {
 
     switch (_wallet.type) {
       case WalletType.monero:
-      case WalletType.ethereum:
-      case WalletType.polygon:
-      case WalletType.solana:
-      case WalletType.tron:
-      case WalletType.haven:
-      case WalletType.zano:
-      case WalletType.nano:
-      case WalletType.decred:
         maximumFractionDigits = 12;
         break;
       case WalletType.bitcoin:
+        maximumFractionDigits = 8;
+        break;
       case WalletType.litecoin:
+        maximumFractionDigits = 8;
+        break;
       case WalletType.bitcoinCash:
         maximumFractionDigits = 8;
         break;
+      case WalletType.haven:
+        maximumFractionDigits = 12;
+        break;
+      case WalletType.ethereum:
+      case WalletType.polygon:
+        maximumFractionDigits = 12;
+        break;
+      case WalletType.solana:
+        maximumFractionDigits = 12;
+        break;
+      case WalletType.tron:
+        maximumFractionDigits = 12;
+        break;
       case WalletType.wownero:
         maximumFractionDigits = 11;
         break;
-      case WalletType.none:
-      case WalletType.banano:
+      case WalletType.zano:
+        maximumFractionDigits = 12;
+        break;
+      default:
         break;
     }
 
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index edca5636c..27bef933b 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -1,61 +1,53 @@
-import 'dart:async';
-
-import 'package:cake_wallet/bitcoin/bitcoin.dart';
-import 'package:cake_wallet/core/address_validator.dart';
-import 'package:cake_wallet/core/amount_validator.dart';
-import 'package:cake_wallet/core/execution_state.dart';
-import 'package:cake_wallet/core/open_crypto_pay/models.dart';
-import 'package:cake_wallet/core/open_crypto_pay/open_cryptopay_service.dart';
-import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/core/wallet_change_listener_view_model.dart';
-import 'package:cake_wallet/decred/decred.dart';
-import 'package:cake_wallet/entities/calculate_fiat_amount.dart';
 import 'package:cake_wallet/entities/contact.dart';
-import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/entities/evm_transaction_error_fees_handler.dart';
-import 'package:cake_wallet/entities/fiat_currency.dart';
-import 'package:cake_wallet/entities/parsed_address.dart';
-import 'package:cake_wallet/entities/preferences_key.dart';
-import 'package:cake_wallet/entities/template.dart';
 import 'package:cake_wallet/entities/transaction_description.dart';
-import 'package:cake_wallet/entities/wallet_contact.dart';
 import 'package:cake_wallet/ethereum/ethereum.dart';
 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/nano/nano.dart';
+import 'package:cake_wallet/decred/decred.dart';
+import 'package:cake_wallet/core/wallet_change_listener_view_model.dart';
+import 'package:cake_wallet/entities/contact_record.dart';
+import 'package:cake_wallet/entities/wallet_contact.dart';
 import 'package:cake_wallet/polygon/polygon.dart';
 import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/solana/solana.dart';
 import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/tron/tron.dart';
-import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/view_model/contact_list/contact_list_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/balance_view_model.dart';
 import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
 import 'package:cake_wallet/view_model/send/fees_view_model.dart';
-import 'package:cake_wallet/view_model/send/output.dart';
-import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
-import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
 import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_list_view_model.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
 import 'package:cake_wallet/zano/zano.dart';
-import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/exceptions.dart';
-import 'package:cw_core/pending_transaction.dart';
-import 'package:cw_core/sync_status.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:cw_core/unspent_coin_type.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/view_model/send/output.dart';
+import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:cake_wallet/entities/template.dart';
+import 'package:cake_wallet/core/address_validator.dart';
+import 'package:cake_wallet/core/amount_validator.dart';
+import 'package:cw_core/pending_transaction.dart';
+import 'package:cake_wallet/core/validator.dart';
+import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/monero/monero.dart';
+import 'package:cw_core/sync_status.dart';
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/calculate_fiat_amount.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
+import 'package:cake_wallet/entities/parsed_address.dart';
+import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/generated/i18n.dart';
 
 part 'send_view_model.g.dart';
 
@@ -225,51 +217,14 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
 
   @computed
   String get balance {
-    if (walletType == WalletType.litecoin && coinTypeToSpendFrom == UnspentCoinType.mweb) {
+    if (coinTypeToSpendFrom == UnspentCoinType.mweb) {
       return balanceViewModel.balances.values.first.secondAvailableBalance;
-    } else if (walletType == WalletType.litecoin &&
-        coinTypeToSpendFrom == UnspentCoinType.nonMweb) {
+    } else if (coinTypeToSpendFrom == UnspentCoinType.nonMweb) {
       return balanceViewModel.balances.values.first.availableBalance;
     }
     return wallet.balance[selectedCryptoCurrency]!.formattedFullAvailableBalance;
   }
 
-  @action
-  Future<void> updateSendingBalance() async {
-    // force the sendingBalance to recompute since unspent coins aren't observable
-    // or at least mobx can't detect the changes
-
-    final currentType = coinTypeToSpendFrom;
-
-    if (currentType == UnspentCoinType.any) {
-      coinTypeToSpendFrom = UnspentCoinType.nonMweb;
-    } else if (currentType == UnspentCoinType.nonMweb) {
-      coinTypeToSpendFrom = UnspentCoinType.any;
-    } else if (currentType == UnspentCoinType.mweb) {
-      coinTypeToSpendFrom = UnspentCoinType.nonMweb;
-    }
-
-    // set it back to the original value:
-    coinTypeToSpendFrom = currentType;
-  }
-
-  @computed
-  Future<String> get sendingBalance async {
-    // only for electrum, monero, wownero, decred wallets atm:
-    switch (wallet.type) {
-      case WalletType.bitcoin:
-      case WalletType.litecoin:
-      case WalletType.bitcoinCash:
-      case WalletType.monero:
-      case WalletType.wownero:
-      case WalletType.decred:
-        return wallet.formatCryptoAmount(
-            (await unspentCoinsListViewModel.getSendingBalance(coinTypeToSpendFrom)).toString());
-      default:
-        return balance;
-    }
-  }
-
   @computed
   bool get isFiatDisabled => balanceViewModel.isFiatDisabled;
 
@@ -293,18 +248,19 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       .toList();
 
   @computed
-  bool get hasCoinControl => [
-        WalletType.bitcoin,
-        WalletType.litecoin,
-        WalletType.monero,
-        WalletType.wownero,
-        WalletType.decred,
-        WalletType.bitcoinCash
-      ].contains(wallet.type);
+  bool get hasCoinControl =>
+      wallet.type == WalletType.bitcoin ||
+      wallet.type == WalletType.litecoin ||
+      wallet.type == WalletType.monero ||
+      wallet.type == WalletType.wownero ||
+      wallet.type == WalletType.decred ||
+      wallet.type == WalletType.bitcoinCash;
 
   @computed
   bool get isElectrumWallet =>
-      [WalletType.bitcoin, WalletType.litecoin, WalletType.bitcoinCash].contains(wallet.type);
+      wallet.type == WalletType.bitcoin ||
+      wallet.type == WalletType.litecoin ||
+      wallet.type == WalletType.bitcoinCash;
 
   @observable
   CryptoCurrency selectedCryptoCurrency;
@@ -398,68 +354,12 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
     return conditionsList.contains(true);
   }
 
-  final _ocpService = OpenCryptoPayService();
-
-  @observable
-  OpenCryptoPayRequest? ocpRequest;
-
-  @action
-  Future<void> dismissTransaction() async {
-    state = InitialExecutionState();
-    if (ocpRequest != null) {
-      clearOutputs();
-      _ocpService.cancelOpenCryptoPayRequest(ocpRequest!);
-      ocpRequest = null;
-    }
-  }
-
-  @action
-  Future<PendingTransaction?> createOpenCryptoPayTransaction(String uri) async {
-    state = IsExecutingState();
-
-    try {
-      final originalOCPRequest = await _ocpService.getOpenCryptoPayInvoice(uri.toString());
-      final paymentUri = await _ocpService.getOpenCryptoPayAddress(
-        originalOCPRequest,
-        selectedCryptoCurrency,
-      );
-
-      ocpRequest = originalOCPRequest;
-
-      final paymentRequest = PaymentRequest.fromUri(paymentUri);
-      clearOutputs();
-
-      outputs.first.address = paymentRequest.address;
-      outputs.first.parsedAddress =
-          ParsedAddress(addresses: [paymentRequest.address], name: ocpRequest!.receiverName);
-      outputs.first.setCryptoAmount(paymentRequest.amount);
-      outputs.first.note = ocpRequest!.receiverName;
-
-      return createTransaction();
-    } catch (e) {
-      printV(e);
-      state = FailureState(translateErrorMessage(e, walletType, currency));
-      return null;
-    }
-  }
-
-  Timer? _ledgerTxStateTimer;
-
   @action
   Future<PendingTransaction?> createTransaction({ExchangeProvider? provider}) async {
     try {
-      if (!(state is IsExecutingState)) state = IsExecutingState();
+      state = IsExecutingState();
 
-      if (wallet.isHardwareWallet) {
-        state = IsAwaitingDeviceResponseState();
-        if (walletType == WalletType.monero)
-          _ledgerTxStateTimer = Timer.periodic(Duration(seconds: 1), (timer) {
-            if (monero!.getLastLedgerCommand() == "INS_CLSAG") {
-              timer.cancel();
-              state = IsDeviceSigningResponseState();
-            }
-          });
-      }
+      if (wallet.isHardwareWallet) state = IsAwaitingDeviceResponseState();
 
       pendingTransaction = await wallet.createTransaction(_credentials(provider));
 
@@ -485,7 +385,6 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       state = ExecutedSuccessfullyState();
       return pendingTransaction;
     } catch (e) {
-      _ledgerTxStateTimer?.cancel();
       // if (e is LedgerException) {
       //   final errorCode = e.errorCode.toRadixString(16);
       //   final fallbackMsg =
@@ -540,24 +439,6 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       throw Exception("Pending transaction doesn't exist. It should not be happened.");
     }
 
-    if (ocpRequest != null) {
-      state = TransactionCommitting();
-      if (selectedCryptoCurrency == CryptoCurrency.xmr) {
-        await pendingTransaction!.commit();
-      }
-
-      await _ocpService.commitOpenCryptoPayRequest(
-        pendingTransaction!.hex,
-        txId: pendingTransaction!.id,
-        request: ocpRequest!,
-        asset: selectedCryptoCurrency,
-      );
-
-      state = TransactionCommitted();
-
-      return;
-    }
-
     String address = outputs.fold('', (acc, value) {
       return value.isParsedAddress
           ? '$acc${value.address}\n${value.extractedAddress}\n\n'
@@ -590,30 +471,14 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       }
 
       if (pendingTransaction!.id.isNotEmpty) {
-        TransactionInfo? tx;
-        if (walletType == WalletType.monero) {
-          await Future.delayed(Duration(milliseconds: 450));
-          await wallet.fetchTransactions();
-          final txhistory = monero!.getTransactionHistory(wallet);
-          tx = txhistory.transactions.values.last;
-        }
         final descriptionKey = '${pendingTransaction!.id}_${wallet.walletAddresses.primaryAddress}';
         _settingsStore.shouldSaveRecipientAddress
             ? await transactionDescriptionBox.add(TransactionDescription(
-                id: descriptionKey,
-                recipientAddress: address,
-                transactionNote: note,
-                transactionKey: tx?.additionalInfo["key"] as String?,
-              ))
-            : await transactionDescriptionBox.add(TransactionDescription(
-                id: descriptionKey,
-                transactionNote: note,
-                transactionKey: tx?.additionalInfo["key"] as String?,
-              ));
+                id: descriptionKey, recipientAddress: address, transactionNote: note))
+            : await transactionDescriptionBox
+                .add(TransactionDescription(id: descriptionKey, transactionNote: note));
       }
-      final sharedPreferences = await SharedPreferences.getInstance();
-      await sharedPreferences.setString(PreferencesKey.backgroundSyncLastTrigger(wallet.name),
-          DateTime.now().add(Duration(minutes: 1)).toIso8601String());
+
       state = TransactionCommitted();
     } catch (e) {
       state = FailureState(translateErrorMessage(e, wallet.type, wallet.currency));
@@ -637,15 +502,14 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
         return bitcoin!.createBitcoinTransactionCredentials(
           outputs,
           priority: priority!,
-          feeRate: feesViewModel.customBitcoinFeeRate,
+          feeRate:feesViewModel. customBitcoinFeeRate,
           coinTypeToSpendFrom: coinTypeToSpendFrom,
-          payjoinUri: _settingsStore.usePayjoin ? payjoinUri : null,
         );
       case WalletType.litecoin:
         return bitcoin!.createBitcoinTransactionCredentials(
           outputs,
           priority: priority!,
-          feeRate: feesViewModel.customBitcoinFeeRate,
+          feeRate:feesViewModel. customBitcoinFeeRate,
           // if it's an exchange flow then disable sending from mweb coins
           coinTypeToSpendFrom: provider != null ? UnspentCoinType.nonMweb : coinTypeToSpendFrom,
         );
@@ -765,7 +629,7 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       }
 
       if (error is CreateAssociatedTokenAccountException) {
-        return "${S.current.solana_create_associated_token_account_exception} ${S.current.added_message_for_ata_error}\n\n${error.errorMessage}";
+        return "${S.current.solana_create_associated_token_account_exception}\n\n${error.errorMessage}";
       }
 
       if (error is SignSPLTokenTransactionRentException) {
@@ -776,15 +640,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
         return S.current.solana_no_associated_token_account_exception;
       }
 
-      if (errorMessage.contains('insufficient funds for rent') && 
-          errorMessage.contains('Transaction simulation failed') && 
-          errorMessage.contains('account_index')) {
-        final accountIndexMatch = RegExp(r'account_index: (\d+)').firstMatch(errorMessage);
-        if (accountIndexMatch != null) {
-          return int.parse(accountIndexMatch.group(1)!) == 0 
-              ? S.current.insufficientFundsForRentError
-              : S.current.insufficientFundsForRentErrorReceiver;
-        }
+      if (errorMessage.contains('insufficient funds for rent')) {
+        return S.current.insufficientFundsForRentError;
       }
 
       return errorMessage;
@@ -800,7 +657,7 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
         final parsedErrorMessageResult =
             EVMTransactionErrorFeesHandler.parseEthereumFeesErrorMessage(
           errorMessage,
-          _fiatConversationStore.prices[currency] ?? 0.0,
+          _fiatConversationStore.prices[currency]!,
         );
 
         if (parsedErrorMessageResult.error != null) {
@@ -883,10 +740,4 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
 
     return false;
   }
-
-  @computed
-  bool get usePayjoin => _settingsStore.usePayjoin;
-
-  @observable
-  String? payjoinUri;
 }
diff --git a/lib/view_model/send/send_view_model_state.dart b/lib/view_model/send/send_view_model_state.dart
index b3506276b..df31041bc 100644
--- a/lib/view_model/send/send_view_model_state.dart
+++ b/lib/view_model/send/send_view_model_state.dart
@@ -1,6 +1,5 @@
 import 'package:cake_wallet/core/execution_state.dart';
 
-class IsDeviceSigningResponseState extends IsExecutingState {}
 class IsAwaitingDeviceResponseState extends IsExecutingState {}
 class TransactionCommitting extends ExecutionState {}
 class TransactionCommitted extends ExecutionState {}
diff --git a/lib/view_model/settings/display_settings_view_model.dart b/lib/view_model/settings/display_settings_view_model.dart
index 37a37af60..26eb05985 100644
--- a/lib/view_model/settings/display_settings_view_model.dart
+++ b/lib/view_model/settings/display_settings_view_model.dart
@@ -1,21 +1,20 @@
 import 'package:cake_wallet/entities/balance_display_mode.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/themes/core/material_base_theme.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
-import 'package:cake_wallet/themes/core/theme_store.dart';
-import 'package:flutter/material.dart';
 
 part 'display_settings_view_model.g.dart';
 
 class DisplaySettingsViewModel = DisplaySettingsViewModelBase with _$DisplaySettingsViewModel;
 
 abstract class DisplaySettingsViewModelBase with Store {
-  DisplaySettingsViewModelBase(this._settingsStore, this._themeStore);
+  DisplaySettingsViewModelBase(
+    this._settingsStore,
+  );
 
   final SettingsStore _settingsStore;
-  final ThemeStore _themeStore;
 
   @computed
   FiatCurrency get fiatCurrency => _settingsStore.fiatCurrency;
@@ -33,10 +32,7 @@ abstract class DisplaySettingsViewModelBase with Store {
   bool get shouldShowMarketPlaceInDashboard => _settingsStore.shouldShowMarketPlaceInDashboard;
 
   @computed
-  ThemeData get theme => _themeStore.currentTheme.themeData;
-
-  @computed
-  ThemeMode get themeMode => _themeStore.themeMode;
+  ThemeBase get theme => _settingsStore.currentTheme;
 
   @computed
   bool get disabledFiatApiMode => _settingsStore.fiatApiMode == FiatApiMode.disabled;
@@ -62,19 +58,8 @@ abstract class DisplaySettingsViewModelBase with Store {
   }
 
   @action
-  Future<void> onThemeSelected(MaterialThemeBase newTheme) async {
-    await setTheme(newTheme);
-    await setThemeMode(newTheme.themeMode);
-  }
-
-  @action
-  Future<void> setTheme(MaterialThemeBase newTheme) async {
-    await _themeStore.setTheme(newTheme);
-  }
-
-  @action
-  Future<void> setThemeMode(ThemeMode value) async {
-    await _themeStore.setThemeMode(value);
+  void setTheme(ThemeBase newTheme) {
+    _settingsStore.currentTheme = newTheme;
   }
 
   @action
@@ -87,4 +72,5 @@ abstract class DisplaySettingsViewModelBase with Store {
 
   @action
   void setShowAddressBookPopup(bool value) => _settingsStore.showAddressBookPopupEnabled = value;
+
 }
diff --git a/lib/view_model/settings/privacy_settings_view_model.dart b/lib/view_model/settings/privacy_settings_view_model.dart
index e78f61ec4..62b656dca 100644
--- a/lib/view_model/settings/privacy_settings_view_model.dart
+++ b/lib/view_model/settings/privacy_settings_view_model.dart
@@ -1,4 +1,3 @@
-import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/ethereum/ethereum.dart';
@@ -33,18 +32,20 @@ abstract class PrivacySettingsViewModelBase with Store {
   @action
   void setAutoGenerateSubaddresses(bool value) {
     _wallet.isEnabledAutoGenerateSubaddress = value;
-    _settingsStore.autoGenerateSubaddressStatus =
-        value ? AutoGenerateSubaddressStatus.enabled : AutoGenerateSubaddressStatus.disabled;
+    if (value) {
+      _settingsStore.autoGenerateSubaddressStatus = AutoGenerateSubaddressStatus.enabled;
+    } else {
+      _settingsStore.autoGenerateSubaddressStatus = AutoGenerateSubaddressStatus.disabled;
+    }
   }
 
-  bool get isAutoGenerateSubaddressesVisible => [
-        WalletType.monero,
-        WalletType.wownero,
-        WalletType.bitcoin,
-        WalletType.litecoin,
-        WalletType.bitcoinCash,
-        WalletType.decred
-      ].contains(_wallet.type);
+  bool get isAutoGenerateSubaddressesVisible =>
+      _wallet.type == WalletType.monero ||
+      _wallet.type == WalletType.wownero ||
+      _wallet.type == WalletType.bitcoin ||
+      _wallet.type == WalletType.litecoin ||
+      _wallet.type == WalletType.bitcoinCash ||
+      _wallet.type == WalletType.decred;
 
   bool get isMoneroWallet => _wallet.type == WalletType.monero;
 
@@ -60,10 +61,6 @@ abstract class PrivacySettingsViewModelBase with Store {
   @computed
   bool get disableTradeOption => _settingsStore.disableTradeOption;
 
-  @computed
-  bool get disableAutomaticExchangeStatusUpdates =>
-      _settingsStore.disableAutomaticExchangeStatusUpdates;
-
   @computed
   bool get disableBulletin => _settingsStore.disableBulletin;
 
@@ -103,9 +100,6 @@ abstract class PrivacySettingsViewModelBase with Store {
   @computed
   bool get looksUpWellKnown => _settingsStore.lookupsWellKnown;
 
-  @computed
-  bool get usePayjoin => _settingsStore.usePayjoin;
-
   bool get canUseEtherscan => _wallet.type == WalletType.ethereum;
 
   bool get canUsePolygonScan => _wallet.type == WalletType.polygon;
@@ -114,8 +108,6 @@ abstract class PrivacySettingsViewModelBase with Store {
 
   bool get canUseMempoolFeeAPI => _wallet.type == WalletType.bitcoin;
 
-  bool get canUsePayjoin => _wallet.type == WalletType.bitcoin;
-
   @action
   void setShouldSaveRecipientAddress(bool value) =>
       _settingsStore.shouldSaveRecipientAddress = value;
@@ -132,10 +124,6 @@ abstract class PrivacySettingsViewModelBase with Store {
   @action
   void setDisableTradeOption(bool value) => _settingsStore.disableTradeOption = value;
 
-  @action
-  void setDisableAutomaticExchangeStatusUpdates(bool value) =>
-      _settingsStore.disableAutomaticExchangeStatusUpdates = value;
-
   @action
   void setDisableBulletin(bool value) => _settingsStore.disableBulletin = value;
 
@@ -153,7 +141,7 @@ abstract class PrivacySettingsViewModelBase with Store {
 
   @action
   void setLookupsWellKnown(bool value) => _settingsStore.lookupsWellKnown = value;
-
+  
   @action
   void setLookupsYatService(bool value) => _settingsStore.lookupsYatService = value;
 
@@ -182,11 +170,7 @@ abstract class PrivacySettingsViewModelBase with Store {
   }
 
   @action
-  void setUseMempoolFeeAPI(bool value) => _settingsStore.useMempoolFeeAPI = value;
-
-  @action
-  void setUsePayjoin(bool value) {
-    _settingsStore.usePayjoin = value;
-    bitcoin!.updatePayjoinState(_wallet, value);
+  void setUseMempoolFeeAPI(bool value) {
+    _settingsStore.useMempoolFeeAPI = value;
   }
 }
diff --git a/lib/view_model/start_tor_view_model.dart b/lib/view_model/start_tor_view_model.dart
deleted file mode 100644
index 1ef819d5f..000000000
--- a/lib/view_model/start_tor_view_model.dart
+++ /dev/null
@@ -1,95 +0,0 @@
-import 'dart:async';
-
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/main.dart';
-import 'package:cake_wallet/reactions/bootstrap.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/utils/tor.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
-import 'package:flutter/material.dart';
-import 'package:mobx/mobx.dart';
-
-part 'start_tor_view_model.g.dart';
-
-class StartTorViewModel = StartTorViewModelBase with _$StartTorViewModel;
-
-abstract class StartTorViewModelBase with Store {
-  StartTorViewModelBase() {
-    _startTimer();
-  }
-
-  Timer? _timer;
-  final int waitTimeInSeconds = 15;
-
-  @observable
-  bool isLoading = true;
-
-  @observable
-  bool timeoutReached = false;
-
-  @observable
-  int remainingSeconds = 15;
-
-  @computed
-  bool get showOptions => timeoutReached;
-
-  @action
-  void _startTimer() {
-    remainingSeconds = waitTimeInSeconds;
-    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      remainingSeconds -= 1;
-      
-      if (remainingSeconds <= 0) {
-        timer.cancel();
-        timeoutReached = true;
-      }
-    });
-  }
-
-  @observable
-  bool didStartTor = false;
-
-  @action
-  Future<void> startTor(BuildContext context) async {
-    if (didStartTor) {
-      return;
-    }
-    await ensureTorStarted(context: null);
-    while (true) {
-      await Future.delayed(Duration(milliseconds: 250));
-      if (CakeTor.instance.port != -1 && CakeTor.instance.started) {
-        break;
-      }
-    }
-    didStartTor = true;
-    final appStore = getIt.get<AppStore>();
-    bootstrapOnline(navigatorKey, loadWallet: true);
-    appStore.wallet?.connectToNode(node: appStore.settingsStore.getCurrentNode(appStore.wallet!.type));
-    Navigator.pushReplacementNamed(context, Routes.login);
-  }
-
-  @action
-  void disableTor(BuildContext context) {
-    final settingsStore = getIt.get<SettingsStore>();
-    settingsStore.currentBuiltinTor = false;
-    bootstrapOnline(navigatorKey, loadWallet: true);
-    final appStore = getIt.get<AppStore>();
-    appStore.wallet?.connectToNode(node: appStore.settingsStore.getCurrentNode(appStore.wallet!.type));
-    Navigator.pushReplacementNamed(context, Routes.login);
-  }
-
-  @action
-  void ignoreAndLaunchApp(BuildContext context) {
-    bootstrapOnline(navigatorKey, loadWallet: true);
-    final appStore = getIt.get<AppStore>();
-    appStore.wallet?.connectToNode(node: appStore.settingsStore.getCurrentNode(appStore.wallet!.type));
-    Navigator.pushReplacementNamed(context, Routes.login);
-  }
-
-  void dispose() {
-    _timer?.cancel();
-    _timer = null;
-  }
-} 
\ No newline at end of file
diff --git a/lib/view_model/trade_details_view_model.dart b/lib/view_model/trade_details_view_model.dart
index 4e6ca7a65..a9a77fb54 100644
--- a/lib/view_model/trade_details_view_model.dart
+++ b/lib/view_model/trade_details_view_model.dart
@@ -20,7 +20,7 @@ import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.da
 import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
 import 'package:cake_wallet/src/screens/trade_details/trade_provider_unsupported_item.dart';
 import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
-import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/date_formatter.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:collection/collection.dart';
@@ -39,13 +39,13 @@ abstract class TradeDetailsViewModelBase with Store {
   TradeDetailsViewModelBase({
     required Trade tradeForDetails,
     required this.trades,
-    required this.appStore,
+    required this.settingsStore,
   })  : items = ObservableList<StandartListItem>(),
         trade = trades.values.firstWhereOrNull((element) => element.id == tradeForDetails.id) ??
             tradeForDetails {
     switch (trade.provider) {
       case ExchangeProviderDescription.changeNow:
-        _provider = ChangeNowExchangeProvider(settingsStore: appStore.settingsStore);
+        _provider = ChangeNowExchangeProvider(settingsStore: settingsStore);
         break;
       case ExchangeProviderDescription.sideShift:
         _provider = SideShiftExchangeProvider();
@@ -126,7 +126,7 @@ abstract class TradeDetailsViewModelBase with Store {
 
   Timer? timer;
 
-  final AppStore appStore;
+  final SettingsStore settingsStore;
 
   @action
   Future<void> _updateTrade() async {
diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart
index 691c94f56..067ca73f9 100644
--- a/lib/view_model/transaction_details_view_model.dart
+++ b/lib/view_model/transaction_details_view_model.dart
@@ -233,13 +233,7 @@ abstract class TransactionDetailsViewModelBase with Store {
   }
 
   void _addMoneroListItems(TransactionInfo tx, DateFormat dateFormat) {
-    final descriptionKey = '${transactionInfo.txHash}_${wallet.walletAddresses.primaryAddress}';
-    final description = transactionDescriptionBox.values.firstWhere(
-      (val) => val.id == descriptionKey || val.id == transactionInfo.txHash,
-      orElse: () => TransactionDescription(id: descriptionKey));
-
-
-    final key = tx.additionalInfo['key'] as String? ?? description.transactionKey;
+    final key = tx.additionalInfo['key'] as String?;
     final accountIndex = tx.additionalInfo['accountIndex'] as int;
     final addressIndex = tx.additionalInfo['addressIndex'] as int;
     final feeFormatted = tx.feeFormatted();
diff --git a/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart b/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart
index bae4677cf..d4fadb2f1 100644
--- a/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart
+++ b/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart
@@ -131,41 +131,10 @@ abstract class UnspentCoinsListViewModelBase with Store {
     }
   }
 
-    List<Unspent> _getSpecificUnspents(UnspentCoinType overrideCoinTypeToSpendFrom) {
-    switch (wallet.type) {
-      case WalletType.monero:
-        return monero!.getUnspents(wallet);
-      case WalletType.wownero:
-        return wownero!.getUnspents(wallet);
-      case WalletType.bitcoin:
-      case WalletType.litecoin:
-      case WalletType.bitcoinCash:
-        return bitcoin!.getUnspents(wallet, coinTypeToSpendFrom: overrideCoinTypeToSpendFrom);
-      case WalletType.decred:
-        return decred!.getUnspents(wallet);
-      default:
-        return List.empty();
-    }
-  }
-
-  @action
-  Future<int> getSendingBalance(UnspentCoinType overrideCoinTypeToSpendFrom) async {
-    // return items.where((element) => element.isSending).fold(0, (previousValue, element) => previousValue + element.value);
-    // go through all unspent coins and add up the value minus frozen and non sending:
-    int total = 0;
-    await _updateUnspents();
-    Set<String> seen = {};
-    for (final item in _getSpecificUnspents(overrideCoinTypeToSpendFrom)) {
-      if (seen.contains(item.toString())) continue;
-      seen.add(item.toString());
-      if (item.isFrozen || !item.isSending) continue;
-      total += item.value;
-    }
-    return total;
-  }
-
   @action
   void _updateUnspentCoinsInfo() {
+    items.clear();
+
     final unspents = _getUnspents()
         .map((elem) {
           try {
@@ -199,7 +168,7 @@ abstract class UnspentCoinsListViewModelBase with Store {
         .toList();
 
     unspents.sort((a, b) => b.value.compareTo(a.value));
-    items.clear();
+
     items.addAll(unspents);
   }
 
diff --git a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
index 910f081ee..5b9be9109 100644
--- a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
+++ b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart
@@ -1,5 +1,4 @@
 import 'dart:developer' as dev;
-import 'dart:core';
 
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/core/fiat_conversion_service.dart';
@@ -73,21 +72,17 @@ class HavenURI extends PaymentURI {
 }
 
 class BitcoinURI extends PaymentURI {
-  BitcoinURI({required super.amount, required super.address, this.pjUri = ''});
-
-  final String pjUri;
+  BitcoinURI({required super.amount, required super.address});
 
   @override
   String toString() {
-    final qp = <String, String>{};
+    var base = 'bitcoin:$address';
 
-    if (amount.isNotEmpty) qp['amount'] = amount.replaceAll(',', '.');
-    if (pjUri.isNotEmpty && !address.startsWith("sp")) {
-      qp['pjos'] = '0';
-      qp['pj'] = pjUri;
+    if (amount.isNotEmpty) {
+      base += '?amount=${amount.replaceAll(',', '.')}';
     }
 
-    return Uri(scheme: 'bitcoin', path: address, queryParameters: qp).toString();
+    return base;
   }
 }
 
@@ -305,17 +300,6 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo
   WalletAddressListItem get address =>
       WalletAddressListItem(address: wallet.walletAddresses.address, isPrimary: false);
 
-  @computed
-  String get payjoinEndpoint => wallet.type == WalletType.bitcoin
-      ? bitcoin!.getPayjoinEndpoint(wallet)
-      : "";
-
-  @computed
-  bool get isPayjoinUnavailable =>
-      wallet.type == WalletType.bitcoin &&
-      _settingsStore.usePayjoin &&
-      payjoinEndpoint.isEmpty;
-
   @computed
   PaymentURI get uri {
     switch (wallet.type) {
@@ -324,10 +308,7 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo
       case WalletType.haven:
         return HavenURI(amount: amount, address: address.address);
       case WalletType.bitcoin:
-        return BitcoinURI(
-            amount: amount,
-            address: address.address,
-            pjUri: payjoinEndpoint);
+        return BitcoinURI(amount: amount, address: address.address);
       case WalletType.litecoin:
         return LitecoinURI(amount: amount, address: address.address);
       case WalletType.ethereum:
diff --git a/lib/view_model/wallet_groups_display_view_model.dart b/lib/view_model/wallet_groups_display_view_model.dart
index ef5b245ba..056d713aa 100644
--- a/lib/view_model/wallet_groups_display_view_model.dart
+++ b/lib/view_model/wallet_groups_display_view_model.dart
@@ -6,7 +6,6 @@ import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/wallet_types.g.dart';
-import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
@@ -128,16 +127,12 @@ abstract class WalletGroupsDisplayViewModelBase with Store {
 
         bool isNonSeedWallet = wallet.isNonSeedWallet;
 
-        bool isNotMoneroBip39Wallet = wallet.type == WalletType.monero &&
-            wallet.derivationInfo?.derivationType != DerivationType.bip39;
-
         // Exclude if any of these conditions are true
         return isNonBIP39Wallet ||
             isNanoDerivationType ||
             isElectrumDerivationType ||
             isSameTypeAsSelectedWallet ||
-            isNonSeedWallet ||
-            isNotMoneroBip39Wallet;
+            isNonSeedWallet;
       });
 
       if (shouldExcludeGroup) continue;
diff --git a/lib/view_model/wallet_hardware_restore_view_model.dart b/lib/view_model/wallet_hardware_restore_view_model.dart
index 0cfc18c16..541e169d0 100644
--- a/lib/view_model/wallet_hardware_restore_view_model.dart
+++ b/lib/view_model/wallet_hardware_restore_view_model.dart
@@ -80,9 +80,11 @@ abstract class WalletHardwareRestoreViewModelBase extends WalletCreationVM with
 
       availableAccounts.addAll(accounts);
       _nextIndex += limit;
+    // } on LedgerException catch (e) {
+    //   error = ledgerViewModel.interpretErrorCode(e.errorCode.toRadixString(16));
     } catch (e) {
       printV(e);
-      error = ledgerViewModel.interpretErrorCode(e.toString()) ?? S.current.ledger_connection_error;
+      error = S.current.ledger_connection_error;
     }
 
     isLoadingMoreAccounts = false;
diff --git a/lib/view_model/wallet_keys_view_model.dart b/lib/view_model/wallet_keys_view_model.dart
index da5d04f59..246227a80 100644
--- a/lib/view_model/wallet_keys_view_model.dart
+++ b/lib/view_model/wallet_keys_view_model.dart
@@ -63,15 +63,14 @@ abstract class WalletKeysViewModelBase with Store {
   String get seed => _wallet.seed != null ? _wallet.seed! : '';
 
   bool get isLegacySeedOnly =>
-      [WalletType.monero, WalletType.wownero].contains(_wallet.type) &&
+      (_wallet.type == WalletType.monero || _wallet.type == WalletType.wownero) &&
       _wallet.seed != null &&
-      !(Polyseed.isValidSeed(_wallet.seed!) ||
-          _wallet.seed!.split(' ').length == 12);
+      !Polyseed.isValidSeed(_wallet.seed!);
 
   String get legacySeed {
     if ((_wallet.type == WalletType.monero || _wallet.type == WalletType.wownero) &&
         _wallet.seed != null &&
-        (Polyseed.isValidSeed(_wallet.seed!) || _wallet.seed!.split(' ').length == 12)) {
+        Polyseed.isValidSeed(_wallet.seed!)) {
       final langName = PolyseedLang.getByPhrase(_wallet.seed!).nameEnglish;
 
       if (_wallet.type == WalletType.monero) {
diff --git a/lib/view_model/wallet_list/wallet_list_view_model.dart b/lib/view_model/wallet_list/wallet_list_view_model.dart
index 4046488fd..8c36f8412 100644
--- a/lib/view_model/wallet_list/wallet_list_view_model.dart
+++ b/lib/view_model/wallet_list/wallet_list_view_model.dart
@@ -2,6 +2,7 @@ import 'package:cake_wallet/core/wallet_loading_service.dart';
 import 'package:cake_wallet/entities/wallet_group.dart';
 import 'package:cake_wallet/entities/wallet_list_order_types.dart';
 import 'package:cake_wallet/entities/wallet_manager.dart';
+import 'package:cake_wallet/reactions/bip39_wallet_utils.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/store/app_store.dart';
@@ -74,9 +75,6 @@ abstract class WalletListViewModelBase with Store {
 
   @action
   Future<void> loadWallet(WalletListItem walletItem) async {
-    if (walletItem.type == WalletType.haven) {
-      return;
-    }
     // bool switchingToSameWalletType = walletItem.type == _appStore.wallet?.type;
     // await _appStore.wallet?.close(shouldCleanup: !switchingToSameWalletType);
     final wallet = await _walletLoadingService.load(walletItem.type, walletItem.name);
@@ -108,7 +106,45 @@ abstract class WalletListViewModelBase with Store {
         continue;
       }
 
-      multiWalletGroups.add(group);
+      // Identify wallets that should be moved to singleWalletsList using the filters: the type/derivation
+      final excludedWallets = <WalletInfo>[];
+
+      for (var wallet in group.wallets) {
+        // Check for non-BIP39 wallet types
+        final isNonBIP39 = !isBIP39Wallet(wallet.type);
+
+        // Check for nano derivation type
+        final isNanoDerivation = wallet.type == WalletType.nano &&
+            wallet.derivationInfo?.derivationType == DerivationType.nano;
+
+        // Check for electrum derivation type
+        final isElectrumDerivation =
+            (wallet.type == WalletType.bitcoin || wallet.type == WalletType.litecoin) &&
+                wallet.derivationInfo?.derivationType == DerivationType.electrum;
+
+        if (isNonBIP39 || isNanoDerivation || isElectrumDerivation) {
+          excludedWallets.add(wallet);
+        }
+      }
+
+      // Add excluded wallets to singleWalletsList
+      for (var excludedWallet in excludedWallets) {
+        singleWalletsList.add(convertWalletInfoToWalletListItem(excludedWallet));
+      }
+
+      // Remove excluded wallets from the group's wallets to avoid duplication
+      group.wallets.removeWhere((wallet) {
+        return excludedWallets.any((excluded) => excluded.address == wallet.address);
+      });
+
+      // Check if the group has more than one wallet after the excluded wallets are removed.
+      if (group.wallets.length > 1) {
+        //Add the entire group to the multi wallet group list since its still a multi wallet
+        multiWalletGroups.add(group);
+      } else if (group.wallets.length == 1) {
+        // Add the group to the wallet left to the single wallets list
+        singleWalletsList.add(convertWalletInfoToWalletListItem(group.wallets.first));
+      }
     }
   }
 
@@ -214,6 +250,7 @@ abstract class WalletListViewModelBase with Store {
         await sortGroupByType();
         break;
       case FilterListOrderType.Custom:
+      default:
         await reorderAccordingToWalletList();
         break;
     }
diff --git a/lib/view_model/wallet_new_vm.dart b/lib/view_model/wallet_new_vm.dart
index 86d1be65f..f4117f8ab 100644
--- a/lib/view_model/wallet_new_vm.dart
+++ b/lib/view_model/wallet_new_vm.dart
@@ -49,12 +49,39 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
   bool get hasLanguageSelector =>
       [WalletType.monero, WalletType.haven, WalletType.wownero].contains(type);
 
-  bool get showLanguageSelector =>
-      newWalletArguments?.mnemonic == null && hasLanguageSelector;
+  int get seedPhraseWordsLength {
+    switch (type) {
+      case WalletType.monero:
+      case WalletType.wownero:
+        return advancedPrivacySettingsViewModel.isPolySeed ? 16 : 25;
+      case WalletType.tron:
+      case WalletType.solana:
+      case WalletType.polygon:
+      case WalletType.ethereum:
+      case WalletType.bitcoinCash:
+        return advancedPrivacySettingsViewModel.seedPhraseLength.value;
+      case WalletType.bitcoin:
+      case WalletType.litecoin:
+        return seedSettingsViewModel.bitcoinSeedType == BitcoinSeedType.bip39
+            ? advancedPrivacySettingsViewModel.seedPhraseLength.value
+            : 24;
+      case WalletType.nano:
+      case WalletType.banano:
+        return seedSettingsViewModel.nanoSeedType == NanoSeedType.bip39
+            ? advancedPrivacySettingsViewModel.seedPhraseLength.value
+            : 24;
+      case WalletType.none:
+        return 24;
+      case WalletType.haven:
+        return 25;
+      case WalletType.zano:
+        return 26;
+      case WalletType.decred:
+        return 15;
+    }
+  }
 
-  bool get hasSeedType =>
-      newWalletArguments?.mnemonic == null &&
-      [WalletType.monero, WalletType.wownero].contains(type);
+  bool get hasSeedType => [WalletType.monero, WalletType.wownero].contains(type);
 
   @override
   WalletCredentials getCredentials(dynamic _options) {
@@ -65,15 +92,11 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
     switch (type) {
       case WalletType.monero:
         return monero!.createMoneroNewWalletCredentials(
-          name: name,
-          language: options!.first as String,
-          password: walletPassword,
-          passphrase: passphrase,
-          seedType: newWalletArguments!.mnemonic != null
-              ? MoneroSeedType.bip39.raw
-              : (options.last as MoneroSeedType).raw,
-          mnemonic: newWalletArguments!.mnemonic,
-        );
+            name: name,
+            language: options!.first as String,
+            password: walletPassword,
+            passphrase: passphrase,
+            isPolyseed: options.last as bool);
       case WalletType.bitcoin:
       case WalletType.litecoin:
         return bitcoin!.createBitcoinNewWalletCredentials(
@@ -129,7 +152,7 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
         return wownero!.createWowneroNewWalletCredentials(
           name: name,
           language: options!.first as String,
-          isPolyseed: (options.last as MoneroSeedType).raw == 1,
+          isPolyseed: options.last as bool,
           password: walletPassword,
           passphrase: passphrase,
         );
diff --git a/lib/view_model/wallet_restore_view_model.dart b/lib/view_model/wallet_restore_view_model.dart
index 6e00ba4cc..dec0be6b1 100644
--- a/lib/view_model/wallet_restore_view_model.dart
+++ b/lib/view_model/wallet_restore_view_model.dart
@@ -43,7 +43,6 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
             type == WalletType.solana ||
             type == WalletType.tron,
         isButtonEnabled = false,
-        hasPassphrase = false,
         mode = restoredWallet?.restoreMode ?? WalletRestoreMode.seed,
         super(appStore, walletInfoSource, walletCreationService, seedSettingsViewModel,
             type: type, isRecovery: true) {
@@ -90,9 +89,6 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
   @observable
   WalletRestoreMode mode;
 
-  @observable
-  bool hasPassphrase;
-
   @observable
   bool isButtonEnabled;
 
diff --git a/lib/wownero/cw_wownero.dart b/lib/wownero/cw_wownero.dart
index 26092486b..e20b6fbbf 100644
--- a/lib/wownero/cw_wownero.dart
+++ b/lib/wownero/cw_wownero.dart
@@ -361,9 +361,4 @@ class CWWownero extends Wownero {
   void wownerocCheck() {
     checkIfMoneroCIsFine();
   }
-
-  @override
-  Map<String, List<int>> debugCallLength() {
-    return wownero_wallet_api.debugCallLength();
-  }
 }
diff --git a/lib/zano/cw_zano.dart b/lib/zano/cw_zano.dart
index ede37eabc..19fec04e4 100644
--- a/lib/zano/cw_zano.dart
+++ b/lib/zano/cw_zano.dart
@@ -131,15 +131,4 @@ class CWZano extends Zano {
 
   @override
   bool validateAddress(String address) => ZanoUtils.validateAddress(address);
-
-  @override
-  Map<String, List<int>> debugCallLength() {
-    return api.debugCallLength();
-  }
-
-  @override
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress) {
-    final zanoWallet = wallet as ZanoWallet;
-    return zanoWallet.zanoAssets.values.any((element) => element?.assetId == contractAddress);
-  }
 }
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index b551d629d..a87e938f3 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -107,7 +107,7 @@ install(CODE "
 set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
 set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
   set(LIB_TRIPLET "aarch64-linux-gnu")
 else()
   set(LIB_TRIPLET "x86_64-linux-gnu")
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
new file mode 100644
index 000000000..01b922894
--- /dev/null
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,27 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <devicelocale/devicelocale_plugin.h>
+#include <flutter_local_authentication/flutter_local_authentication_plugin.h>
+#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
+#include <url_launcher_linux/url_launcher_plugin.h>
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) devicelocale_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "DevicelocalePlugin");
+  devicelocale_plugin_register_with_registrar(devicelocale_registrar);
+  g_autoptr(FlPluginRegistrar) flutter_local_authentication_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterLocalAuthenticationPlugin");
+  flutter_local_authentication_plugin_register_with_registrar(flutter_local_authentication_registrar);
+  g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
+  flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+}
diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h
new file mode 100644
index 000000000..e0f0a47bc
--- /dev/null
+++ b/linux/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
new file mode 100644
index 000000000..f52be7481
--- /dev/null
+++ b/linux/flutter/generated_plugins.cmake
@@ -0,0 +1,28 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  devicelocale
+  flutter_local_authentication
+  flutter_secure_storage_linux
+  url_launcher_linux
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  sp_scanner
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
new file mode 100644
index 000000000..528de8c42
--- /dev/null
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -0,0 +1,44 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+import connectivity_plus
+import cw_decred
+import cw_mweb
+import device_info_plus
+import devicelocale
+import fast_scanner
+import flutter_inappwebview_macos
+import flutter_local_authentication
+import flutter_secure_storage_macos
+import in_app_review
+import package_info_plus
+import path_provider_foundation
+import share_plus
+import shared_preferences_foundation
+import universal_ble
+import url_launcher_macos
+import wakelock_plus
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
+  CwDecredPlugin.register(with: registry.registrar(forPlugin: "CwDecredPlugin"))
+  CwMwebPlugin.register(with: registry.registrar(forPlugin: "CwMwebPlugin"))
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
+  DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
+  MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
+  InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
+  FlutterLocalAuthenticationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalAuthenticationPlugin"))
+  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
+  InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
+  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
+  UniversalBlePlugin.register(with: registry.registrar(forPlugin: "UniversalBlePlugin"))
+  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
+  WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
+}
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
index 5b209b0cf..cc6ae6e3b 100644
--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@@ -1,7 +1,9 @@
 PODS:
   - connectivity_plus (0.0.1):
     - FlutterMacOS
+    - ReachabilitySwift
   - cw_mweb (0.0.1):
+  - cw_decred (0.0.1):
     - FlutterMacOS
   - device_info_plus (0.0.1):
     - FlutterMacOS
@@ -14,8 +16,6 @@ PODS:
     - OrderedSet (~> 6.0.3)
   - flutter_local_authentication (1.2.0):
     - FlutterMacOS
-  - flutter_local_notifications (0.0.1):
-    - FlutterMacOS
   - flutter_secure_storage_macos (6.1.1):
     - FlutterMacOS
   - FlutterMacOS (1.0.0)
@@ -27,6 +27,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - ReachabilitySwift (5.2.4)
   - share_plus (0.0.1):
     - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
@@ -45,12 +46,12 @@ PODS:
 DEPENDENCIES:
   - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
   - cw_mweb (from `Flutter/ephemeral/.symlinks/plugins/cw_mweb/macos`)
+  - cw_decred (from `Flutter/ephemeral/.symlinks/plugins/cw_decred/macos`)
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`)
   - fast_scanner (from `Flutter/ephemeral/.symlinks/plugins/fast_scanner/macos`)
   - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`)
   - flutter_local_authentication (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_authentication/macos`)
-  - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
   - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
   - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`)
@@ -66,12 +67,17 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - OrderedSet
+    - ReachabilitySwift
 
 EXTERNAL SOURCES:
   connectivity_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
   cw_mweb:
     :path: Flutter/ephemeral/.symlinks/plugins/cw_mweb/macos
+  cw_decred:
+    :path: Flutter/ephemeral/.symlinks/plugins/cw_decred/macos
+  cw_monero:
+    :path: Flutter/ephemeral/.symlinks/plugins/cw_monero/macos
   device_info_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   devicelocale:
@@ -82,8 +88,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos
   flutter_local_authentication:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_authentication/macos
-  flutter_local_notifications:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos
   flutter_secure_storage_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos
   FlutterMacOS:
@@ -108,20 +112,22 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos
 
 SPEC CHECKSUMS:
-  connectivity_plus: 0a976dfd033b59192912fa3c6c7b54aab5093802
+  connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
   cw_mweb: 7440b12ead811dda972a9918442ea2a458e8742c
+  cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4
+  cw_decred: 0c93fbeb31bd97a6ad4ec5680960af0943bfca78
   device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
   devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
   fast_scanner: d31bae07e2653403a69dac99fb710c1722b16a97
   flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b
   flutter_local_authentication: 85674893931e1c9cfa7c9e4f5973cb8c56b018b0
-  flutter_local_notifications: 4ccab5b7a22835214a6672e3f9c5e8ae207dab36
   flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   in_app_review: a6a031b9acd03c7d103e341aa334adf2c493fb93
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
   share_plus: 1fa619de8392a4398bfaf176d441853922614e89
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sp_scanner: 269d96e0ec3173e69156be7239b95182be3b8303
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index 9f7f17ae4..a4a23ed36 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -10,7 +10,7 @@ dependencies:
       url: https://github.com/cake-tech/qr.flutter.git
       ref: cake-4.0.2
       version: 4.0.2
-  shared_preferences: 2.5.3
+  shared_preferences: 2.3.2
   # provider: ^6.0.3
   rxdart: ^0.28.0
   yaml: ^3.1.1
@@ -21,7 +21,7 @@ dependencies:
   http: ^1.1.0
   path_provider: ^2.0.11
   mobx: ^2.1.4
-  flutter_mobx: 2.0.6+5
+  flutter_mobx: ^2.0.6+5
   flutter_slidable: ^3.0.1
   share_plus: ^10.0.0
   # date_range_picker: ^1.0.6
@@ -54,7 +54,7 @@ dependencies:
   basic_utils: ^5.6.1
   get_it: ^7.2.0
   # connectivity: ^3.0.3
-  connectivity_plus: ^6.1.3
+  connectivity_plus: ^5.0.2
   keyboard_actions: ^4.0.1
   another_flushbar: ^1.12.29
   archive: ^4.0.3
@@ -83,44 +83,37 @@ dependencies:
       version: 1.0.0
   flutter_plugin_android_lifecycle: 2.0.23
   path_provider_android: ^2.2.1
-  shared_preferences_android: ^2.4.8
+  shared_preferences_android: 2.3.3
   url_launcher_android: 6.3.14
   url_launcher_linux: 3.1.1 # https://github.com/flutter/flutter/issues/153083
   sensitive_clipboard:
     git:
       url: https://github.com/MrCyjaneK/sensitive_clipboard
       ref: 288c7ee2d63b459bc735f7dc89321b29a1f12fae
+  walletconnect_flutter_v2: ^2.1.4
   eth_sig_util: ^0.0.9
   ens_dart:
     git:
-      url: https://github.com/MrCyjaneK/ens_dart.git
-      ref: 9fa09b9db69b8645d5d50a844652aa570451d101
+      url: https://github.com/cake-tech/ens_dart.git
+      ref: main
   fluttertoast: 8.2.12
 #  tor:
 #    git:
 #      url: https://github.com/cake-tech/tor.git
 #      ref: main
-  socks5_proxy:
-    git:
-      url: https://github.com/LacticWhale/socks_dart
-      ref: 27ad7c2efae8d7460325c74b90f660085cbd0685
+  socks5_proxy: ^1.0.4
   flutter_svg: ^2.0.9
   polyseed: ^0.0.7
-  nostr_tools:
-    git:
-      url: https://github.com/MrCyjaneK/nostr_tools.git
-      ref: 089d5a2dd751429a040ba10fb24fcbae564053e5
-  solana: ^0.31.0+1
+  nostr_tools: ^1.0.9
   ledger_flutter_plus:
     git:
       url: https://github.com/vespr-wallet/ledger-flutter-plus
-      ref: 60817d4b20144f9da9029f5034790272795b9d38
+      ref: c2e341d8038f1108690ad6f80f7b4b7156aacc76
   hashlib: ^1.19.2
   on_chain:
     git:
       url: https://github.com/cake-tech/on_chain.git
       ref: cake-update-v2
-  reown_walletkit: ^1.1.5+1
   blockchain_utils:
     git:
       url: https://github.com/cake-tech/blockchain_utils
@@ -128,8 +121,7 @@ dependencies:
   flutter_daemon:
     git:
       url: https://github.com/MrCyjaneK/flutter_daemon
-      ref: c24ee99f2f3070ea02d8108bbdd7727d73f7e5f1
-  flutter_local_notifications: ^19.0.0
+      ref: 5c369e0e69e6f459357b9802bc694a221397298a
 
 dev_dependencies:
   flutter_test:
@@ -137,10 +129,10 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   mocktail: ^1.0.4
-  build_runner: ^2.4.15
+  build_runner: ^2.3.3
   logging: ^1.2.0
   mobx_codegen: ^2.1.1
-  build_resolvers: ^2.4.4
+  build_resolvers: ^2.0.9
   hive_generator: ^2.0.1
   # flutter_launcher_icons: ^0.11.0
   # check flutter_launcher_icons for usage
@@ -169,17 +161,7 @@ dependency_overrides:
   ledger_flutter_plus:
     git:
       url: https://github.com/vespr-wallet/ledger-flutter-plus
-      ref: 60817d4b20144f9da9029f5034790272795b9d38
-  socks5_proxy:
-    git:
-      url: https://github.com/LacticWhale/socks_dart.git
-      ref: 27ad7c2efae8d7460325c74b90f660085cbd0685
-  tor_binary:
-    git:
-      url: https://github.com/MrCyjaneK/flutter-tor_binary
-      ref: cb811c610871a9517d47134b87c2f590c15c96c5
-  web_socket_channel: ^3.0.2
-  freezed_annotation: 2.4.4
+      ref: c2e341d8038f1108690ad6f80f7b4b7156aacc76
 
 flutter_icons:
   image_path: "assets/images/app_logo.png"
diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb
index 0a48d4da5..64089065d 100644
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "أضف أموالاً مدفوعة مسبقًا إلى البطاقات (حتى ${value})",
   "add_new_node": "أضافة عقدة جديدة",
   "add_new_word": "أضف كلمة جديدة",
-  "add_passphrase": "أضف عبارة المرور",
-  "add_passphrase_warning_text": "أدخل عبارة المرور فقط إذا كنت قد استخدمت واحدة لهذه المحفظة في الماضي. إذا أدخلت عبارة الممر الخاطئ أو لم تستخدم عبارة تمريرة من قبل على هذه المحفظة ، فلن ترى أيًا من الأموال أو التاريخ الحالي.",
   "add_receiver": "أضف مستقبل آخر (اختياري)",
   "add_secret_code": "                                     ﺔﻗﺩﺎﺼﻤﻟﺍ ﻖﻴﺒﻄﺗ ﻰﻟﺇ ﻱﺮﺴﻟﺍ ﺰﻣﺮﻟﺍ ﺍﺬﻫ ﻒﺿﺃ ﻭﺃ",
   "add_tip": "أضف بقشيش",
   "add_token_disclaimer_check": "لقد قمت بتأكيد عنوان ومعلومات عقد الرمز المميز باستخدام مصدر حسن السمعة. يمكن أن تؤدي إضافة معلومات خبيثة أو غير صحيحة إلى خسارة الأموال.",
   "add_token_warning": "لا تقم بتحرير أو إضافة رموز وفقًا لتعليمات المحتالين.\nقم دائمًا بتأكيد عناوين الرموز مع مصادر حسنة السمعة!",
   "add_value": "إضافة قيمة",
-  "added_message_for_ata_error": "يرجى التأكد من أن لديك ما يكفي من توازن SOL لإكمال معاملتك.",
   "address": " ﻥﺍﻮﻨﻋ",
   "address_book": "دليل العناوين",
   "address_book_menu": "دليل العناوين",
@@ -55,8 +52,6 @@
   "anonpay_description": "توليد ${type}. يمكن للمستلم ${method} بأي عملة مشفرة مدعومة ، وستتلقى أموالاً في هذه",
   "apk_update": "تحديث APK",
   "approve": "ﺪﻤﺘﻌﻳ",
-  "approve_request": "الموافقة على الطلب",
-  "approve_tokens": "الموافقة على الرموز",
   "arrive_in_this_address": "سيصل ${currency} ${tag}إلى هذا العنوان",
   "ascending": "تصاعدي",
   "ask_each_time": "اسأل في كل مرة",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "في انتظار تأكيد الدفع",
   "background_sync": "مزامنة الخلفية",
   "background_sync_mode": "وضع مزامنة الخلفية",
-  "background_sync_on_battery_low": "تزامن على البطارية المنخفضة",
-  "background_sync_on_charging": "تزامن فقط عند الشحن",
-  "background_sync_on_device_idle": "تزامن فقط عند عدم استخدام الجهاز",
-  "background_sync_on_unmetered_network": "تتطلب شبكة غير مستوفاة",
   "backup": "نسخ الاحتياطي",
   "backup_file": "ملف النسخ الاحتياطي",
   "backup_password": "كلمة مرور النسخ الاحتياطي",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "شراء Bitcoin",
   "buy_now": "اشتري الآن",
   "buy_provider_unavailable": "مزود حاليا غير متوفر.",
-  "buy_sell_pair_is_not_supported_warning": "لا يتم دعم زوج العملة هذا من قبل أي مزود لطريقة الدفع المحددة. الرجاء اختيار زوج مختلف أو محاولة تغيير طريقة الدفع.",
   "buy_with": "اشتر بواسطة",
   "by_cake_pay": "عن طريق Cake Pay",
   "cake_2fa_preset": " كعكة 2FA مسبقا",
@@ -124,12 +114,9 @@
   "camera_consent": ".ﻞﻴﺻﺎﻔﺘﻟﺍ ﻰﻠﻋ ﻝﻮﺼﺤﻠﻟ ﻢﻬﺑ ﺔﺻﺎﺨﻟﺍ ﺔﻴﺻﻮﺼﺨﻟﺍ ﺔﺳﺎﻴﺳ ﻦﻣ ﻖﻘﺤﺘﻟﺍ ﻰﺟﺮﻳ .${provider} ﻝﻮﻠ",
   "camera_permission_is_required": ".ﺍﺮﻴﻣﺎﻜﻟﺍ ﻥﺫﺇ ﺏﻮﻠﻄﻣ",
   "cancel": "إلغاء",
-  "cannot_verify": "لا يمكن التحقق",
-  "cannot_verify_description": "لا يمكن التحقق من هذا المجال. تحقق من الطلب بعناية قبل الموافقة.",
   "card_address": "العنوان:",
   "cardholder_agreement": "اتفاقية حامل البطاقة",
   "cards": "البطاقات",
-  "chain_id": "معرف سلسلة",
   "chains": "ﻞﺳﻼﺴﻟﺍ",
   "change": "تغير",
   "change_backup_password_alert": "لن تكون ملفات النسخ الاحتياطي السابقة متاحة للاستيراد بكلمة مرور نسخ احتياطي جديدة. سيتم استخدام كلمة مرور النسخ الاحتياطي الجديدة لملفات النسخ الاحتياطي الجديدة فقط. هل أنت متأكد أنك تريد تغيير كلمة المرور الاحتياطية؟",
@@ -144,7 +131,6 @@
   "change_rep_message": "؟ﻦﻴﻠﺜﻤﻤﻟﺍ ﺮﻴﻴﻐﺗ ﺪﻳﺮﺗ ﻚﻧﺃ ﺪﻛﺄﺘﻣ ﺖﻧﺃ ﻞﻫ",
   "change_rep_successful": "تم تغيير ممثل بنجاح",
   "change_selected_exchanges": "تغيير التبادلات المحددة",
-  "change_selected_pair": "تغيير الزوج المحدد",
   "change_wallet_alert_content": "هل تريد تغيير المحفظة الحالية إلى ${wallet_name}؟",
   "change_wallet_alert_title": "تغيير المحفظة الحالية",
   "choose_a_payment_method": "اختر طريقة الدفع",
@@ -182,14 +168,9 @@
   "confirmed_tx": "مؤكد",
   "congratulations": "تهانينا!",
   "connect_an_existing_yat": "توصيل Yat الحالي",
-  "connect_hw_info_step_1": "تأكد من تشغيل جهازك.",
-  "connect_hw_info_step_2": "قم بتشغيل Bluetooth لكل من الجهازين وإقرانها من الهاتف ، أو قم بتوصيل أجهزتك معًا باستخدام كبل USB.",
-  "connect_hw_info_step_3": "افتح جهازك وانتقل إلى تطبيق التشفير المطلوب.",
-  "connect_hw_info_step_4": "حدد جهازك في محفظة كعكة ومتابعة الإعداد.",
   "connect_yats": "توصيل Yats",
   "connect_your_hardware_wallet": "قم بتوصيل محفظة الأجهزة الخاصة بك باستخدام Bluetooth أو USB",
   "connect_your_hardware_wallet_ios": "قم بتوصيل محفظة الأجهزة الخاصة بك باستخدام Bluetooth",
-  "connected": "متصل",
   "connection_sync": "الاتصال والمزامنة",
   "connectWalletPrompt": "ﺕﻼﻣﺎﻌﻤﻟﺍ ءﺍﺮﺟﻹ WalletConnect ﻊﻣ ﻚﺘﻈﻔﺤﻣ ﻞﻴﺻﻮﺘﺑ ﻢﻗ",
   "contact": "تواصل",
@@ -207,8 +188,6 @@
   "copy": "نسخ",
   "copy_address": "نسخ العنوان",
   "copy_id": "نسخ معرف العملية",
-  "copy_payjoin_address": "نسخ عنوان payjoin",
-  "copy_payjoin_url": "نسخ Payjoin url",
   "copyWalletConnectLink": "ﺎﻨﻫ ﻪﻘﺼﻟﺍﻭ dApp ﻦﻣ WalletConnect ﻂﺑﺍﺭ ﺦﺴﻧﺍ",
   "corrupted_seed_notice": "تالف ملفات هذه المحفظة ولا يمكن فتحها. يرجى الاطلاع على عبارة البذور وحفظها واستعادة المحفظة.\n\nإذا كانت القيمة فارغة ، لم تتمكن البذور من استردادها بشكل صحيح.",
   "countries": "بلدان",
@@ -245,22 +224,11 @@
   "descending": "النزول",
   "description": "ﻒﺻﻭ",
   "destination_tag": "علامة الوجهة:",
-  "deuro_collect_interest": "يجمع",
-  "deuro_savings": "الادخار ديورو",
-  "deuro_savings_add": "إيداع",
-  "deuro_savings_balance": "توازن الادخار",
-  "deuro_savings_collect_interest": "جمع الاهتمام",
-  "deuro_savings_remove": "ينسحب",
-  "deuro_savings_set_approval": "تعيين الموافقة",
-  "deuro_savings_subtitle": "كسب ما يصل إلى 10 ٪ فائدة على مقتنيات Deuro Stablecoin",
-  "deuro_tx_commited_content": "قد يستغرق الأمر بضع ثوانٍ حتى يتم تأكيد المعاملة وينعكس على الشاشة",
-  "device_is_signing": "الجهاز يوقع",
   "dfx_option_description": "شراء التشفير مع EUR & CHF. لعملاء البيع بالتجزئة والشركات في أوروبا",
   "didnt_get_code": "لم تحصل على رمز؟",
   "digit_pin": "-رقم PIN",
   "digital_and_physical_card": "  بطاقة ائتمان رقمية ومادية مسبقة الدفع",
   "disable": "إبطال",
-  "disable_automatic_exchange_status_updates": "تعطيل تحديثات حالة التبادل التلقائي",
   "disable_bulletin": "تعطيل نشرة حالة الخدمة",
   "disable_buy": "تعطيل إجراء الشراء",
   "disable_cake_2fa": "تعطيل 2 عامل المصادقة",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "من خلال إيقاف تشغيل هذا ، قد تكون معدلات الرسوم غير دقيقة في بعض الحالات ، لذلك قد ينتهي بك الأمر إلى دفع مبالغ زائدة أو دفع رسوم المعاملات الخاصة بك",
   "disable_fiat": "تعطيل fiat",
   "disable_sell": "قم بتعطيل إجراء البيع",
-  "disable_tor": "تعطيل تور",
   "disable_trade_option": "تعطيل خيار التجارة",
   "disableBatteryOptimization": "تعطيل تحسين البطارية",
   "disableBatteryOptimizationDescription": "هل تريد تعطيل تحسين البطارية من أجل جعل الخلفية مزامنة تعمل بحرية وسلاسة؟",
   "disabled": "معطلة",
-  "disconnect_session": "فصل الجلسة",
   "discount": "وفر ${value}٪",
   "display_settings": "اعدادات العرض",
   "displayable": "قابل للعرض",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "لا تشارك هذه مع أي شخص آخر ، بما في ذلك الدعم.\n\nيمكن أن تتم سرقة أموالك!",
   "do_not_show_me": "لا ترني هذا مجددا",
   "domain_looks_up": "ﻝﺎﺠﻤﻟﺍ ﺚﺤﺑ ﺕﺎﻴﻠﻤﻋ",
-  "domain_mismatch": "عدم تطابق المجال",
-  "domain_mismatch_description": "يحتوي هذا الموقع على مجال لا يتطابق مع مرسل هذا الطلب. قد تؤدي الموافقة على فقدان الأموال.",
   "donation_link_details": "تفاصيل رابط التبرع",
-  "done": "منتهي",
   "e_sign_consent": "الموافقة على التوقيع الإلكتروني",
   "edit": "تعديل",
   "edit_backup_password": "تعديل كلمة مرور النسخ الاحتياطي",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "نقوم بإنشاء عناوين جديدة في كل مرة تستخدم فيها عنوانًا ، لكن العناوين السابقة تستمر في العمل",
   "email_address": "عنوان البريد الالكترونى",
   "enable": "يُمكَِن",
-  "enable_builtin_tor": "تمكين بنيت في تور",
   "enable_mempool_api": "MEMPOOL API للحصول على رسوم وتواريخ دقيقة",
   "enable_replace_by_fee": "تمكين الاستبدال",
   "enable_silent_payments_scanning": "ابدأ في مسح المدفوعات الصامتة ، حتى يتم الوصول إلى الطرف",
@@ -333,10 +295,8 @@
   "error_text_template": "لا يمكن أن يحتوي اسم القالب وعنوانه على رموز ` , \"\nويجب أن يتراوح طولها بين 1 و 106 حرفًا",
   "error_text_wallet_name": "يمكن أن يحتوي اسم المحفظة على أحرف وأرقام ورموز _ - فقط\nويجب أن يتراوح طولها بين حرف واحد و 33 حرفًا",
   "error_text_xmr": "لا يمكن أن تتجاوز قيمة XMR الرصيد المتاح.\nيجب أن يكون عدد الكسور أقل من أو يساوي 12",
-  "error_while_processing": "حدث خطأ أثناء التنقل",
   "errorGettingCredentials": "ﺩﺎﻤﺘﻋﻻﺍ ﺕﺎﻧﺎﻴﺑ ﻰﻠﻋ ﻝﻮﺼﺤﻟﺍ ءﺎﻨﺛﺃ ﺄﻄﺧ ﺙﺪﺣ :ﻞﺸﻓ",
   "errorSigningTransaction": "ﺔﻠﻣﺎﻌﻤﻟﺍ ﻊﻴﻗﻮﺗ ءﺎﻨﺛﺃ ﺄﻄﺧ ﺙﺪﺣ",
-  "establishing_tor_connection": "ارتياح توصيل تور",
   "estimated": "مُقدَّر",
   "estimated_new_fee": "رسوم جديدة مقدرة",
   "estimated_receive_amount": "مقدرة المبلغ الاستقبال",
@@ -360,7 +320,6 @@
   "export_backup": "تصدير نسخة احتياطية",
   "export_logs": "سجلات التصدير",
   "export_outputs": "مخرجات التصدير",
-  "extend_session": "تمديد الجلسة",
   "extra_id": "معرف إضافي:",
   "extracted_address_content": "سوف ترسل الأموال إلى\n${recipient_name}",
   "failed_authentication": "${state_error} فشل المصادقة.",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "الرصيد فيات",
   "field_required": "هذه الخانة مطلوبه",
-  "file_saved": "تم حفظ الملف",
   "fill_code": "يرجى ملء رمز التحقق المرسل إلى بريدك الإلكتروني",
   "filter_by": "تصفية حسب",
   "first_wallet_text": "محفظة رائعة ل Monero, Bitcoin, Ethereum, Litecoin و Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "هل نسيت كلمة السر",
   "freeze": "تجميد",
   "frequently_asked_questions": "الأسئلة الشائعة",
-  "from": "من",
   "frozen": "مجمدة",
   "frozen_balance": "التوازن المجمد",
   "full_balance": "الرصيد الكامل",
   "gas_exceeds_allowance": "الغاز المطلوب بالمعاملة يتجاوز البدل.",
-  "gas_price": "سعر الغاز",
   "generate_name": "توليد الاسم",
   "generating_gift_card": "يتم توليد بطاقة هدية",
   "generating_transaction": "توليد معاملة",
@@ -413,7 +369,6 @@
   "hide_details": "أخف التفاصيل",
   "high_contrast_theme": "موضوع عالي التباين",
   "home_screen_settings": "إعدادات الشاشة الرئيسية",
-  "how_to_connect": "كيفية الاتصال",
   "how_to_use": "                                                                    ﻞﻤﻌﺘﺴﺗ ﻒﻴﻛ",
   "how_to_use_card": "كيفية استخدام هذه البطاقة",
   "id": "رقم المعرف:",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "ليس لديك ما يكفي من SOL لتغطية المعاملة ورسوم المعاملات الخاصة بها. يرجى إضافة المزيد من SOL إلى محفظتك أو تقليل كمية SOL التي ترسلها.",
   "insufficient_lamports": "ليس لديك ما يكفي من SOL لتغطية المعاملة ورسوم المعاملات الخاصة بها. تحتاج على الأقل ${solValueNeeded} sol. يرجى إضافة المزيد من sol إلى محفظتك أو تقليل مبلغ sol الذي ترسله",
   "insufficientFundsForRentError": "ليس لديك ما يكفي من SOL لتغطية رسوم المعاملة والإيجار للحساب. يرجى إضافة المزيد من sol إلى محفظتك أو تقليل مبلغ sol الذي ترسله",
-  "insufficientFundsForRentErrorReceiver": "لا يحتوي حساب المتلقي على ما يكفي من SOL لتغطية الإيجار. يرجى اطلب من المتلقي إضافة المزيد من SOL إلى حسابه.",
   "introducing_cake_pay": "نقدم لكم Cake Pay!",
   "invalid_input": "مدخل غير صالح",
   "invalid_password": "رمز مرور خاطئ",
@@ -471,7 +425,6 @@
   "logout": "تسجيل خروج",
   "low_fee": "رسوم منخفضة",
   "low_fee_alert": "أنت تستخدم حاليًا أولوية منخفضة لرسوم الشبكة. قد يتسبب هذا في فترات انتظار طويلة ، أو أسعار مختلفة ، أو إلغاء صفقات. نوصي بتحديد رسوم أعلى لتجربة أفضل.",
-  "made_easy": "جعل بسهولة",
   "manage_nodes": "ﺪﻘﻌﻟﺍ ﺓﺭﺍﺩﺇ",
   "manage_pow_nodes": "PoW ﻁﺎﻘﻧ ﺓﺭﺍﺩﺇ",
   "manage_yats": "إدارة Yats",
@@ -483,8 +436,6 @@
   "memo": "مذكرة:",
   "message": "ﺔﻟﺎﺳﺭ",
   "message_verified": "تم التحقق من الرسالة بنجاح",
-  "messages": "رسائل",
-  "method": "طريقة",
   "methods": " ﻕﺮﻃُ",
   "min_amount": "الحد الأدنى: ${value}",
   "min_value": "الحد الأدنى: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "موضوع مونيرو الظلام",
   "monero_light_theme": " ضوء مونيرو",
   "moonpay_alert_text": "يجب أن تكون قيمة المبلغ أكبر من أو تساوي ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "حدث خطأ أثناء جلب NFTs. يرجى التحقق من اتصال الإنترنت الخاص بك وحاول مرة أخرى.",
   "more_options": "المزيد من الخيارات",
   "multiple_addresses_detected": "عناوين متعددة تم اكتشافها",
   "mweb_confirmed": "أكد MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "تسمية",
   "new_subaddress_title": "عنوان جديد",
   "new_template": "قالب جديد",
-  "new_transactions_notifications": "إرسال إشعارات حول المعاملات الجديدة",
   "new_wallet": "إنشاء محفظة جديدة",
   "newConnection": "ﺪﻳﺪﺟ ﻝﺎﺼﺗﺍ",
   "no_cards_found": "لم يتم العثور على بطاقات",
@@ -539,7 +488,6 @@
   "normal": "طبيعي",
   "note_optional": "ملاحظة (اختياري)",
   "note_tap_to_change": "ملاحظة (انقر للتغيير)",
-  "notification_permission_denied": "تم رفض إذن الإخطار بشكل جيد ، يرجى تمكينه يدويًا في الإعدادات",
   "nullURIError": "ﻍﺭﺎﻓ (URI) ﻢﻈﺘﻨﻤﻟﺍ ﺩﺭﺍﻮﻤﻟﺍ ﻑﺮﻌﻣ",
   "offer_expires_in": "ينتهي العرض في:",
   "offline": "غير متصل على الانترنت",
@@ -571,20 +519,8 @@
   "password": "كلمة المرور",
   "paste": "لصق",
   "pause_wallet_creation": ".ﺎﻴًﻟﺎﺣ ﺎﺘًﻗﺆﻣ ﺔﻔﻗﻮﺘﻣ Haven Wallet ءﺎﺸﻧﺇ ﻰﻠﻋ ﺓﺭﺪﻘﻟﺍ",
-  "payjoin_card_content": "Payjoin هي ميزة جديدة للحفاظ على الخصوصية وتوفير الرسوم في Bitcoin.",
-  "payjoin_details": "Payjoin تفاصيل",
-  "payjoin_enabled": "Payjoin تمكين",
-  "payjoin_enabling_popup_content": "يمكنك التبديل Payjoin ضمن القائمة → الخصوصية ← استخدام Payjoin لتمكينه أو تعطيله لاحقًا.",
-  "payjoin_enabling_popup_title": "تمكين Payjoin",
-  "payjoin_request_awaiting_tx": "في انتظار المعاملة",
-  "payjoin_request_in_progress": "في تَقَدم",
-  "payjoin_unavailable": "Payjoin غير متوفر",
-  "payjoin_unavailable_sheet_content": "يتطلب استلام معاملة Payjoin أن تكون Bitcoin جاهزًا للاستخدام.",
-  "payjoin_unavailable_sheet_title": "لماذا Payjoin غير متوفر؟",
   "payment_id": "معرف الدفع:",
-  "payment_made_easy": "المدفوعات جعلت سهلة",
   "payment_was_received": "تم استلام الدفع الخاص بك.",
-  "payments": "المدفوعات",
   "pending": "  (في الإنتظار)",
   "percentageOf": "من ${amount}",
   "pin_at_top": "تثبيت ${token} في الأعلى",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "الرجاء محاولة الاتصال بعقدة أخرى",
   "please_wait": "انتظر من فضلك",
   "polygonscan_history": "ﻥﺎﻜﺴﻧﻮﺠﻴﻟﻮﺑ ﺦﻳﺭﺎﺗ",
-  "potential_scam": "عملية احتيال محتملة",
   "powered_by": "بدعم من ${title}",
   "pre_seed_button_text": "انا أفهم. أرني سييد الخاص بي",
-  "pre_seed_description": "في الصفحة التالية ، سترى سلسلة من الكلمات. هذه هي البذور الفريدة والخاصة الخاصة بك وهي الطريقة الوحيدة لاستعادة محفظتك في حالة الخسارة أو العطل. تقع على عاتقك مسؤولية كتابتها وتخزينها في مكان آمن خارج تطبيق Cake Wallet.",
+  "pre_seed_description": "في الصفحة التالية ستشاهد سلسلة من الكلمات ${words}. هذه هي سييد الفريدة والخاصة بك وهي الطريقة الوحيدة لاسترداد محفظتك في حالة فقدها أو عطلها. تقع على عاتقك مسؤولية تدوينها وتخزينها في مكان آمن خارج تطبيق Cake Wallet.",
   "pre_seed_title": "مهم",
   "prepaid_cards": "البطاقات المدفوعة مسبقا",
   "prevent_screenshots": "منع لقطات الشاشة وتسجيل الشاشة",
@@ -617,7 +552,6 @@
   "proceed_on_device": "تابع جهازك",
   "proceed_on_device_description": "يرجى اتباع الإرشادات المطلوبة على محفظة الأجهزة الخاصة بك",
   "processing": "يعالج",
-  "processing_signed_tx": "معالجة المعاملة الموقعة",
   "profile": "حساب تعريفي",
   "provider_error": "خطأ ${provider}",
   "public_key": "مفتاح عمومي",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "لا يبدو أن ممثلك في وضع جيد. اضغط هنا لاختيار واحدة جديدة",
   "repeat_wallet_password": "كرر كلمة مرور المحفظة",
   "repeated_password_is_incorrect": "كلمة المرور المتكررة غير صحيحة. يرجى تكرار كلمة مرور المحفظة مرة أخرى.",
-  "requested": "مطلوب",
   "require_for_adding_contacts": "تتطلب إضافة جهات اتصال",
   "require_for_all_security_and_backup_settings": "مطلوب لجميع إعدادات الأمان والنسخ الاحتياطي",
   "require_for_assessing_wallet": "تتطلب الوصول إلى المحفظة",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "تتطلب عمليات الإرسال إلى المحافظ الداخلية",
   "require_for_sends_to_non_contacts": "تتطلب لارسال لغير جهات الاتصال",
   "require_pin_after": "طلب PIN بعد",
-  "required_passphrase": "عبارة المرور",
   "rescan": "إعادة الفحص",
   "resend_code": "الرجاء إعادة إرسالها",
   "reset": "إعادة",
   "reset_password": "إعادة تعيين كلمة المرور",
-  "restore": "يعيد",
   "restore_active_seed": "السييد النشطة",
   "restore_address": "العنوان",
   "restore_bitcoin_description_from_keys": "قم باستعادة محفظتك من سلسلة WIF التي تم إنشاؤها من مفاتيحك الخاصة",
@@ -713,10 +644,7 @@
   "search_language": "ابحث عن لغة",
   "second_intro_content": "Yat الخاص بك هو عنوان تعبيري فريد يحل محل جميع العناوين السداسية العشرية الطويلة لجميع عملاتك.",
   "second_intro_title": "عنوان تعبيري ايموجي واحد يحكمهم جميعا!",
-  "security": "حماية",
   "security_and_backup": "الأمان والنسخ الاحتياطي",
-  "security_risk": "خطر الأمن",
-  "security_risk_description": "تم وضع علامة على هذا المجال على أنه غير آمن من قبل مقدمي الأمان المتعددين. اترك على الفور لحماية أصولك.",
   "seed_alert_back": "العودة إلى الوراء",
   "seed_alert_content": "السييد هي الطريقة الوحيدة لاسترداد محفظتك. هل كتبتها؟",
   "seed_alert_title": "انتباه",
@@ -751,6 +679,9 @@
   "seedtype": "البذور",
   "seedtype_alert_content": "مشاركة البذور مع محافظ أخرى ممكن فقط مع BIP39 Seedtype.",
   "seedtype_alert_title": "تنبيه البذور",
+  "seedtype_legacy": "إرث (25 كلمة)",
+  "seedtype_polyseed": "بوليسيد (16 كلمة)",
+  "seedtype_wownero": "Wownero (14 كلمة)",
   "select_backup_file": "حدد ملف النسخ الاحتياطي",
   "select_buy_provider_notice": "حدد مزود شراء أعلاه. يمكنك تخطي هذه الشاشة عن طريق تعيين مزود شراء الافتراضي في إعدادات التطبيق.",
   "select_destination": ".ﻲﻃﺎﻴﺘﺣﻻﺍ ﺦﺴﻨﻟﺍ ﻒﻠﻣ ﺔﻬﺟﻭ ﺪﻳﺪﺤﺗ ءﺎﺟﺮﻟﺍ",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "أرسل من محفظة خارجية",
   "send_name": "الأسم",
   "send_new": "جديد",
-  "send_payjoin": "يرسل Payjoin",
   "send_payment_id": "معرف عملية الدفع (اختياري)",
   "send_priority": "حاليًا ، تم تحديد الرسوم بأولوية ${transactionPriority}.\nيمكن تعديل أولوية المعاملة في الإعدادات",
   "send_sending": "يتم الإرسال...",
@@ -832,9 +762,7 @@
   "show_keys": "اظهار السييد / المفاتيح",
   "show_market_place": "إظهار السوق",
   "show_seed": "عرض السييد",
-  "sign_all": "قم بتوقيع الكل",
   "sign_message": "تسجيل رسالة",
-  "sign_one": "وقع واحد",
   "sign_up": "اشتراك",
   "sign_verify_message": "تسجيل / تحقق",
   "sign_verify_message_sub": "قم بتوقيع أو التحقق من رسالة باستخدام المفتاح الخاص بك",
@@ -863,14 +791,11 @@
   "sort_by": "ترتيب حسب",
   "spend_key_private": "مفتاح الإنفاق (خاص)",
   "spend_key_public": "مفتاح الإنفاق (عام)",
-  "starting_tor_proxy": "بدء الوكيل Tor",
   "status": "الحالة:",
-  "step": "خطوة",
   "string_default": "تقصير",
   "subaddress_title": "قائمة العناوين الفرعية",
   "subaddresses": "العناوين الفرعية",
   "submit_request": "تقديم طلب",
-  "success": "نجاح",
   "successful": "ﺢﺟﺎﻧ",
   "support_description_guides": "توثيق ودعم القضايا المشتركة",
   "support_description_live_chat": "حرة وسريعة! ممثلو الدعم المدربين متاحون للمساعدة",
@@ -878,7 +803,6 @@
   "support_title_guides": "مستندات محفظة كعكة",
   "support_title_live_chat": "الدعم المباشر",
   "support_title_other_links": "روابط دعم أخرى",
-  "supported": "مدعوم",
   "swap": "تبديل",
   "sweeping_wallet": "كنس المحفظة",
   "sweeping_wallet_alert": "لن يستغرق هذا وقتًا طويلاً. لا تترك هذه الشاشة وإلا فقد يتم فقد أموال سويبت",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "يتم المزامنة",
   "sync_status_timed_out": "نفد وقته",
   "sync_status_unsupported": "عقدة غير مدعومة",
-  "synchronizing": "المزامنة",
   "syncing_wallet_alert_content": "قد لا يكتمل رصيدك وقائمة المعاملات الخاصة بك حتى تظهر عبارة “SYNCHRONIZED“ في الأعلى. انقر / اضغط لمعرفة المزيد.",
   "syncing_wallet_alert_title": "محفظتك تتم مزامنتها",
   "template": "قالب",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "لا يدعم مزود Thorchain عناوين Taproot. يرجى تغيير العنوان أو تحديد مزود مختلف.",
   "time": "${minutes}د ${seconds}س",
   "tip": "بقشيش:",
-  "to": "ل",
   "today": "اليوم",
-  "token_already_exists": "رمز موجود بالفعل",
   "token_contract_address": "عنوان عقد الرمز",
   "token_decimal": "رمز عشري",
   "token_name": "اسم الرمز ، على سبيل المثال: Tether",
   "token_symbol": "رمز العملة ، على سبيل المثال: USDT",
   "tokenID": "ﻒﻳﺮﻌﺗ ﺔﻗﺎﻄﺑ",
-  "ton_extra_info": "يرجى عدم نسيان تحديد معرف المذكرة أثناء إرسال معاملة TON للتبادل",
   "tor_connection": "ﺭﻮﺗ ﻝﺎﺼﺗﺍ",
-  "tor_connection_timeout": "Tor Torn Connection Timeout",
-  "tor_experimental": "هذه ميزة تجريبية ، وليس جميع الاتصالات المصنوعة من توجيه Cake Wallet Support - قد تستخدم بعض الاتصالات ClearNet ، من أجل توجيه حركة المرور بشكل كامل باستخدام TOR مع وضع VPN.",
   "tor_only": "Tor فقط",
   "total": "المجموع",
   "total_saving": "إجمالي المدخرات",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "إذا لم تستمر الشاشة بعد دقيقة واحدة ، فتحقق من مستكشف البلوك والبريد الإلكتروني.",
   "transactions": "المعاملات",
   "transactions_by_date": "المعاملات حسب التاريخ",
-  "transport_type": "نوع النقل",
   "trongrid_history": "تاريخ ترونغريد",
   "trusted": "موثوق به",
-  "try_again": "حاول ثانية",
   "tx_commit_exception_no_dust_on_change": "يتم رفض المعاملة مع هذا المبلغ. باستخدام هذه العملات المعدنية ، يمكنك إرسال ${min} دون تغيير أو ${max} الذي يعيد التغيير.",
   "tx_commit_failed": "فشل ارتكاب المعاملة. يرجى الاتصال بالدعم.",
   "tx_commit_failed_no_peers": "فشل المعاملة في البث ، يرجى المحاولة مرة أخرى في ثانية أو نحو ذلك",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "تفاصيل العملات الغير المنفقة",
   "unspent_coins_title": "العملات الغير المنفقة",
   "unsupported_asset": ".ﻡﻮﻋﺪﻣ ﻞﺻﺃ ﻉﻮﻧ ﻦﻣ ﺔﻈﻔﺤﻣ ﻰﻟﺇ ﻞﻳﺪﺒﺘﻟﺍ ﻭﺃ ءﺎﺸﻧﺇ ﻰﺟﺮﻳ .ﻞﺻﻷﺍ ﺍﺬﻬﻟ ءﺍﺮﺟﻹﺍ ﺍﺬﻫ ﻢﻋﺪﻧ ﻻ ﻦﺤﻧ",
-  "update_session": "جلسة التحديث",
   "uptime": "مدة التشغيل",
   "upto": "حتى ${value}",
   "usb": "USB",
   "use": "التبديل إلى",
   "use_card_info_three": "استخدم البطاقة الرقمية عبر الإنترنت أو مع طرق الدفع غير التلامسية.",
   "use_card_info_two": "يتم تحويل الأموال إلى الدولار الأمريكي عند الاحتفاظ بها في الحساب المدفوع مسبقًا ، وليس بالعملات الرقمية.",
-  "use_device_theme": "استخدم موضوع الجهاز",
-  "use_payjoin": "يستخدم Payjoin",
   "use_ssl": "استخدم SSL",
   "use_suggested": "استخدام المقترح",
   "use_testnet": "استخدم testnet",
-  "user_rejected_method": "طريقة رفض المستخدم",
   "value": "قيمة",
   "value_type": "نوع القيمة",
   "variable_pair_not_supported": "هذا الزوج المتغير غير مدعوم في التبادلات المحددة",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "يمكنك دائمًا عرض هذه البذرة مرة أخرى تحت",
   "wallet_group_empty_state_text_one": "يبدو أنه ليس لديك أي مجموعات محفظة متوافقة !\n\n انقر",
   "wallet_group_empty_state_text_two": "أدناه لجعل واحدة جديدة.",
-  "wallet_has_passphrase": "هذه المحفظة تحتوي على عبارة ممر",
   "wallet_keys": "سييد المحفظة / المفاتيح",
   "wallet_list_create_new_wallet": "إنشاء محفظة جديدة",
   "wallet_list_edit_group_name": "تحرير اسم المجموعة",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "المحافظ",
   "warning": "تحذير",
-  "welcome": "مرحباً",
+  "welcome": "مرحبا بك في",
   "welcome_subtitle_new_wallet": "إذا كنت ترغب في البدء من جديد ، فانقر فوق إنشاء محفظة جديدة أدناه وستكون خارج السباقات.",
   "welcome_subtitle_restore_wallet": "إذا كان لديك محفظة موجودة تريد إحضارها إلى كعكة ، فما عليك سوى اختيار استعادة المحفظة الموجودة وسنمشيك خلال العملية.",
   "welcome_to_cakepay": "مرحبا بكم في Cake Pay!",
-  "what_is_payjoin": "ما هو Payjoin?",
   "what_is_silent_payments": "ما هي المدفوعات الصامتة؟",
   "widgets_address": "عنوان",
   "widgets_or": "أو",
@@ -1111,6 +1021,5 @@
   "you_will_get": "حول الى",
   "you_will_receive_estimated_amount": "سوف تتلقى(ooded )",
   "you_will_send": "تحويل من",
-  "youCanGoBackToYourDapp": "يمكنك العودة إلى DAPP الخاص بك الآن",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb
index c083b8297..24b6e2640 100644
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Добавете предплатени средства в картите (до ${value})",
   "add_new_node": "Добави нов node",
   "add_new_word": "Добавяне на нова дума",
-  "add_passphrase": "Добавете парола",
-  "add_passphrase_warning_text": "Въведете парола само ако сте използвали такава за този портфейл в миналото. Ако въведете грешна парола или не сте използвали парола преди в този портфейл, няма да видите нито един от съществуващите средства или история.",
   "add_receiver": "Добавяне на друг получател (не е задължително)",
   "add_secret_code": "Или добавете този таен код към приложение за удостоверяване",
   "add_tip": "Add Tip",
   "add_token_disclaimer_check": "Потвърдих адреса и информацията за токен договора, използвайки надежден източник. Добавянето на злонамерена или неправилна информация може да доведе до загуба на средства.",
   "add_token_warning": "Не редактирайте и не добавяйте токени според инструкциите на измамниците.\nВинаги потвърждавайте адресите на токени с надеждни източници!",
   "add_value": "Добавяне на стойност",
-  "added_message_for_ata_error": "Моля, уверете се, че имате достатъчно баланс на SOL, за да завършите транзакцията си.",
   "address": "Адрес",
   "address_book": "Адресна книга",
   "address_book_menu": "Адресна книга",
@@ -55,8 +52,6 @@
   "anonpay_description": "Генерирайте ${type}. Получателят може да ${method} с всяка поддържана криптовалута и вие ще получите средства в този портфейл.",
   "apk_update": "APK ъпдейт",
   "approve": "Одобряване",
-  "approve_request": "Одобрете искане",
-  "approve_tokens": "Одобрете жетоните",
   "arrive_in_this_address": "${currency} ${tag}ще отидат на този адрес",
   "ascending": "Възходящ",
   "ask_each_time": "Питайте всеки път",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Чака се потвърждение на плащането",
   "background_sync": "Фон Синхх",
   "background_sync_mode": "Режим на синхронизиране на фона",
-  "background_sync_on_battery_low": "Синхронизирайте на ниска батерия",
-  "background_sync_on_charging": "Синхронизирайте само при зареждане",
-  "background_sync_on_device_idle": "Синхронизирайте само когато устройството не се използва",
-  "background_sync_on_unmetered_network": "Изисквайте незадоволена мрежа",
   "backup": "Резервно копие",
   "backup_file": "Резервно копие",
   "backup_password": "Парола за възстановяване",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Купуване на Bitcoin",
   "buy_now": "Купи сега",
   "buy_provider_unavailable": "Понастоящем доставчик не е наличен.",
-  "buy_sell_pair_is_not_supported_warning": "Тази валутна двойка не се поддържа от нито един доставчик за избрания начин на плащане. Моля, изберете друга двойка или опитайте да промените начина на плащане.",
   "buy_with": "Купуване чрез",
   "by_cake_pay": "от Cake Pay",
   "cake_2fa_preset": "Торта 2FA Preset",
@@ -124,12 +114,9 @@
   "camera_consent": "Вашият фотоапарат ще бъде използван за заснемане на изображение с цел идентификация от ${provider}. Моля, проверете тяхната политика за поверителност за подробности.",
   "camera_permission_is_required": "Изисква се разрешение за камерата.\nМоля, активирайте го от настройките на приложението.",
   "cancel": "Откажи",
-  "cannot_verify": "Не може да провери",
-  "cannot_verify_description": "Този домейн не може да бъде проверен. Проверете внимателно заявката, преди да одобрите.",
   "card_address": "Адрес:",
   "cardholder_agreement": "Съгласие за картодържец",
   "cards": "Карти",
-  "chain_id": "Идентификационен номер на веригата",
   "chains": "Вериги",
   "change": "Промени",
   "change_backup_password_alert": "Предишните резервни копия не могат да бъдат импортирани с новата парола. Те ще се използва само за нови такива. Are you sure that you want to change backup password?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Сигурни ли сте, че искате да смените представителите?",
   "change_rep_successful": "Успешно промени представител",
   "change_selected_exchanges": "Променете избраните борси",
-  "change_selected_pair": "Променете избраната двойка",
   "change_wallet_alert_content": "Искате ли да смените сегашния портфейл на ${wallet_name}?",
   "change_wallet_alert_title": "Смяна на сегашния портфейл",
   "choose_a_payment_method": "Изберете начин на плащане",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Потвърдено",
   "congratulations": "Поздравления!",
   "connect_an_existing_yat": "Добавете съществуващ Yat",
-  "connect_hw_info_step_1": "Уверете се, че вашето устройство е включено.",
-  "connect_hw_info_step_2": "Включете Bluetooth както за устройства, така и за тях от телефона или свържете устройствата си заедно с USB кабел.",
-  "connect_hw_info_step_3": "Отключете устройството си и отворете желаното приложение за криптовалута.",
-  "connect_hw_info_step_4": "Изберете вашето устройство в портфейла за торта и продължете с настройката.",
   "connect_yats": "Добавете Yats",
   "connect_your_hardware_wallet": "Свържете хардуерния си портфейл с помощта на Bluetooth или USB",
   "connect_your_hardware_wallet_ios": "Свържете хардуерния си портфейл с помощта на Bluetooth",
-  "connected": "Свързани",
   "connection_sync": "Свързване и синхронизиране",
   "connectWalletPrompt": "Свържете портфейла си с WalletConnect, за да извършвате транзакции",
   "contact": "Контакт",
@@ -207,8 +188,6 @@
   "copy": "Копиране",
   "copy_address": "Copy Address",
   "copy_id": "Копиране на ID",
-  "copy_payjoin_address": "Копирайте адрес на payjoin",
-  "copy_payjoin_url": "Копиране Payjoin url",
   "copyWalletConnectLink": "Копирайте връзката WalletConnect от dApp и я поставете тук",
   "corrupted_seed_notice": "Файловете за този портфейл са повредени и не могат да бъдат отворени. Моля, прегледайте фразата за семена, запазете я и възстановете портфейла.\n\nАко стойността е празна, тогава семето не успя да бъде правилно възстановено.",
   "countries": "Държави",
@@ -245,22 +224,11 @@
   "descending": "Низходящ",
   "description": "Описание",
   "destination_tag": "Destination tag:",
-  "deuro_collect_interest": "Събиране",
-  "deuro_savings": "Спестявания на Деуро",
-  "deuro_savings_add": "Депозит",
-  "deuro_savings_balance": "Спестотен баланс",
-  "deuro_savings_collect_interest": "Събиране на интерес",
-  "deuro_savings_remove": "Оттегляне",
-  "deuro_savings_set_approval": "Задайте одобрение",
-  "deuro_savings_subtitle": "Печелете до 10% лихва за вашите Deuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Може да отнеме няколко секунди, за да може транзакцията да се потвърди и да бъде отразена на екрана",
-  "device_is_signing": "Устройството подписва",
   "dfx_option_description": "Купете криптовалута с Eur & CHF. За търговски и корпоративни клиенти в Европа",
   "didnt_get_code": "Не получихте код?",
   "digit_pin": "-цифрен PIN",
   "digital_and_physical_card": " дигитална или физическа предплатена дебитна карта",
   "disable": "Деактивиране",
-  "disable_automatic_exchange_status_updates": "Деактивирайте актуализациите на състоянието на автоматичния обмен",
   "disable_bulletin": "Деактивирайте бюлетина за състоянието на услугата",
   "disable_buy": "Деактивирайте действието за покупка",
   "disable_cake_2fa": "Деактивирайте Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Като изключите това, таксите могат да бъдат неточни в някои случаи, така че може да се препланите или да не плащате таксите за вашите транзакции",
   "disable_fiat": "Деактивиране на fiat",
   "disable_sell": "Деактивирайте действието за продажба",
-  "disable_tor": "Деактивирайте Tor",
   "disable_trade_option": "Деактивирайте опцията за търговия",
   "disableBatteryOptimization": "Деактивирайте оптимизацията на батерията",
   "disableBatteryOptimizationDescription": "Искате ли да деактивирате оптимизацията на батерията, за да направите синхронизирането на фона да работи по -свободно и гладко?",
   "disabled": "Деактивирано",
-  "disconnect_session": "Изключете сесията",
   "discount": "Спестете ${value}%",
   "display_settings": "Настройки на екрана",
   "displayable": "Възможност за показване",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Не споделяйте това с никого, дори и отдел поддръжка.\n\nПарите Ви могат и ще бъдат откраднати!",
   "do_not_show_me": "Не показвай повече това",
   "domain_looks_up": "Търсене на домейни",
-  "domain_mismatch": "Несъответствие на домейна",
-  "domain_mismatch_description": "Този уебсайт има домейн, който не съответства на подателя на тази заявка. Одобряването може да доведе до загуба на средства.",
   "donation_link_details": "Подробности за връзката за дарение",
-  "done": "Готово",
   "e_sign_consent": "E-Sign съгласие",
   "edit": "Промени",
   "edit_backup_password": "Промяна на паролата за възстановяване",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Нови адреси се генерират всеки път, когато използвате този, но и предишните продължават да работят",
   "email_address": "Имейл адрес",
   "enable": "Активиране",
-  "enable_builtin_tor": "Активирайте вграден Tor",
   "enable_mempool_api": "Mempool API за точни такси и дати",
   "enable_replace_by_fee": "Активиране на замяна по забрана",
   "enable_silent_payments_scanning": "Започнете да сканирате безшумните плащания, докато се достигне съветът",
@@ -333,10 +295,8 @@
   "error_text_template": "Имената на шаблони и адреси не могат да съдържат ` , ' \" \nи трябва да са между 1 и 106 символа.",
   "error_text_wallet_name": "Името на портфейла може да съдържа само букви, цифри, и символите _ и - \n и трябва да е между 1 и 33 символа",
   "error_text_xmr": "XMR сумата не може да надхвърля наличния баланс.\nБроят на цифрите след десетичната запетая може да бъде най-много 12",
-  "error_while_processing": "Възникна грешка при приемане",
   "errorGettingCredentials": "Неуспешно: Грешка при получаване на идентификационни данни",
   "errorSigningTransaction": "Възникна грешка при подписване на транзакция",
-  "establishing_tor_connection": "Естибилиране на TOR връзка",
   "estimated": "Изчислено",
   "estimated_new_fee": "Прогнозна нова такса",
   "estimated_receive_amount": "Прогнозна сума за получаване",
@@ -360,7 +320,6 @@
   "export_backup": "Експортиране на резервно копие",
   "export_logs": "Експортни дневници",
   "export_outputs": "Експортни резултати",
-  "extend_session": "Удължаване на сесията",
   "extra_id": "Допълнително ID:",
   "extracted_address_content": "Ще изпратите средства на \n${recipient_name}",
   "failed_authentication": "Неуспешно удостоверяване. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Фиат Баланс",
   "field_required": "Това поле е задължително",
-  "file_saved": "Запасен файл",
   "fill_code": "Моля, въведето кода за потвърждаване, изпратен на Вашия имейл",
   "filter_by": "Филтрирай по",
   "first_wallet_text": "Невероятен портфейл за Monero, Bitcoin, Ethereum, Litecoin и Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Забравена парола",
   "freeze": "Замразяване",
   "frequently_asked_questions": "Често задавани въпроси",
-  "from": "От",
   "frozen": "Замразени",
   "frozen_balance": "Замразен баланс",
   "full_balance": "Пълен баланс",
   "gas_exceeds_allowance": "Газът, изискван от транзакцията, надвишава надбавката.",
-  "gas_price": "Цена на газ",
   "generate_name": "Генериране на име",
   "generating_gift_card": "Създаване на Gift Card",
   "generating_transaction": "Генериране на транзакция",
@@ -413,7 +369,6 @@
   "hide_details": "Скриване на подробностите",
   "high_contrast_theme": "Тема с висок контраст",
   "home_screen_settings": "Настройки на началния екран",
-  "how_to_connect": "Как да се свържа",
   "how_to_use": "Как да използвам",
   "how_to_use_card": "Как се ползва тази карта",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Нямате достатъчно SOL, за да покриете транзакцията и таксата му за транзакция. Моля, добавете повече SOL към портфейла си или намалете сумата на SOL, която изпращате.",
   "insufficient_lamports": "Нямате достатъчно SOL, за да покриете транзакцията и таксата му за транзакция. Имате нужда от поне ${solValueNeeded} sol. Моля, добавете повече SOL към портфейла си или намалете сумата на SOL, която изпращате",
   "insufficientFundsForRentError": "Нямате достатъчно SOL, за да покриете таксата за транзакцията и наемането на сметката. Моля, добавете повече SOL към портфейла си или намалете сумата на SOL, която изпращате",
-  "insufficientFundsForRentErrorReceiver": "Сметката на приемника няма достатъчно SOL, за да покрие наема. Моля, помолете приемника да добави още SOL към техния акаунт.",
   "introducing_cake_pay": "Запознайте се с Cake Pay!",
   "invalid_input": "Невалиден вход",
   "invalid_password": "Невалидна парола",
@@ -471,7 +425,6 @@
   "logout": "Logout",
   "low_fee": "Ниска такса",
   "low_fee_alert": "Използвате ниска приоритетност в мрежата. Това може да доведе до дълго чакане, различни обменни курсове или отказани сделки. Препоръчваме използването на по-висока такса.",
-  "made_easy": "улесняваше",
   "manage_nodes": "Управление на възли",
   "manage_pow_nodes": "Управление на PoW възли",
   "manage_yats": "Управление на Yats",
@@ -483,8 +436,6 @@
   "memo": "Мемо:",
   "message": "Съобщение",
   "message_verified": "Съобщението беше успешно проверено",
-  "messages": "Съобщения",
-  "method": "Метод",
   "methods": "Методи",
   "min_amount": "Мин: ${value}",
   "min_value": "Мин: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Тъмна тема Monero",
   "monero_light_theme": "Лека тема Monero",
   "moonpay_alert_text": "Сумата трябва да бъде най-малко ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Възникна грешка при извличането на NFT. Моля, проверете вашата интернет връзка и опитайте отново.",
   "more_options": "Още настройки",
   "multiple_addresses_detected": "Открити множество адреси",
   "mweb_confirmed": "Потвърден MWeb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Име на Label",
   "new_subaddress_title": "Нов адрес",
   "new_template": "Нов шаблон",
-  "new_transactions_notifications": "Изпратете известия за нови транзакции",
   "new_wallet": "Нов портфейл",
   "newConnection": "Нова връзка",
   "no_cards_found": "Не са намерени карти",
@@ -539,7 +488,6 @@
   "normal": "нормално",
   "note_optional": "Бележка (не е задължително)",
   "note_tap_to_change": "Бележка (натиснете за промяна)",
-  "notification_permission_denied": "Разрешението за уведомяване е отказано, моля, моля, активирайте го в настройки",
   "nullURIError": "URI е нула",
   "offer_expires_in": "Предложението изтича след: ",
   "offline": "Офлайн",
@@ -571,20 +519,8 @@
   "password": "Парола",
   "paste": "Поставяне",
   "pause_wallet_creation": "Възможността за създаване на Haven Wallet в момента е на пауза.",
-  "payjoin_card_content": "Payjoin е нова функция за запазване на поверителност и пестене на такси в Bitcoin.",
-  "payjoin_details": "Payjoin подробности",
-  "payjoin_enabled": "Payjoin enabled",
-  "payjoin_enabling_popup_content": "Можете да превключвате Payjoin под меню → поверителност → Използвайте Payjoin, за да го активирате или деактивирате по -късно.",
-  "payjoin_enabling_popup_title": "Активиране Payjoin",
-  "payjoin_request_awaiting_tx": "В очакване на транзакция",
-  "payjoin_request_in_progress": "В ход",
-  "payjoin_unavailable": "Payjoin недостъпно",
-  "payjoin_unavailable_sheet_content": "Получаването на Payjoin транзакция изисква да имате готови за биткойн. \\ N \\ nas скоро, когато портфейлът ви има средства, Payjoin ще бъде активиран автоматично.",
-  "payjoin_unavailable_sheet_title": "Защо Payjoin не е наличен?",
   "payment_id": "Payment ID: ",
-  "payment_made_easy": "Плащанията, направени лесно",
   "payment_was_received": "Плащането бе получено.",
-  "payments": "Плащания",
   "pending": " (чакащи)",
   "percentageOf": "от ${amount}",
   "pin_at_top": "закачете ${token} отгоре",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Моля, опитайте се да се свържете към друг node.",
   "please_wait": "Моля Изчакай",
   "polygonscan_history": "История на PolygonScan",
-  "potential_scam": "Потенциална измама",
   "powered_by": "Powered by ${title}",
   "pre_seed_button_text": "Разбирам. Покажи seed",
-  "pre_seed_description": "На следващата страница ще видите поредица от думи. Това е вашето уникално и частно семе и това е единственият начин да възстановите портфейла си в случай на загуба или неизправност. Ваша отговорност е да го запишете и да го съхранявате на безопасно място извън приложението за портфейл за торта.",
+  "pre_seed_description": "На следващата страница ще видите поредица от ${words} думи. Това е вашият таен личен seed и е единственият начин да възстановите портфейла си. Отговорността за съхранението му на сигурно място извън приложението на Cake Wallet е изцяло ВАША.",
   "pre_seed_title": "ВАЖНО",
   "prepaid_cards": "Предплатени карти",
   "prevent_screenshots": "Предотвратете екранни снимки и запис на екрана",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Продължете на вашето устройство",
   "proceed_on_device_description": "Моля, следвайте инструкциите, подканени на вашия хардуер",
   "processing": "Обработка",
-  "processing_signed_tx": "Обработка подписана транзакция",
   "profile": "Профил",
   "provider_error": "Грешка на ${provider} ",
   "public_key": "Публичен ключ",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Вашият представител изглежда не е в добро състояние. Докоснете тук, за да изберете нов",
   "repeat_wallet_password": "Повторете паролата на портфейла",
   "repeated_password_is_incorrect": "Многократната парола е неправилна. Моля, повторете отново паролата за портфейла.",
-  "requested": "Поискано",
   "require_for_adding_contacts": "Изисква се за добавяне на контакти",
   "require_for_all_security_and_backup_settings": "Изисква се за всички настройки за сигурност и архивиране",
   "require_for_assessing_wallet": "Изискване за достъп до портфейла",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Изискване за изпращане до вътрешни портфейли",
   "require_for_sends_to_non_contacts": "Изискване за изпращане до лица без контакт",
   "require_pin_after": "Въведете PIN след",
-  "required_passphrase": "Парола",
   "rescan": "Сканирай отново",
   "resend_code": "Повторно изпращане",
   "reset": "Нулиране",
   "reset_password": "Нулиране на парола",
-  "restore": "Възстановяване",
   "restore_active_seed": "Активиране на seed",
   "restore_address": "Адреси",
   "restore_bitcoin_description_from_keys": "Възстановяване на портфейл чрез WIF, изведен от Вашите private keys",
@@ -713,10 +644,7 @@
   "search_language": "Търсене на език",
   "second_intro_content": "Вашият Yat е уникален адрес във формата на емоджи, който играе ролята на всички Ваши дълги шестнайсетични портфейли за всяка валута.",
   "second_intro_title": "Един емоджи адрес, обединяващ всички останали.",
-  "security": "Сигурност",
   "security_and_backup": "Сигурност и резервни копия",
-  "security_risk": "Риск за сигурността",
-  "security_risk_description": "Този домейн се маркира като опасен от множество доставчици на сигурност. Оставете незабавно, за да защитите активите си.",
   "seed_alert_back": "Назад",
   "seed_alert_content": "Seed-ът е единственият начин да възстановите портфейла си. Записахте ли го?",
   "seed_alert_title": "Внимание",
@@ -751,6 +679,9 @@
   "seedtype": "Семенна тип",
   "seedtype_alert_content": "Споделянето на семена с други портфейли е възможно само с BIP39 Seedtype.",
   "seedtype_alert_title": "Сигнал за семена",
+  "seedtype_legacy": "Наследство (25 думи)",
+  "seedtype_polyseed": "Поли семе (16 думи)",
+  "seedtype_wownero": "Wownero (14 думи)",
   "select_backup_file": "Избор на резервно копие",
   "select_buy_provider_notice": "Изберете доставчик на покупка по -горе. Можете да пропуснете този екран, като зададете вашия доставчик по подразбиране по подразбиране в настройките на приложението.",
   "select_destination": "Моля, изберете дестинация за архивния файл.",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "Изпратете от външен портфейл",
   "send_name": "Име",
   "send_new": "Ново",
-  "send_payjoin": "Изпратете Payjoin",
   "send_payment_id": "Payment ID (не е задължително)",
   "send_priority": "В момента таксата е на ${transactionPriority} приоритетност.\nПриоритетността на транзакцията може да бъде променена в настройките",
   "send_sending": "Изпращане...",
@@ -832,9 +762,7 @@
   "show_keys": "Покажи seed/keys",
   "show_market_place": "Покажи пазар",
   "show_seed": "Покажи seed",
-  "sign_all": "Подпишете всички",
   "sign_message": "Съобщение за подписване",
-  "sign_one": "Подпишете един",
   "sign_up": "Регистрация",
   "sign_verify_message": "Подпишете / проверете",
   "sign_verify_message_sub": "Подпишете или проверете съобщение с помощта на вашия личен ключ",
@@ -863,14 +791,11 @@
   "sort_by": "Сортирай по",
   "spend_key_private": "Spend key (таен)",
   "spend_key_public": "Spend key (публичен)",
-  "starting_tor_proxy": "Стартиране на прокси",
   "status": "Статус: ",
-  "step": "Стъпка",
   "string_default": "По подразбиране",
   "subaddress_title": "Лист от подадреси",
   "subaddresses": "Подадреси",
   "submit_request": "изпращане на заявка",
-  "success": "Успех",
   "successful": "Успешен",
   "support_description_guides": "Документация и подкрепа за общи проблеми",
   "support_description_live_chat": "Безплатно и бързо! Обучени представители на подкрепата са на разположение за подпомагане",
@@ -878,7 +803,6 @@
   "support_title_guides": "Документи за портфейл за торта",
   "support_title_live_chat": "Подкрепа на живо",
   "support_title_other_links": "Други връзки за поддръжка",
-  "supported": "Поддържано",
   "swap": "Разметка",
   "sweeping_wallet": "Метещ портфейл",
   "sweeping_wallet_alert": "Това не трябва да отнема много време. Не оставяйте този екран или пометените средства могат да бъдат загубени.",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "СИНХРОНИЗИРАНЕ",
   "sync_status_timed_out": "ВРЕМЕТО ИЗТЕЧЕ",
   "sync_status_unsupported": "Неподдържан възел",
-  "synchronizing": "Синхронизиране",
   "syncing_wallet_alert_content": "Списъкът ви с баланс и транзакции може да не е пълен, докато в горната част не пише „СИНХРОНИЗИРАН“. Кликнете/докоснете, за да научите повече.",
   "syncing_wallet_alert_title": "Вашият портфейл се синхронизира",
   "template": "Шаблон",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Доставчикът на Thorchain не поддържа адреси на TapRoot. Моля, променете адреса или изберете друг доставчик.",
   "time": "${minutes} мин ${seconds} сек",
   "tip": "Tip:",
-  "to": "Да",
   "today": "Днес",
-  "token_already_exists": "Токена вече съществува",
   "token_contract_address": "Адрес на токен договор",
   "token_decimal": "Токен десетичен",
   "token_name": "Име на токена, напр.: Tether",
   "token_symbol": "Символ на токена, напр.: USDT",
   "tokenID": "документ за самоличност",
-  "ton_extra_info": "Моля, не забравяйте да посочите идентификационния номер на бележката, докато изпращате транзакцията TON за борсата",
   "tor_connection": "Tor връзка",
-  "tor_connection_timeout": "TOR ВРЕМЕ НА ВРЕМЕТО ВРЕМЕ",
-  "tor_experimental": "Това е експериментална функция, не всички връзки, направени от маршрутизиране на тортата за портфейл за торта - някои връзки могат да използват ClearNet, за да се насочи напълно да използва трафик на приложения TOR с VPN режим.",
   "tor_only": "Само чрез Tor",
   "total": "Обща сума",
   "total_saving": "Общо спестявания",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "Ако процесът продължи повече от 1 минута, проверете някой block explorer и своя имейл.",
   "transactions": "Транзакции",
   "transactions_by_date": "Транзакции по дата",
-  "transport_type": "Тип транспорт",
   "trongrid_history": "Trongrid History",
   "trusted": "Надежден",
-  "try_again": "Опитайте отново",
   "tx_commit_exception_no_dust_on_change": "Сделката се отхвърля с тази сума. С тези монети можете да изпратите ${min} без промяна или ${max}, която връща промяна.",
   "tx_commit_failed": "Компетацията на транзакцията не успя. Моля, свържете се с поддръжката.",
   "tx_commit_failed_no_peers": "Сделката не успя да излъчи, моля, опитайте отново след секунда или така",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "Подробности за неизползваните монети",
   "unspent_coins_title": "Неизползвани монети",
   "unsupported_asset": "Не поддържаме това действие за този актив. Моля, създайте или преминете към портфейл от поддържан тип актив.",
-  "update_session": "Сесия за актуализиране",
   "uptime": "Време за работа",
   "upto": "до ${value}",
   "usb": "USB",
   "use": "Смяна на ",
   "use_card_info_three": "Използвайте дигиталната карта онлайн или чрез безконтактен метод на плащане.",
   "use_card_info_two": "Средствата се обръщат в USD, когато биват запазени в предплатената карта, а не в дигитална валута.",
-  "use_device_theme": "Използвайте темата за устройството",
-  "use_payjoin": "Използвайте Payjoin",
   "use_ssl": "Използване на SSL",
   "use_suggested": "Използване на предложеното",
   "use_testnet": "Използвайте TestNet",
-  "user_rejected_method": "Отхвърлен метод на потребителя",
   "value": "Стойност",
   "value_type": "Тип стойност",
   "variable_pair_not_supported": "Този variable pair не се поддържа от избраната борса",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "Винаги можете да видите това семе отново под",
   "wallet_group_empty_state_text_one": "Изглежда, че нямате съвместими групи портфейли !\n\n tap",
   "wallet_group_empty_state_text_two": "по -долу, за да се направи нов.",
-  "wallet_has_passphrase": "Този портфейл има парола",
   "wallet_keys": "Seed/keys на портфейла",
   "wallet_list_create_new_wallet": "Създаване на нов портфейл",
   "wallet_list_edit_group_name": "Редактиране на име на групата",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Портфейли",
   "warning": "Внимание",
-  "welcome": "Добре дошли",
+  "welcome": "Добре дошли в",
   "welcome_subtitle_new_wallet": "Ако искате да стартирате свеж, докоснете Създайте нов портфейл по -долу и ще се откажете от състезанията.",
   "welcome_subtitle_restore_wallet": "Ако имате съществуващ портфейл, който искате да внесете в тортата, просто изберете възстановяване на съществуващия портфейл и ще ви преведем през процеса.",
   "welcome_to_cakepay": "Добре дошли в Cake Pay!",
-  "what_is_payjoin": "Какво е Payjoin ?",
   "what_is_silent_payments": "Какво са мълчаливи плащания?",
   "widgets_address": "Адрес",
   "widgets_or": "или",
@@ -1111,6 +1021,5 @@
   "you_will_get": "Обръщане в",
   "you_will_receive_estimated_amount": "Ще получите(прогнозно )",
   "you_will_send": "Обръщане от",
-  "youCanGoBackToYourDapp": "Можете да се върнете при вашия Dapp сега",
   "yy": "гг"
 }
\ No newline at end of file
diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb
index 49becb211..9dbc99d5c 100644
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Všechny předplacené prostředky na kartě (až ${value})",
   "add_new_node": "Přidat nový uzel",
   "add_new_word": "Přidat nové slovo",
-  "add_passphrase": "Přidejte přístupovou frázi",
-  "add_passphrase_warning_text": "Zadejte přístupovou frázi pouze tehdy, pokud jste ji v minulosti použili pro tuto peněženku. Pokud zadáte nesprávnou přístupovou frázi nebo jste na této peněžence nepoužili přístupovou frázi, neuvidíte žádnou existující fondy nebo historii.",
   "add_receiver": "Přidat dalšího příjemce (nepovinné)",
   "add_secret_code": "Nebo přidejte tento tajný kód do ověřovací aplikace",
   "add_tip": "Přidat spropitné",
   "add_token_disclaimer_check": "Potvrdil jsem adresu a informace smlouvy o tokenu pomocí důvěryhodného zdroje. Přidání škodlivých nebo nesprávných informací může vést ke ztrátě finančních prostředků.",
   "add_token_warning": "Neupravujte ani nepřidávejte tokeny podle pokynů podvodníků.\nVždy potvrďte adresy tokenů s renomovanými zdroji!",
   "add_value": "Přidat hodnotu",
-  "added_message_for_ata_error": "Laskavě se ujistěte, že máte dostatek rovnováhy SOL, abyste dokončili transakci.",
   "address": "Adresa",
   "address_book": "Adresář",
   "address_book_menu": "Adresář",
@@ -55,8 +52,6 @@
   "anonpay_description": "Vygenerujte ${type}. Příjemce může ${method} s jakoukoli podporovanou kryptoměnou a vy obdržíte prostředky v této peněžence.",
   "apk_update": "aktualizace APK",
   "approve": "Schvalovat",
-  "approve_request": "Schválit žádost",
-  "approve_tokens": "Schválit tokeny",
   "arrive_in_this_address": "${currency} ${tag}přijde na tuto adresu",
   "ascending": "Vzestupné",
   "ask_each_time": "Zeptejte se pokaždé",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Čeká se na potvrzení platby",
   "background_sync": "Synchronizace pozadí",
   "background_sync_mode": "Režim synchronizace pozadí",
-  "background_sync_on_battery_low": "Synchronizace na nízké baterii",
-  "background_sync_on_charging": "Synchronizovat pouze při nabíjení",
-  "background_sync_on_device_idle": "Synchronizujte pouze tehdy, když se zařízení nepoužívá",
-  "background_sync_on_unmetered_network": "Vyžadovat nemetrovou síť",
   "backup": "Záloha",
   "backup_file": "Soubor se zálohou",
   "backup_password": "Heslo pro zálohy",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Nakoupit Bitcoin",
   "buy_now": "Kup nyní",
   "buy_provider_unavailable": "Poskytovatel aktuálně nedostupný.",
-  "buy_sell_pair_is_not_supported_warning": "Tento dvojice měny není podporován žádným poskytovatelem pro vybranou metodu platby. Vyberte prosím jiný pár nebo zkuste změnit způsob platby.",
   "buy_with": "Nakoupit pomocí",
   "by_cake_pay": "od Cake Pay",
   "cake_2fa_preset": "Předvolba Cake 2FA",
@@ -124,12 +114,9 @@
   "camera_consent": "Váš fotoaparát použije k pořízení snímku pro účely identifikace ${provider}. Podrobnosti najdete v jejich Zásadách ochrany osobních údajů.",
   "camera_permission_is_required": "Vyžaduje se povolení fotoaparátu.\nPovolte jej v nastavení aplikace.",
   "cancel": "Zrušit",
-  "cannot_verify": "Nelze ověřit",
-  "cannot_verify_description": "Tuto doménu nelze ověřit. Před schválením pečlivě zkontrolujte požadavek.",
   "card_address": "Adresa:",
   "cardholder_agreement": "Smlouva držitele karty",
   "cards": "Karty",
-  "chain_id": "ID řetězce",
   "chains": "Řetězy",
   "change": "Změnit",
   "change_backup_password_alert": "Vaše předchozí soubory se zálohami nebude možné naimportovat s novým heslem. Nové heslo bude použito pouze pro nové zálohy. Opravdu chcete změnit heslo pro zálohy?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Jste si jisti, že chcete změnit zástupce?",
   "change_rep_successful": "Úspěšně změnil zástupce",
   "change_selected_exchanges": "Změnit vybrané výměny",
-  "change_selected_pair": "Změnit vybraný pár",
   "change_wallet_alert_content": "Opravdu chcete změnit aktivní peněženku na ${wallet_name}?",
   "change_wallet_alert_title": "Přepnout peněženku",
   "choose_a_payment_method": "Vyberte metodu platby",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Potvrzeno",
   "congratulations": "Gratulujeme!",
   "connect_an_existing_yat": "Připojit existující Yat",
-  "connect_hw_info_step_1": "Ujistěte se, že je vaše zařízení zapnuté.",
-  "connect_hw_info_step_2": "Zapněte Bluetooth pro obě zařízení a spárujte je z telefonu nebo připojte zařízení pomocí kabelu USB.",
-  "connect_hw_info_step_3": "Odemkněte zařízení a přejděte na požadovanou aplikaci Crypto.",
-  "connect_hw_info_step_4": "Vyberte zařízení v peněžence dortu a pokračujte v nastavení.",
   "connect_yats": "Připojit Yaty",
   "connect_your_hardware_wallet": "Připojte hardwarovou peněženku pomocí Bluetooth nebo USB",
   "connect_your_hardware_wallet_ios": "Připojte hardwarovou peněženku pomocí Bluetooth",
-  "connected": "Připojeno",
   "connection_sync": "Připojení a synch.",
   "connectWalletPrompt": "Propojte svou peněženku s WalletConnect a provádějte transakce",
   "contact": "Kontakt",
@@ -207,8 +188,6 @@
   "copy": "Kopírovat",
   "copy_address": "Zkopírovat adresu",
   "copy_id": "Kopírovat ID",
-  "copy_payjoin_address": "Kopírovat adresu payjoin",
-  "copy_payjoin_url": "Kopírovat Payjoin URL",
   "copyWalletConnectLink": "Zkopírujte odkaz WalletConnect z dApp a vložte jej sem",
   "corrupted_seed_notice": "Soubory pro tuto peněženku jsou poškozeny a nemohou být otevřeny. Podívejte se prosím na osivo, uložte ji a obnovte peněženku.\n\nPokud je hodnota prázdná, pak semeno nebylo možné správně obnovit.",
   "countries": "Země",
@@ -245,22 +224,11 @@
   "descending": "Klesající",
   "description": "Popis",
   "destination_tag": "Destination Tag:",
-  "deuro_collect_interest": "Sbírat",
-  "deuro_savings": "dEuro úspory",
-  "deuro_savings_add": "Vklad",
-  "deuro_savings_balance": "Úspora zůstatek",
-  "deuro_savings_collect_interest": "Sbírat zájem",
-  "deuro_savings_remove": "Odstoupit",
-  "deuro_savings_set_approval": "Stanovit schválení",
-  "deuro_savings_subtitle": "Získejte až 10% úrok z vašeho Deuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Transakce může trvat několik sekund, aby se potvrdila a odrážela se na obrazovce",
-  "device_is_signing": "Zařízení se podpisu",
   "dfx_option_description": "Koupit krypto s EUR & CHF. Pro maloobchodní a firemní zákazníky v Evropě",
   "didnt_get_code": "Nepřišel Vám kód?",
   "digit_pin": "-číselný PIN",
   "digital_and_physical_card": " digitální a fyzické předplacené debetní karty,",
   "disable": "Zakázat",
-  "disable_automatic_exchange_status_updates": "Zakázat aktualizace stavu automatické výměny",
   "disable_bulletin": "Zakázat status servisního stavu",
   "disable_buy": "Zakázat akci nákupu",
   "disable_cake_2fa": "Zakázat Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Tímto vypnutím by sazby poplatků mohly být v některých případech nepřesné, takže byste mohli skončit přepláváním nebo nedoplatkem poplatků za vaše transakce",
   "disable_fiat": "Zakázat fiat",
   "disable_sell": "Zakázat akci prodeje",
-  "disable_tor": "Zakázat tor",
   "disable_trade_option": "Zakázat možnost TRADE",
   "disableBatteryOptimization": "Zakázat optimalizaci baterie",
   "disableBatteryOptimizationDescription": "Chcete deaktivovat optimalizaci baterie, aby se synchronizovala pozadí volně a hladce?",
   "disabled": "Zakázáno",
-  "disconnect_session": "Odpojit relace",
   "discount": "Ušetříte ${value}%",
   "display_settings": "Nastavení zobrazení",
   "displayable": "Zobrazitelné",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Toto nesdílejte s nikým jiným, ani s podporou.\n\nJinak mohou být Vaše prostředky ukradeny!",
   "do_not_show_me": "Příště nezobrazovat",
   "domain_looks_up": "Vyhledávání domén",
-  "domain_mismatch": "Neshoda domény",
-  "domain_mismatch_description": "Tento web má doménu, která neodpovídá odesílateli této žádosti. Schválení může vést ke ztrátě finančních prostředků.",
   "donation_link_details": "Podrobnosti odkazu na darování",
-  "done": "Hotovo",
   "e_sign_consent": "E-Sign souhlas",
   "edit": "Upravit",
   "edit_backup_password": "Upravit heslo pro zálohy",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Po každém použití je generována nová adresa, ale předchozí adresy také stále fungují",
   "email_address": "E-mailová adresa",
   "enable": "Umožnit",
-  "enable_builtin_tor": "Povolte vestavěné tor",
   "enable_mempool_api": "Mempool API pro přesné poplatky a data",
   "enable_replace_by_fee": "Povolit výměnu podle poplatku",
   "enable_silent_payments_scanning": "Začněte skenovat tiché platby, dokud není dosaženo špičky",
@@ -333,10 +295,8 @@
   "error_text_template": "Jméno šablony a adresa nemohou obsahovat symboly ` , ' \" \na musí mít délku 1 až 106 znaků",
   "error_text_wallet_name": "Jméno peněženky může obsahovat pouze písmena, čísla, symbol _ \na musí mít délku 1 až 33 znaků",
   "error_text_xmr": "Hodnota XMR nemůže překročit dostupný zůstatek.\nPočet desetinných míst musí být menší, nebo roven 12",
-  "error_while_processing": "Při převádění došlo k chybě",
   "errorGettingCredentials": "Selhalo: Chyba při získávání přihlašovacích údajů",
   "errorSigningTransaction": "Při podepisování transakce došlo k chybě",
-  "establishing_tor_connection": "Estabilizující připojení Tor",
   "estimated": "Odhadováno",
   "estimated_new_fee": "Odhadovaný nový poplatek",
   "estimated_receive_amount": "Odhadovaná částka přijímání",
@@ -360,7 +320,6 @@
   "export_backup": "Exportovat zálohu",
   "export_logs": "Vývozní protokoly",
   "export_outputs": "Vývozní výstupy",
-  "extend_session": "Prodloužit relaci",
   "extra_id": "Extra ID:",
   "extracted_address_content": "Prostředky budete posílat na\n${recipient_name}",
   "failed_authentication": "Ověřování selhalo. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Fiat Balance",
   "field_required": "Toto pole je povinné",
-  "file_saved": "Uložen soubor",
   "fill_code": "Prosím vyplňte ověřovací kód zaslaný na Váš e-mail",
   "filter_by": "Filtrovat podle",
   "first_wallet_text": "Úžasná peněženka pro Monero, Bitcoin, Ethereum, Litecoin a Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Zapomenuté heslo",
   "freeze": "Zmrazit",
   "frequently_asked_questions": "Často kladené otázky",
-  "from": "Z",
   "frozen": "Zmraženo",
   "frozen_balance": "Zmrazená rovnováha",
   "full_balance": "Celkový zůstatek",
   "gas_exceeds_allowance": "Plyn vyžadovaný transakcí přesahuje příspěvek.",
-  "gas_price": "Cena plynu",
   "generate_name": "Generovat jméno",
   "generating_gift_card": "Generuji dárkovou kartu",
   "generating_transaction": "Generování transakce",
@@ -413,7 +369,6 @@
   "hide_details": "Skrýt detaily",
   "high_contrast_theme": "Téma s vysokým kontrastem",
   "home_screen_settings": "Nastavení domovské obrazovky",
-  "how_to_connect": "Jak se připojit",
   "how_to_use": "Jak používat",
   "how_to_use_card": "Jak použít tuto kartu",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Nemáte dostatek SOL na pokrytí transakce a jejího transakčního poplatku. Laskavě přidejte do své peněženky více solu nebo snižte množství Sol, kterou odesíláte.",
   "insufficient_lamports": "Nemáte dostatek SOL na pokrytí transakce a jejího transakčního poplatku. Potřebujete alespoň ${solValueNeeded} sol. Laskavě přidejte do své peněženky více SOL nebo snižte množství Sol, kterou odesíláte",
   "insufficientFundsForRentError": "Nemáte dostatek SOL na pokrytí transakčního poplatku a nájemného za účet. Laskavě přidejte do své peněženky více SOL nebo snižte množství Sol, kterou odesíláte",
-  "insufficientFundsForRentErrorReceiver": "Účet přijímače nemá dostatek SOL na pokrytí nájemného. Požádejte přijímač, aby na jejich účet přidal další SOL.",
   "introducing_cake_pay": "Představujeme Cake Pay!",
   "invalid_input": "Neplatný vstup",
   "invalid_password": "Neplatné heslo",
@@ -471,7 +425,6 @@
   "logout": "Odhlásit",
   "low_fee": "Nízký poplatek",
   "low_fee_alert": "Momentálně máte nastavené nízké poplatky pro transakce. To může způsobovat dlouhé čekání, změnu směnného kurzu, nebo zrušení směny. Doporučujeme nastavit vyšší poplatek.",
-  "made_easy": "usnadněný",
   "manage_nodes": "Spravovat uzly",
   "manage_pow_nodes": "Správa uzlů PoW",
   "manage_yats": "Spravovat Yaty",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Zpráva",
   "message_verified": "Zpráva byla úspěšně ověřena",
-  "messages": "Zprávy",
-  "method": "Metoda",
   "methods": "Metody",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Tmavé téma Monero",
   "monero_light_theme": "Světlé téma Monero",
   "moonpay_alert_text": "Částka musí být větší nebo rovna ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Při načítání NFT došlo k chybě. Laskavě zkontrolujte připojení k internetu a zkuste to znovu.",
   "more_options": "Více možností",
   "multiple_addresses_detected": "Detekované více adres",
   "mweb_confirmed": "Potvrzený mweb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Popisek",
   "new_subaddress_title": "Nová adresa",
   "new_template": "Nová šablona",
-  "new_transactions_notifications": "Zašlete oznámení o nových transakcích",
   "new_wallet": "Nová peněženka",
   "newConnection": "Nové připojení",
   "no_cards_found": "Žádné karty nenalezeny",
@@ -539,7 +488,6 @@
   "normal": "Normální",
   "note_optional": "Poznámka (nepovinné)",
   "note_tap_to_change": "Poznámka (poklepáním upravit)",
-  "notification_permission_denied": "Oznámení o oznámení bylo oprávněně zamítnuto, prosím ručně jej povolte v nastavení",
   "nullURIError": "URI je nulové",
   "offer_expires_in": "Nabídka vyprší: ",
   "offline": "Offline",
@@ -571,20 +519,8 @@
   "password": "Heslo",
   "paste": "Vložit",
   "pause_wallet_creation": "Možnost vytvářet Haven Wallet je momentálně pozastavena.",
-  "payjoin_card_content": "Payjoin je nová funkce ochrany soukromí a úspory poplatků v bitcoinech.",
-  "payjoin_details": "%%TE podrobnosti",
-  "payjoin_enabled": "Payjoin povoleno",
-  "payjoin_enabling_popup_content": "Můžete přepínat Payjoin v nabídce → Ochrana osobních údajů → Použít Payjoin, abyste jej povolili později.",
-  "payjoin_enabling_popup_title": "Povolení Payjoin",
-  "payjoin_request_awaiting_tx": "Čeká na transakci",
-  "payjoin_request_in_progress": "Probíhá",
-  "payjoin_unavailable": "Payjoin nedostupné",
-  "payjoin_unavailable_sheet_content": "Přijetí transakce Payjoin vyžaduje, abyste měli bitcoin připraveni k použití. \\ N \\ NAS, jakmile má vaše peněženka finanční prostředky, Payjoin bude automaticky povoleno.",
-  "payjoin_unavailable_sheet_title": "Proč je Payjoin nedostupný?",
   "payment_id": "ID platby: ",
-  "payment_made_easy": "Platby byly snadné",
   "payment_was_received": "Vaše platba byla přijata.",
-  "payments": "Platby",
   "pending": " (čeká)",
   "percentageOf": "z ${amount}",
   "pin_at_top": "špendlík ${token} nahoře",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Zkuste se prosím připojit k jinému uzlu",
   "please_wait": "Prosím, čekejte",
   "polygonscan_history": "Historie PolygonScan",
-  "potential_scam": "Potenciální podvod",
   "powered_by": "Zajišťuje ${title}",
   "pre_seed_button_text": "Rozumím. Ukaž mi můj seed.",
-  "pre_seed_description": "Na další stránce uvidíte řadu slov. Toto je vaše jedinečné a soukromé semeno a je to jediný způsob, jak obnovit peněženku v případě ztráty nebo poruchy. Je vaší odpovědností zapisovat jej a uložit jej na bezpečném místě mimo aplikaci Cake Wallet.",
+  "pre_seed_description": "Na následující stránce uvidíte sérii ${words} slov. Je to váš tzv. seed a je to JEDINÁ možnost, jak můžete později obnovit svou peněženku v případě ztráty nebo poruchy. Je VAŠÍ zodpovědností zapsat si ho a uložit si ho na bezpečném místě mimo aplikaci Cake Wallet.",
   "pre_seed_title": "DŮLEŽITÉ",
   "prepaid_cards": "Předplacené karty",
   "prevent_screenshots": "Zabránit vytváření snímků obrazovky a nahrávání obrazovky",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Pokračujte ve svém zařízení",
   "proceed_on_device_description": "Postupujte podle pokynů na výzvu na vaší hardwarové peněžence",
   "processing": "Zpracování",
-  "processing_signed_tx": "Zpracování podepsané transakce",
   "profile": "Profil",
   "provider_error": "${provider} chyba",
   "public_key": "Veřejný klíč",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Zdá se, že váš zástupce není v dobrém stavu. Klepnutím zde vyberte nový",
   "repeat_wallet_password": "Opakujte heslo peněženky",
   "repeated_password_is_incorrect": "Opakované heslo je nesprávné. Znovu opakujte heslo peněženky.",
-  "requested": "Požadováno",
   "require_for_adding_contacts": "Vyžadovat pro přidání kontaktů",
   "require_for_all_security_and_backup_settings": "Vyžadovat všechna nastavení zabezpečení a zálohování",
   "require_for_assessing_wallet": "Vyžadovat pro přístup k peněžence",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Vyžadovat pro odesílání do interních peněženek",
   "require_for_sends_to_non_contacts": "Vyžadovat pro odesílání nekontaktním osobám",
   "require_pin_after": "Vyžadovat PIN po",
-  "required_passphrase": "Passphrase",
   "rescan": "Znovu prohledat",
   "resend_code": "Prosím poslat znovu",
   "reset": "Vymazat",
   "reset_password": "Resetovat heslo",
-  "restore": "Obnovit",
   "restore_active_seed": "Aktivní seed",
   "restore_address": "Adresa",
   "restore_bitcoin_description_from_keys": "Obnovte svou peněženku pomocí vygenerovaného WIF řetězce z vašich soukromých klíčů",
@@ -713,10 +644,7 @@
   "search_language": "Hledat jazyk",
   "second_intro_content": "Váš Yat je jediná unikátní emoji adresa, která nahrazuje všechny Vaše dlouhé hexadecimální adresy pro všechny Vaše měny.",
   "second_intro_title": "Jedna emoji adresa vládne všem",
-  "security": "Zabezpečení",
   "security_and_backup": "Bezpečnost a zálohy",
-  "security_risk": "Bezpečnostní riziko",
-  "security_risk_description": "Tato doména je označena jako nebezpečná více poskytovateli zabezpečení. Okamžitě nechte chránit vaše aktiva.",
   "seed_alert_back": "Zpět",
   "seed_alert_content": "Tento seed představuje jedinou možnost, jak obnovit peněženku. Zapsali jste si ho?",
   "seed_alert_title": "Pozor",
@@ -751,6 +679,9 @@
   "seedtype": "SeedType",
   "seedtype_alert_content": "Sdílení semen s jinými peněženkami je možné pouze u BIP39 SeedType.",
   "seedtype_alert_title": "Upozornění seedtype",
+  "seedtype_legacy": "Legacy (25 slov)",
+  "seedtype_polyseed": "Polyseed (16 slov)",
+  "seedtype_wownero": "Wownero (14 slov)",
   "select_backup_file": "Vybrat soubor se zálohou",
   "select_buy_provider_notice": "Vyberte výše uvedeného poskytovatele nákupu. Tuto obrazovku můžete přeskočit nastavením výchozího poskytovatele nákupu v nastavení aplikace.",
   "select_destination": "Vyberte cíl pro záložní soubor.",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "Odeslat z externí peněženky",
   "send_name": "Název",
   "send_new": "Nová",
-  "send_payjoin": "Odeslat Payjoin",
   "send_payment_id": "ID platby (nepovinné)",
   "send_priority": "Momentálně je poplatek nastaven na prioritu: ${transactionPriority}.\nPriorita transakce může být upravena v nastavení.",
   "send_sending": "Odesílání...",
@@ -832,9 +762,7 @@
   "show_keys": "Zobrazit seed/klíče",
   "show_market_place": "Zobrazit trh",
   "show_seed": "Zobrazit seed",
-  "sign_all": "Podepište všechny",
   "sign_message": "Podepsat zprávu",
-  "sign_one": "Podepsat jeden",
   "sign_up": "Registrovat se",
   "sign_verify_message": "Podepsat / ověřit",
   "sign_verify_message_sub": "Podepište nebo ověřte zprávu pomocí soukromého klíče",
@@ -863,14 +791,11 @@
   "sort_by": "Seřazeno podle",
   "spend_key_private": "Klíč pro platby (soukromý)",
   "spend_key_public": "Klíč pro platby (veřejný)",
-  "starting_tor_proxy": "Zahájení proxy Tor",
   "status": "Status: ",
-  "step": "Krok",
   "string_default": "Výchozí",
   "subaddress_title": "Seznam subadres",
   "subaddresses": "Subadresy",
   "submit_request": "odeslat požadavek",
-  "success": "Úspěch",
   "successful": "Úspěšný",
   "support_description_guides": "Dokumentace a podpora běžných otázek",
   "support_description_live_chat": "Zdarma a rychle! K dispozici jsou zástupci vyškolených podpůrných podpory",
@@ -878,7 +803,6 @@
   "support_title_guides": "Dokumenty peněženky dortu",
   "support_title_live_chat": "Živá podpora",
   "support_title_other_links": "Další odkazy na podporu",
-  "supported": "Podporováno",
   "swap": "Swap",
   "sweeping_wallet": "Zametací peněženka",
   "sweeping_wallet_alert": "To by nemělo trvat dlouho. Nenechávejte tuto obrazovku, jinak mohou být ztraceny prostředky.",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "SYNCHRONIZUJI",
   "sync_status_timed_out": "ČAS VYPRŠEL",
   "sync_status_unsupported": "Nepodporovaný uzel",
-  "synchronizing": "Synchronizace",
   "syncing_wallet_alert_content": "Váš seznam zůstatků a transakcí nemusí být úplný, dokud nebude nahoře uvedeno „SYNCHRONIZOVANÉ“. Kliknutím/klepnutím se dozvíte více.",
   "syncing_wallet_alert_title": "Vaše peněženka se synchronizuje",
   "template": "Šablona",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Poskytovatel Thorchain nepodporuje adresy Taproot. Změňte adresu nebo vyberte jiného poskytovatele.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Spropitné:",
-  "to": "Na",
   "today": "Dnes",
-  "token_already_exists": "Token již existuje",
   "token_contract_address": "Adresa tokenové smlouvy",
   "token_decimal": "Token v desítkové soustavě",
   "token_name": "Název tokenu např.: Tether",
   "token_symbol": "Symbol tokenu, např.: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Při odeslání TON transakce pro výměnu nezapomeňte zadat ID Memo ID",
   "tor_connection": "Připojení Tor",
-  "tor_connection_timeout": "Časový limit připojení",
-  "tor_experimental": "Jedná se o experimentální funkci, ne všechna připojení vyrobená z podpory dortů na dort Tor - některá připojení mohou používat ClearNet, aby se plně směrovaly používání provozu aplikací s režimem VPN.",
   "tor_only": "Pouze Tor",
   "total": "Celkový",
   "total_saving": "Celkem ušetřeno",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "Pokud proces nepokročí během 1 minuty, zkontrolujte block explorer a svůj e-mail.",
   "transactions": "Transakce",
   "transactions_by_date": "Transakce podle data",
-  "transport_type": "Typ transportu",
   "trongrid_history": "Trongridní historie",
   "trusted": "Důvěřovat",
-  "try_again": "Zkuste to znovu",
   "tx_commit_exception_no_dust_on_change": "Transakce je zamítnuta s touto částkou. S těmito mincemi můžete odeslat ${min} bez změny nebo ${max}, které se vrátí změna.",
   "tx_commit_failed": "Transakce COMPORT selhala. Kontaktujte prosím podporu.",
   "tx_commit_failed_no_peers": "Transakce se nepodařilo vysílat, zkuste to prosím znovu za vteřinu",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "Podrobnosti o neutracených mincích",
   "unspent_coins_title": "Neutracené mince",
   "unsupported_asset": "Tuto akci u tohoto díla nepodporujeme. Vytvořte nebo přepněte na peněženku podporovaného typu aktiv.",
-  "update_session": "Aktualizační relace",
   "uptime": "Uptime",
   "upto": "až ${value}",
   "usb": "USB",
   "use": "Přepnout na ",
   "use_card_info_three": "Použijte tuto digitální kartu online nebo bezkontaktními platebními metodami.",
   "use_card_info_two": "Prostředky jsou převedeny na USD, když jsou drženy na předplaceném účtu, nikoliv na digitální měnu.",
-  "use_device_theme": "Použijte téma zařízení",
-  "use_payjoin": "Použijte %%TE",
   "use_ssl": "Použít SSL",
   "use_suggested": "Použít doporučený",
   "use_testnet": "Použijte testNet",
-  "user_rejected_method": "Metoda odmítnutá uživatele",
   "value": "Hodnota",
   "value_type": "Typ hodnoty",
   "variable_pair_not_supported": "Tento pár s tržním kurzem není ve zvolené směnárně podporován",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "Toto semeno si můžete vždy znovu prohlédnout",
   "wallet_group_empty_state_text_one": "Vypadá to, že nemáte žádné kompatibilní skupiny peněženky !\n\n",
   "wallet_group_empty_state_text_two": "Níže vytvořit nový.",
-  "wallet_has_passphrase": "Tato peněženka má přístupovou frázi",
   "wallet_keys": "Seed/klíče peněženky",
   "wallet_list_create_new_wallet": "Vytvořit novou peněženku",
   "wallet_list_edit_group_name": "Upravit název skupiny",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Peněženky",
   "warning": "Varování",
-  "welcome": "Vítejte",
+  "welcome": "Vítejte v",
   "welcome_subtitle_new_wallet": "Pokud chcete začít čerstvě, klepněte na Vytvořit novou peněženku níže a budete na závodech.",
   "welcome_subtitle_restore_wallet": "Pokud máte existující peněženku, kterou chcete přinést do dortu, jednoduše si vyberte obnovení stávající peněženky a my vás projdeme procesem.",
   "welcome_to_cakepay": "Vítejte v Cake Pay!",
-  "what_is_payjoin": "Co je Payjoin ?",
   "what_is_silent_payments": "Co jsou tiché platby?",
   "widgets_address": "Adresa",
   "widgets_or": "nebo",
@@ -1111,6 +1021,5 @@
   "you_will_get": "Směnit na",
   "you_will_receive_estimated_amount": "Obdržíte(odhadovaný )",
   "you_will_send": "Směnit z",
-  "youCanGoBackToYourDapp": "Nyní se můžete vrátit do svého dappu",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 4f5c3f87e..54303caf3 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Prepaid-Guthaben zu den Karten hinzufügen (bis zu ${value})",
   "add_new_node": "Neuen Knoten hinzufügen",
   "add_new_word": "Neues Wort hinzufügen",
-  "add_passphrase": "Fügen Sie Passphrase hinzu",
-  "add_passphrase_warning_text": "Geben Sie nur eine Passphrase ein, wenn Sie in der Vergangenheit eine für diese Brieftasche verwendet haben. Wenn Sie die falsche Passphrase eingeben oder in dieser Brieftasche noch keine Passphrase verwendet haben, werden Sie keine vorhandenen Gelder oder Geschichte sehen.",
   "add_receiver": "Fügen Sie einen weiteren Empfänger hinzu (optional)",
   "add_secret_code": "Oder fügen Sie diesen Geheimcode einer Authentifizierungs-App hinzu",
   "add_tip": "Tipp hinzufügen",
   "add_token_disclaimer_check": "Ich habe die Adresse und Informationen zum Token-Contract anhand einer seriösen Quelle bestätigt. Das Hinzufügen böswilliger oder falscher Informationen kann zu einem Verlust von Geldern führen.",
   "add_token_warning": "Bearbeiten oder fügen Sie Token nicht gemäß den Anweisungen von Betrügern hinzu.\nBestätigen Sie Token-Adressen immer mit seriösen Quellen!",
   "add_value": "Wert hinzufügen",
-  "added_message_for_ata_error": "Bitte stellen Sie sicher, dass Sie über genügend SOL -Balance verfügen, um Ihre Transaktion abzuschließen.",
   "address": "Adresse",
   "address_book": "Adressbuch",
   "address_book_menu": "Adressbuch",
@@ -55,8 +52,6 @@
   "anonpay_description": "Generieren Sie ${type}. Der Empfänger kann ${method} mit jeder unterstützten Kryptowährung verwenden, und Sie erhalten Geld in dieser Wallet.",
   "apk_update": "APK-Update",
   "approve": "Genehmigen",
-  "approve_request": "Anfrage genehmigen",
-  "approve_tokens": "Token genehmigen",
   "arrive_in_this_address": "${currency} ${tag} wird an dieser Adresse ankommen",
   "ascending": "Aufsteigend",
   "ask_each_time": "Jedes Mal fragen",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Warten auf Zahlungsbestätigung",
   "background_sync": "Hintergrundsynchronisation",
   "background_sync_mode": "Hintergrundsynchronisierungsmodus",
-  "background_sync_on_battery_low": "Bei niedrigem Akkustand synchronisieren",
-  "background_sync_on_charging": "Nur beim Laden synchronisieren",
-  "background_sync_on_device_idle": "Nur dann synchronisieren, wenn das Gerät nicht verwendet wird",
-  "background_sync_on_unmetered_network": "Erfordere ein ungetaktetes Netzwerk",
   "backup": "Sicherung",
   "backup_file": "Sicherungsdatei",
   "backup_password": "Passwort sichern",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Bitcoin kaufen",
   "buy_now": "Kaufe jetzt",
   "buy_provider_unavailable": "Anbieter derzeit nicht verfügbar.",
-  "buy_sell_pair_is_not_supported_warning": "Dieses Währungspaar wird von keinem Anbieter für die ausgewählte Zahlungsmethode unterstützt. Bitte wählen Sie ein anderes Paar oder versuchen Sie, die Zahlungsmethode zu ändern.",
   "buy_with": "Kaufen mit",
   "by_cake_pay": "von Cake Pay",
   "cake_2fa_preset": "Cake 2FA-Voreinstellung",
@@ -124,12 +114,9 @@
   "camera_consent": "Mit Ihrer Kamera wird bis zum ${provider} ein Bild zur Identifizierung aufgenommen. Weitere Informationen finden Sie in deren Datenschutzbestimmungen.",
   "camera_permission_is_required": "Eine Kameraerlaubnis ist erforderlich.\nBitte aktivieren Sie es in den App-Einstellungen.",
   "cancel": "Abbrechen",
-  "cannot_verify": "Kann nicht überprüfen",
-  "cannot_verify_description": "Diese Domäne kann nicht verifiziert werden. Überprüfen Sie die Anfrage vor der Genehmigung sorgfältig.",
   "card_address": "Adresse:",
   "cardholder_agreement": "Karteninhabervertrag",
   "cards": "Karten",
-  "chain_id": "Ketten -ID",
   "chains": "Blockchains",
   "change": "Ändern",
   "change_backup_password_alert": "Ihre vorherigen Sicherungsdateien können nicht mit einem neuen Sicherungskennwort importiert werden. Das neue Sicherungskennwort wird nur für neue Sicherungsdateien verwendet. Sind Sie sicher, dass Sie das Sicherungskennwort ändern möchten?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Sind Sie sicher, dass Sie den Vertreter wechseln möchten?",
   "change_rep_successful": "Vertreter erfolgreich gerändert",
   "change_selected_exchanges": "Änderung ausgewählter Austausch",
-  "change_selected_pair": "Ändern Sie das ausgewählte Paar",
   "change_wallet_alert_content": "Möchten Sie die aktuelle Wallet zu ${wallet_name} ändern?",
   "change_wallet_alert_title": "Aktuelle Wallet ändern",
   "choose_a_payment_method": "Wählen Sie eine Zahlungsmethode",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Bestätigt",
   "congratulations": "Glückwunsch!",
   "connect_an_existing_yat": "Verbinden Sie ein vorhandenes Yat",
-  "connect_hw_info_step_1": "Stellen Sie sicher, dass Ihr Gerät eingeschaltet ist.",
-  "connect_hw_info_step_2": "Schalten Sie Bluetooth für beide Geräte ein oder schließen Sie Ihre Geräte mit einem USB-Kabel an.",
-  "connect_hw_info_step_3": "Entsperren Sie Ihr Gerät und navigieren Sie zur gewünschten Krypto-App auf ihrem Gerät.",
-  "connect_hw_info_step_4": "Wählen Sie Ihr Gerät in Cake Wallet aus und fahren Sie mit dem Setup fort.",
   "connect_yats": "Yats verbinden",
   "connect_your_hardware_wallet": "Verbinden Sie Ihre Hardware-Wallet über Bluetooth oder USB",
   "connect_your_hardware_wallet_ios": "Verbinden Sie Ihre Hardware-Wallet über Bluetooth",
-  "connected": "Verbunden",
   "connection_sync": "Verbindung und Synchronisierung",
   "connectWalletPrompt": "Verbinden Sie Ihr Wallet mit WalletConnect, um Transaktionen durchzuführen",
   "contact": "Kontakt",
@@ -207,8 +188,6 @@
   "copy": "Kopieren",
   "copy_address": "Adresse kopieren",
   "copy_id": "ID kopieren",
-  "copy_payjoin_address": "Kopieren Sie Payjoin-Adresse",
-  "copy_payjoin_url": "Payjoin URL kopieren",
   "copyWalletConnectLink": "Kopieren Sie den WalletConnect-Link von dApp und fügen Sie ihn hier ein",
   "corrupted_seed_notice": "Die Dateien für diese Wallet sind beschädigt und können nicht geöffnet werden. Bitte sehen Sie sich die Seeds an, speichern Sie sie und stellen Sie die Wallet wieder her.\n\nWenn der Wert leer ist, konnte der Seed nicht korrekt wiederhergestellt werden.",
   "countries": "Länder",
@@ -245,22 +224,11 @@
   "descending": "Absteigend",
   "description": "Beschreibung",
   "destination_tag": "Ziel-Tag:",
-  "deuro_collect_interest": "Auszahlen",
-  "deuro_savings": "dEuro-Savings",
-  "deuro_savings_add": "Einzahlen",
-  "deuro_savings_balance": "Sparguthaben",
-  "deuro_savings_collect_interest": "Interesse sammeln",
-  "deuro_savings_remove": "Auszahlen",
-  "deuro_savings_set_approval": "Genehmigung festlegen",
-  "deuro_savings_subtitle": "Verdienen Sie bis zu 10% Zinsen für Ihre dEuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Es kann ein paar Sekunden dauern, bis die Transaktion bestätigt und auf dem Bildschirm angezeigt",
-  "device_is_signing": "Das Gerät unterschreibt",
   "dfx_option_description": "Kaufen Sie Krypto mit EUR & CHF. Für Einzelhandel und Unternehmenskunden in Europa",
   "didnt_get_code": "Kein Code?",
   "digit_pin": "-stellige PIN",
   "digital_and_physical_card": "digitale und physische Prepaid-Debitkarte",
   "disable": "Deaktivieren",
-  "disable_automatic_exchange_status_updates": "Deaktivieren Sie die automatischen Austauschstatusaktualisierungen",
   "disable_bulletin": "Deaktivieren Sie das Bulletin des Service Status",
   "disable_buy": "Kaufaktion deaktivieren",
   "disable_cake_2fa": "Cake 2FA deaktivieren",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Wenn dies ausgeschaltet wird, sind die Gebührenquoten in einigen Fällen möglicherweise ungenau, sodass Sie die Gebühren für Ihre Transaktionen möglicherweise überbezahlt oder unterzahlt",
   "disable_fiat": "Fiat deaktivieren",
   "disable_sell": "Verkaufsaktion deaktivieren",
-  "disable_tor": "Tor deaktivieren",
   "disable_trade_option": "Handelsoption deaktivieren",
   "disableBatteryOptimization": "Batterieoptimierung deaktivieren",
   "disableBatteryOptimizationDescription": "Möchten Sie die Batterieoptimierung deaktivieren, um die Hintergrundsynchronisierung reibungsloser zu gestalten?",
   "disabled": "Deaktiviert",
-  "disconnect_session": "Sitzung trennen",
   "discount": "${value} % sparen",
   "display_settings": "Anzeigeeinstellungen",
   "displayable": "Anzeigebar",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Teilen Sie diese nicht mit anderen, einschließlich Support.\n\nIhr Geld kann und wird gestohlen werden!",
   "do_not_show_me": "Zeig mir das nicht noch einmal",
   "domain_looks_up": "Domain-Suchen",
-  "domain_mismatch": "Domänenfehlanpassung",
-  "domain_mismatch_description": "Diese Website hat eine Domain, die nicht mit dem Absender dieser Anfrage übereinstimmt. Die Genehmigung kann zum Verlust von Geldern führen.",
   "donation_link_details": "Details zum Spendenlink",
-  "done": "Erledigt",
   "e_sign_consent": "E-Sign-Zustimmung",
   "edit": "Bearbeiten",
   "edit_backup_password": "Sicherungskennwort bearbeiten",
@@ -295,11 +258,10 @@
   "electrum_address_disclaimer": "Wir generieren jedes Mal neue Adressen, wenn Sie eine verwenden, aber vorherige Adressen funktionieren weiterhin",
   "email_address": "E-Mail-Adresse",
   "enable": "Aktivieren",
-  "enable_builtin_tor": "Aktivieren Sie den bau-in tor",
   "enable_mempool_api": "Mempool-API für genaue Gebühren und Daten",
   "enable_replace_by_fee": "Aktivieren Sie Ersatz für Fee",
   "enable_silent_payments_scanning": "Scannen Sie nach Silent Payments ihrer Adresse",
-  "enabled": "Aktiviert",
+  "enabled": "Ermöglicht",
   "enter_amount": "Betrag eingeben",
   "enter_backup_password": "Sicherungskennwort hier eingeben",
   "enter_code": "Code eingeben",
@@ -333,10 +295,8 @@
   "error_text_template": "Vorlagenname und Adresse dürfen nicht die Zeichen ` , ' \" enthalten\nund müssen zwischen 1 und 106 Zeichen lang sein",
   "error_text_wallet_name": "Der Wallet-Name darf nur Buchstaben, Zahlen und _- Symbole enthalten\nund muss zwischen 1 und 33 Zeichen lang sein",
   "error_text_xmr": "Der XMR-Wert darf das verfügbare Guthaben nicht überschreiten.\nDie Anzahl der Nachkommastellen muss kleiner oder gleich 12 sein",
-  "error_while_processing": "Ein Fehler beim Proceessing trat ein Fehler auf",
   "errorGettingCredentials": "Fehlgeschlagen: Fehler beim Abrufen der Anmeldeinformationen",
   "errorSigningTransaction": "Beim Signieren der Transaktion ist ein Fehler aufgetreten",
-  "establishing_tor_connection": "Einstellung der TOR -Verbindung",
   "estimated": "Geschätzt",
   "estimated_new_fee": "Geschätzte neue Gebühr",
   "estimated_receive_amount": "Geschätzter Empfangsbetrag",
@@ -360,7 +320,6 @@
   "export_backup": "Sicherung exportieren",
   "export_logs": "Exportprotokolle",
   "export_outputs": "Exportausgaben",
-  "extend_session": "Sitzung verlängern",
   "extra_id": "Extra ID:",
   "extracted_address_content": "Sie senden Geld an\n${recipient_name}",
   "failed_authentication": "Authentifizierung fehlgeschlagen. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Fiat Balance",
   "field_required": "Dieses Feld ist erforderlich",
-  "file_saved": "Datei gespeichert",
   "fill_code": "Geben Sie den Bestätigungscode ein, den Sie per E-Mail erhalten haben",
   "filter_by": "Filtern nach",
   "first_wallet_text": "Eine großartige Wallet für Monero, Bitcoin, Ethereum, Litecoin, und Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Passwort vergessen",
   "freeze": "Einfrieren",
   "frequently_asked_questions": "Häufig gestellte Fragen",
-  "from": "Aus",
   "frozen": "Gefroren",
   "frozen_balance": "Gefrorenes Guthaben",
   "full_balance": "Gesamtguthaben",
   "gas_exceeds_allowance": "Die durch Transaktion erforderliche Gas übertrifft die Zulage.",
-  "gas_price": "Gaspreis",
   "generate_name": "Namen generieren",
   "generating_gift_card": "Geschenkkarte wird erstellt",
   "generating_transaction": "Transaktion erzeugen",
@@ -413,7 +369,6 @@
   "hide_details": "Details ausblenden",
   "high_contrast_theme": "Kontrastreiches Thema",
   "home_screen_settings": "Einstellungen für den Startbildschirm",
-  "how_to_connect": "Anleitung",
   "how_to_use": "Wie benutzt man",
   "how_to_use_card": "Wie man diese Karte benutzt",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Sie haben nicht genug SOL, um die Transaktion und ihre Transaktionsgebühr abzudecken. Bitte fügen Sie Ihrer Wallet mehr Sol hinzu oder reduzieren Sie die SOL-Menge, die Sie senden.",
   "insufficient_lamports": "Sie haben nicht genug SOL, um die Transaktion und ihre Transaktionsgebühr abzudecken. Sie brauchen mindestens ${solValueNeeded} Sol. Bitte fügen Sie mehr Sol zu Ihrer Wallet hinzu oder reduzieren Sie den von Ihnen gesendeten Sol-Betrag",
   "insufficientFundsForRentError": "Sie haben nicht genug SOL, um die Transaktionsgebühr und die Miete für das Konto zu decken. Bitte fügen Sie mehr Sol zu Ihrer Wallet hinzu oder reduzieren Sie den von Ihnen gesendeten Sol-Betrag",
-  "insufficientFundsForRentErrorReceiver": "Das Konto des Empfängers hat nicht genug SOL, um die Miete zu decken. Bitte bitten Sie den Empfänger, ihr Konto mehr Sol hinzuzufügen.",
   "introducing_cake_pay": "Einführung von Cake Pay!",
   "invalid_input": "Ungültige Eingabe",
   "invalid_password": "Ungültiges Passwort",
@@ -471,7 +425,6 @@
   "logout": "Abmelden",
   "low_fee": "Niedrige Gebühr",
   "low_fee_alert": "Sie verwenden derzeit eine niedrige Netzwerkgebührenpriorität. Dies kann zu langen Wartezeiten, unterschiedlichen Kursen oder stornierten Trades führen. Wir empfehlen, für ein besseres Erlebnis eine höhere Gebühr festzulegen.",
-  "made_easy": "leicht gemacht",
   "manage_nodes": "Knoten verwalten",
   "manage_pow_nodes": "PoW-Knoten verwalten",
   "manage_yats": "Yats verwalten",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Nachricht",
   "message_verified": "Die Nachricht wurde erfolgreich überprüft",
-  "messages": "Nachrichten",
-  "method": "Verfahren",
   "methods": "Methoden",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Dunkles Monero-Thema",
   "monero_light_theme": "Monero Light-Thema",
   "moonpay_alert_text": "Der Wert des Betrags muss größer oder gleich ${minAmount} ${fiatCurrency} sein",
-  "moralis_nft_error": "Ein Fehler trat beim Abrufen von NFTs auf. Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut.",
   "more_options": "Weitere Optionen",
   "multiple_addresses_detected": "Mehrere Adressen erkannt",
   "mweb_confirmed": "Bestätigt MWeb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Bezeichnung",
   "new_subaddress_title": "Neue Adresse",
   "new_template": "neue Vorlage",
-  "new_transactions_notifications": "Senden Sie Benachrichtigungen über neue Transaktionen",
   "new_wallet": "Neue Wallet",
   "newConnection": "Neue Verbindung",
   "no_cards_found": "Keine Karten gefunden",
@@ -539,7 +488,6 @@
   "normal": "Normal",
   "note_optional": "Bemerkung (optional)",
   "note_tap_to_change": "Bemerkung (zum Ändern tippen)",
-  "notification_permission_denied": "Die Benachrichtigungsgenehmigung wurde verweigert verweigert. Bitte ermöglichen Sie dies manuell in Einstellungen",
   "nullURIError": "URI ist null",
   "offer_expires_in": "Angebot läuft ab in: ",
   "offline": "offline",
@@ -571,20 +519,8 @@
   "password": "Passwort",
   "paste": "Einfügen",
   "pause_wallet_creation": "Die Möglichkeit, Haven Wallet zu erstellen, ist derzeit pausiert.",
-  "payjoin_card_content": "Payjoin ist eine neue Feature für Privatsphäre und Gebühren in Bitcoin.",
-  "payjoin_details": "Payjoin Details",
-  "payjoin_enabled": "Payjoin aktiv",
-  "payjoin_enabling_popup_content": "Sie können Payjoin unter dem Menü → Privatsphäre → Payjoin verwenden, um es später zu aktivieren oder zu deaktivieren.",
-  "payjoin_enabling_popup_title": "Aktiviere Payjoin",
-  "payjoin_request_awaiting_tx": "Warten auf die Transaktion",
-  "payjoin_request_in_progress": "Im Gange",
-  "payjoin_unavailable": "Payjoin nicht verfügbar",
-  "payjoin_unavailable_sheet_content": "Wenn Sie eine Payjoin-Transaktion erhalten, müssen Sie bereits Bitcoin im Wallet haben.",
-  "payjoin_unavailable_sheet_title": "Warum ist Payjoin nicht verfügbar?",
   "payment_id": "Zahlungs-ID: ",
-  "payment_made_easy": "Zahlungen einfach gemacht",
   "payment_was_received": "Ihre Zahlung ist eingegangen.",
-  "payments": "Zahlungen",
   "pending": " (ausstehend)",
   "percentageOf": "von ${amount}",
   "pin_at_top": "Stecken Sie ${token} oben fest",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "Bitte versuchen Sie, sich mit einem anderen Knoten zu verbinden",
   "please_wait": "Warten Sie mal",
   "polygonscan_history": "PolygonScan-Verlauf",
-  "potential_scam": "Potenzieller Betrug",
   "powered_by": "Ermöglicht durch ${title}",
   "pre_seed_button_text": "Verstanden. Zeig mir meinen Seed",
-  "pre_seed_description": "Auf der nächsten Seite sehen Sie eine Reihe von Wörtern. Dies ist Ihr einzigartiger und privater Seed und der einzige Weg, Ihre Brieftasche im Falle eines Verlusts oder einer Fehlfunktion zurückzugewinnen. Es liegt in Ihrer Verantwortung, es aufzuschreiben und an einem sicheren Ort außerhalb der Cake Wallet -App aufzubewahren.",
+  "pre_seed_description": "Auf der nächsten Seite sehen Sie eine Reihe von ${words} Wörtern. Dies ist Ihr einzigartiger und privater Seed und der EINZIGE Weg, um Ihre Wallet im Falle eines Verlusts oder einer Fehlfunktion wiederherzustellen. Es liegt in IHRER Verantwortung, ihn aufzuschreiben und an einem sicheren Ort außerhalb der Cake Wallet-App aufzubewahren.",
   "pre_seed_title": "WICHTIG",
   "prepaid_cards": "Karten mit Guthaben",
   "prevent_screenshots": "Verhindern Sie Screenshots und Bildschirmaufzeichnungen",
@@ -618,7 +553,6 @@
   "proceed_on_device": "Fahren Sie auf Ihrem Gerät fort",
   "proceed_on_device_description": "Bitte befolgen Sie die Anweisungen, die auf Ihrer Hardware-Wallet angezeigt werden",
   "processing": "Verarbeitung",
-  "processing_signed_tx": "Verarbeitung unterschriebene Transaktion",
   "profile": "Profil",
   "provider_error": "${provider}-Fehler",
   "public_key": "Öffentlicher Schlüssel",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "Ihr Vertreter scheint nicht gut zu sein. Tippen Sie hier, um eine neue auszuwählen",
   "repeat_wallet_password": "Wiederholen Sie das Walletkennwort",
   "repeated_password_is_incorrect": "Wiederholtes Passwort ist falsch. Bitte wiederholen Sie das Walletkennwort erneut.",
-  "requested": "Angefordert",
   "require_for_adding_contacts": "Erforderlich zum Hinzufügen von Kontakten",
   "require_for_all_security_and_backup_settings": "Für alle Sicherheits- und Sicherungseinstellungen erforderlich",
   "require_for_assessing_wallet": "Für den Zugriff auf die Wallet erforderlich",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "Erforderlich für Sendungen an interne Wallets",
   "require_for_sends_to_non_contacts": "Erforderlich für Versendungen an Nichtkontakte",
   "require_pin_after": "PIN anfordern nach",
-  "required_passphrase": "Passphrase",
   "rescan": "Erneut scannen",
   "resend_code": "Bitte erneut senden",
   "reset": "Zurücksetzen",
   "reset_password": "Passwort zurücksetzen",
-  "restore": "Wiederherstellen",
   "restore_active_seed": "Aktiver Seed",
   "restore_address": "Adresse",
   "restore_bitcoin_description_from_keys": "Stellen Sie Ihre Wallet aus der generierten WIF-Zeichenfolge aus Ihren privaten Schlüsseln wieder her",
@@ -714,10 +645,7 @@
   "search_language": "Sprache suchen",
   "second_intro_content": "Ihr Yat ist eine einzige eindeutige Emoji-Adresse, die alle Ihre langen hexadezimalen Adressen für alle Ihre Währungen ersetzt.",
   "second_intro_title": "Eine Emoji-Adresse, um sie alle zu beherrschen",
-  "security": "Sicherheit",
   "security_and_backup": "Sicherheit und Datensicherung",
-  "security_risk": "Sicherheitsrisiko",
-  "security_risk_description": "Diese Domäne wird von mehreren Sicherheitsanbietern als unsicher gekennzeichnet. Gehen Sie sofort auf, um Ihr Vermögen zu schützen.",
   "seed_alert_back": "Zurückgehen",
   "seed_alert_content": "Der Seed ist der einzige Weg, Ihre Wallet wiederherzustellen. Haben Sie ihn aufgeschrieben?",
   "seed_alert_title": "Achtung",
@@ -752,6 +680,9 @@
   "seedtype": "Seedtyp",
   "seedtype_alert_content": "Das Teilen von Seeds mit anderen Wallet ist nur mit bip39 Seedype möglich.",
   "seedtype_alert_title": "Seedype-Alarm",
+  "seedtype_legacy": "Veraltet (25 Wörter)",
+  "seedtype_polyseed": "Polyseed (16 Wörter)",
+  "seedtype_wownero": "WOWNO (14 Wörter)",
   "select_backup_file": "Sicherungsdatei auswählen",
   "select_buy_provider_notice": "Wählen Sie oben einen Anbieter kaufen. Sie können diese Seite überspringen, indem Sie Ihren Standard-Kaufanbieter in den App-Einstellungen festlegen.",
   "select_destination": "Bitte wählen Sie das Ziel für die Sicherungsdatei aus.",
@@ -765,7 +696,7 @@
   "send": "Senden",
   "send_address": "${cryptoCurrency}-Adresse",
   "send_amount": "Betrag:",
-  "send_change_to_you": "Rückgeld:",
+  "send_change_to_you": "Verändere dich zu dir:",
   "send_creating_transaction": "Erstelle Transaktion",
   "send_error_currency": "Die Währung darf nur Zahlen enthalten",
   "send_error_minimum_value": "Der Mindestbetrag ist 0,01",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "Senden Sie aus der Außenschreibe",
   "send_name": "Name",
   "send_new": "Neu",
-  "send_payjoin": "Payjoin senden",
   "send_payment_id": "Zahlungs-ID (optional)",
   "send_priority": "Derzeit ist ${transactionPriority} als Gebührenpriorität eingestellt.\nDie Transaktionspriorität kann in den Einstellungen angepasst werden",
   "send_sending": "Senden...",
@@ -833,9 +763,7 @@
   "show_keys": "Seed/Schlüssel anzeigen",
   "show_market_place": "Marktplatz anzeigen",
   "show_seed": "Seed zeigen",
-  "sign_all": "Alle unterschreiben",
   "sign_message": "Nachricht unterschreiben",
-  "sign_one": "Unterschreiben",
   "sign_up": "Anmelden",
   "sign_verify_message": "Zeichen / überprüfen",
   "sign_verify_message_sub": "Unterschreiben oder überprüfen Sie eine Nachricht mit Ihrem privaten Schlüssel",
@@ -864,14 +792,11 @@
   "sort_by": "Sortiere nach",
   "spend_key_private": "Spend Key (geheim)",
   "spend_key_public": "Spend Key (öffentlich)",
-  "starting_tor_proxy": "TOR -Proxy beginnen",
   "status": "Status: ",
-  "step": "Schritt",
   "string_default": "Standard",
   "subaddress_title": "Unteradressenliste",
   "subaddresses": "Unteradressen",
   "submit_request": "Eine Anfrage stellen",
-  "success": "Erfolg",
   "successful": "Erfolgreich",
   "support_description_guides": "Dokumentation und Hilfe für bekannte Probleme",
   "support_description_live_chat": "Kostenlos und schnell! Ausgebildete Mitarbeiter stehen zur Unterstützung bereit, um zu helfen",
@@ -879,7 +804,6 @@
   "support_title_guides": "Cake Wallet Docs",
   "support_title_live_chat": "Live Support",
   "support_title_other_links": "Andere Support-Links",
-  "supported": "Unterstützt",
   "swap": "Tauschen",
   "sweeping_wallet": "Wallet leeren",
   "sweeping_wallet_alert": "Das sollte nicht lange dauern. VERLASSEN SIE DIESEN BILDSCHIRM NICHT, ANDERNFALLS KÖNNEN DIE GELDER VERLOREN GEHEN",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "SYNCHRONISIERE",
   "sync_status_timed_out": "Zeitlich abgestimmt",
   "sync_status_unsupported": "Nicht unterstützter Knoten",
-  "synchronizing": "Synchronisierung",
   "syncing_wallet_alert_content": "Ihr Kontostand und Ihre Transaktionsliste sind möglicherweise erst vollständig, wenn oben „SYNCHRONISIERT“ steht. Klicken/tippen Sie, um mehr zu erfahren.",
   "syncing_wallet_alert_title": "Ihr Wallet wird synchronisiert",
   "template": "Vorlage",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "Der Thorchain-Anbieter unterstützt keine Taproot-Adressen. Bitte ändern Sie die Adresse oder wählen Sie einen anderen Anbieter aus.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Hinweis:",
-  "to": "Zu",
   "today": "Heute",
-  "token_already_exists": "Token existiert bereits",
   "token_contract_address": "Token-Contract-Adresse",
   "token_decimal": "Token-Dezimalzahl",
   "token_name": "Token-Name, z. B.: Tether",
   "token_symbol": "Token-Symbol, z. B.: USDT",
   "tokenID": "AUSWEIS",
-  "ton_extra_info": "Bitte vergessen Sie nicht, die Memo -ID anzugeben, während Sie die TON -Transaktion für den Austausch senden",
   "tor_connection": "Tor-Verbindung",
-  "tor_connection_timeout": "TOR -Verbindungs ​​-Zeitüberschreitung",
-  "tor_experimental": "Dies ist eine experimentelle Funktion, nicht alle Verbindungen, die aus Kuchen -Wallet -Stütze für die Routing hergestellt werden. Einige Verbindungen können ClearNET verwenden, um den App -Traffic -App -TOR mit dem VPN -Modus vollständig zu verwenden.",
   "tor_only": "Nur Tor",
   "total": "Gesamt",
   "total_saving": "Gesamteinsparungen",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "Wenn der Bildschirm nach 1 Minute nicht weitergeht, überprüfen Sie einen Block-Explorer und Ihre E-Mail.",
   "transactions": "Transaktionen",
   "transactions_by_date": "Transaktionen nach Datum",
-  "transport_type": "Transporttyp",
   "trongrid_history": "Trongrid-Historie",
   "trusted": "Vertrauenswürdige",
-  "try_again": "Erneut versuchen",
   "tx_commit_exception_no_dust_on_change": "Die Transaktion wird diesen Betrag abgelehnt. Mit diesen Münzen können Sie ${min} ohne Veränderung oder ${max} senden, die Änderungen zurückgeben.",
   "tx_commit_failed": "Transaktionsausschüsse ist fehlgeschlagen. Bitte wenden Sie sich an Support.",
   "tx_commit_failed_no_peers": "Transaktion konnte nicht übertragen werden. Bitte versuchen Sie es in einer Sekunde oder so erneut",
@@ -1015,19 +931,15 @@
   "unspent_coins_details_title": "Details zu nicht ausgegebenen Coins",
   "unspent_coins_title": "Nicht ausgegebene Coins",
   "unsupported_asset": "Wir unterstützen diese Aktion für dieses Asset nicht. Bitte erstellen Sie eine Wallet eines unterstützten Asset-Typs oder wechseln Sie zu einer Wallet.",
-  "update_session": "Sitzung aktualisieren",
   "uptime": "Betriebszeit",
   "upto": "bis zu ${value}",
   "usb": "USB",
   "use": "Wechsel zu ",
   "use_card_info_three": "Verwenden Sie die digitale Karte online oder mit kontaktlosen Zahlungsmethoden.",
   "use_card_info_two": "Guthaben werden auf dem Prepaid-Konto in USD umgerechnet, nicht in digitale Währung.",
-  "use_device_theme": "Verwenden Sie das Gerätethema",
-  "use_payjoin": "Benutze Payjoin",
   "use_ssl": "SSL verwenden",
   "use_suggested": "Vorgeschlagen verwenden",
   "use_testnet": "TESTNET verwenden",
-  "user_rejected_method": "Benutzerverletzte Methode",
   "value": "Wert",
   "value_type": "Werttyp",
   "variable_pair_not_supported": "Dieses Variablenpaar wird von den ausgewählten Börsen nicht unterstützt",
@@ -1055,7 +967,6 @@
   "wallet_group_description_view_seed": "Sie können diesen Seed immer wieder untersuchen",
   "wallet_group_empty_state_text_one": "Sieht so aus, als hätten Sie keine kompatiblen Walletgruppen !\n\n TAP",
   "wallet_group_empty_state_text_two": "unten, um einen neuen zu machen.",
-  "wallet_has_passphrase": "Diese Brieftasche hat eine Passphrase",
   "wallet_keys": "Wallet-Seed/-Schlüssel",
   "wallet_list_create_new_wallet": "Neue Wallet erstellen",
   "wallet_list_edit_group_name": "Gruppenname bearbeiten",
@@ -1080,11 +991,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Wallets",
   "warning": "Warnung",
-  "welcome": "Willkommen",
+  "welcome": "Willkommen bei",
   "welcome_subtitle_new_wallet": "Wenn Sie frisch anfangen möchten, tippen Sie unten neue Wallet und schon sind Sie bereit.",
   "welcome_subtitle_restore_wallet": "Wenn Sie über eine vorhandene Wallet verfügen, die Sie in Cake Wallet öffnen möchten, drücken Sie auf Vorhandene Wallet wiederherstellen und wir werden Sie durch den Prozess führen.",
   "welcome_to_cakepay": "Willkommen bei Cake Pay!",
-  "what_is_payjoin": "Was ist Payjoin ?",
   "what_is_silent_payments": "Was sind Silent Payments?",
   "widgets_address": "Adresse",
   "widgets_or": "oder",
@@ -1114,6 +1024,5 @@
   "you_will_get": "Konvertieren zu",
   "you_will_receive_estimated_amount": "Sie erhalten(geschätzt )",
   "you_will_send": "Konvertieren von",
-  "youCanGoBackToYourDapp": "Sie können jetzt zu Ihrem Dapp zurückkehren",
   "yy": "YY"
-}
+}
\ No newline at end of file
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 3de612694..85103162d 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Add prepaid funds to the cards (up to ${value})",
   "add_new_node": "Add new node",
   "add_new_word": "Add new word",
-  "add_passphrase": "Add Passphrase",
-  "add_passphrase_warning_text": "Only enter a passphrase if you have used one for this wallet in the past. If you enter the wrong passphrase or have not used a passphrase before on this wallet, you won't see any of existing funds or history.",
   "add_receiver": "Add another receiver (optional)",
   "add_secret_code": "Or, add this secret code to an authenticator app",
   "add_tip": "Add Tip",
   "add_token_disclaimer_check": "I have confirmed the token contract address and information using a reputable source. Adding malicious or incorrect information can result in a loss of funds.",
   "add_token_warning": "Do not edit or add tokens as instructed by scammers.\nAlways confirm token addresses with reputable sources!",
   "add_value": "Add value",
-  "added_message_for_ata_error": "Kindly ensure you have enough SOL balance to complete your transaction.",
   "address": "Address",
   "address_book": "Address Book",
   "address_book_menu": "Address book",
@@ -55,8 +52,6 @@
   "anonpay_description": "Generate ${type}. The recipient can ${method} with any supported cryptocurrency, and you will receive funds in this wallet.",
   "apk_update": "APK update",
   "approve": "Approve",
-  "approve_request": "Approve Request",
-  "approve_tokens": "Approve tokens",
   "arrive_in_this_address": "${currency} ${tag}will arrive in this address",
   "ascending": "Ascending",
   "ask_each_time": "Ask each time",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Awaiting Payment Confirmation",
   "background_sync": "Background sync",
   "background_sync_mode": "Background sync mode",
-  "background_sync_on_battery_low": "Synchronize on low battery",
-  "background_sync_on_charging": "Synchronize only when charging",
-  "background_sync_on_device_idle": "Synchronize only when device is not being used",
-  "background_sync_on_unmetered_network": "Require unmetered network",
   "backup": "Backup",
   "backup_file": "Backup file",
   "backup_password": "Backup password",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Buy Bitcoin",
   "buy_now": "Buy Now",
   "buy_provider_unavailable": "Provider currently unavailable.",
-  "buy_sell_pair_is_not_supported_warning": "This currency pair isn’t supported by any provider for the selected payment method. Please choose a different pair or try changing the payment method.",
   "buy_with": "Buy with",
   "by_cake_pay": "by Cake Pay",
   "cake_2fa_preset": "Cake 2FA Preset",
@@ -124,12 +114,9 @@
   "camera_consent": "Your camera will be used to capture an image for identification purposes by ${provider}.  Please check their Privacy Policy for details.",
   "camera_permission_is_required": "Camera permission is required. \nPlease enable it from app settings.",
   "cancel": "Cancel",
-  "cannot_verify": "Cannot Verify",
-  "cannot_verify_description": "This domain cannot be verified. Check the request carefully before approving.",
   "card_address": "Address:",
   "cardholder_agreement": "Cardholder Agreement",
   "cards": "Cards",
-  "chain_id": "Chain ID",
   "chains": "Chains",
   "change": "Change",
   "change_backup_password_alert": "Your previous backup files will be not available to import with new backup password. New backup password will be used only for new backup files. Are you sure that you want to change backup password?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Are you sure that you want to change representatives?",
   "change_rep_successful": "Successfully changed representative",
   "change_selected_exchanges": "Change Selected Exchanges",
-  "change_selected_pair": "Change Selected Pair",
   "change_wallet_alert_content": "Do you want to change current wallet to ${wallet_name}?",
   "change_wallet_alert_title": "Change current wallet",
   "choose_a_payment_method": "Choose a payment method",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Confirmed",
   "congratulations": "Congratulations!",
   "connect_an_existing_yat": "Connect an existing Yat",
-  "connect_hw_info_step_1": "Make sure your device is powered ON.",
-  "connect_hw_info_step_2": "Turn Bluetooth on for both devices and pair them from the phone, OR connect your devices together using a USB cable.",
-  "connect_hw_info_step_3": "Unlock your device and navigate to the desired crypto app.",
-  "connect_hw_info_step_4": "Select your device in Cake Wallet and continue with the setup.",
   "connect_yats": "Connect Yats",
   "connect_your_hardware_wallet": "Connect your hardware wallet using Bluetooth or USB",
   "connect_your_hardware_wallet_ios": "Connect your hardware wallet using Bluetooth",
-  "connected": "Connected",
   "connection_sync": "Connection and sync",
   "connectWalletPrompt": "Connect your wallet with WalletConnect to make transactions",
   "contact": "Contact",
@@ -207,8 +188,6 @@
   "copy": "Copy",
   "copy_address": "Copy Address",
   "copy_id": "Copy ID",
-  "copy_payjoin_address": "Copy Payjoin Address",
-  "copy_payjoin_url": "Copy Payjoin URL",
   "copyWalletConnectLink": "Copy the WalletConnect link from dApp and paste here",
   "corrupted_seed_notice": "The files for this wallet are corrupted and are unable to be opened. Please view the seed phrase, save it, and restore the wallet.\n\nIf the value is empty, then the seed was unable to be correctly recovered.",
   "countries": "Countries",
@@ -245,22 +224,11 @@
   "descending": "Descending",
   "description": "Description",
   "destination_tag": "Destination tag:",
-  "deuro_collect_interest": "Collect",
-  "deuro_savings": "dEuro Savings",
-  "deuro_savings_add": "Deposit",
-  "deuro_savings_balance": "Savings Balance",
-  "deuro_savings_collect_interest": "Collect interest",
-  "deuro_savings_remove": "Withdraw",
-  "deuro_savings_set_approval": "Set approval",
-  "deuro_savings_subtitle": "Earn up to 10% interest on your dEuro Stablecoin holdings",
-  "deuro_tx_commited_content": "It might take a couple of seconds for the transaction to confirm and be reflected on screen",
-  "device_is_signing": "Device is signing",
   "dfx_option_description": "Buy crypto with EUR & CHF. For retail and corporate customers in Europe",
   "didnt_get_code": "Didn't get code?",
   "digit_pin": "-digit PIN",
   "digital_and_physical_card": " digital and physical prepaid debit card",
   "disable": "Disable",
-  "disable_automatic_exchange_status_updates": "Disable Automatic Exchange Status Updates",
   "disable_bulletin": "Disable service status bulletin",
   "disable_buy": "Disable buy action",
   "disable_cake_2fa": "Disable Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "By turning this off, the fee rates might be inaccurate in some cases, so you might end up overpaying or underpaying the fees for your transactions",
   "disable_fiat": "Disable fiat",
   "disable_sell": "Disable sell action",
-  "disable_tor": "Disable Tor",
   "disable_trade_option": "Disable trade option",
   "disableBatteryOptimization": "Disable Battery Optimization",
   "disableBatteryOptimizationDescription": "Do you want to disable battery optimization in order to make background sync run more freely and smoothly?",
   "disabled": "Disabled",
-  "disconnect_session": "Disconnect Session",
   "discount": "Save ${value}%",
   "display_settings": "Display settings",
   "displayable": "Displayable",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Do not share these with anyone else, including support.\n\nYour funds can and will be stolen!",
   "do_not_show_me": "Do not show me this again",
   "domain_looks_up": "Domain lookups",
-  "domain_mismatch": "Domain Mismatch",
-  "domain_mismatch_description": "This website has a domain that does not match the sender of this request. Approving may lead to loss of funds.",
   "donation_link_details": "Donation link details",
-  "done": "Done",
   "e_sign_consent": "E-Sign Consent",
   "edit": "Edit",
   "edit_backup_password": "Edit Backup Password",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "We generate new addresses each time you use one, but previous addresses continue to work",
   "email_address": "Email Address",
   "enable": "Enable",
-  "enable_builtin_tor": "Enable built-in Tor",
   "enable_mempool_api": "Mempool API for accurate fees and dates",
   "enable_replace_by_fee": "Enable Replace-By-Fee",
   "enable_silent_payments_scanning": "Start scanning for transactions sent to your Silent Payment address.",
@@ -333,10 +295,8 @@
   "error_text_template": "Template name and address can't contain ` , ' \" symbols\nand must be between 1 and 106 characters long",
   "error_text_wallet_name": "Wallet name can only contain letters, numbers, _ - symbols \nand must be between 1 and 33 characters long",
   "error_text_xmr": "XMR value can't exceed available balance.\nThe number of fraction digits must be less or equal to 12",
-  "error_while_processing": "An error occurred while proceessing",
   "errorGettingCredentials": "Failed: Error while getting credentials",
   "errorSigningTransaction": "An error has occured while signing transaction",
-  "establishing_tor_connection": "Estabilishing Tor connection",
   "estimated": "Estimated",
   "estimated_new_fee": "Estimated new fee",
   "estimated_receive_amount": "Estimated receive amount",
@@ -360,7 +320,6 @@
   "export_backup": "Export backup",
   "export_logs": "Export logs",
   "export_outputs": "Export outputs",
-  "extend_session": "Extend Session",
   "extra_id": "Extra ID:",
   "extracted_address_content": "You will be sending funds to\n${recipient_name}",
   "failed_authentication": "Failed authentication. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Fiat Balance",
   "field_required": "This field is required",
-  "file_saved": "File saved",
   "fill_code": "Please fill in the verification code provided to your email",
   "filter_by": "Filter by",
   "first_wallet_text": "Awesome wallet for Monero, Bitcoin, Ethereum, Litecoin, and Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Forgot Password",
   "freeze": "Freeze",
   "frequently_asked_questions": "Frequently asked questions",
-  "from": "From",
   "frozen": "Frozen",
   "frozen_balance": "Frozen Balance",
   "full_balance": "Full Balance",
   "gas_exceeds_allowance": "Gas required by transaction exceeds allowance.",
-  "gas_price": "Gas price",
   "generate_name": "Generate Name",
   "generating_gift_card": "Generating Gift Card",
   "generating_transaction": "Generating transaction",
@@ -413,7 +369,6 @@
   "hide_details": "Hide Details",
   "high_contrast_theme": "High Contrast Theme",
   "home_screen_settings": "Home screen settings",
-  "how_to_connect": "How to Connect",
   "how_to_use": "How to use",
   "how_to_use_card": "How to use this card",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "You do not have enough SOL to cover the transaction and its transaction fee. Kindly add more SOL to your wallet or reduce the SOL amount you\\'re sending.",
   "insufficient_lamports": "You do not have enough SOL to cover the transaction and its transaction fee. You need at least ${solValueNeeded} SOL. Kindly add more SOL to your wallet or reduce the SOL amount you\\'re sending",
   "insufficientFundsForRentError": "You do not have enough SOL to cover the transaction fee and rent for the account. Kindly add more SOL to your wallet or reduce the SOL amount you\\'re sending",
-  "insufficientFundsForRentErrorReceiver": "The receiver's account does not have enough SOL to cover the rent. Please ask the receiver to add more SOL to their account.",
   "introducing_cake_pay": "Introducing Cake Pay!",
   "invalid_input": "Invalid input",
   "invalid_password": "Invalid password",
@@ -471,7 +425,6 @@
   "logout": "Logout",
   "low_fee": "Low fee",
   "low_fee_alert": "You currently are using a low network fee priority. This could cause long waits, different rates, or canceled trades. We recommend setting a higher fee for a better experience.",
-  "made_easy": "made easy",
   "manage_nodes": "Manage nodes",
   "manage_pow_nodes": "Manage PoW nodes",
   "manage_yats": "Manage Yats",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Message",
   "message_verified": "The message was successfully verified",
-  "messages": "Messages",
-  "method": "Method",
   "methods": "Methods",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero Dark Theme",
   "monero_light_theme": "Monero Light Theme",
   "moonpay_alert_text": "Value of the amount must be more or equal to ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "An error occurred while fetching NFTs. Kindly check your internet connection and try again.",
   "more_options": "More Options",
   "multiple_addresses_detected": "Multiple addresses detected",
   "mweb_confirmed": "Confirmed MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Label name",
   "new_subaddress_title": "New address",
   "new_template": "New Template",
-  "new_transactions_notifications": "Send notifications about new transactions",
   "new_wallet": "New Wallet",
   "newConnection": "New Connection",
   "no_cards_found": "No cards found",
@@ -539,7 +488,6 @@
   "normal": "Normal",
   "note_optional": "Note (optional)",
   "note_tap_to_change": "Note (tap to change)",
-  "notification_permission_denied": "Notification permission got permamently denied, please manually enable it in settings",
   "nullURIError": "URI is null",
   "offer_expires_in": "Offer expires in: ",
   "offline": "Offline",
@@ -572,20 +520,8 @@
   "password": "Password",
   "paste": "Paste",
   "pause_wallet_creation": "Ability to create Haven Wallet is currently paused.",
-  "payjoin_card_content": "Payjoin is a new privacy-preserving and fee-saving feature in Bitcoin.",
-  "payjoin_details": "Payjoin details",
-  "payjoin_enabled": "Payjoin enabled",
-  "payjoin_enabling_popup_content": "You can toggle Payjoin under Menu → Privacy → Use Payjoin to enable or disable it later.",
-  "payjoin_enabling_popup_title": "Enabling Payjoin",
-  "payjoin_request_awaiting_tx": "Awaiting Transaction",
-  "payjoin_request_in_progress": "In Progress",
-  "payjoin_unavailable": "Payjoin unavailable",
-  "payjoin_unavailable_sheet_content": "Receiving a Payjoin transaction requires you to have Bitcoin ready to use.\n\nAs soon as your wallet has funds, Payjoin will be automatically enabled.",
-  "payjoin_unavailable_sheet_title": "Why is Payjoin unavailable?",
   "payment_id": "Payment ID: ",
-  "payment_made_easy": "Payments made easy",
   "payment_was_received": "Your payment was received.",
-  "payments": "Payments",
   "pending": " (pending)",
   "percentageOf": "of ${amount}",
   "pin_at_top": "Pin ${token} at top",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "Please try to connect to another node",
   "please_wait": "Please wait",
   "polygonscan_history": "PolygonScan history",
-  "potential_scam": "Potential Scam",
   "powered_by": "Powered by ${title}",
   "pre_seed_button_text": "I understand. Show me my seed",
-  "pre_seed_description": "On the next page you will see a series of words. This is your unique and private seed and it is the ONLY way to recover your wallet in case of loss or malfunction. It is YOUR responsibility to write it down and store it in a safe place outside of the Cake Wallet app.",
+  "pre_seed_description": "On the next page you will see a series of ${words} words. This is your unique and private seed and it is the ONLY way to recover your wallet in case of loss or malfunction. It is YOUR responsibility to write it down and store it in a safe place outside of the Cake Wallet app.",
   "pre_seed_title": "IMPORTANT",
   "prepaid_cards": "Prepaid Cards",
   "prevent_screenshots": "Prevent screenshots and screen recording",
@@ -618,7 +553,6 @@
   "proceed_on_device": "Proceed on your device",
   "proceed_on_device_description": "Please follow the instructions prompted on your hardware wallet",
   "processing": "Processing",
-  "processing_signed_tx": "Processing signed transaction",
   "profile": "Profile",
   "provider_error": "${provider} error",
   "public_key": "Public key",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "Your representative does not appear to be in good standing. Tap here to select a new one",
   "repeat_wallet_password": "Repeat the wallet password",
   "repeated_password_is_incorrect": "Repeated password is incorrect. Please repeat the wallet password again.",
-  "requested": "Requested",
   "require_for_adding_contacts": "Require for adding contacts",
   "require_for_all_security_and_backup_settings": "Require for all security and backup settings",
   "require_for_assessing_wallet": "Require for accessing wallet",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "Require for sends to internal wallets",
   "require_for_sends_to_non_contacts": "Require for sends to non-contacts",
   "require_pin_after": "Require PIN after",
-  "required_passphrase": "Passphrase",
   "rescan": "Rescan",
   "resend_code": "Please resend it",
   "reset": "Reset",
   "reset_password": "Reset Password",
-  "restore": "Restore",
   "restore_active_seed": "Active seed",
   "restore_address": "Address",
   "restore_bitcoin_description_from_keys": "Restore your wallet from generated WIF string from your private keys",
@@ -714,10 +645,7 @@
   "search_language": "Search language",
   "second_intro_content": "Your Yat is a single unique emoji address that replaces all of your long hexadecimal addresses for all of your currencies.",
   "second_intro_title": "One emoji address to rule them all",
-  "security": "Security",
   "security_and_backup": "Security and backup",
-  "security_risk": "Security Risk",
-  "security_risk_description": "This domain is flagged as unsafe by multiple security providers. Leave immediately to protect your assets.",
   "seed_alert_back": "Go back",
   "seed_alert_content": "The seed is the only way to recover your wallet. Have you written it down?",
   "seed_alert_title": "Attention",
@@ -752,6 +680,9 @@
   "seedtype": "Seedtype",
   "seedtype_alert_content": "Sharing seeds with other wallets is only possible with BIP39 SeedType.",
   "seedtype_alert_title": "SeedType Alert",
+  "seedtype_legacy": "Legacy (25 words)",
+  "seedtype_polyseed": "Polyseed (16 words)",
+  "seedtype_wownero": "Wownero (14 words)",
   "select_backup_file": "Select backup file",
   "select_buy_provider_notice": "Select a buy provider above. You can skip this screen by setting your default buy provider in app settings.",
   "select_destination": "Please select destination for the backup file.",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "Send from External Wallet",
   "send_name": "Name",
   "send_new": "New",
-  "send_payjoin": "Send Payjoin",
   "send_payment_id": "Payment ID (optional)",
   "send_priority": "Currently the fee is set at ${transactionPriority} priority.\nTransaction priority can be adjusted in the settings",
   "send_sending": "Sending...",
@@ -833,9 +763,7 @@
   "show_keys": "Show seed/keys",
   "show_market_place": "Show Marketplace",
   "show_seed": "Show seed",
-  "sign_all": "Sign All",
   "sign_message": "Sign Message",
-  "sign_one": "Sign One",
   "sign_up": "Sign Up",
   "sign_verify_message": "Sign / Verify",
   "sign_verify_message_sub": "Sign or verify a message using your private key",
@@ -864,14 +792,11 @@
   "sort_by": "Sort by",
   "spend_key_private": "Spend key (private)",
   "spend_key_public": "Spend key (public)",
-  "starting_tor_proxy": "Starting Tor proxy",
   "status": "Status: ",
-  "step": "Step",
   "string_default": "Default",
   "subaddress_title": "Subaddress list",
   "subaddresses": "Subaddresses",
   "submit_request": "submit a request",
-  "success": "Success",
   "successful": "Successful",
   "support_description_guides": "Documentation and support for common issues",
   "support_description_live_chat": "Free and fast! Trained support representatives are available to assist",
@@ -879,7 +804,6 @@
   "support_title_guides": "Cake Wallet docs",
   "support_title_live_chat": "Live support",
   "support_title_other_links": "Other support links",
-  "supported": "Supported",
   "swap": "Swap",
   "sweeping_wallet": "Sweeping wallet",
   "sweeping_wallet_alert": "This shouldn’t take long. DO NOT LEAVE THIS SCREEN OR THE SWEPT FUNDS MAY BE LOST.",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "SYNCHRONIZING",
   "sync_status_timed_out": "TIMED OUT",
   "sync_status_unsupported": "UNSUPPORTED NODE",
-  "synchronizing": "Synchronizing",
   "syncing_wallet_alert_content": "Your balance and transaction list may not be complete until it says “SYNCHRONIZED” at the top. Click/tap to learn more.",
   "syncing_wallet_alert_title": "Your wallet is syncing",
   "template": "Template",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "The ThorChain provider does not support Taproot addresses. Please change the address or select a different provider.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Tip:",
-  "to": "To",
   "today": "Today",
-  "token_already_exists": "Token already exists",
   "token_contract_address": "Token contract address",
   "token_decimal": "Token decimal",
   "token_name": "Token name eg: Tether",
   "token_symbol": "Token symbol eg: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Please don’t forget to specify the Memo ID while sending the TON transaction for the exchange",
   "tor_connection": "Tor connection",
-  "tor_connection_timeout": "Tor connection timeout",
-  "tor_experimental": "This is an experimental feature, not all connections made from Cake Wallet support Tor routing - some connections may use clearnet, in order to fully route app traffic use Tor with VPN mode.",
   "tor_only": "Tor only",
   "total": "Total",
   "total_saving": "Total Savings",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "If the screen doesn’t proceed after 1 minute, check a block explorer and your email.",
   "transactions": "Transactions",
   "transactions_by_date": "Transactions by date",
-  "transport_type": "Transport Type",
   "trongrid_history": "TronGrid history",
   "trusted": "Trusted",
-  "try_again": "Try again",
   "tx_commit_exception_no_dust_on_change": "The transaction is rejected with this amount. With these coins you can send ${min} without change or ${max} that returns change.",
   "tx_commit_failed": "Transaction commit failed. Please contact support.",
   "tx_commit_failed_no_peers": "Transaction failed to broadcast, please try again in a second or so",
@@ -1014,19 +930,15 @@
   "unspent_coins_details_title": "Unspent coins details",
   "unspent_coins_title": "Unspent coins",
   "unsupported_asset": "We don't support this action for this asset. Please create or switch to a wallet of a supported asset type.",
-  "update_session": "Update Session",
   "uptime": "Uptime",
   "upto": "up to ${value}",
   "usb": "USB",
   "use": "Switch to ",
   "use_card_info_three": "Use the digital card online or with contactless payment methods.",
   "use_card_info_two": "Funds are converted to USD when they're held in the prepaid account, not in digital currencies.",
-  "use_device_theme": "Use Device Theme",
-  "use_payjoin": "Use Payjoin",
   "use_ssl": "Use SSL",
   "use_suggested": "Use Suggested",
   "use_testnet": "Use Testnet",
-  "user_rejected_method": "User rejected method",
   "value": "Value",
   "value_type": "Value Type",
   "variable_pair_not_supported": "This variable pair is not supported with the selected exchanges",
@@ -1053,7 +965,6 @@
   "wallet_group_description_view_seed": "You can always view this seed again under",
   "wallet_group_empty_state_text_one": "Looks like you don't have any compatible wallet groups!\n\nTap",
   "wallet_group_empty_state_text_two": "below to make a new one.",
-  "wallet_has_passphrase": "This wallet has a passphrase",
   "wallet_keys": "Wallet seed/keys",
   "wallet_list_create_new_wallet": "Create New Wallet",
   "wallet_list_edit_group_name": "Edit Group Name",
@@ -1078,11 +989,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Wallets",
   "warning": "Warning",
-  "welcome": "Welcome",
+  "welcome": "Welcome to",
   "welcome_subtitle_new_wallet": "If you want to start fresh, tap Create New Wallet below and you'll be off to the races.",
   "welcome_subtitle_restore_wallet": "If you have an existing wallet you want to bring into Cake, simply choose Restore Existing Wallet and we'll walk you through the process.",
   "welcome_to_cakepay": "Welcome to Cake Pay!",
-  "what_is_payjoin": "What is Payjoin?",
   "what_is_silent_payments": "What are Silent Payments?",
   "widgets_address": "Address",
   "widgets_or": "or",
@@ -1112,6 +1022,5 @@
   "you_will_get": "Convert to",
   "you_will_receive_estimated_amount": "You will receive (estimated)",
   "you_will_send": "Convert from",
-  "youCanGoBackToYourDapp": "You can go back to your dApp now",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index d19ec108d..cd63e5a3d 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Agregar fondos prepagos a las tarjetas (hasta ${value})",
   "add_new_node": "Agregar nuevo nodo",
   "add_new_word": "Agregar palabra nueva",
-  "add_passphrase": "Agregar frase de pases",
-  "add_passphrase_warning_text": "Solo ingrese una frase de pases si ha usado una para esta billetera en el pasado. Si ingresa a la frase de pases incorrecta o no ha utilizado una frase de pases antes en esta billetera, no verá ninguno de los fondos o historial existentes.",
   "add_receiver": "Agregar otro receptor (opcional)",
   "add_secret_code": "O agregue este código secreto a una aplicación de autenticación",
   "add_tip": "Agregar sugerencia",
   "add_token_disclaimer_check": "He confirmado la dirección del contrato del token y la información utilizando una fuente confiable. Agregar información maliciosa o incorrecta puede resultar en una pérdida de fondos.",
   "add_token_warning": "No edite ni agregue tokens según las instrucciones de los estafadores.\n¡Confirme siempre las direcciones de los tokens con fuentes acreditadas!",
   "add_value": "Añadir valor",
-  "added_message_for_ata_error": "Asegúrese de tener suficiente equilibrio SOL para completar su transacción.",
   "address": "Dirección",
   "address_book": "Libreta de direcciones",
   "address_book_menu": "Libreta de direcciones",
@@ -55,8 +52,6 @@
   "anonpay_description": "Genera ${type}. El destinatario puede ${method} con cualquier criptomoneda admitida, y recibirá fondos en esta billetera.",
   "apk_update": "Actualización de APK",
   "approve": "Aprobar",
-  "approve_request": "Aprobar la solicitud",
-  "approve_tokens": "Aprobar tokens",
   "arrive_in_this_address": "${currency} ${tag}llegará a esta dirección",
   "ascending": "Ascendente",
   "ask_each_time": "Pregunta cada vez",
@@ -74,12 +69,8 @@
   "avg_savings": "Ahorro promedio",
   "awaitDAppProcessing": "Espere a que la dApp termine de procesarse.",
   "awaiting_payment_confirmation": "Esperando confirmación de pago",
-  "background_sync": "Sincronización en segundo plano",
+  "background_sync": "Sincronización de fondo",
   "background_sync_mode": "Modo de sincronización en segundo plano",
-  "background_sync_on_battery_low": "Sincronizar con batería baja",
-  "background_sync_on_charging": "Sincronizar solo al cargar",
-  "background_sync_on_device_idle": "Sincronizar solo cuando el dispositivo no se usa",
-  "background_sync_on_unmetered_network": "Requerir una red no medida",
   "backup": "Apoyo",
   "backup_file": "Archivo de respaldo",
   "backup_password": "Contraseña de respaldo",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Comprar Bitcoin",
   "buy_now": "Comprar ahora",
   "buy_provider_unavailable": "Proveedor actualmente no disponible.",
-  "buy_sell_pair_is_not_supported_warning": "Este par de divisas no es compatible con ningún proveedor para el método de pago seleccionado. Elija un par diferente o intente cambiar el método de pago.",
   "buy_with": "Compra con",
   "by_cake_pay": "por Cake Pay",
   "cake_2fa_preset": "Pastel 2FA preestablecido",
@@ -124,12 +114,9 @@
   "camera_consent": "Su cámara será utilizada para capturar una imagen con fines de identificación por ${provider}. Consulta tu Política de privacidad para obtener más detalles.",
   "camera_permission_is_required": "Se requiere permiso de la cámara.\nHabilítalo desde la configuración de la aplicación.",
   "cancel": "Cancelar",
-  "cannot_verify": "No se puede verificar",
-  "cannot_verify_description": "Este dominio no se puede verificar. Verifique la solicitud cuidadosamente antes de aprobar.",
   "card_address": "Dirección:",
   "cardholder_agreement": "Acuerdo del titular de la tarjeta",
   "cards": "Cartas",
-  "chain_id": "ID de cadena",
   "chains": "Cadenas",
   "change": "Cambio",
   "change_backup_password_alert": "Tus archivos de respaldo anteriores no estarán disponibles para importar con la nueva contraseña de respaldo. La nueva contraseña de respaldo se utilizará solo para los nuevos archivos de respaldo. ¿Está seguro de que desea cambiar la contraseña de respaldo?",
@@ -144,7 +131,6 @@
   "change_rep_message": "¿Estás seguro de que quieres cambiar de representante?",
   "change_rep_successful": "Representante cambiado con éxito",
   "change_selected_exchanges": "Cambiar intercambios seleccionados",
-  "change_selected_pair": "Cambiar el par seleccionado",
   "change_wallet_alert_content": "¿Quieres cambiar la billetera actual a ${wallet_name}?",
   "change_wallet_alert_title": "Cambiar billetera actual",
   "choose_a_payment_method": "Elija un método de pago",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Confirmado",
   "congratulations": "Felicidades!",
   "connect_an_existing_yat": "Conectar un Yat existente",
-  "connect_hw_info_step_1": "Asegúrese de que su dispositivo esté encendido.",
-  "connect_hw_info_step_2": "Encienda Bluetooth para ambos dispositivos y combínelos desde el teléfono o conecte sus dispositivos con un cable USB.",
-  "connect_hw_info_step_3": "Desbloquee su dispositivo y navegue a la aplicación de cifrado deseada.",
-  "connect_hw_info_step_4": "Seleccione su dispositivo en la billetera de pastel y continúe con la configuración.",
   "connect_yats": "Conectar Yats",
   "connect_your_hardware_wallet": "Conecta tu billetera de hardware con Bluetooth o USB",
   "connect_your_hardware_wallet_ios": "Conecta tu billetera de hardware con Bluetooth",
-  "connected": "Conectado",
   "connection_sync": "Conexión y sincronización",
   "connectWalletPrompt": "Conecte tu billetera con WalletConnect para realizar transacciones",
   "contact": "Contacto",
@@ -204,11 +185,9 @@
   "contractSymbol": "Símbolo de contrato",
   "copied_key_to_clipboard": "Copiado ${key} al portapapeles",
   "copied_to_clipboard": "Copiado al portapapeles",
-  "copy": "Copiar",
+  "copy": "Dupdo",
   "copy_address": "Copiar dirección ",
   "copy_id": "Copiar ID",
-  "copy_payjoin_address": "Copiar dirección de payjoin",
-  "copy_payjoin_url": "Copiar Payjoin url",
   "copyWalletConnectLink": "Copie el enlace de WalletConnect de dApp y péguelo aquí",
   "corrupted_seed_notice": "Los archivos para esta billetera están dañados y no pueden abrirse. Vea la frase de semillas, guárdela y restaura la billetera.\n\nSi el valor está vacío, entonces la semilla no pudo recuperarse correctamente.",
   "countries": "Países",
@@ -245,22 +224,11 @@
   "descending": "Descendente",
   "description": "Descripción",
   "destination_tag": "Etiqueta de destino:",
-  "deuro_collect_interest": "Recolectar",
-  "deuro_savings": "ahorros de deuro",
-  "deuro_savings_add": "Depósito",
-  "deuro_savings_balance": "Saldo de ahorro",
-  "deuro_savings_collect_interest": "Cobrar interés",
-  "deuro_savings_remove": "Retirar",
-  "deuro_savings_set_approval": "Establecer aprobación",
-  "deuro_savings_subtitle": "Gane hasta un 10% de interés en sus Holdings de Deuro Stablecoin",
-  "deuro_tx_commited_content": "La transacción puede tardar un par de segundos en confirmar y reflejarse en la pantalla",
-  "device_is_signing": "El dispositivo está firmando",
   "dfx_option_description": "Compre cripto con EUR y CHF. Para clientes minoristas y corporativos en Europa",
   "didnt_get_code": "¿No recibiste el código?",
   "digit_pin": "-dígito PIN",
   "digital_and_physical_card": " tarjeta de débito prepago digital y física",
   "disable": "Desactivar",
-  "disable_automatic_exchange_status_updates": "Deshabilitar actualizaciones de estado de intercambio automático",
   "disable_bulletin": "Desactivar el boletín de estado del servicio",
   "disable_buy": "Desactivar acción de compra",
   "disable_cake_2fa": "Desactivar 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Al apagar esto, las tasas de tarifas pueden ser inexactas en algunos casos, por lo que puede terminar pagando en exceso o pagando menos las tarifas por sus transacciones",
   "disable_fiat": "Deshabilitar fiat",
   "disable_sell": "Desactivar acción de venta",
-  "disable_tor": "Deshabilitar tor",
   "disable_trade_option": "Deshabilitar la opción de comercio",
   "disableBatteryOptimization": "Deshabilitar la optimización de la batería",
   "disableBatteryOptimizationDescription": "¿Desea deshabilitar la optimización de la batería para que la sincronización de fondo se ejecute más libremente y sin problemas?",
   "disabled": "Desactivado",
-  "disconnect_session": "Desconectar la sesión",
   "discount": "Ahorra ${value}%",
   "display_settings": "Configuración de pantalla",
   "displayable": "Visualizable",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "No compartas estos con nadie más, incluido el soporte.\n\n¡Tus fondos pueden ser y serán robados!",
   "do_not_show_me": "no me muestres esto otra vez",
   "domain_looks_up": "Búsquedas de dominio",
-  "domain_mismatch": "Desajuste de dominio",
-  "domain_mismatch_description": "Este sitio web tiene un dominio que no coincide con el remitente de esta solicitud. La aprobación puede conducir a la pérdida de fondos.",
   "donation_link_details": "Detalles del enlace de donación",
-  "done": "Hecho",
   "e_sign_consent": "Consentimiento de firma electrónica",
   "edit": "Editar",
   "edit_backup_password": "Editar contraseña de respaldo",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Generamos nuevas direcciones cada vez que usa una, pero las direcciones anteriores siguen funcionando",
   "email_address": "Dirección de correo electrónico",
   "enable": "Permitir",
-  "enable_builtin_tor": "Habilitar buildi-in tor",
   "enable_mempool_api": "API de Mempool para tarifas y fechas precisas",
   "enable_replace_by_fee": "Habilitar reemplazar por tarea",
   "enable_silent_payments_scanning": "Comienza a escanear pagos silenciosos, hasta que se alcance la altura actual",
@@ -333,10 +295,8 @@
   "error_text_template": "El nombre y la dirección de la plantilla no pueden contener símbolos ` , '\" \ny debe tener entre 1 y 106 caracteres de longitud",
   "error_text_wallet_name": "El nombre de la billetera solo puede contener letras, números , _ - símbolos\ny debe tener entre 1 y 33 caracteres de longitud",
   "error_text_xmr": "El valor XMR no puede exceder el saldo disponible.\nTEl número de dígitos de fracción debe ser menor o igual a 12",
-  "error_while_processing": "Se produjo un error mientras procesaba",
   "errorGettingCredentials": "Error: error al obtener las credenciales",
   "errorSigningTransaction": "Se ha producido un error al firmar la transacción.",
-  "establishing_tor_connection": "Estabilización de la conexión para",
   "estimated": "Estimado",
   "estimated_new_fee": "Nueva tarifa estimada",
   "estimated_receive_amount": "Cantidad de recepción estimada",
@@ -360,7 +320,6 @@
   "export_backup": "Exportar copia de seguridad",
   "export_logs": "Registros de exportación",
   "export_outputs": "Exportaciones de exportación",
-  "extend_session": "Extender la sesión",
   "extra_id": "ID adicional:",
   "extracted_address_content": "Enviará fondos a\n${recipient_name}",
   "failed_authentication": "Autenticación fallida. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Balance fiat",
   "field_required": "Este campo es obligatorio",
-  "file_saved": "Archivo guardado",
   "fill_code": "Por favor completa el código de verificación proporcionado en tu correo electrónico",
   "filter_by": "Filtrado por",
   "first_wallet_text": "Impresionante billetera para Monero, Bitcoin, Ethereum, Litecoin, y Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Olvidé mi contraseña",
   "freeze": "Congelar",
   "frequently_asked_questions": "Preguntas frecuentes",
-  "from": "De",
   "frozen": "Congelada",
   "frozen_balance": "Equilibrio congelado",
   "full_balance": "Balance completo",
   "gas_exceeds_allowance": "El gas requerido por la transacción excede la asignación.",
-  "gas_price": "Precio de gas",
   "generate_name": "Generar nombre",
   "generating_gift_card": "Generando tarjeta de regalo",
   "generating_transaction": "Generación de transacciones",
@@ -413,7 +369,6 @@
   "hide_details": "Ocultar detalles",
   "high_contrast_theme": "Tema de alto contraste",
   "home_screen_settings": "Configuración de la pantalla de inicio",
-  "how_to_connect": "Cómo conectarse",
   "how_to_use": "Cómo utilizar",
   "how_to_use_card": "Cómo usar esta tarjeta",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "No tienes suficiente SOL para cubrir la transacción y su tarifa de transacción. Por favor, agrega más SOL a su billetera o reduce la cantidad de sol que está enviando.",
   "insufficient_lamports": "No tienes suficiente SOL para cubrir la transacción y su tarifa de transacción. Necesita al menos ${solValueNeeded} sol. Por favor, agrega más sol a su billetera o reduzca la cantidad de sol que está enviando",
   "insufficientFundsForRentError": "No tienes suficiente SOL para cubrir la tarifa de transacción y alquilar para la cuenta. Por favor, agrega más sol a su billetera o reduce la cantidad de sol que está enviando",
-  "insufficientFundsForRentErrorReceiver": "La cuenta del receptor no tiene suficiente SOL para cubrir el alquiler. Pida al receptor que agregue más SOL a su cuenta.",
   "introducing_cake_pay": "¡Presentamos Cake Pay!",
   "invalid_input": "Entrada inválida",
   "invalid_password": "Contraseña invalida",
@@ -471,7 +425,6 @@
   "logout": "Cerrar sesión",
   "low_fee": "Tarifa baja",
   "low_fee_alert": "Actualmente está utilizando una prioridad de tarifa de red baja. Esto podría causar largas esperas, tarifas diferentes o transacciones canceladas. Recomendamos establecer una tarifa más alta para una mejor experiencia.",
-  "made_easy": "hecho fácil",
   "manage_nodes": "Administrar nodos",
   "manage_pow_nodes": "Administrar nodos PoW",
   "manage_yats": "Administrar Yats",
@@ -483,8 +436,6 @@
   "memo": "Memorándum:",
   "message": "Mensaje",
   "message_verified": "El mensaje fue verificado con éxito",
-  "messages": "Mensajes",
-  "method": "Método",
   "methods": "Métodos",
   "min_amount": "Mínimo: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Tema oscuro de Monero",
   "monero_light_theme": "Tema ligero de Monero",
   "moonpay_alert_text": "El valor de la cantidad debe ser mayor o igual a ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Se produjo un error al alcanzar las NFT. Por favor, consulte su conexión a Internet y vuelva a intentarlo.",
   "more_options": "Más Opciones",
   "multiple_addresses_detected": "Múltiples direcciones detectadas",
   "mweb_confirmed": "Confirmado mweb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Nombre de etiqueta",
   "new_subaddress_title": "Nueva direccion",
   "new_template": "Nueva plantilla",
-  "new_transactions_notifications": "Enviar notificaciones sobre nuevas transacciones",
   "new_wallet": "Nueva billetera",
   "newConnection": "Nueva conexión",
   "no_cards_found": "No se encuentran cartas",
@@ -539,7 +488,6 @@
   "normal": "Normal",
   "note_optional": "Nota (opcional)",
   "note_tap_to_change": "Nota (toque para cambiar)",
-  "notification_permission_denied": "El permiso de notificación se negó de manera permanente, por favor, habilite manualmente en la configuración",
   "nullURIError": "URI es nula",
   "offer_expires_in": "Oferta expira en: ",
   "offline": "fuera de línea",
@@ -571,20 +519,8 @@
   "password": "Contraseña",
   "paste": "Pegar",
   "pause_wallet_creation": "La capacidad para crear Haven Wallet está actualmente pausada.",
-  "payjoin_card_content": "Payjoin es una nueva función de preservación de la privacidad y ahorro de tarifas en Bitcoin.",
-  "payjoin_details": "Payjoin detalles",
-  "payjoin_enabled": "Payjoin activado",
-  "payjoin_enabling_popup_content": "Puede alternar Payjoin en menú → privacidad → usar Payjoin para habilitarlo o deshabilitarlo más tarde.",
-  "payjoin_enabling_popup_title": "Habilitando Payjoin",
-  "payjoin_request_awaiting_tx": "Esperando transacción",
-  "payjoin_request_in_progress": "En curso",
-  "payjoin_unavailable": "Payjoin no disponible",
-  "payjoin_unavailable_sheet_content": "Recibir una transacción Payjoin requiere que tenga Bitcoin listo para usar.\n\nTan pronto como su billetera tenga fondos, Payjoin se habilitará automáticamente.",
-  "payjoin_unavailable_sheet_title": "¿Por qué no está disponible Payjoin?",
   "payment_id": "ID de pago: ",
-  "payment_made_easy": "Pagos hechos fáciles",
   "payment_was_received": "Su pago fue recibido.",
-  "payments": "Pagos",
   "pending": " (pendiente)",
   "percentageOf": "de ${amount}",
   "personalizado": "personalizado",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "Intenta conectarte a otro nodo",
   "please_wait": "Espera por favor",
   "polygonscan_history": "Historial de PolygonScan",
-  "potential_scam": "Estafa potencial",
   "powered_by": "Posible gracias a ${title}",
   "pre_seed_button_text": "Entiendo. Muéstrame mi semilla",
-  "pre_seed_description": "En la página siguiente, verá una serie de palabras. Esta es su semilla única y privada y es la única forma de recuperar su billetera en caso de pérdida o mal funcionamiento. Es su responsabilidad escribirlo y almacenarlo en un lugar seguro fuera de la aplicación de billetera de pastel.",
+  "pre_seed_description": "En la página siguiente verás una serie de ${words} palabras. Esta es su semilla única y privada y es la ÚNICA forma de recuperar tu billetera en caso de pérdida o mal funcionamiento. Es TU responsabilidad escribirla y guardarla en un lugar seguro fuera de la aplicación Cake Wallet.",
   "pre_seed_title": "IMPORTANTE",
   "prepaid_cards": "Tajetas prepagadas",
   "prevent_screenshots": "Evitar capturas de pantalla y grabación de pantalla",
@@ -618,7 +553,6 @@
   "proceed_on_device": "Continúa con tu dispositivo",
   "proceed_on_device_description": "Sigue las instrucciones solicitadas en su billetera de hardware",
   "processing": "Tratamiento",
-  "processing_signed_tx": "Procesamiento de transacción firmada",
   "profile": "Perfil",
   "provider_error": "${provider} error",
   "public_key": "Clave pública",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "Tu representante no parece estar en buena posición. Toca aquí para seleccionar uno nuevo",
   "repeat_wallet_password": "Repite la contraseña de billetera",
   "repeated_password_is_incorrect": "La contraseña repetida es incorrecta. Repite la contraseña de la billetera nuevamente.",
-  "requested": "Solicitado",
   "require_for_adding_contacts": "Requerido para agregar contactos",
   "require_for_all_security_and_backup_settings": "Requerido para todas las configuraciones de seguridad y copia de seguridad",
   "require_for_assessing_wallet": "Requerido para acceder a la billetera",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "Requerido para envíos a billeteras internas",
   "require_for_sends_to_non_contacts": "Requerido para envíos a no contactos",
   "require_pin_after": "Requerir PIN después de",
-  "required_passphrase": "Frase",
   "rescan": "Reescanear",
   "resend_code": "Por favor reenvíalo",
   "reset": "Reiniciar",
   "reset_password": "Restablecer contraseña",
-  "restore": "Restaurar",
   "restore_active_seed": "Semilla activa",
   "restore_address": "Dirección",
   "restore_bitcoin_description_from_keys": "Restaure su billetera a partir de una cadena WIF generada a partir de sus claves privadas",
@@ -682,7 +613,7 @@
   "restore_from_date_or_blockheight": "Ingrese una fecha unos días antes de crear esta billetera. O si conoce la altura del bloque, ingréselo en su lugar",
   "restore_from_seed_placeholder": "Ingrese o pegue su frase de código aquí",
   "restore_new_seed": "Nueva semilla",
-  "restore_next": "Seguir",
+  "restore_next": "Próximo",
   "restore_recover": "Recuperar",
   "restore_restore_wallet": "Recuperar Cartera",
   "restore_seed_keys_restore": "Restauración de semillas / llaves",
@@ -698,7 +629,7 @@
   "restore_wallet_restore_description": "Restaurar billetera",
   "robinhood_option_description": "Compra y transfiere instantáneamente utilizando su tarjeta de débito, cuenta bancaria o saldo de Robinhood. Solo EE. UU.",
   "router_no_route": "No hay ruta definida para ${name}",
-  "save": "Guardar",
+  "save": "Salvar",
   "save_backup_password": "Asegúrese de haber guardado su contraseña de respaldo. No podrá importar sus archivos de respaldo sin él.",
   "save_backup_password_alert": "Guardar contraseña de respaldo",
   "save_to_downloads": "Guardar en Descargas",
@@ -714,10 +645,7 @@
   "search_language": "Idioma de búsqueda",
   "second_intro_content": "Tu Yat es una única dirección emoji única que reemplaza todas tus direcciones hexadecimales largas para todas tus monedas.",
   "second_intro_title": "Una dirección de emoji para gobernarlos a todos",
-  "security": "Seguridad",
   "security_and_backup": "Seguridad y respaldo",
-  "security_risk": "Riesgo de seguridad",
-  "security_risk_description": "Este dominio es marcado como inseguro por múltiples proveedores de seguridad. Deje inmediatamente para proteger sus activos.",
   "seed_alert_back": "Regresa",
   "seed_alert_content": "La semilla es la única forma de recuperar su billetera. ¿Lo has escrito?",
   "seed_alert_title": "Atención",
@@ -737,7 +665,7 @@
   "seed_language_italian": "Italiana/Italiano",
   "seed_language_japanese": "Japonés",
   "seed_language_korean": "Coreano",
-  "seed_language_next": "Seguir",
+  "seed_language_next": "Próximo",
   "seed_language_portuguese": "Portugués",
   "seed_language_russian": "Ruso",
   "seed_language_spanish": "Español",
@@ -752,6 +680,9 @@
   "seedtype": "Tipos de semillas",
   "seedtype_alert_content": "Compartir semillas con otras billeteras solo es posible con semillas bip39 - un tipo específico de semilla.",
   "seedtype_alert_title": "Alerta de tipo de semillas",
+  "seedtype_legacy": "Semilla clásica-legacy (25 palabras)",
+  "seedtype_polyseed": "Poli-semilla (16 palabras)",
+  "seedtype_wownero": "Wownero (14 palabras)",
   "select_backup_file": "Seleccionar archivo de respaldo",
   "select_buy_provider_notice": "Selecciona un proveedor de compra arriba. Puede omitir esta pantalla configurando su proveedor de compra predeterminado en la configuración de la aplicación.",
   "select_destination": "Selecciona el destino del archivo de copia de seguridad.",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "Enviar desde la billetera externa",
   "send_name": "Nombre",
   "send_new": "Nuevo",
-  "send_payjoin": "Enviar Payjoin",
   "send_payment_id": "ID de pago (opcional)",
   "send_priority": "Actualmente la tarifa se establece en ${transactionPriority} prioridad.\nLa prioridad de la transacción se puede ajustar en la configuración",
   "send_sending": "Enviando...",
@@ -820,22 +750,20 @@
   "setup_pin": "PIN de configuración",
   "setup_successful": "Tu PIN se ha configurado correctamente!",
   "setup_totp_recommended": "Configurar TOTP",
-  "setup_warning_2fa_text": "Deberá restaurar su billetera a partir de la semilla mnemotécnica.\n\nEl soporte de Cake no podrá ayudarlo si pierde el acceso a su 2FA o a sus semillas mnemotécnicas.\nCake 2FA es una segunda autenticación para ciertas acciones en la billetera. Antes de usar Cake 2FA, recomendamos leer la guía. NO es tan seguro como el almacenamiento en frío.\n\nSi pierde el acceso a su aplicación 2FA o a sus claves TOTP, perderá el acceso a esta billetera. ",
+  "setup_warning_2fa_text": "Deberá restaurar su billetera a partir de la semilla mnemotécnica.\n\nEl soporte de Cake no podrá ayudarlo si pierde el acceso a su 2FA o a sus semillas mnemotécnicas.\nCake 2FA es una segunda autenticación para ciertas acciones en la billetera. Antes de usar Cake 2FA, recomendamos leer la guía.NO es tan seguro como el almacenamiento en frío.\n\nSi pierde el acceso a su aplicación 2FA o a sus claves TOTP, perderá el acceso a esta billetera. ",
   "setup_your_debit_card": "Configura tu tarjeta de débito",
   "share": "Compartir",
   "share_address": "Compartir dirección",
   "shared_seed_wallet_groups": "Grupos de billetera de semillas compartidas",
-  "show": "Mostrar",
+  "show": "Espectáculo",
   "show_address_book_popup": "Mostrar la ventana emergente de la libreta de direcciones",
-  "show_balance": "Pulsación larga para mostrar balance",
-  "show_balance_toast": "Pulsación larga para ocultar o mostrar balance",
+  "show_balance": "Prensa larga para mostrar equilibrio",
+  "show_balance_toast": "Prensa larga para esconder o mostrar equilibrio",
   "show_details": "Mostrar detalles",
   "show_keys": "Mostrar semilla/claves",
   "show_market_place": "Mostrar mercado",
   "show_seed": "Mostrar semilla",
-  "sign_all": "Firmar todo",
-  "sign_message": "Firmar mensaje",
-  "sign_one": "Firmar",
+  "sign_message": "Mensaje de firma",
   "sign_up": "Registrarse",
   "sign_verify_message": "Firmar / verificar",
   "sign_verify_message_sub": "Firmar o verificar un mensaje usando su clave privada",
@@ -864,22 +792,18 @@
   "sort_by": "Ordenar por",
   "spend_key_private": "Llave de gasto (privada)",
   "spend_key_public": "Llave de gasto (pública)",
-  "starting_tor_proxy": "Inicio Tor Proxy",
   "status": "Estado: ",
-  "step": "Paso",
   "string_default": "Por defecto",
   "subaddress_title": "Lista de subdirecciones",
   "subaddresses": "Subdirecciones",
   "submit_request": "presentar una solicitud",
-  "success": "Éxito",
   "successful": "Exitoso",
   "support_description_guides": "Documentación y apoyo para problemas comunes",
-  "support_description_live_chat": "¡Gratis y rápido! Los representantes de soporte están disponibles para ayudar",
-  "support_description_other_links": "Únete a nuestras comunidades o comunícate con nosotros o nuestros socios a través de otros métodos",
-  "support_title_guides": "Documentación de Cake Wallet",
+  "support_description_live_chat": "¡GRATIS y RÁPIDO! Los representantes de apoyo capacitado están disponibles para ayudar",
+  "support_description_other_links": "Únete a nuestras comunidades o comunícate con nosotros nuestros socios a través de otros métodos",
+  "support_title_guides": "Documentos de billetera de pastel",
   "support_title_live_chat": "Soporte en tiempo real",
   "support_title_other_links": "Otros enlaces de soporte",
-  "supported": "Compatible",
   "swap": "Intercambio",
   "sweeping_wallet": "Barrer billetera (gastar todos los fondos disponibles)",
   "sweeping_wallet_alert": "Esto no debería llevar mucho tiempo. NO DEJES ESTA PANTALLA O SE PUEDEN PERDER LOS FONDOS BARRIDOS",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "SINCRONIZANDO",
   "sync_status_timed_out": "CADUCADO",
   "sync_status_unsupported": "Nodo no compatible",
-  "synchronizing": "Sincronización",
   "syncing_wallet_alert_content": "Es posible que su lista de saldo y transacciones no esté completa hasta que diga \"SINCRONIZADO\" en la parte superior. Haga clic/toque para obtener más información.",
   "syncing_wallet_alert_title": "Tu billetera se está sincronizando",
   "template": "Plantilla",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "El proveedor de Thorchain no admite las direcciones de Taproot. Cambia la dirección o selecciona un proveedor diferente.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Consejo:",
-  "to": "A",
   "today": "Hoy",
-  "token_already_exists": "Token ya existe",
   "token_contract_address": "Dirección de contrato de token",
   "token_decimal": "Token decimal",
   "token_name": "Nombre del token, por ejemplo: Tether",
   "token_symbol": "Símbolo de token, por ejemplo: USDT",
   "tokenID": "IDENTIFICACIÓN",
-  "ton_extra_info": "No olvide especificar el ID de memo mientras envía la transacción TON para el intercambio",
   "tor_connection": "conexión tor",
-  "tor_connection_timeout": "Tiempo de espera de conexión de Tor",
-  "tor_experimental": "Esta es una característica experimental, no todas las conexiones hechas con el enrutamiento de soporte para la billetera de pastel: algunas conexiones pueden usar ClearNet, para enrutar completamente el tráfico de aplicaciones Uso Tor con el modo VPN.",
   "tor_only": "solo Tor",
   "total": "Total",
   "total_saving": "Ahorro Total",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "Si la pantalla no continúa después de 1 minuto, revisa un explorador de bloques y tu correo electrónico.",
   "transactions": "Transacciones",
   "transactions_by_date": "Transacciones por fecha",
-  "transport_type": "Tipo de transporte",
   "trongrid_history": "Historia trongrid",
   "trusted": "de confianza",
-  "try_again": "Intentar otra vez",
   "tx_commit_exception_no_dust_on_change": "La transacción se rechaza con esta cantidad. Con estas monedas puede enviar ${min} sin cambios o ${max} que devuelve el cambio.",
   "tx_commit_failed": "La confirmación de transacción falló. Ponte en contacto con el soporte.",
   "tx_commit_failed_no_peers": "La transacción no se transmitió, intenta nuevamente en un segundo más o menos",
@@ -1005,33 +921,29 @@
   "unavailable_balance": "Saldo no disponible",
   "unavailable_balance_description": "Saldo no disponible: este total incluye fondos que están bloqueados en transacciones pendientes y aquellos que usted ha congelado activamente en su configuración de control de monedas. Los saldos bloqueados estarán disponibles una vez que se completen sus respectivas transacciones, mientras que los saldos congelados permanecerán inaccesibles para las transacciones hasta que usted decida descongelarlos.",
   "unconfirmed": "Saldo no confirmado",
-  "understand": "Entendido",
+  "understand": "Entiendo",
   "unlock": "desbloquear",
   "unmatched_currencies": "La moneda de tu billetera actual no coincide con la del QR escaneado",
-  "unrestricted_background_service": "Servicio de sincronización sin restricciones",
-  "unrestricted_background_service_notice": "Para habilitar la sincronización en segundo plano, debes habilitar el servicio de sincronización sin restricciones",
+  "unrestricted_background_service": "Servicio de antecedentes sin restricciones",
+  "unrestricted_background_service_notice": "Para habilitar la sincronización de antecedentes, debe habilitar el servicio de fondo sin restricciones",
   "unspent_change": "Cambiar",
   "unspent_coins_details_title": "Detalles de monedas no gastadas",
   "unspent_coins_title": "Monedas no gastadas",
   "unsupported_asset": "No admitimos esta acción para este activo. Cree o cambie a una billetera de un tipo de activo admitido.",
-  "update_session": "Sesión de actualización",
   "uptime": "Tiempo de actividad",
   "upto": "hasta ${value}",
   "usb": "USB",
   "use": "Utilizar a ",
   "use_card_info_three": "Utiliza la tarjeta digital en línea o con métodos de pago sin contacto.",
   "use_card_info_two": "Los fondos se convierten a USD cuando se mantienen en la cuenta prepaga, no en monedas digitales.",
-  "use_device_theme": "Utilice el tema del dispositivo",
-  "use_payjoin": "Usar Payjoin",
   "use_ssl": "Utiliza SSL",
   "use_suggested": "Usar sugerido",
   "use_testnet": "Usar TestNet",
-  "user_rejected_method": "Método rechazado por el usuario",
   "value": "Valor",
   "value_type": "Tipo de valor",
   "variable_pair_not_supported": "Este par de variables no es compatible con los intercambios seleccionados",
   "verification": "Verificación",
-  "verify_message": "Verificar mensaje",
+  "verify_message": "Mensaje de verificación",
   "verify_seed": "Verificar semilla",
   "verify_with_2fa": "Verificar con Cake 2FA",
   "version": "Versión ${currentVersion}",
@@ -1053,7 +965,6 @@
   "wallet_group_description_view_seed": "Siempre puedes ver esta semilla nuevamente debajo",
   "wallet_group_empty_state_text_one": "Parece que no tienes ningún grupo de billetera compatible !\n\n toque",
   "wallet_group_empty_state_text_two": "a continuación para hacer uno nuevo.",
-  "wallet_has_passphrase": "Esta billetera tiene una frase de pases",
   "wallet_keys": "Billetera semilla/claves",
   "wallet_list_create_new_wallet": "Crear nueva billetera",
   "wallet_list_edit_group_name": "Editar nombre de grupo",
@@ -1079,11 +990,9 @@
   "wallets": "Carteras",
   "warning": "Advertencia",
   "welcome": "Bienvenido",
-  "welcome_only": "Bienvenido",
   "welcome_subtitle_new_wallet": "Si desea comenzar de nuevo, toque Crear nueva billetera a continuación y se irá a las carreras.",
   "welcome_subtitle_restore_wallet": "Si tiene una billetera existente que desea llevar al pastel, simplemente elija Restaurar la billetera existente y lo guiaremos a través del proceso.",
   "welcome_to_cakepay": "¡Bienvenido a Cake Pay!",
-  "what_is_payjoin": "¿Qué es Payjoin ?",
   "what_is_silent_payments": "¿Qué son los pagos silenciosos?",
   "widgets_address": "Dirección",
   "widgets_or": "o",
@@ -1113,6 +1022,5 @@
   "you_will_get": "Convertir a",
   "you_will_receive_estimated_amount": "Recibirá(estimado )",
   "you_will_send": "Convertir de",
-  "youCanGoBackToYourDapp": "Puedes volver a tu dapp ahora",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 9056dbc49..309319277 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Ajouter des fonds prépayés aux cartes (jusqu'à ${value})",
   "add_new_node": "Ajouter un nouveau nœud",
   "add_new_word": "Ajouter un nouveau mot",
-  "add_passphrase": "Ajouter la phrase secrète",
-  "add_passphrase_warning_text": "Entrez une phrase secrète si vous en avez utilisé un pour ce portefeuille dans le passé. Si vous entrez dans la mauvaise phrase de passe ou si vous n'avez pas utilisé de phrase de passe auparavant sur ce portefeuille, vous ne verrez aucun fonds ou historique existant.",
   "add_receiver": "Ajouter un autre bénéficiaire (optionnel)",
   "add_secret_code": "Ou ajoutez ce code secret à une application d'authentification",
   "add_tip": "Ajouter un pourboire",
   "add_token_disclaimer_check": "J'ai confirmé l'adresse et les informations du contrat de token en utilisant une source fiable. L'ajout d'informations malveillantes ou incorrectes peut entraîner une perte de fonds.",
   "add_token_warning": "Ne modifiez pas ou n'ajoutez pas de tokens comme pourraient vous le suggérer des escrocs.\nConfirmez toujours les adresses de token auprès de sources fiables !",
   "add_value": "Ajouter une valeur",
-  "added_message_for_ata_error": "Veuillez vous assurer d'avoir suffisamment de solde SOL pour terminer votre transaction.",
   "address": "Adresse",
   "address_book": "Carnet d'Adresses",
   "address_book_menu": "Carnet d'Adresses",
@@ -55,8 +52,6 @@
   "anonpay_description": "Générez ${type}. Le destinataire peut ${method} avec n'importe quelle crypto-monnaie prise en charge, et vous recevrez des fonds dans ce portefeuille (wallet).",
   "apk_update": "Mise à jour d'APK",
   "approve": "Approuver",
-  "approve_request": "Approuver la demande",
-  "approve_tokens": "Approuver les jetons",
   "arrive_in_this_address": "${currency} ${tag}arrivera à cette adresse",
   "ascending": "Ascendant",
   "ask_each_time": "Demander à chaque fois",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "En attente de confirmation de paiement",
   "background_sync": "Synchronisation de fond",
   "background_sync_mode": "Mode de synchronisation en arrière-plan",
-  "background_sync_on_battery_low": "Synchroniser sur une batterie basse",
-  "background_sync_on_charging": "Synchroniser uniquement lors de la charge",
-  "background_sync_on_device_idle": "Synchroniser uniquement lorsque l'appareil n'est pas utilisé",
-  "background_sync_on_unmetered_network": "Exiger un réseau non métallique",
   "backup": "Sauvegarde",
   "backup_file": "Fichier de sauvegarde",
   "backup_password": "Mot de passe de sauvegarde",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Acheter du Bitcoin",
   "buy_now": "Acheter maintenant",
   "buy_provider_unavailable": "Fournisseur actuellement indisponible.",
-  "buy_sell_pair_is_not_supported_warning": "Cette paire de devises n'est prise en charge par aucun fournisseur pour le mode de paiement sélectionné. Veuillez choisir une autre paire ou essayer de modifier le mode de paiement.",
   "buy_with": "Acheter avec",
   "by_cake_pay": "par Cake Pay",
   "cake_2fa_preset": "Cake 2FA prédéfini",
@@ -124,12 +114,9 @@
   "camera_consent": "Votre appareil photo sera utilisé pour capturer une image à des fins d'identification par ${provider}. Veuillez consulter leur politique de confidentialité pour plus de détails.",
   "camera_permission_is_required": "L'autorisation de la caméra est requise.\nVeuillez l'activer à partir des paramètres de l'application.",
   "cancel": "Annuler",
-  "cannot_verify": "Ne peut pas vérifier",
-  "cannot_verify_description": "Ce domaine ne peut pas être vérifié. Vérifiez attentivement la demande avant d'approuver.",
   "card_address": "Adresse:",
   "cardholder_agreement": "Contrat de titulaire de carte",
   "cards": "Cartes",
-  "chain_id": "Chaîne ID",
   "chains": "Chaînes",
   "change": "Changer",
   "change_backup_password_alert": "Vos fichiers de sauvegarde précédents ne pourront pas être importés avec le nouveau mot de passe de sauvegarde. Le nouveau mot de passe ne sera utilisé que pour les nouveaux fichiers de sauvegarde. Êtes vous certain de vouloir modifier le mot de passe de sauvegarde ?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Êtes-vous sûr de vouloir changer de représentant ?",
   "change_rep_successful": "Représentant changé avec succès",
   "change_selected_exchanges": "Modifier les échanges sélectionnés",
-  "change_selected_pair": "Modifier la paire sélectionnée",
   "change_wallet_alert_content": "Souhaitez-vous changer le portefeuille (wallet) actuel vers ${wallet_name} ?",
   "change_wallet_alert_title": "Changer le portefeuille (wallet) actuel",
   "choose_a_payment_method": "Choisissez un mode de paiement",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Confirmé",
   "congratulations": "Félicitations !",
   "connect_an_existing_yat": "Connecter un Yat existant",
-  "connect_hw_info_step_1": "Assurez-vous que votre appareil est allumé.",
-  "connect_hw_info_step_2": "Allumez Bluetooth pour les deux appareils et associez-les à partir du téléphone, ou connectez vos appareils ensemble à l'aide d'un câble USB.",
-  "connect_hw_info_step_3": "Déverrouillez votre appareil et accédez à l'application Crypto souhaitée.",
-  "connect_hw_info_step_4": "Sélectionnez votre appareil dans le portefeuille de gâteaux et continuez avec la configuration.",
   "connect_yats": "Connecter Yats",
   "connect_your_hardware_wallet": "Connectez votre portefeuille matériel à l'aide de Bluetooth ou USB",
   "connect_your_hardware_wallet_ios": "Connectez votre portefeuille matériel à l'aide de Bluetooth",
-  "connected": "Connecté",
   "connection_sync": "Connexion et synchronisation",
   "connectWalletPrompt": "Connectez votre portefeuille (wallet) avec WalletConnect pour effectuer des transactions",
   "contact": "Contact",
@@ -207,8 +188,6 @@
   "copy": "Copier",
   "copy_address": "Copier l'Adresse",
   "copy_id": "Copier l'ID",
-  "copy_payjoin_address": "Copier l'adresse de paiement",
-  "copy_payjoin_url": "Copie Payjoin URL",
   "copyWalletConnectLink": "Copiez le lien WalletConnect depuis l'application décentralisée (dApp) et collez-le ici",
   "corrupted_seed_notice": "Les fichiers de ce portefeuille sont corrompus et ne peuvent pas être ouverts. Veuillez consulter la phrase de graines, sauver et restaurer le portefeuille.\n\nSi la valeur est vide, la graine n'a pas pu être correctement récupérée.",
   "countries": "Pays",
@@ -245,22 +224,11 @@
   "descending": "Descendant",
   "description": "Description",
   "destination_tag": "Tag de destination :",
-  "deuro_collect_interest": "Collecter",
-  "deuro_savings": "Économies de deuro",
-  "deuro_savings_add": "Dépôt",
-  "deuro_savings_balance": "Solde d'épargne",
-  "deuro_savings_collect_interest": "Percevoir l'intérêt",
-  "deuro_savings_remove": "Retirer",
-  "deuro_savings_set_approval": "Établir l'approbation",
-  "deuro_savings_subtitle": "Gagnez jusqu'à 10% d'intérêt sur vos avoirs de Deuro Stablecoin",
-  "deuro_tx_commited_content": "Il pourrait prendre quelques secondes pour que la transaction confirme et soit reflétée à l'écran",
-  "device_is_signing": "L'appareil signale",
   "dfx_option_description": "Achetez de la crypto avec EUR & CHF. Pour les clients de la vente au détail et des entreprises en Europe",
   "didnt_get_code": "Vous n'avez pas reçu le code ?",
   "digit_pin": " chiffres",
   "digital_and_physical_card": "carte de débit prépayée numérique et physique",
   "disable": "Désactiver",
-  "disable_automatic_exchange_status_updates": "Désactiver les mises à jour de l'état d'échange automatique",
   "disable_bulletin": "Désactiver le bulletin de statut de service",
   "disable_buy": "Désactiver l'action d'achat",
   "disable_cake_2fa": "Désactiver Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "En désactivant cela, les taux de frais peuvent être inexacts dans certains cas, vous pourriez donc finir par payer trop ou sous-paiement les frais pour vos transactions",
   "disable_fiat": "Désactiver les montants en fiat",
   "disable_sell": "Désactiver l'action de vente",
-  "disable_tor": "Désactiver Tor",
   "disable_trade_option": "Désactiver l'option de commerce",
   "disableBatteryOptimization": "Désactiver l'optimisation de la batterie",
   "disableBatteryOptimizationDescription": "Voulez-vous désactiver l'optimisation de la batterie afin de faire fonctionner la synchronisation d'arrière-plan plus librement et en douceur?",
   "disabled": "Désactivé",
-  "disconnect_session": "Débrancher la session",
   "discount": "Économisez ${value}%",
   "display_settings": "Paramètres d'affichage",
   "displayable": "Visible",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Ne les partagez avec personne, y compris avec l'assistance.\n\nVos fonds seraient inmanquablement volés !",
   "do_not_show_me": "Ne plus me montrer ceci à l'avenir",
   "domain_looks_up": "Résolution de nom",
-  "domain_mismatch": "Décalage du domaine",
-  "domain_mismatch_description": "Ce site Web a un domaine qui ne correspond pas à l'expéditeur de cette demande. L'approbation peut entraîner une perte de fonds.",
   "donation_link_details": "Détails du lien de don",
-  "done": "Fait",
   "e_sign_consent": "Consentement de signature électronique",
   "edit": "Modifier",
   "edit_backup_password": "Modifier le Mot de Passe de Sauvegarde",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Nous générons de nouvelles adresses à chaque fois que vous en utilisez une, mais les adresses précédentes continuent à fonctionner",
   "email_address": "Adresse e-mail",
   "enable": "Activer",
-  "enable_builtin_tor": "Activer le Tor construit",
   "enable_mempool_api": "API Mempool pour les frais et dates précis",
   "enable_replace_by_fee": "Activer Remplace-by-Fee",
   "enable_silent_payments_scanning": "Commencez à analyser les transactions envoyées à votre adresse de paiement silencieux.",
@@ -333,17 +295,15 @@
   "error_text_template": "Le nom du modèle et l'adresse ne peuvent pas contenir les symboles ` , ' \"\net leur longueur doit être comprise entre 1 et 106 caractères",
   "error_text_wallet_name": "Le nom du portefeuille (wallet) ne peut contenir que des lettres et des chiffres\net sa longueur doit être comprise entre 1 et 15 caractères",
   "error_text_xmr": "La valeur de XMR dépasse le solde disponible.\nLa partie décimale doit comporter au plus 12 chiffres",
-  "error_while_processing": "Une erreur s'est produite lors de la procédure",
   "errorGettingCredentials": "Échec : erreur lors de l'obtention des informations d'identification",
   "errorSigningTransaction": "Une erreur s'est produite lors de la signature de la transaction",
-  "establishing_tor_connection": "Établir la connexion TOR",
   "estimated": "Estimé",
   "estimated_new_fee": "De nouveaux frais estimés",
   "estimated_receive_amount": "Recevoir estimé le montant",
   "etherscan_history": "Historique Etherscan",
   "event": "Événement",
   "events": "Événements",
-  "exchange": "Acheter / Vendre",
+  "exchange": "Échange",
   "exchange_incorrect_current_wallet_for_xmr": "Si vous souhaitez échanger des XMR depuis le solde Monero de votre Cake Wallet, veuillez d'abord passer à votre portefeuille Monero.",
   "exchange_new_template": "Nouveau modèle d'échange",
   "exchange_provider_unsupported": "${providerName} n'est plus pris en charge !",
@@ -360,7 +320,6 @@
   "export_backup": "Exporter la sauvegarde",
   "export_logs": "Journaux d'exportation",
   "export_outputs": "Exportation des sorties",
-  "extend_session": "Prolonger la séance",
   "extra_id": "ID supplémentaire :",
   "extracted_address_content": "Vous allez envoyer des fonds à\n${recipient_name}",
   "failed_authentication": "Échec d'authentification. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Solde fiat",
   "field_required": "Ce champ est obligatoire",
-  "file_saved": "Dossier enregistré",
   "fill_code": "Veuillez remplir le code de vérification fourni sur votre e-mail",
   "filter_by": "Filtrer par",
   "first_wallet_text": "Super portefeuille (wallet) pour Monero, Bitcoin, Ethereum, Litecoin et Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Mot de passe oublié",
   "freeze": "Geler",
   "frequently_asked_questions": "Foire aux questions",
-  "from": "Depuis",
   "frozen": "Gelées",
   "frozen_balance": "Équilibre gelé",
   "full_balance": "Solde Complet",
   "gas_exceeds_allowance": "Le gaz requis par la transaction dépasse l'allocation.",
-  "gas_price": "Prix ​​du gaz",
   "generate_name": "Générer un nom",
   "generating_gift_card": "Génération d'une carte-cadeau",
   "generating_transaction": "Transaction de génération",
@@ -413,7 +369,6 @@
   "hide_details": "Masquer les détails",
   "high_contrast_theme": "Thème à contraste élevé",
   "home_screen_settings": "Paramètres de l'écran d'accueil",
-  "how_to_connect": "Comment se connecter",
   "how_to_use": "Comment utiliser",
   "how_to_use_card": "Comment utiliser cette carte",
   "id": "ID : ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Vous n'avez pas assez de sol pour couvrir la transaction et ses frais de transaction. Veuillez ajouter plus de Sol à votre portefeuille ou réduire la quantité de Sol que vous envoyez.",
   "insufficient_lamports": "Vous n'avez pas assez de sol pour couvrir la transaction et ses frais de transaction. Vous avez besoin d'au moins ${solValueNeeded} sol. Veuillez ajouter plus de Sol à votre portefeuille ou réduire la quantité de sol que vous envoyez",
   "insufficientFundsForRentError": "Vous n'avez pas assez de SOL pour couvrir les frais de transaction et le loyer pour le compte. Veuillez ajouter plus de Sol à votre portefeuille ou réduire la quantité de sol que vous envoyez",
-  "insufficientFundsForRentErrorReceiver": "Le compte du récepteur n'a pas assez de sol pour couvrir le loyer. Veuillez demander au récepteur d'ajouter plus de Sol à son compte.",
   "introducing_cake_pay": "Présentation de Cake Pay !",
   "invalid_input": "Entrée invalide",
   "invalid_password": "Mot de passe incorrect",
@@ -471,7 +425,6 @@
   "logout": "Déconnexion",
   "low_fee": "Frais faibles",
   "low_fee_alert": "Vous utilisez actuellement une priorité de frais de réseau peu élevés. Cela pourrait entraîner de longues attentes, des taux différents ou des transactions annulées. Nous vous recommandons de fixer des frais plus élevés pour une meilleure expérience.",
-  "made_easy": "rendu facile",
   "manage_nodes": "Gérer les nœuds",
   "manage_pow_nodes": "Gérer les nœuds PoW",
   "manage_yats": "Gérer les Yats",
@@ -483,8 +436,6 @@
   "memo": "Mémo :",
   "message": "Message",
   "message_verified": "Le message a été vérifié avec succès",
-  "messages": "Messages",
-  "method": "Méthode",
   "methods": "Méthodes",
   "min_amount": "Min : ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Thème sombre Monero",
   "monero_light_theme": "Thème de lumière Monero",
   "moonpay_alert_text": "Le montant doit être au moins égal à ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Une erreur s'est produite tout en récupérant les NFT. Veuillez vérifier votre connexion Internet et réessayer.",
   "more_options": "Plus d'options",
   "multiple_addresses_detected": "Plusieurs adresses détectées",
   "mweb_confirmed": "Confirmé MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Nom",
   "new_subaddress_title": "Nouvelle adresse",
   "new_template": "Nouveau Modèle",
-  "new_transactions_notifications": "Envoyer des notifications sur les nouvelles transactions",
   "new_wallet": "Nouveau Portefeuille (Wallet)",
   "newConnection": "Nouvelle connexion",
   "no_cards_found": "Pas de cartes trouvées",
@@ -539,7 +488,6 @@
   "normal": "Normal",
   "note_optional": "Note (optionnelle)",
   "note_tap_to_change": "Note (appuyez pour changer)",
-  "notification_permission_denied": "L'autorisation de notification a été refusée permanente, veuillez l'activer manuellement dans les paramètres",
   "nullURIError": "L'URI est nul",
   "offer_expires_in": "L'Offre expire dans: ",
   "offline": "Hors ligne",
@@ -571,20 +519,8 @@
   "password": "Mot de passe",
   "paste": "Coller",
   "pause_wallet_creation": "La possibilité de créer Haven Wallet est actuellement suspendue.",
-  "payjoin_card_content": "Payjoin est une nouvelle fonctionnalité de préservation de la confidentialité et d'économie de frais dans Bitcoin.",
-  "payjoin_details": "Payjoin détails",
-  "payjoin_enabled": "Payjoin activé",
-  "payjoin_enabling_popup_content": "Vous pouvez basculer Payjoin sous le menu → Confidentialité → Utiliser Payjoin pour l'activer ou le désactiver plus tard.",
-  "payjoin_enabling_popup_title": "Activer Payjoin",
-  "payjoin_request_awaiting_tx": "En attente de transaction",
-  "payjoin_request_in_progress": "En cours",
-  "payjoin_unavailable": "Payjoin indisponible",
-  "payjoin_unavailable_sheet_content": "La réception d'une transaction Payjoin vous oblige à avoir un bitcoin prêt à l'emploi. \\ N \\ nas dès que votre portefeuille a des fonds, Payjoin sera automatiquement activé.",
-  "payjoin_unavailable_sheet_title": "Pourquoi Payjoin n'est-il pas disponible?",
   "payment_id": "ID de Paiement : ",
-  "payment_made_easy": "Les paiements facilites",
   "payment_was_received": "Votre paiement a été reçu.",
-  "payments": "Paiements",
   "pending": " (en attente)",
   "percentageOf": "sur ${amount}",
   "pin_at_top": "épingler ${token} en haut",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Merci d'essayer la connexion vers un autre nœud",
   "please_wait": "Merci de patienter",
   "polygonscan_history": "Historique de PolygonScan",
-  "potential_scam": "Arnaque potentielle",
   "powered_by": "Proposé par ${title}",
   "pre_seed_button_text": "J'ai compris. Montrez moi ma phrase secrète (seed)",
-  "pre_seed_description": "À la page suivante, vous verrez une série de mots. Il s'agit de votre semence unique et privée et c'est le seul moyen de récupérer votre portefeuille en cas de perte ou de dysfonctionnement. Il est de votre responsabilité de l'écrire et de le stocker dans un endroit sûr à l'extérieur de l'application de portefeuille Cake.",
+  "pre_seed_description": "Sur la page suivante vous allez voir une série de ${words} mots. Ils constituent votre phrase secrète (seed) unique et privée et sont le SEUL moyen de restaurer votre portefeuille (wallet) en cas de perte ou de dysfonctionnement. Il est de VOTRE responsabilité d'écrire cette série de mots et de la stocker dans un lieu sûr en dehors de l'application Cake Wallet.",
   "pre_seed_title": "IMPORTANT",
   "prepaid_cards": "Cartes prépayées",
   "prevent_screenshots": "Empêcher les captures d'écran et l'enregistrement d'écran",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Continuez sur votre appareil",
   "proceed_on_device_description": "Veuillez suivre les instructions affichées sur votre portefeuille physique.",
   "processing": "Traitement",
-  "processing_signed_tx": "Traitement de la transaction signée",
   "profile": "Profil",
   "provider_error": "Erreur de ${provider}",
   "public_key": "Clef publique",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Votre représentant ne semble pas être en règle. Appuyez ici pour en sélectionner un nouveau",
   "repeat_wallet_password": "Répétez le mot de passe du portefeuille",
   "repeated_password_is_incorrect": "Le mot de passe répété est incorrect. Veuillez répéter le mot de passe du portefeuille.",
-  "requested": "Demandé",
   "require_for_adding_contacts": "Requis pour ajouter des contacts",
   "require_for_all_security_and_backup_settings": "Exiger pour tous les paramètres de sécurité et de sauvegarde",
   "require_for_assessing_wallet": "Nécessaire pour accéder au portefeuille",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Exiger pour les envois vers des portefeuilles (wallets) internes",
   "require_for_sends_to_non_contacts": "Exiger pour les envois hors contacts",
   "require_pin_after": "Code PIN requis après",
-  "required_passphrase": "Phrase secrète",
   "rescan": "Analyser la blockchain",
   "resend_code": "Veuillez le renvoyer",
   "reset": "Réinitialiser",
   "reset_password": "Réinitialiser le mot de passe",
-  "restore": "Restaurer",
   "restore_active_seed": "Phrase secrète (seed) active",
   "restore_address": "Adresse",
   "restore_bitcoin_description_from_keys": "Restaurer votre portefeuille (wallet) d'après la chaîne WIF générée d'après vos clefs privées",
@@ -713,10 +644,7 @@
   "search_language": "Rechercher une langue",
   "second_intro_content": "Votre Yat est une seule et unique adresse emoji qui remplace toutes vos longues adresses hexadécimales pour toutes vos cryptomonnaies.",
   "second_intro_title": "Une adresse emoji pour les gouverner toutes",
-  "security": "Sécurité",
   "security_and_backup": "Sécurité et sauvegarde",
-  "security_risk": "Risque de sécurité",
-  "security_risk_description": "Ce domaine est signalé comme dangereux par plusieurs fournisseurs de sécurité. Laissez immédiatement pour protéger vos actifs.",
   "seed_alert_back": "Retour",
   "seed_alert_content": "La phrase secrète (seed) est la seule façon de restaurer votre portefeuille (wallet). L'avez-vous correctement écrite ?",
   "seed_alert_title": "Attention",
@@ -751,6 +679,9 @@
   "seedtype": "Type de graine",
   "seedtype_alert_content": "Le partage de graines avec d'autres portefeuilles n'est possible qu'avec le type de graine BIP39.",
   "seedtype_alert_title": "Alerte Type de Graine",
+  "seedtype_legacy": "Legacy (25 words)",
+  "seedtype_polyseed": "Polyseed (16 mots)",
+  "seedtype_wownero": "WOWNERO (14 mots)",
   "select_backup_file": "Sélectionnez le fichier de sauvegarde",
   "select_buy_provider_notice": "Sélectionnez un fournisseur d'achat ci-dessus. Vous pouvez ignorer cet écran en définissant votre fournisseur d'achat par défaut dans les paramètres de l'application.",
   "select_destination": "Veuillez sélectionner la destination du fichier de sauvegarde.",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "Envoyer du portefeuille externe",
   "send_name": "Nom",
   "send_new": "Nouveau",
-  "send_payjoin": "Envoyer Payjoin",
   "send_payment_id": "ID de paiement (optionnel)",
   "send_priority": "Actuellement les frais sont positionnés à la priorité ${transactionPriority}.\nLa priorité de la transaction peut être modifiée dans les réglages",
   "send_sending": "Envoi...",
@@ -826,15 +756,13 @@
   "shared_seed_wallet_groups": "Groupes de portefeuilles partagés",
   "show": "Montrer",
   "show_address_book_popup": "Afficher la fenêtre contextuelle du carnet d'adresses",
-  "show_balance": "Appuyez longtemps pour afficher votre solde",
-  "show_balance_toast": "Appuyez longtemps pour masquer ou afficher votre solde",
+  "show_balance": "Longue presse pour montrer l'équilibre",
+  "show_balance_toast": "Longue appuyez sur pour masquer ou afficher l'équilibre",
   "show_details": "Afficher les détails",
   "show_keys": "Visualiser la phrase secrète (seed) et les clefs",
   "show_market_place": "Afficher la place de marché",
   "show_seed": "Visualiser la phrase secrète (seed)",
-  "sign_all": "Signer tout",
   "sign_message": "Signer le message",
-  "sign_one": "Signer un",
   "sign_up": "S'inscrire",
   "sign_verify_message": "Signe / vérifier",
   "sign_verify_message_sub": "Signez ou vérifiez un message en utilisant votre clé privée",
@@ -854,7 +782,7 @@
   "silent_payments_scanned_tip": "SCANNEZ POUR DONNER ! (${tip})",
   "silent_payments_scanning": "Scan des paiements silencieux",
   "silent_payments_settings": "Paramètres de paiement silencieux",
-  "single_seed_wallets_group": "Portefeuilles de mots-clés (seed) simples",
+  "single_seed_wallets_group": "Portefeuilles de semences simples",
   "slidable": "Glissable",
   "solana_create_associated_token_account_exception": "Création d'erreur Création de jetons associés pour l'adresse détenue.",
   "solana_no_associated_token_account_exception": "Il n'y a pas de compte de jeton associé pour cette adresse.",
@@ -863,14 +791,11 @@
   "sort_by": "Trier par",
   "spend_key_private": "Clef de dépense (spend key) (privée)",
   "spend_key_public": "Clef de dépense (spend key) (publique)",
-  "starting_tor_proxy": "Démarrer le proxy Tor",
   "status": "Statut: ",
-  "step": "Étape",
   "string_default": "Défaut",
   "subaddress_title": "Liste des sous-adresses",
   "subaddresses": "Sous-adresses",
   "submit_request": "soumettre une requête",
-  "success": "Succès",
   "successful": "Réussi",
   "support_description_guides": "Documentation et support pour les problèmes communs",
   "support_description_live_chat": "GRATUIT ET RAPIDE ! Des représentants de soutien formé sont disponibles pour aider",
@@ -878,7 +803,6 @@
   "support_title_guides": "Docs de portefeuille à gâteau",
   "support_title_live_chat": "Support en direct",
   "support_title_other_links": "Autres liens d'assistance",
-  "supported": "Soutenu",
   "swap": "Échanger",
   "sweeping_wallet": "Portefeuille (wallet) de consolidation",
   "sweeping_wallet_alert": "Cela ne devrait pas prendre longtemps. NE QUITTEZ PAS CET ÉCRAN OU LES FONDS TRANSFÉRÉS POURRAIENT ÊTRE PERDUS.",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "SYNCHRONISATION EN COURS",
   "sync_status_timed_out": "FIN DU TEMPS",
   "sync_status_unsupported": "Nœud non pris en charge",
-  "synchronizing": "Synchronisation",
   "syncing_wallet_alert_content": "Votre solde et votre liste de transactions peuvent ne pas être à jour tant que la mention « SYNCHRONISÉ » n'apparaît en haut de l'écran. Cliquez/appuyez pour en savoir plus.",
   "syncing_wallet_alert_title": "Votre portefeuille (wallet) est en cours de synchronisation",
   "template": "Modèle",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Le fournisseur de Thorchain ne prend pas en charge les adresses de tapoot. Veuillez modifier l'adresse ou sélectionner un autre fournisseur.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Pourboire:",
-  "to": "À",
   "today": "Aujourd'hui",
-  "token_already_exists": "Le jeton existe déjà",
   "token_contract_address": "Adresse du contrat de token",
   "token_decimal": "Décimales de token",
   "token_name": "Nom du token, par exemple : Tether",
   "token_symbol": "Symbole de token, par exemple : USDT",
   "tokenID": "IDENTIFIANT",
-  "ton_extra_info": "N'oubliez pas de spécifier l'identification de la note lors de l'envoi de la transaction TON pour l'échange",
   "tor_connection": "Connexion Tor",
-  "tor_connection_timeout": "Tor Connection Timeout",
-  "tor_experimental": "Il s'agit d'une caractéristique expérimentale, toutes les connexions faites à partir du portefeuille du portefeuille de gâteaux TOR ROUTING - Certaines connexions peuvent utiliser ClearNet, afin d'achever entièrement le trafic d'application Utiliser TOR avec le mode VPN.",
   "tor_only": "Tor uniquement",
   "total": "Total",
   "total_saving": "Économies totales",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "Si l'écran ne continue pas après 1 minute, vérifiez un explorateur de blocs et votre e-mail.",
   "transactions": "Transactions",
   "transactions_by_date": "Transactions par date",
-  "transport_type": "Type de transport",
   "trongrid_history": "Histoire de la trongride",
   "trusted": "de confiance",
-  "try_again": "Essayer à nouveau",
   "tx_commit_exception_no_dust_on_change": "La transaction est rejetée avec ce montant. Avec ces pièces, vous pouvez envoyer ${min} sans changement ou ${max} qui renvoie le changement.",
   "tx_commit_failed": "La validation de la transaction a échoué. Veuillez contacter l'assistance.",
   "tx_commit_failed_no_peers": "La transaction n'a pas été diffusée, veuillez réessayer dans une seconde environ",
@@ -1013,25 +929,21 @@
   "unspent_coins_details_title": "Détails des pièces (coins) non dépensées",
   "unspent_coins_title": "Pièces (coins) non dépensées",
   "unsupported_asset": "Nous ne prenons pas en charge cette action pour cet élément. Veuillez créer ou passer à un portefeuille d'un type d'actif pris en charge.",
-  "update_session": "Mettre à jour la session",
   "uptime": "Durée de la baisse",
   "upto": "jusqu'à ${value}",
   "usb": "USB",
   "use": "Changer vers code PIN à ",
   "use_card_info_three": "Utilisez la carte numérique en ligne ou avec des méthodes de paiement sans contact.",
   "use_card_info_two": "Les fonds sont convertis en USD lorsqu'ils sont détenus sur le compte prépayé, et non en devises numériques.",
-  "use_device_theme": "Utiliser le thème de l'appareil",
-  "use_payjoin": "Utiliser Payjoin",
   "use_ssl": "Utiliser SSL",
   "use_suggested": "Suivre la suggestion",
   "use_testnet": "Utiliser TestNet",
-  "user_rejected_method": "Méthode rejetée par l'utilisateur",
   "value": "Valeur",
   "value_type": "Type de valeur",
   "variable_pair_not_supported": "Cette paire variable n'est pas prise en charge avec les échanges sélectionnés",
   "verification": "Vérification",
   "verify_message": "Vérifier le message",
-  "verify_seed": "Vérifiez les mots-clés (seed)",
+  "verify_seed": "Vérifiez les semences",
   "verify_with_2fa": "Vérifier avec Cake 2FA",
   "version": "Version ${currentVersion}",
   "view_all": "Voir tout",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "Vous pouvez toujours revoir cette graine sous",
   "wallet_group_empty_state_text_one": "On dirait que vous n'avez pas de groupes de portefeuilles compatibles !\n\n Tap",
   "wallet_group_empty_state_text_two": "Ci-dessous pour en faire un nouveau.",
-  "wallet_has_passphrase": "Ce portefeuille a une phrase secrète",
   "wallet_keys": "Phrase secrète (seed)/Clefs du portefeuille (wallet)",
   "wallet_list_create_new_wallet": "Créer un Nouveau Portefeuille (Wallet)",
   "wallet_list_edit_group_name": "Modifier le nom du groupe",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Portefeuilles",
   "warning": "Avertissement",
-  "welcome": "Accueillir",
+  "welcome": "Bienvenue sur",
   "welcome_subtitle_new_wallet": "Si vous souhaitez repartir de zéro, appuyez sur Créer un nouveau portefeuille ci-dessous et vous serez prêt à commencer.",
   "welcome_subtitle_restore_wallet": "Si vous avez un portefeuille existant que vous souhaitez importer dans Cake, choisissez simplement Restaurer un portefeuille existant et nous vous guiderons à travers le processus.",
   "welcome_to_cakepay": "Bienvenue sur Cake Pay !",
-  "what_is_payjoin": "Qu'est-ce que Payjoin ?",
   "what_is_silent_payments": "Qu'est-ce que les paiements silencieux?",
   "widgets_address": "Adresse",
   "widgets_or": "ou",
@@ -1111,6 +1021,5 @@
   "you_will_get": "Convertir vers",
   "you_will_receive_estimated_amount": "Vous recevrez ( estimé )",
   "you_will_send": "Convertir depuis",
-  "youCanGoBackToYourDapp": "Vous pouvez retourner à votre Dapp maintenant",
   "yy": "AA"
 }
\ No newline at end of file
diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb
index b5f77a1c0..4ae70f8dd 100644
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Ƙara kuɗin da aka riga aka biya a katunan (har zuwa ${value})",
   "add_new_node": "Ƙara sabon node",
   "add_new_word": "Ƙara kalma sabuwa",
-  "add_passphrase": "Addara fasphrase",
-  "add_passphrase_warning_text": "Kawai shigar da kalmar wucewa idan kun yi amfani da ɗaya don wannan walat a baya. Idan ka shigar da kalmar wucewa ko ba a yi amfani da kalmar wucewa ba kafin a wannan waljin, ba za ka ga wani kudaden da ake da su ba ko tarihi.",
   "add_receiver": "Ƙara wani mai karɓa (na zaɓi)",
   "add_secret_code": "Ko, ƙara wannan lambar sirrin zuwa ƙa'idar mai tabbatarwa",
   "add_tip": "Ƙara Tukwici",
   "add_token_disclaimer_check": "Na tabbatar da adireshin kwangilar alamar da bayanin ta amfani da ingantaccen tushe. Ƙara bayanan ƙeta ko kuskure na iya haifar da asarar kuɗi.",
   "add_token_warning": "Kar a gyara ko ƙara alamu kamar yadda masu zamba suka umarta.\nKoyaushe tabbatar da adiresoshin alamar tare da sanannun tushe!",
   "add_value": "Ƙara ƙima",
-  "added_message_for_ata_error": "Da kyau tabbatar kana da isasshen so su daidaita don kammala ma'amalar ku.",
   "address": "Adireshi",
   "address_book": "Littafin adireshi",
   "address_book_menu": "Littafin adireshi",
@@ -55,8 +52,6 @@
   "anonpay_description": "Ƙirƙirar ${type}. Maƙiyantun mai nasara zai iya ${method} da duk abubuwan da ke samun lambar waya, kuma zaku samu kuɗin dama a wannan kashi.",
   "apk_update": "apk sabunta",
   "approve": "Amincewa",
-  "approve_request": "Amince da bukata",
-  "approve_tokens": "Amince da Alamu",
   "arrive_in_this_address": "${currency} ${tag} zai je wurin wannan adireshi",
   "ascending": "Hau",
   "ask_each_time": "Tambaya kowane lokaci",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Ana jiran Tabbacin Biyan Kuɗi",
   "background_sync": "Tunawa da Setc",
   "background_sync_mode": "Yanayin Sync",
-  "background_sync_on_battery_low": "Aiki tare a kan baturin",
-  "background_sync_on_charging": "Aiki tare kawai lokacin caji",
-  "background_sync_on_device_idle": "Aiki tare kawai lokacin da ba a amfani da na'urar",
-  "background_sync_on_unmetered_network": "Bukatar cibiyar sadarwar da ba ta dace ba",
   "backup": "Ajiyayyen",
   "backup_file": "Ajiyayyen fayil",
   "backup_password": "Ajiyayyen kalmar sirri",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Sayi Bitcoin",
   "buy_now": "Saya yanzu",
   "buy_provider_unavailable": "Mai ba da kyauta a halin yanzu babu.",
-  "buy_sell_pair_is_not_supported_warning": "Wannan mai samar da wannan kudin ba shi da goyan bayan hanyar biyan kuɗi da aka zaɓa. Da fatan za a zabi wata ƙungiya daban ko kuma gwada canza hanyar biyan kuɗi.",
   "buy_with": "Saya da",
   "by_cake_pay": "da Cake Pay",
   "cake_2fa_preset": "Cake 2FA saiti",
@@ -124,12 +114,9 @@
   "camera_consent": "Za a yi amfani da kyamarar ku don ɗaukar hoto don dalilai na tantancewa ta ${provider}. Da fatan za a duba Manufar Sirri don cikakkun bayanai.",
   "camera_permission_is_required": "Ana buƙatar izinin kyamara.\nDa fatan za a kunna shi daga saitunan app.",
   "cancel": "Soke",
-  "cannot_verify": "Ba zai iya tabbatarwa",
-  "cannot_verify_description": "Ba za a iya tabbatar da wannan yanki ba. Duba buƙatun a hankali kafin amincewa.",
   "card_address": "Adireshin:",
   "cardholder_agreement": "Yarjejeniyar mai katin",
   "cards": "Katuna",
-  "chain_id": "ID na ID",
   "chains": "Sarkoki",
   "change": "Canja",
   "change_backup_password_alert": "Fayilolin madadin ku na baya ba za su kasance don shigo da sabon kalmar sirri ta madadin ba. Sabuwar kalmar sirri ta ajiya za a yi amfani da ita kawai don sabbin fayilolin madadin. Shin kun tabbata cewa kuna son canza kalmar wucewa?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Shin kun tabbata kuna son canza wakilai?",
   "change_rep_successful": "An samu nasarar canzawa wakilin",
   "change_selected_exchanges": "Canza musayar musayar",
-  "change_selected_pair": "Canja wurin biyu",
   "change_wallet_alert_content": "Kana so ka canja walat yanzu zuwa ${wallet_name}?",
   "change_wallet_alert_title": "Canja walat yanzu",
   "choose_a_payment_method": "Zabi hanyar biyan kuɗi",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Tabbatar",
   "congratulations": "Taya murna!",
   "connect_an_existing_yat": "Haɗa Yat da ke akwai",
-  "connect_hw_info_step_1": "Tabbatar cewa na'urarka tana da iko.",
-  "connect_hw_info_step_2": "Juya Bluetooth akan na'urorin biyu da kuma haɗa su daga wayar, ko haɗa na'urorinku tare ta amfani da kebul na USB.",
-  "connect_hw_info_step_3": "Buɗe na'urarka kuma kewaya cikin app ɗin da ake so.",
-  "connect_hw_info_step_4": "Zaɓi na'urarka a cikin walat walat kuma ci gaba da saiti.",
   "connect_yats": "Haɗa Yats",
   "connect_your_hardware_wallet": "Haɗa Wallake Wallware ɗinku ta Bluetooth ko USB",
   "connect_your_hardware_wallet_ios": "Haɗa kayan aikinku ta Bluetooth",
-  "connected": "Wanda aka haɗa",
   "connection_sync": "Haɗi da daidaitawa",
   "connectWalletPrompt": "Haɗa walat ɗin ku tare da WalletConnect don yin ma'amala",
   "contact": "Tuntuɓar",
@@ -207,8 +188,6 @@
   "copy": "Kwafi",
   "copy_address": "Kwafi Adireshin",
   "copy_id": "Kwafi ID",
-  "copy_payjoin_address": "Kwafi Adireshin Payjoin",
-  "copy_payjoin_url": "Kwafa Payjoin url",
   "copyWalletConnectLink": "Kwafi hanyar haɗin WalletConnect daga dApp kuma liƙa a nan",
   "corrupted_seed_notice": "Fayilolin don wannan walat ɗin sun lalata kuma ba za a iya buɗe su ba. Da fatan za a duba kalmar iri, adana shi, da dawo da walat.\n\nIdan darajar ta kasance fanko, to sai zuriyar da ba ta iya murmurewa daidai ba.",
   "countries": "Kasashe",
@@ -245,22 +224,11 @@
   "descending": "Saukowa",
   "description": "Bayani",
   "destination_tag": "Tambarin makoma:",
-  "deuro_collect_interest": "Tara",
-  "deuro_savings": "deuro tanadi",
-  "deuro_savings_add": "Yi ajiya",
-  "deuro_savings_balance": "Ma'auni",
-  "deuro_savings_collect_interest": "Tattara amfani da sha'awa",
-  "deuro_savings_remove": "Janye",
-  "deuro_savings_set_approval": "Saita yarda",
-  "deuro_savings_subtitle": "Sami har zuwa 10% sha'awa a kan Deuro Stovecoin Rike",
-  "deuro_tx_commited_content": "Yana iya ɗaukar wasu secondsan seconds don ma'amala don tabbatarwa kuma a nuna shi a allon",
-  "device_is_signing": "Na'urar tana shiga",
   "dfx_option_description": "Buy crypto tare da Eur & Chf. Don Retail da abokan ciniki na kamfanoni a Turai",
   "didnt_get_code": "Ba a samun code?",
   "digit_pin": "-lambar PIN",
   "digital_and_physical_card": "katin zare kudi na dijital da na zahiri",
   "disable": "Kashe",
-  "disable_automatic_exchange_status_updates": "Musaki sabuntawar yanayin canji na atomatik",
   "disable_bulletin": "Musaki ma'aunin sabis na sabis",
   "disable_buy": "Kashe alama",
   "disable_cake_2fa": "Musaki Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Ta hanyar juya wannan kashe, kudaden da zai iya zama ba daidai ba a wasu halaye, saboda haka zaku iya ƙare da overpaying ko a ƙarƙashin kudaden don ma'amaloli",
   "disable_fiat": "Dakatar da fiat",
   "disable_sell": "Kashe karbuwa",
-  "disable_tor": "Musaki tor",
   "disable_trade_option": "Musaki zaɓi na kasuwanci",
   "disableBatteryOptimization": "Kashe ingantawa baturi",
   "disableBatteryOptimizationDescription": "Shin kana son kashe ingantawa baturi don yin setnc bankwali gudu da yar kyauta da kyau?",
   "disabled": "tsaya",
-  "disconnect_session": "Cire haɗin",
   "discount": "Ajiye ${value}%",
   "display_settings": "Nuni saituna",
   "displayable": "Ana iya nunawa",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Kada ku raba waɗannan ga kowa, gami da tallafi.\n\nZa a iya sace kuɗin ku kuma za a sace!",
   "do_not_show_me": "Kar ka sake nuna min wannan",
   "domain_looks_up": "Binciken yanki",
-  "domain_mismatch": "Yankin zalunci",
-  "domain_mismatch_description": "Wannan rukunin yanar gizon yana da yanki wanda bai dace da aika wannan bukatar ba. Yarda na iya haifar da asarar kudade.",
   "donation_link_details": "Bayanin hanyar sadaka",
-  "done": "Yi",
   "e_sign_consent": "Izinin Alamar E-Sign",
   "edit": "Gyara",
   "edit_backup_password": "Shirya Kalmar wucewa ta Ajiyayyen",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Muna samar da sababbin adireshi duk lokacin da kuka yi amfani da ɗaya, amma adiresoshin da suka gabata suna ci gaba da aiki",
   "email_address": "Adireshin i-mel",
   "enable": "Ba dama",
-  "enable_builtin_tor": "Sanya riguna-inf",
   "enable_mempool_api": "Mampool API don ingantattun kudade da kwanakin",
   "enable_replace_by_fee": "Ba da damar maye gurbin-by-kudin",
   "enable_silent_payments_scanning": "Fara bincika biya na shiru, har sai tip ɗin ya kai",
@@ -333,10 +295,8 @@
   "error_text_template": "Sunan na tushe da adireshin ba zai iya ɗaukar ` , ' \" haruffa\nkuma ya zama tsakanin 1 zuwa 106 haruffa",
   "error_text_wallet_name": "Sunan hujja kawai zai iya ɗauka ne haruffa, lambobi, _ - haruffa\nkuma ya zama tsakanin 1 zuwa 33 haruffa",
   "error_text_xmr": "XMR adadin ba zai iya wuce available balance.\nAdadin haruffan gaba zai kamata ya zama ko ƙasa daga na 12",
-  "error_while_processing": "Kuskure ya faru yayin bincike",
   "errorGettingCredentials": "Ba a yi nasara ba: Kuskure yayin samun takaddun shaida",
   "errorSigningTransaction": "An sami kuskure yayin sanya hannu kan ciniki",
-  "establishing_tor_connection": "Kafa Tor Haɗaɗɗa",
   "estimated": "Kiyasta",
   "estimated_new_fee": "An kiyasta sabon kudin",
   "estimated_receive_amount": "Kiyasta samun adadin",
@@ -360,7 +320,6 @@
   "export_backup": "Ajiyayyen fitarwa",
   "export_logs": "Injin fitarwa",
   "export_outputs": "Fitarwar fitarwa",
-  "extend_session": "Mika zaman",
   "extra_id": "Karin ID:",
   "extracted_address_content": "Za ku aika da kudade zuwa\n${recipient_name}",
   "failed_authentication": "Binne wajen shiga. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "API ɗin Fiat",
   "fiat_balance": "Fiat Balance",
   "field_required": "wannan fillin ana bukatansa",
-  "file_saved": "Fayil ɗin ceto",
   "fill_code": "Da fatan za a cika lambar tabbatarwa da aka bayar zuwa imel ɗin ku",
   "filter_by": "Tace ta",
   "first_wallet_text": "Aikace-aikacen e-wallet ga Monero, Bitcoin, Ethereum, Litecoin, da kuma Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Manta Kalmar wucewa",
   "freeze": "Daskare",
   "frequently_asked_questions": "Tambayoyin da ake yawan yi",
-  "from": "Daga",
   "frozen": "Daskararre",
   "frozen_balance": "Daidaituwa mai sanyi",
   "full_balance": "DUKAN KUDI",
   "gas_exceeds_allowance": "Gas da ake buƙata ta hanyar ma'amala ya wuce izini.",
-  "gas_price": "Farashin gas",
   "generate_name": "Ƙirƙirar Suna",
   "generating_gift_card": "Samar da Katin Kyauta",
   "generating_transaction": "Ma'amala samar da ma'amala",
@@ -413,7 +369,6 @@
   "hide_details": "Ɓoye cikakkun bayanai",
   "high_contrast_theme": "Babban Jigon Kwatance",
   "home_screen_settings": "Saitunan allo na gida",
-  "how_to_connect": "Yadda ake haɗa",
   "how_to_use": "Yadda ake amfani da shi",
   "how_to_use_card": "Yadda ake amfani da wannan kati",
   "id": "ID:",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Ba ku da isasshen sool don rufe ma'amala da kuɗin ma'amala. Da unara ƙara ƙarin sool a cikin walat ɗinku ko rage adadin Sol ɗin da kuke aikawa.",
   "insufficient_lamports": "Ba ku da isasshen sool don rufe ma'amala da kuɗin ma'amala. Kuna buƙatar aƙalla ${solValueNeeded} Sol. Da kyau ƙara ƙarin sool zuwa walat ɗinku ko rage adadin Sol ɗin da kuke aikawa",
   "insufficientFundsForRentError": "Ba ku da isasshen Sol don rufe kuɗin ma'amala da haya don asusun. Da kyau ƙara ƙarin sool zuwa walat ɗinku ko rage adadin Sol ɗin da kuke aikawa",
-  "insufficientFundsForRentErrorReceiver": "Asusun mai karba bashi da isasshen soya don rufe haya. Da fatan za a nemi mai karba don ƙara ƙarin sol zuwa asusun su.",
   "introducing_cake_pay": "Gabatar da Cake Pay!",
   "invalid_input": "Shigar da ba daidai ba",
   "invalid_password": "Kalmar sirri mara inganci",
@@ -471,7 +425,6 @@
   "logout": "Fita",
   "low_fee": "maras tsada",
   "low_fee_alert": "A halin yanzu kuna amfani da ƙarancin fifikon kuɗin hanyar sadarwa. Wannan na iya haifar da dogon jira, farashi daban-daban, ko soke kasuwancin. Muna ba da shawarar saita farashi mafi girma don ƙwarewa mafi kyau.",
-  "made_easy": "Ya sanya sauki",
   "manage_nodes": "Sarrafa nodes",
   "manage_pow_nodes": "Sarrafa PoW Nodes",
   "manage_yats": "Sarrafa Yats",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Sako",
   "message_verified": "An yi nasarar tabbatar da sakon",
-  "messages": "Manegiya",
-  "method": "Hanya",
   "methods": "Hanyoyin",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero Dark Jigo",
   "monero_light_theme": "Jigon Hasken Monero",
   "moonpay_alert_text": "Darajar adadin dole ne ya zama fiye ko daidai da ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Kuskuren ya faru yayin da ake kawo NFFTs. Da fatan za a duba haɗin intanet ɗinka kuma sake gwadawa.",
   "more_options": "Ƙarin Zaɓuɓɓuka",
   "multiple_addresses_detected": "An gano adiresoshin da aka gano",
   "mweb_confirmed": "Tabbatar da Mweb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Lakabin suna",
   "new_subaddress_title": "Adireshin sabuwa",
   "new_template": "Sabon Samfura",
-  "new_transactions_notifications": "Aika sanarwa game da sababbin ma'amaloli",
   "new_wallet": "Sabuwar Wallet",
   "newConnection": "Sabuwar Haɗi",
   "no_cards_found": "Babu katunan da aka samo",
@@ -539,7 +488,6 @@
   "normal": "Na al'ada",
   "note_optional": "Bayani (optional)",
   "note_tap_to_change": "Bayani (tap don canja)",
-  "notification_permission_denied": "Izinin sanarwar da aka samu an ƙaryata game da shi, don Allah a kunna shi a cikin saiti",
   "nullURIError": "URI banza ne",
   "offer_expires_in": "tayin zai ƙare a:",
   "offline": "Offline",
@@ -573,20 +521,8 @@
   "password": "Kalmar wucewa",
   "paste": "Manna",
   "pause_wallet_creation": "A halin yanzu an dakatar da ikon ƙirƙirar Haven Wallet.",
-  "payjoin_card_content": "Payjoin Shin sabon salo ne da adana sirri da biyan kuɗi a cikin Bitcoin.",
-  "payjoin_details": "Payjoin LIT LOCEC LOcciya",
-  "payjoin_enabled": "Payjoin An kunna",
-  "payjoin_enabling_popup_content": "Kuna iya juyawa Payjoin a ƙarƙashin menu → Sirrin Sirri → Amfani Payjoin don kunna ko musaki shi daga baya.",
-  "payjoin_enabling_popup_title": "Samu Payjoin",
-  "payjoin_request_awaiting_tx": "Jiran ma'amala",
-  "payjoin_request_in_progress": "Ana kai",
-  "payjoin_unavailable": "Payjoin Babu",
-  "payjoin_unavailable_sheet_content": "Karɓar A Payjoin Ma'amala yana buƙatar ku sami Bitcoin shirye don amfani. \\ N \\ n5 da zaran kamar walat ɗinku yana da kuɗi, Payjoin za'a kunna ta atomatik.",
-  "payjoin_unavailable_sheet_title": "Me yasa Payjoin rasaa?",
   "payment_id": "ID na biyan kuɗi:",
-  "payment_made_easy": "Biya mai sauki",
   "payment_was_received": "An karɓi kuɗin ku.",
-  "payments": "Biya",
   "pending": "(pending)",
   "percentageOf": "na ${amount}",
   "pin_at_top": "pin ${token} a sama",
@@ -603,10 +539,9 @@
   "please_try_to_connect_to_another_node": "Don Allah yi ƙoƙarin haɗa da wani node",
   "please_wait": "Don Allah a rufe",
   "polygonscan_history": "PolygonScan tarihin kowane zamani",
-  "potential_scam": "M zamba",
   "powered_by": "An ƙarfafa shi ta ${title}",
   "pre_seed_button_text": "Ina fahimta. Nuna mini seed din nawa",
-  "pre_seed_description": "A shafi na gaba za ku ga jerin kalmomi. Wannan shi ne zuriyarku na musamman da keɓaɓɓun iri kuma ita ce kadai hanyar da za a dawo da walat ɗinku idan an rasa ko rashin lalacewa ko kuma muguntar. Hakkin ku ne ka rubuta shi ƙasa kuma adana shi a cikin amintaccen wuri a waje da app din Wallet Ojef.",
+  "pre_seed_description": "A kan shafin nan za ku ga wata ƙungiya na ${words} kalmomi. Wannan shine tsarin daban-daban ku kuma na sirri kuma shine hanya ɗaya kadai don mai da purse dinku a cikin yanayin rasa ko rashin aiki. Yana da damar da kuke a cikin tabbatar da kuyi rubuta shi kuma kuyi ajiye shi a wuri na aminci wanda ya wuce wurin app na Cake Wallet.",
   "pre_seed_title": "MUHIMMANCI",
   "prepaid_cards": "Katunan shirye-shirye",
   "prevent_screenshots": "Fada lambobi da jarrabobi na kayan lambobi",
@@ -619,7 +554,6 @@
   "proceed_on_device": "Ci gaba akan na'urarka",
   "proceed_on_device_description": "Da fatan za a bi umarnin akan walatware",
   "processing": "Aiki",
-  "processing_signed_tx": "Gudanar da Kasuwancin Samfura",
   "profile": "Rabin fuska",
   "provider_error": "${provider} kuskure",
   "public_key": "Maɓallin jama'a",
@@ -652,7 +586,6 @@
   "rep_warning_sub": "Wakilinku bai bayyana ya kasance cikin kyakkyawan yanayi ba. Matsa nan don zaɓar sabon",
   "repeat_wallet_password": "Maimaita kalmar sirri",
   "repeated_password_is_incorrect": "Maimaita kalmar sirri ba daidai ba ce. Da fatan za a sake maimaita kalmar sirri.",
-  "requested": "Nema",
   "require_for_adding_contacts": "Bukatar ƙara lambobin sadarwa",
   "require_for_all_security_and_backup_settings": "Bukatar duk tsaro da saitunan wariyar ajiya",
   "require_for_assessing_wallet": "Bukatar samun damar walat",
@@ -663,12 +596,10 @@
   "require_for_sends_to_internal_wallets": "Bukatar aika zuwa wallet na ciki",
   "require_for_sends_to_non_contacts": "Bukatar aika zuwa waɗanda ba lambobin sadarwa ba",
   "require_pin_after": "Bukatar PIN bayan",
-  "required_passphrase": "Mashiganya",
   "rescan": "Rescan",
   "resend_code": "Da fatan za a sake aika shi",
   "reset": "Sake saiti",
   "reset_password": "Sake saita kalmar wucewa",
-  "restore": "Sabunta",
   "restore_active_seed": "iri mai aiki",
   "restore_address": "Address",
   "restore_bitcoin_description_from_keys": "Dawo da kwalinku daga WIF string dake generate daga maɓallan sirri",
@@ -715,10 +646,7 @@
   "search_language": "Bincika harshe",
   "second_intro_content": "Your Yat adireshi ne na musamman na Emoji guda ɗaya wanda ke maye gurbin duk dogayen adiresoshin ku na hexadecimal na duk kudaden ku.",
   "second_intro_title": "Adireshin emoji ɗaya don sarrafa su duka",
-  "security": "Tsaro",
   "security_and_backup": "Tsaro da madadin",
-  "security_risk": "Hadarin tsaro",
-  "security_risk_description": "An yiwa wannan yanki a matsayin marasa tsaro da masu ba da izini na tsaro. Bar nan da nan don kare kadarorin ku.",
   "seed_alert_back": "juya baya",
   "seed_alert_content": "Irin ita ce kawai hanya don dawo da walat ɗin ku. Kun rubuta shi?",
   "seed_alert_title": "Hankali",
@@ -753,6 +681,9 @@
   "seedtype": "Seedtype",
   "seedtype_alert_content": "Raba tsaba tare da sauran wallets yana yiwuwa ne kawai tare da Bip39 seedtype.",
   "seedtype_alert_title": "Seedtype farke",
+  "seedtype_legacy": "Legacy (25 kalmomi)",
+  "seedtype_polyseed": "Polyseed (16 kalmomi)",
+  "seedtype_wownero": "WowRero (kalmomi 14)",
   "select_backup_file": "Zaɓi fayil ɗin madadin",
   "select_buy_provider_notice": "Zaɓi mai ba da kyauta a sama. Zaka iya tsallake wannan allon ta hanyar saita mai ba da isasshen busasshen mai ba da isasshen busasshiyar saiti.",
   "select_destination": "Da fatan za a zaɓi wurin da za a yi wa madadin fayil ɗin.",
@@ -776,7 +707,6 @@
   "send_from_external_wallet": "Aika daga walat na waje",
   "send_name": "Sunan",
   "send_new": "Sabon",
-  "send_payjoin": "Aika Payjoin",
   "send_payment_id": "ID na biyan kuɗi (optional)",
   "send_priority": "Yanzu haka fee yana set a ${transactionPriority} fifiko.\nAna iya daidaita fifikon ciniki a cikin saitunan",
   "send_sending": "Aika...",
@@ -834,9 +764,7 @@
   "show_keys": "Nuna iri/maɓallai",
   "show_market_place": "Nuna dan kasuwa",
   "show_seed": "Nuna iri",
-  "sign_all": "Shiga All",
   "sign_message": "Sa hannu",
-  "sign_one": "Alamar daya",
   "sign_up": "Shiga",
   "sign_verify_message": "Sa hannu / Tabbatar",
   "sign_verify_message_sub": "Shiga ko tabbatar da saƙo ta amfani da Maɓallinku na sirri",
@@ -865,14 +793,11 @@
   "sort_by": "Kasa",
   "spend_key_private": "makullin biya (maɓallin kalmar sirri)",
   "spend_key_public": "makullin biya (maɓallin jama'a)",
-  "starting_tor_proxy": "Fara tor proxy",
   "status": "Matsayi:",
-  "step": "Taka",
   "string_default": "Ƙin cika alƙawari",
   "subaddress_title": "Jagorar subaddress",
   "subaddresses": "Subaddresses",
   "submit_request": "gabatar da bukata",
-  "success": "Nasara",
   "successful": "Nasara",
   "support_description_guides": "Tallafi da tallafi don batutuwa na yau da kullun",
   "support_description_live_chat": "Kyauta da sauri! An horar da wakilan tallafi na tallafi don taimakawa",
@@ -880,7 +805,6 @@
   "support_title_guides": "Docs Bakin",
   "support_title_live_chat": "Tallafi na Live",
   "support_title_other_links": "Sauran hanyoyin tallafi",
-  "supported": "Goyan baya",
   "swap": "Musya",
   "sweeping_wallet": "Kashi na kasa",
   "sweeping_wallet_alert": "Wannan ba zai samu lokacin mai tsaski. KADA KA SAMU KUNGIYARAN KUHON, ZAMAN DADIN BANKUNCI ZAI HAŘA",
@@ -900,7 +824,6 @@
   "sync_status_syncronizing": "KWAFI",
   "sync_status_timed_out": "ATED Out",
   "sync_status_unsupported": "Ba a Taimako ba",
-  "synchronizing": "Aikiɓaɓaƙe",
   "syncing_wallet_alert_content": "Ma'aunin ku da lissafin ma'amala bazai cika ba har sai an ce \"SYNCHRONIZED\" a saman. Danna/matsa don ƙarin koyo.",
   "syncing_wallet_alert_title": "Walat ɗin ku yana aiki tare",
   "template": "Samfura",
@@ -913,18 +836,13 @@
   "thorchain_taproot_address_not_supported": "Mai ba da tallafi na ThorChain baya goyan bayan adreshin taproot. Da fatan za a canza adireshin ko zaɓi mai bayarwa daban.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Tukwici:",
-  "to": "Zuwa",
   "today": "Yau",
-  "token_already_exists": "Alama an riga an wanzu",
   "token_contract_address": "Adireshin kwangilar Token",
   "token_decimal": "Alamar ƙima",
   "token_name": "Alamar sunan misali: Tether",
   "token_symbol": "Alamar alama misali: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Don Allah kar a manta su saka ID na Memo yayin aikawa da ma'amala don musayar",
   "tor_connection": "Tor haɗin gwiwa",
-  "tor_connection_timeout": "A lokacin Tor Haɗin",
-  "tor_experimental": "Wannan fasalin gwaji ne, ba duk haɗin da aka yi ba daga Wall Wall Wall Walling goyon baya Tor Routing - don cikakken amfani da hanyar zirga-zirga amfani da tor tare da yanayin vpn.",
   "tor_only": "Tor kawai",
   "total": "Duka",
   "total_saving": "Jimlar Adana",
@@ -985,10 +903,8 @@
   "transaction_sent_notice": "Idan allon bai ci gaba ba bayan minti 1, duba mai binciken toshewa da imel ɗin ku.",
   "transactions": "Ma'amaloli",
   "transactions_by_date": "Ma'amaloli ta kwanan wata",
-  "transport_type": "Nau'in sufuri",
   "trongrid_history": "Tarihin Trongrid",
   "trusted": "Amintacce",
-  "try_again": "Gwada kuma",
   "tx_commit_exception_no_dust_on_change": "An ƙi ma'amala da wannan adadin. Tare da waɗannan tsabar kudi Zaka iya aika ${min}, ba tare da canji ba ko ${max} wanda ya dawo canzawa.",
   "tx_commit_failed": "Ma'amala ya kasa. Da fatan za a tuntuɓi goyan baya.",
   "tx_commit_failed_no_peers": "Kasuwanci ya kasa watsa, don Allah sake gwadawa a cikin na biyu ko",
@@ -1015,19 +931,15 @@
   "unspent_coins_details_title": "Bayanan tsabar kudi da ba a kashe ba",
   "unspent_coins_title": "Tsabar da ba a kashe ba",
   "unsupported_asset": "Ba mu goyi bayan wannan aikin don wannan kadara. Da fatan za a ƙirƙira ko canza zuwa walat na nau'in kadara mai tallafi.",
-  "update_session": "Zaman gaba",
   "uptime": "Sama",
   "upto": "har zuwa ${value}",
   "usb": "Alib",
   "use": "Canja zuwa",
   "use_card_info_three": "Yi amfani da katin dijital akan layi ko tare da hanyoyin biyan kuɗi mara lamba.",
   "use_card_info_two": "Ana canza kuɗi zuwa dalar Amurka lokacin da ake riƙe su a cikin asusun da aka riga aka biya, ba cikin agogon dijital ba.",
-  "use_device_theme": "Yi amfani da taken na'urar",
-  "use_payjoin": "Yi amfani da Payjoin",
   "use_ssl": "Yi amfani da SSL",
   "use_suggested": "Amfani da Shawarwari",
   "use_testnet": "Amfani da gwaji",
-  "user_rejected_method": "Mai amfani da hanya",
   "value": "Daraja",
   "value_type": "Nau'in darajar",
   "variable_pair_not_supported": "Ba a samun goyan bayan wannan m biyu tare da zaɓaɓɓun musayar",
@@ -1054,7 +966,6 @@
   "wallet_group_description_view_seed": "Koyaushe zaka iya duba wannan zuriya",
   "wallet_group_empty_state_text_one": "Kamar dai ba ku da wata ƙungiya matattara !\n\n Taɓa",
   "wallet_group_empty_state_text_two": "da ke ƙasa don yin sabo.",
-  "wallet_has_passphrase": "Wannan walat ɗin yana da kalmar wucewa",
   "wallet_keys": "Iri/maɓalli na walat",
   "wallet_list_create_new_wallet": "Ƙirƙiri Sabon Wallet",
   "wallet_list_edit_group_name": "Shirya sunan rukuni",
@@ -1080,11 +991,9 @@
   "wallets": "Wallets",
   "warning": "Gargadi",
   "welcome": "Barka da zuwa",
-  "welcome_only": "Barka da zuwa",
   "welcome_subtitle_new_wallet": "Idan kana son farawa sabo ne, matsa Newirƙiri Sabuwar Wallow a ƙasa kuma za ka tafi da tsere.",
   "welcome_subtitle_restore_wallet": "Idan kuna da walat ɗin da kuke son shigo da cake, kawai zaɓi a cikin walat ɗin da yake ciki kuma za mu bi ku ta hanyar aiwatarwa.",
   "welcome_to_cakepay": "Barka da zuwa Cake Pay!",
-  "what_is_payjoin": "Mene ne Payjoin ?",
   "what_is_silent_payments": "Menene biyan shiru?",
   "widgets_address": "Adireshin",
   "widgets_or": "ko",
@@ -1114,6 +1023,5 @@
   "you_will_get": "Maida zuwa",
   "you_will_receive_estimated_amount": "Za ku (karɓi )",
   "you_will_send": "Maida daga",
-  "youCanGoBackToYourDapp": "Kuna iya komawa zuwa DPP ɗinku yanzu",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 79d25a1fb..de15f45b6 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "कार्ड में प्रीपेड धनराशि जोड़ें (${value} तक)",
   "add_new_node": "नया नोड जोड़ें",
   "add_new_word": "नया शब्द जोड़ें",
-  "add_passphrase": "पासफ़्रेज़ जोड़ें",
-  "add_passphrase_warning_text": "यदि आपने अतीत में इस बटुए के लिए एक का उपयोग किया है, तो केवल एक पासफ्रेज़ दर्ज करें। यदि आप गलत पासफ्रेज़ में प्रवेश करते हैं या इस वॉलेट पर पहले पासफ्रेज़ का उपयोग नहीं करते हैं, तो आप मौजूदा फंड या इतिहास में से कोई भी नहीं देखेंगे।",
   "add_receiver": "एक और रिसीवर जोड़ें (वैकल्पिक)",
   "add_secret_code": "या, इस गुप्त कोड को प्रमाणक ऐप में जोड़ें",
   "add_tip": "टिप जोड़ें",
   "add_token_disclaimer_check": "मैंने एक प्रतिष्ठित स्रोत का उपयोग करके टोकन अनुबंध पते और जानकारी की पुष्टि की है। दुर्भावनापूर्ण या गलत जानकारी जोड़ने से धन की हानि हो सकती है।",
   "add_token_warning": "स्कैमर्स के निर्देशानुसार टोकन संपादित या जोड़ें न करें।\nहमेशा प्रतिष्ठित स्रोतों से टोकन पते की पुष्टि करें!",
   "add_value": "मूल्य जोड़ें",
-  "added_message_for_ata_error": "कृपया सुनिश्चित करें कि आपके पास अपना लेनदेन पूरा करने के लिए पर्याप्त SOL बैलेंस है।",
   "address": "पता",
   "address_book": "पता पुस्तिका",
   "address_book_menu": "पता पुस्तिका",
@@ -55,8 +52,6 @@
   "anonpay_description": "${type} उत्पन्न करें। प्राप्तकर्ता किसी भी समर्थित क्रिप्टोकरेंसी के साथ ${method} कर सकता है, और आपको इस वॉलेट में धन प्राप्त होगा।",
   "apk_update": "APK अद्यतन",
   "approve": "मंज़ूरी देना",
-  "approve_request": "अनुरोध को स्वीकृत करें",
-  "approve_tokens": "टोकन को मंजूरी देना",
   "arrive_in_this_address": "${currency} ${tag}इस पते पर पहुंचेंगे",
   "ascending": "आरोही",
   "ask_each_time": "हर बार पूछें",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "भुगतान की पुष्टि की प्रतीक्षा में",
   "background_sync": "पृष्ठभूमि सिंक",
   "background_sync_mode": "बैकग्राउंड सिंक मोड",
-  "background_sync_on_battery_low": "कम बैटरी पर सिंक्रनाइज़ करें",
-  "background_sync_on_charging": "चार्ज करते समय केवल सिंक्रनाइज़ करें",
-  "background_sync_on_device_idle": "केवल तब सिंक्रनाइज़ करें जब डिवाइस का उपयोग नहीं किया जा रहा है",
-  "background_sync_on_unmetered_network": "अनमेट्रेड नेटवर्क की आवश्यकता है",
   "backup": "बैकअप",
   "backup_file": "बैकअपफ़ाइल",
   "backup_password": "बैकअप पासवर्ड",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "बिटकॉइन खरीदें",
   "buy_now": "अभी खरीदें",
   "buy_provider_unavailable": "वर्तमान में प्रदाता अनुपलब्ध है।",
-  "buy_sell_pair_is_not_supported_warning": "यह मुद्रा जोड़ी चयनित भुगतान विधि के लिए किसी भी प्रदाता द्वारा समर्थित नहीं है। कृपया एक अलग जोड़ी चुनें या भुगतान विधि को बदलने का प्रयास करें।",
   "buy_with": "के साथ खरीदें",
   "by_cake_pay": "केकपे द्वारा",
   "cake_2fa_preset": "केक 2एफए प्रीसेट",
@@ -124,12 +114,9 @@
   "camera_consent": "आपके कैमरे का उपयोग ${provider} द्वारा पहचान उद्देश्यों के लिए एक छवि कैप्चर करने के लिए किया जाएगा। विवरण के लिए कृपया उनकी गोपनीयता नीति जांचें।",
   "camera_permission_is_required": "कैमरे की अनुमति आवश्यक है.\nकृपया इसे ऐप सेटिंग से सक्षम करें।",
   "cancel": "रद्द करना",
-  "cannot_verify": "सत्यापित नहीं कर सकते",
-  "cannot_verify_description": "इस डोमेन को सत्यापित नहीं किया जा सकता है। अनुमोदन से पहले अनुरोध को ध्यान से देखें।",
   "card_address": "पता:",
   "cardholder_agreement": "कार्डधारक अनुबंध",
   "cards": "कार्ड",
-  "chain_id": "चेन आईडी",
   "chains": "चेन",
   "change": "परिवर्तन",
   "change_backup_password_alert": "आपकी पिछली बैकअप फाइलें नए बैकअप पासवर्ड के साथ आयात करने के लिए उपलब्ध नहीं होंगी। नए बैकअप पासवर्ड का उपयोग केवल नई बैकअप फ़ाइलों के लिए किया जाएगा। क्या आप वाकई बैकअप पासवर्ड बदलना चाहते हैं?",
@@ -144,7 +131,6 @@
   "change_rep_message": "क्या आप वाकई प्रतिनिधियों को बदलना चाहते हैं?",
   "change_rep_successful": "सफलतापूर्वक बदलकर प्रतिनिधि",
   "change_selected_exchanges": "चयनित एक्सचेंजों को बदलें",
-  "change_selected_pair": "चयनित जोड़ी बदलें",
   "change_wallet_alert_content": "क्या आप करंट वॉलेट को बदलना चाहते हैं ${wallet_name}?",
   "change_wallet_alert_title": "वर्तमान बटुआ बदलें",
   "choose_a_payment_method": "एक भुगतान विधि का चयन करें",
@@ -182,14 +168,9 @@
   "confirmed_tx": "की पुष्टि",
   "congratulations": "बधाई!",
   "connect_an_existing_yat": "मौजूदा Yat कनेक्ट करें",
-  "connect_hw_info_step_1": "सुनिश्चित करें कि आपका डिवाइस चालू है।",
-  "connect_hw_info_step_2": "दोनों उपकरणों के लिए ब्लूटूथ चालू करें और उन्हें फोन से पेयर करें, या एक USB केबल का उपयोग करके अपने डिवाइस को एक साथ कनेक्ट करें।",
-  "connect_hw_info_step_3": "अपने डिवाइस को अनलॉक करें और वांछित क्रिप्टो ऐप पर नेविगेट करें।",
-  "connect_hw_info_step_4": "केक वॉलेट में अपने डिवाइस का चयन करें और सेटअप के साथ जारी रखें।",
   "connect_yats": "कनेक्ट Yats",
   "connect_your_hardware_wallet": "ब्लूटूथ या यूएसबी का उपयोग करके अपने हार्डवेयर वॉलेट को कनेक्ट करें",
   "connect_your_hardware_wallet_ios": "ब्लूटूथ का उपयोग करके अपने हार्डवेयर वॉलेट को कनेक्ट करें",
-  "connected": "जुड़े हुए",
   "connection_sync": "कनेक्शन और सिंक",
   "connectWalletPrompt": "लेन-देन करने के लिए अपने वॉलेट को वॉलेटकनेक्ट से कनेक्ट करें",
   "contact": "संपर्क करें",
@@ -207,8 +188,6 @@
   "copy": "प्रतिलिपि",
   "copy_address": "पता कॉपी करें",
   "copy_id": "प्रतिलिपि ID",
-  "copy_payjoin_address": "कॉपी पेजोइन पता",
-  "copy_payjoin_url": "कॉपी Payjoin url",
   "copyWalletConnectLink": "dApp से वॉलेटकनेक्ट लिंक को कॉपी करें और यहां पेस्ट करें",
   "corrupted_seed_notice": "इस वॉलेट की फाइलें दूषित हैं और उन्हें खोलने में असमर्थ हैं। कृपया बीज वाक्यांश देखें, इसे बचाएं, और बटुए को पुनर्स्थापित करें।\n\nयदि मूल्य खाली है, तो बीज सही ढंग से पुनर्प्राप्त करने में असमर्थ था।",
   "countries": "देशों",
@@ -245,22 +224,11 @@
   "descending": "अवरोही",
   "description": "विवरण",
   "destination_tag": "गंतव्य टैग:",
-  "deuro_collect_interest": "इकट्ठा करना",
-  "deuro_savings": "देउरो बचत",
-  "deuro_savings_add": "जमा",
-  "deuro_savings_balance": "बचत शेष",
-  "deuro_savings_collect_interest": "ब्याज इकट्ठा करना",
-  "deuro_savings_remove": "निकालना",
-  "deuro_savings_set_approval": "अनुमोदन निर्धारित करना",
-  "deuro_savings_subtitle": "अपने Deuro Stablecoin होल्डिंग्स पर 10% ब्याज कमाएँ",
-  "deuro_tx_commited_content": "लेन -देन की पुष्टि करने और स्क्रीन पर प्रतिबिंबित होने के लिए कुछ सेकंड लग सकते हैं",
-  "device_is_signing": "उपकरण हस्ताक्षर कर रहा है",
   "dfx_option_description": "EUR और CHF के साथ क्रिप्टो खरीदें। यूरोप में खुदरा और कॉर्पोरेट ग्राहकों के लिए",
   "didnt_get_code": "कोड नहीं मिला?",
   "digit_pin": "-अंक पिन",
   "digital_and_physical_card": "डिजिटल और भौतिक प्रीपेड डेबिट कार्ड",
   "disable": "अक्षम करना",
-  "disable_automatic_exchange_status_updates": "स्वचालित एक्सचेंज स्टेटस अपडेट अक्षम करें",
   "disable_bulletin": "सेवा स्थिति बुलेटिन अक्षम करें",
   "disable_buy": "खरीद कार्रवाई अक्षम करें",
   "disable_cake_2fa": "केक 2FA अक्षम करें",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "इसे बंद करने से, कुछ मामलों में शुल्क दरें गलत हो सकती हैं, इसलिए आप अपने लेनदेन के लिए फीस को कम कर सकते हैं या कम कर सकते हैं",
   "disable_fiat": "िएट को अक्षम करें",
   "disable_sell": "बेचने की कार्रवाई अक्षम करें",
-  "disable_tor": "टोर को अक्षम करें",
   "disable_trade_option": "व्यापार विकल्प अक्षम करें",
   "disableBatteryOptimization": "बैटरी अनुकूलन अक्षम करें",
   "disableBatteryOptimizationDescription": "क्या आप बैकग्राउंड सिंक को अधिक स्वतंत्र और सुचारू रूप से चलाने के लिए बैटरी ऑप्टिमाइज़ेशन को अक्षम करना चाहते हैं?",
   "disabled": "अक्षम",
-  "disconnect_session": "सत्र को डिस्कनेक्ट करें",
   "discount": "${value}% बचाएं",
   "display_settings": "प्रदर्शन सेटिंग्स",
   "displayable": "प्रदर्शन योग्य",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "समर्थन सहित, इन्हें किसी और के साथ साझा न करें।\n\nआपके धन की चोरी हो सकती है और होगी!",
   "do_not_show_me": "मुझे यह फिर न दिखाएं",
   "domain_looks_up": "डोमेन लुकअप",
-  "domain_mismatch": "डोमेन बेमेल",
-  "domain_mismatch_description": "इस वेबसाइट में एक डोमेन है जो इस अनुरोध के प्रेषक से मेल नहीं खाता है। अनुमोदन से धन की हानि हो सकती है।",
   "donation_link_details": "दान लिंक विवरण",
-  "done": "हो गया",
   "e_sign_consent": "ई-साइन सहमति",
   "edit": "संपादित करें",
   "edit_backup_password": "बैकअप पासवर्ड संपादित करें",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "हर बार जब आप एक का उपयोग करते हैं तो हम नए पते उत्पन्न करते हैं, लेकिन पिछले पते काम करना जारी रखते हैं",
   "email_address": "ईमेल पता",
   "enable": "सक्षम",
-  "enable_builtin_tor": "बिल्ट-इन टोर को सक्षम करें",
   "enable_mempool_api": "सटीक शुल्क और तिथियों के लिए मेमपूल एपीआई",
   "enable_replace_by_fee": "प्रतिस्थापित-दर-शुल्क सक्षम करें",
   "enable_silent_payments_scanning": "मूक भुगतान स्कैनिंग सक्षम करें",
@@ -333,10 +295,8 @@
   "error_text_template": "टेम्प्लेट का नाम और पता नहीं हो सकता ` , ' \" प्रतीकों\nऔर 1 और 106 वर्णों के बीच लंबा होना चाहिए",
   "error_text_wallet_name": "वॉलेट नाम में केवल अक्षर, संख्याएं, _ - प्रतीक हो सकते हैं\nऔर 1 और 33 वर्णों के बीच लंबा होना चाहिए",
   "error_text_xmr": "एक्सएमआर मूल्य उपलब्ध शेष राशि से अधिक नहीं हो सकता.\nअंश अंकों की संख्या 12 से कम या इसके बराबर होनी चाहिए",
-  "error_while_processing": "प्रोकसिंग करते समय एक त्रुटि हुई",
   "errorGettingCredentials": "विफल: क्रेडेंशियल प्राप्त करते समय त्रुटि",
   "errorSigningTransaction": "लेन-देन पर हस्ताक्षर करते समय एक त्रुटि उत्पन्न हुई है",
-  "establishing_tor_connection": "टोर -कनेक्शन",
   "estimated": "अनुमानित",
   "estimated_new_fee": "अनुमानित नया शुल्क",
   "estimated_receive_amount": "अनुमानित राशि",
@@ -360,7 +320,6 @@
   "export_backup": "निर्यात बैकअप",
   "export_logs": "निर्यात लॉग",
   "export_outputs": "निर्यात आउटपुट",
-  "extend_session": "सत्र का विस्तार करें",
   "extra_id": "अतिरिक्त आईडी:",
   "extracted_address_content": "आपको धनराशि भेजी जाएगी\n${recipient_name}",
   "failed_authentication": "प्रमाणीकरण विफल. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "फिएट पैसे API",
   "fiat_balance": "फिएट बैलेंस",
   "field_required": "यह फ़ील्ड आवश्यक है",
-  "file_saved": "फ़ाइल सहेजा गया",
   "fill_code": "कृपया अपने ईमेल पर प्रदान किया गया सत्यापन कोड भरें",
   "filter_by": "के द्वारा छनित",
   "first_wallet_text": "Monero, Bitcoin, Ethereum, Litecoin, और Haven के लिए बहुत बढ़िया बटुआ",
@@ -382,12 +340,10 @@
   "forgot_password": "पासवर्ड भूल गए",
   "freeze": "फ्रीज",
   "frequently_asked_questions": "अक्सर पूछे जाने वाले प्रश्न",
-  "from": "से",
   "frozen": "जमा हुआ",
   "frozen_balance": "जमे हुए संतुलन",
   "full_balance": "पूर्ण संतुलन",
   "gas_exceeds_allowance": "लेनदेन द्वारा आवश्यक गैस भत्ता से अधिक है।",
-  "gas_price": "गैस की कीमत",
   "generate_name": "नाम जनरेट करें",
   "generating_gift_card": "गिफ्ट कार्ड जनरेट कर रहा है",
   "generating_transaction": "सृजन लेन -देन",
@@ -413,7 +369,6 @@
   "hide_details": "विवरण छुपाएं",
   "high_contrast_theme": "उच्च कंट्रास्ट थीम",
   "home_screen_settings": "होम स्क्रीन सेटिंग्स",
-  "how_to_connect": "कनेक्ट कैसे करें",
   "how_to_use": "का उपयोग कैसे करें",
   "how_to_use_card": "इस कार्ड का उपयोग कैसे करें",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "आपके पास लेनदेन और इसके लेनदेन शुल्क को कवर करने के लिए पर्याप्त सोल नहीं है। कृपया अपने बटुए में अधिक सोल जोड़ें या आपके द्वारा भेजे जा रहे सोल राशि को कम करें।",
   "insufficient_lamports": "आपके पास लेनदेन और इसके लेनदेन शुल्क को कवर करने के लिए पर्याप्त सोल नहीं है। आपको कम से कम ${solValueNeeded} सोल की आवश्यकता है। कृपया अपने बटुए में अधिक सोल जोड़ें या सोल राशि को कम करें जिसे आप भेज रहे हैं",
   "insufficientFundsForRentError": "आपके पास लेन -देन शुल्क और खाते के लिए किराए को कवर करने के लिए पर्याप्त सोल नहीं है। कृपया अपने बटुए में अधिक सोल जोड़ें या सोल राशि को कम करें जिसे आप भेज रहे हैं",
-  "insufficientFundsForRentErrorReceiver": "रिसीवर के खाते में किराए को कवर करने के लिए पर्याप्त सोल नहीं है। कृपया रिसीवर को उनके खाते में अधिक सोल जोड़ने के लिए कहें।",
   "introducing_cake_pay": "परिचय Cake Pay!",
   "invalid_input": "अमान्य निवेश",
   "invalid_password": "अवैध पासवर्ड",
@@ -471,7 +425,6 @@
   "logout": "लॉगआउट",
   "low_fee": "कम शुल्क",
   "low_fee_alert": "आप वर्तमान में कम नेटवर्क शुल्क प्राथमिकता का उपयोग कर रहे हैं। यह लंबे इंतजार, अलग-अलग दरों या रद्द किए गए ट्रेडों का कारण बन सकता है। हम बेहतर अनुभव के लिए अधिक शुल्क निर्धारित करने की सलाह देते हैं।",
-  "made_easy": "आसान बनाया हुआ",
   "manage_nodes": "नोड्स प्रबंधित करें",
   "manage_pow_nodes": "PoW नोड्स प्रबंधित करें",
   "manage_yats": "Yats प्रबंधित करें",
@@ -483,8 +436,6 @@
   "memo": "ज्ञापन:",
   "message": "संदेश",
   "message_verified": "संदेश को सफलतापूर्वक सत्यापित किया गया था",
-  "messages": "संदेशों",
-  "method": "तरीका",
   "methods": "तरीकों",
   "min_amount": "न्यूनतम: ${value}",
   "min_value": "मिन: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "मोनेरो डार्क थीम",
   "monero_light_theme": "मोनेरो लाइट थीम",
   "moonpay_alert_text": "राशि का मूल्य अधिक है या करने के लिए बराबर होना चाहिए ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "एनएफटी लाने के दौरान एक त्रुटि हुई। कृपया अपने इंटरनेट कनेक्शन की जाँच करें और फिर से प्रयास करें।",
   "more_options": "और विकल्प",
   "multiple_addresses_detected": "कई पते का पता चला",
   "mweb_confirmed": "MWEB की पुष्टि की",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "लेबल का नाम",
   "new_subaddress_title": "नया पता",
   "new_template": "नया टेम्पलेट",
-  "new_transactions_notifications": "नए लेनदेन के बारे में सूचनाएं भेजें",
   "new_wallet": "नया बटुआ",
   "newConnection": "नया कनेक्शन",
   "no_cards_found": "कोई कार्ड नहीं मिला",
@@ -539,7 +488,6 @@
   "normal": "सामान्य",
   "note_optional": "नोट (वैकल्पिक)",
   "note_tap_to_change": "नोट (टैप टू चेंज)",
-  "notification_permission_denied": "अधिसूचना की अनुमति को पारगम्य रूप से अस्वीकार कर दिया गया, कृपया इसे मैन्युअल रूप से सेटिंग्स में सक्षम करें",
   "nullURIError": "यूआरआई शून्य है",
   "offer_expires_in": "में ऑफर समाप्त हो रहा है: ",
   "offline": "ऑफ़लाइन",
@@ -571,21 +519,9 @@
   "password": "पारण शब्द",
   "paste": "पेस्ट करें",
   "pause_wallet_creation": "हेवन वॉलेट बनाने की क्षमता फिलहाल रुकी हुई है।",
-  "payjoin_card_content": "Payjoin बिटकॉइन में एक नई गोपनीयता-संरक्षण और शुल्क-बचत सुविधा है।",
-  "payjoin_details": "Payjoin विवरण",
-  "payjoin_enabled": "Payjoin सक्षम",
-  "payjoin_enabling_popup_content": "आप मेनू → गोपनीयता → के तहत Payjoin टॉगल कर सकते हैं → बाद में इसे सक्षम या अक्षम करने के लिए Payjoin का उपयोग करें।",
-  "payjoin_enabling_popup_title": "सक्षम Payjoin",
-  "payjoin_request_awaiting_tx": "लेन -देन का इंतजार",
-  "payjoin_request_in_progress": "प्रगति पर है",
-  "payjoin_unavailable": "Payjoin अनुपलब्ध",
-  "payjoin_unavailable_sheet_content": "Payjoin लेन -देन प्राप्त करने के लिए आपको बिटकॉइन का उपयोग करने के लिए तैयार होना आवश्यक है। जैसे ही आपके वॉलेट में धन है, \\ n \\ nas, Payjoin स्वचालित रूप से सक्षम हो जाएगा।",
-  "payjoin_unavailable_sheet_title": "Payjoin अनुपलब्ध क्यों है?",
   "payment_id": "भुगतान ID: ",
-  "payment_made_easy": "भुगतान आसान किया गया",
-  "Payment_was_received": "आपका भुगतान प्राप्त हो गया था।",
   "payment_was_received": "आपका भुगतान प्राप्त हुआ था।",
-  "payments": "भुगतान",
+  "Payment_was_received": "आपका भुगतान प्राप्त हो गया था।",
   "pending": " (अपूर्ण)",
   "percentageOf": "${amount} का",
   "pin_at_top": "शीर्ष पर ${token} पिन करें",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "कृपया दूसरे नोड से कनेक्ट करने का प्रयास करें",
   "please_wait": "कृपया प्रतीक्षा करें",
   "polygonscan_history": "पॉलीगॉनस्कैन इतिहास",
-  "potential_scam": "संभावित घोटाला",
   "powered_by": "द्वारा संचालित ${title}",
   "pre_seed_button_text": "मै समझता हुँ। मुझे अपना बीज दिखाओ",
-  "pre_seed_description": "अगले पृष्ठ पर आपको शब्दों की एक श्रृंखला दिखाई देगी। यह आपका अनूठा और निजी बीज है और यह नुकसान या खराबी के मामले में अपने बटुए को पुनर्प्राप्त करने का एकमात्र तरीका है। यह आपकी जिम्मेदारी है कि आप इसे लिखें और इसे केक वॉलेट ऐप के बाहर एक सुरक्षित स्थान पर संग्रहीत करें।",
+  "pre_seed_description": "अगले पेज पर आपको ${words} शब्दों की एक श्रृंखला दिखाई देगी। यह आपका अद्वितीय और निजी बीज है और नुकसान या खराबी के मामले में अपने बटुए को पुनर्प्राप्त करने का एकमात्र तरीका है। यह आपकी जिम्मेदारी है कि इसे नीचे लिखें और इसे Cake Wallet ऐप के बाहर सुरक्षित स्थान पर संग्रहीत करें।",
   "pre_seed_title": "महत्वपूर्ण",
   "prepaid_cards": "पूर्वदत्त कार्ड",
   "prevent_screenshots": "स्क्रीनशॉट और स्क्रीन रिकॉर्डिंग रोकें",
@@ -618,7 +553,6 @@
   "proceed_on_device": "अपने डिवाइस पर आगे बढ़ें",
   "proceed_on_device_description": "कृपया अपने हार्डवेयर वॉलेट पर दिए गए निर्देशों का पालन करें",
   "processing": "प्रसंस्करण",
-  "processing_signed_tx": "हस्ताक्षरित लेनदेन प्रसंस्करण",
   "profile": "प्रोफ़ाइल",
   "provider_error": "${provider} त्रुटि",
   "public_key": "सार्वजनिक कुंजी",
@@ -652,7 +586,6 @@
   "rep_warning_sub": "आपका प्रतिनिधि अच्छी स्थिति में नहीं दिखाई देता है। एक नया चयन करने के लिए यहां टैप करें",
   "repeat_wallet_password": "वॉलेट पासवर्ड दोहराएं",
   "repeated_password_is_incorrect": "बार -बार पासवर्ड गलत है। कृपया फिर से वॉलेट पासवर्ड दोहराएं।",
-  "requested": "अनुरोधित",
   "require_for_adding_contacts": "संपर्क जोड़ने के लिए आवश्यकता है",
   "require_for_all_security_and_backup_settings": "सभी सुरक्षा और बैकअप सेटिंग्स की आवश्यकता है",
   "require_for_assessing_wallet": "वॉलेट तक पहुँचने के लिए आवश्यकता है",
@@ -663,12 +596,10 @@
   "require_for_sends_to_internal_wallets": "आंतरिक वॉलेट में भेजने की आवश्यकता है",
   "require_for_sends_to_non_contacts": "गैर-संपर्कों को भेजने की आवश्यकता",
   "require_pin_after": "इसके बाद पिन आवश्यक है",
-  "required_passphrase": "पदबंध",
   "rescan": "पुन: स्कैन",
   "resend_code": "कृपया इसे फिर से भेजें",
   "reset": "रीसेट",
   "reset_password": "पासवर्ड रीसेट करें",
-  "restore": "पुनर्स्थापित करना",
   "restore_active_seed": "सक्रिय बीज",
   "restore_address": "पता",
   "restore_bitcoin_description_from_keys": "अपने निजी कुंजी से उत्पन्न WIF स्ट्रिंग से अपने वॉलेट को पुनर्स्थापित करें",
@@ -715,10 +646,7 @@
   "search_language": "भाषा खोजें",
   "second_intro_content": "आपका Yat एक अद्वितीय इमोजी पता है जो आपकी सभी मुद्राओं के लिए आपके सभी लंबे हेक्साडेसिमल पतों को बदल देता है।",
   "second_intro_title": "उन सभी पर राज करने के लिए एक इमोजी पता",
-  "security": "सुरक्षा",
   "security_and_backup": "सुरक्षा और बैकअप",
-  "security_risk": "सुरक्षा मे जोखिम",
-  "security_risk_description": "इस डोमेन को कई सुरक्षा प्रदाताओं द्वारा असुरक्षित के रूप में चिह्नित किया जाता है। अपनी संपत्ति की रक्षा के लिए तुरंत छोड़ दें।",
   "seed_alert_back": "वापस जाओ",
   "seed_alert_content": "बीज आपके बटुए को पुनर्प्राप्त करने का एकमात्र तरीका है। क्या आपने इसे लिखा है?",
   "seed_alert_title": "ध्यान",
@@ -753,6 +681,9 @@
   "seedtype": "बीज",
   "seedtype_alert_content": "अन्य पर्स के साथ बीज साझा करना केवल BIP39 सीडटाइप के साथ संभव है।",
   "seedtype_alert_title": "बीजगणित अलर्ट",
+  "seedtype_legacy": "विरासत (25 शब्द)",
+  "seedtype_polyseed": "पॉलीसीड (16 शब्द)",
+  "seedtype_wownero": "Wownero (14 शब्द)",
   "select_backup_file": "बैकअप फ़ाइल का चयन करें",
   "select_buy_provider_notice": "ऊपर एक खरीद प्रदाता का चयन करें। आप इस स्क्रीन को ऐप सेटिंग्स में अपना डिफ़ॉल्ट बाय प्रदाता सेट करके छोड़ सकते हैं।",
   "select_destination": "कृपया बैकअप फ़ाइल के लिए गंतव्य का चयन करें।",
@@ -776,7 +707,6 @@
   "send_from_external_wallet": "बाहरी बटुए से भेजें",
   "send_name": "नाम",
   "send_new": "नया",
-  "send_payjoin": "भेजना Payjoin",
   "send_payment_id": "भुगतान ID (ऐच्छिक)",
   "send_priority": "वर्तमान में शुल्क निर्धारित है ${transactionPriority} प्राथमिकता.\nलेन-देन की प्राथमिकता को सेटिंग्स में समायोजित किया जा सकता है",
   "send_sending": "भेजना...",
@@ -834,9 +764,7 @@
   "show_keys": "बीज / कुंजियाँ दिखाएँ",
   "show_market_place": "बाज़ार दिखाएँ",
   "show_seed": "बीज दिखाओ",
-  "sign_all": "साइन इन करें",
   "sign_message": "हस्ताक्षर संदेश",
-  "sign_one": "साइन वन",
   "sign_up": "साइन अप करें",
   "sign_verify_message": "हस्ताक्षर / सत्यापित करें",
   "sign_verify_message_sub": "अपनी निजी कुंजी का उपयोग करके किसी संदेश पर हस्ताक्षर या सत्यापित करें",
@@ -865,14 +793,11 @@
   "sort_by": "इसके अनुसार क्रमबद्ध करें",
   "spend_key_private": "खर्च करना (निजी)",
   "spend_key_public": "खर्च करना (जनता)",
-  "starting_tor_proxy": "टोर प्रॉक्सी शुरू करना",
   "status": "स्थिति: ",
-  "step": "कदम",
   "string_default": "गलती करना",
   "subaddress_title": "उपखंड सूची",
   "subaddresses": "उप पते",
   "submit_request": "एक अनुरोध सबमिट करें",
-  "success": "सफलता",
   "successful": "सफल",
   "support_description_guides": "सामान्य मुद्दों के लिए प्रलेखन और समर्थन",
   "support_description_live_chat": "मुक्त और तेजी से! प्रशिक्षित सहायता प्रतिनिधि सहायता के लिए उपलब्ध हैं",
@@ -880,7 +805,6 @@
   "support_title_guides": "केक बटुए डॉक्स",
   "support_title_live_chat": "लाइव सहायता",
   "support_title_other_links": "अन्य समर्थन लिंक",
-  "supported": "का समर्थन किया",
   "swap": "बदलना",
   "sweeping_wallet": "स्वीपिंग वॉलेट",
   "sweeping_wallet_alert": "इसमें अधिक समय नहीं लगना चाहिए। इस स्क्रीन को न छोड़ें या स्वैप्ट फंड खो सकते हैं",
@@ -900,7 +824,6 @@
   "sync_status_syncronizing": "सिंक्रनाइज़ करने",
   "sync_status_timed_out": "समय समााप्त",
   "sync_status_unsupported": "असमर्थित नोड",
-  "synchronizing": "सिंक्रनाइज़ करना",
   "syncing_wallet_alert_content": "आपकी शेष राशि और लेनदेन सूची तब तक पूरी नहीं हो सकती जब तक कि शीर्ष पर \"सिंक्रनाइज़्ड\" न लिखा हो। अधिक जानने के लिए क्लिक/टैप करें।",
   "syncing_wallet_alert_title": "आपका वॉलेट सिंक हो रहा है",
   "template": "खाका",
@@ -913,18 +836,13 @@
   "thorchain_taproot_address_not_supported": "थोरचेन प्रदाता टैपरोट पते का समर्थन नहीं करता है। कृपया पता बदलें या एक अलग प्रदाता का चयन करें।",
   "time": "${minutes}m ${seconds}s",
   "tip": "टिप:",
-  "to": "को",
   "today": "आज",
-  "token_already_exists": "टोकन पहले से मौजूद है",
   "token_contract_address": "टोकन अनुबंध पता",
   "token_decimal": "सांकेतिक दशमलव",
   "token_name": "टोकन नाम जैसे: टीथर",
   "token_symbol": "टोकन प्रतीक जैसे: यूएसडीटी",
   "tokenID": "पहचान",
-  "ton_extra_info": "कृपया एक्सचेंज के लिए टन लेनदेन भेजते समय मेमो आईडी निर्दिष्ट करना न भूलें",
   "tor_connection": "टोर कनेक्शन",
-  "tor_connection_timeout": "टोर कनेक्शन टाइमआउट",
-  "tor_experimental": "यह एक प्रायोगिक विशेषता है, केक वॉलेट सपोर्ट टोर रूटिंग से किए गए सभी कनेक्शन नहीं - कुछ कनेक्शन क्लीयरनेट का उपयोग कर सकते हैं, ताकि वीपीएन मोड के साथ ऐप ट्रैफिक का उपयोग पूरी तरह से रूट करने के लिए हो।",
   "tor_only": "Tor केवल",
   "total": "कुल",
   "total_saving": "कुल बचत",
@@ -985,10 +903,8 @@
   "transaction_sent_notice": "अगर 1 मिनट के बाद भी स्क्रीन आगे नहीं बढ़ती है, तो ब्लॉक एक्सप्लोरर और अपना ईमेल देखें।",
   "transactions": "लेन-देन",
   "transactions_by_date": "तारीख से लेन-देन",
-  "transport_type": "परिवहन प्रकार",
   "trongrid_history": "ट्रॉन्ग्रिड का इतिहास",
   "trusted": "भरोसा",
-  "try_again": "पुनः प्रयास करें",
   "tx_commit_exception_no_dust_on_change": "लेनदेन को इस राशि से खारिज कर दिया जाता है। इन सिक्कों के साथ आप चेंज या ${min} के बिना ${max} को भेज सकते हैं जो परिवर्तन लौटाता है।",
   "tx_commit_failed": "लेन -देन प्रतिबद्ध विफल। कृपया संपर्क समर्थन करें।",
   "tx_commit_failed_no_peers": "लेन -देन प्रसारित करने में विफल रहा, कृपया एक या दो सेकंड में पुनः प्रयास करें",
@@ -1015,19 +931,15 @@
   "unspent_coins_details_title": "अव्ययित सिक्कों का विवरण",
   "unspent_coins_title": "खर्च न किए गए सिक्के",
   "unsupported_asset": "हम इस संपत्ति के लिए इस कार्रवाई का समर्थन नहीं करते हैं. कृपया समर्थित परिसंपत्ति प्रकार का वॉलेट बनाएं या उस पर स्विच करें।",
-  "update_session": "अद्यतन सत्र",
   "uptime": "अपटाइम",
   "upto": "${value} तक",
   "usb": "USB",
   "use": "उपयोग ",
   "use_card_info_three": "डिजिटल कार्ड का ऑनलाइन या संपर्क रहित भुगतान विधियों के साथ उपयोग करें।",
   "use_card_info_two": "डिजिटल मुद्राओं में नहीं, प्रीपेड खाते में रखे जाने पर निधियों को यूएसडी में बदल दिया जाता है।",
-  "use_device_theme": "डिवाइस थीम का उपयोग करें",
-  "use_payjoin": "उपयोग Payjoin",
   "use_ssl": "उपयोग SSL",
   "use_suggested": "सुझाए गए का प्रयोग करें",
   "use_testnet": "टेस्टनेट का उपयोग करें",
-  "user_rejected_method": "उपयोगकर्ता अस्वीकार विधि",
   "value": "कीमत",
   "value_type": "मान प्रकार",
   "variable_pair_not_supported": "यह परिवर्तनीय जोड़ी चयनित एक्सचेंजों के साथ समर्थित नहीं है",
@@ -1054,7 +966,6 @@
   "wallet_group_description_view_seed": "आप हमेशा इस बीज को फिर से देख सकते हैं",
   "wallet_group_empty_state_text_one": "लगता है कि आपके पास कोई संगत बटुआ समूह नहीं है!\n\nनल",
   "wallet_group_empty_state_text_two": "नीचे एक नया बनाने के लिए।",
-  "wallet_has_passphrase": "इस बटुए में एक पासफ़्रेज़ है",
   "wallet_keys": "बटुआ बीज / चाबियाँ",
   "wallet_list_create_new_wallet": "नया बटुआ बनाएँ",
   "wallet_list_edit_group_name": "समूह का नाम संपादित करें",
@@ -1079,11 +990,10 @@
   "walletConnect": "वॉलेटकनेक्ट",
   "wallets": "पर्स",
   "warning": "चेतावनी",
-  "welcome": "स्वागत",
+  "welcome": "स्वागत हे सेवा मेरे",
   "welcome_subtitle_new_wallet": "यदि आप ताजा शुरू करना चाहते हैं, तो नीचे नया बटुआ बनाएं और आप दौड़ से दूर हो जाएंगे।",
   "welcome_subtitle_restore_wallet": "यदि आपके पास एक मौजूदा बटुआ है जिसे आप केक में लाना चाहते हैं, तो बस मौजूदा बटुए को पुनर्स्थापित करें और हम आपको प्रक्रिया के माध्यम से चलेंगे।",
   "welcome_to_cakepay": "केकपे में आपका स्वागत है!",
-  "what_is_payjoin": "Payjoin ##### क्या है",
   "what_is_silent_payments": "मूक भुगतान क्या है?",
   "widgets_address": "पता",
   "widgets_or": "या",
@@ -1113,6 +1023,5 @@
   "you_will_get": "में बदलें",
   "you_will_receive_estimated_amount": "आपको#अनुमानित ( प्राप्त होगा)",
   "you_will_send": "से रूपांतरित करें",
-  "youCanGoBackToYourDapp": "अब आप अपने DAPP पर वापस जा सकते हैं",
   "yy": "वाईवाई"
 }
\ No newline at end of file
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 6f94329ff..48da3833a 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Dodajte unaprijed uplaćena sredstva na kartice (do ${value})",
   "add_new_node": "Dodaj novi node",
   "add_new_word": "Dodaj novu riječ",
-  "add_passphrase": "Dodajte prolaznu frazu",
-  "add_passphrase_warning_text": "U prošlosti unesite samo prolaznu frazu ako ste je koristili za ovaj novčanik. Ako uđete u pogrešnu lozu ili niste prije koristili prolaznu frazu na ovom novčaniku, nećete vidjeti nijedno postojeće fondove ili povijest.",
   "add_receiver": "Dodajte drugi prijemnik (izborno)",
   "add_secret_code": "Ili dodajte ovaj tajni kod u aplikaciju za autentifikaciju",
   "add_tip": "Dodaj savjet",
   "add_token_disclaimer_check": "Potvrdio sam adresu i informacije o ugovoru o tokenu koristeći ugledni izvor. Dodavanje zlonamjernih ili netočnih informacija može dovesti do gubitka sredstava.",
   "add_token_warning": "Nemojte uređivati niti dodavati tokene prema uputama prevaranata.\nUvijek potvrdite adrese tokena s uglednim izvorima!",
   "add_value": "Dodaj vrijednost",
-  "added_message_for_ata_error": "Ljubazno osigurajte da imate dovoljno salda SOL -a da dovršite svoju transakciju.",
   "address": "Adresa",
   "address_book": "Imenik",
   "address_book_menu": "Imenik",
@@ -55,8 +52,6 @@
   "anonpay_description": "Generiraj ${type}. Primatelj može ${method} s bilo kojom podržanom kriptovalutom, a vi ćete primiti sredstva u ovaj novčanik.",
   "apk_update": "APK ažuriranje",
   "approve": "Odobriti",
-  "approve_request": "Odobriti zahtjev",
-  "approve_tokens": "Odobriti tokene",
   "arrive_in_this_address": "${currency} ${tag}će stići na ovu adresu",
   "ascending": "Uzlazni",
   "ask_each_time": "Pitajte svaki put",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Čeka se potvrda plaćanja",
   "background_sync": "Sinkronizacija pozadine",
   "background_sync_mode": "Sinkronizacija u pozadini",
-  "background_sync_on_battery_low": "Sinkronizirati na niskoj bateriji",
-  "background_sync_on_charging": "Sinkronizirati samo prilikom punjenja",
-  "background_sync_on_device_idle": "Sinkronizirati samo kada se uređaj ne koristi",
-  "background_sync_on_unmetered_network": "Zahtijevaju nezadovoljnu mrežu",
   "backup": "Sigurnosna kopija",
   "backup_file": "Sigurnosna kopija datoteke",
   "backup_password": "Lozinka za sigurnosnu kopiju",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Kupite Bitcoin",
   "buy_now": "Kupi sada",
   "buy_provider_unavailable": "Davatelj trenutno nije dostupan.",
-  "buy_sell_pair_is_not_supported_warning": "Ovaj par valute nije podržao nijedan pružatelj odabranog načina plaćanja. Odaberite drugi par ili pokušajte promijeniti način plaćanja.",
   "buy_with": "Kupite s",
   "by_cake_pay": "od Cake Paya",
   "cake_2fa_preset": "Cake 2FA Preset",
@@ -124,12 +114,9 @@
   "camera_consent": "Vaš će fotoaparat koristiti za snimanje slike u svrhu identifikacije od strane ${provider}. Pojedinosti potražite u njihovoj politici privatnosti.",
   "camera_permission_is_required": "Potrebno je dopuštenje kamere.\nOmogućite ga u postavkama aplikacije.",
   "cancel": "Poništi",
-  "cannot_verify": "Ne može provjeriti",
-  "cannot_verify_description": "Ova se domena ne može provjeriti. Pažljivo provjerite zahtjev prije odobrenja.",
   "card_address": "Adresa:",
   "cardholder_agreement": "Ugovor s vlasnikom kartice",
   "cards": "Kartice",
-  "chain_id": "Lanac",
   "chains": "Lanci",
   "change": "Promijeni",
   "change_backup_password_alert": "Nećemo moći uvesti Vaše prethodne datoteke sigurnosne kopije s novom lozinkom za sigurnosnu kopiju. Novu lozinku za sigurnosnu kopiju moći ćete koristiti samo za nove datoteke sigurnosne kopije. Jeste li sigurni da želite promijeniti lozinku za sigurnosnu kopiju?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Jeste li sigurni da želite promijeniti predstavnika?",
   "change_rep_successful": "Uspješno promijenjena reprezentativna",
   "change_selected_exchanges": "Promijenite odabrane razmjene",
-  "change_selected_pair": "Promijenite odabrani par",
   "change_wallet_alert_content": "Želite li promijeniti trenutni novčanik u ${wallet_name}?",
   "change_wallet_alert_title": "Izmijeni trenutni novčanik",
   "choose_a_payment_method": "Odaberite način plaćanja",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Potvrđen",
   "congratulations": "Čestitamo!",
   "connect_an_existing_yat": "Povežite postojeći Yat",
-  "connect_hw_info_step_1": "Provjerite je li vaš uređaj uključen.",
-  "connect_hw_info_step_2": "Uključite Bluetooth za oba uređaja i uparite ih s telefona ili spojite svoje uređaje zajedno pomoću USB kabela.",
-  "connect_hw_info_step_3": "Otključajte svoj uređaj i idite do željene kripto aplikacije.",
-  "connect_hw_info_step_4": "Odaberite svoj uređaj u novčanici za torte i nastavite s postavljanjem.",
   "connect_yats": "Povežite Yats",
   "connect_your_hardware_wallet": "Spojite svoj hardverski novčanik pomoću Bluetooth -a ili USB -a",
   "connect_your_hardware_wallet_ios": "Spojite svoj hardverski novčanik pomoću Bluetooth -a",
-  "connected": "Povezan",
   "connection_sync": "Povezivanje i sinkronizacija",
   "connectWalletPrompt": "Povežite svoj novčanik s WalletConnectom za obavljanje transakcija",
   "contact": "Kontakt",
@@ -207,8 +188,6 @@
   "copy": "Kopiraj",
   "copy_address": "Kopiraj adresu",
   "copy_id": "Kopirati ID",
-  "copy_payjoin_address": "Kopirajte Payjoin adresu",
-  "copy_payjoin_url": "Kopirajte Payjoin url",
   "copyWalletConnectLink": "Kopirajte vezu WalletConnect iz dApp-a i zalijepite je ovdje",
   "corrupted_seed_notice": "Datoteke za ovaj novčanik su oštećene i nisu u mogućnosti otvoriti. Molimo pogledajte sjemensku frazu, spremite je i vratite novčanik.\n\nAko je vrijednost prazna, tada sjeme nije bilo u stanju ispravno oporaviti.",
   "countries": "Zemalja",
@@ -245,22 +224,11 @@
   "descending": "Silazni",
   "description": "Opis",
   "destination_tag": "Odredišna oznaka:",
-  "deuro_collect_interest": "Prikupiti",
-  "deuro_savings": "deuro ušteda",
-  "deuro_savings_add": "Depozit",
-  "deuro_savings_balance": "Ravnoteža uštede",
-  "deuro_savings_collect_interest": "Prikupiti interes",
-  "deuro_savings_remove": "Povući",
-  "deuro_savings_set_approval": "Odrediti odobrenje",
-  "deuro_savings_subtitle": "Zaradite do 10% kamate na svoje Deuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Možda će trebati nekoliko sekundi da se transakcija potvrdi i odrazi na zaslonu",
-  "device_is_signing": "Uređaj se potpisuje",
   "dfx_option_description": "Kupite kriptovalute s Eur & CHF. Za maloprodajne i korporativne kupce u Europi",
   "didnt_get_code": "Ne dobivate kod?",
   "digit_pin": "-znamenkasti PIN",
   "digital_and_physical_card": "digitalna i fizička unaprijed plaćena debitna kartica",
   "disable": "Onemogući",
-  "disable_automatic_exchange_status_updates": "Onemogućite ažuriranja automatskog statusa razmjene",
   "disable_bulletin": "Onemogućite bilten o statusu usluge",
   "disable_buy": "Onemogući kupnju",
   "disable_cake_2fa": "Onemogući Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Isključivanjem ovoga, stope naknade u nekim bi slučajevima mogle biti netočne, tako da biste mogli preplatiti ili predati naknadu za vaše transakcije",
   "disable_fiat": "Isključi, fiat",
   "disable_sell": "Onemogući akciju prodaje",
-  "disable_tor": "Onemogućiti tor",
   "disable_trade_option": "Onemogući trgovinsku opciju",
   "disableBatteryOptimization": "Onemogući optimizaciju baterije",
   "disableBatteryOptimizationDescription": "Želite li onemogućiti optimizaciju baterije kako bi se pozadinska sinkronizacija radila slobodnije i glatko?",
   "disabled": "Onemogućeno",
-  "disconnect_session": "Odspojite sesiju",
   "discount": "Uštedite ${value}%",
   "display_settings": "Postavke zaslona",
   "displayable": "Dostupno za prikaz",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Nemojte ih dijeliti ni s kim, uključujući podršku.\n\nVaša sredstva mogu i bit će ukradena!",
   "do_not_show_me": "Ne pokazuj mi ovo više",
   "domain_looks_up": "Pretraga domena",
-  "domain_mismatch": "Neusklađenost domena",
-  "domain_mismatch_description": "Ova web stranica ima domenu koja ne odgovara pošiljatelju ovog zahtjeva. Odobrenje može dovesti do gubitka sredstava.",
   "donation_link_details": "Detalji veza za donacije",
-  "done": "Završen",
   "e_sign_consent": "E-Sign pristanak",
   "edit": "Uredi",
   "edit_backup_password": "Uredi lozinku za sigurnosnu kopiju",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Minden egyes alkalommal új címeket generálunk, de a korábbi címek továbbra is működnek",
   "email_address": "Adresa e-pošte",
   "enable": "Omogućiti",
-  "enable_builtin_tor": "Omogućite ugrađeni u tor",
   "enable_mempool_api": "Mempool API za točne naknade i datume",
   "enable_replace_by_fee": "Omogući zamjenu",
   "enable_silent_payments_scanning": "Započnite skeniranje tihih plaćanja, dok se ne postigne savjet",
@@ -333,10 +295,8 @@
   "error_text_template": "Ime i adresa predloška ne smiju sadržavati znakove ` , ' \" \ni moraju biti dužine između 1 i 106 znakova",
   "error_text_wallet_name": "Naziv novčanika može sadržavati samo slova, brojeve, _ - simbole\ni mora imati između 1 i 33 znaka",
   "error_text_xmr": "XMR vrijednost ne smije biti veća od raspoloživog iznosa.\nBroj decimala smije biti 12 ili manji.",
-  "error_while_processing": "Došlo je do pogreške tijekom prožimanja",
   "errorGettingCredentials": "Neuspješno: Pogreška prilikom dobivanja vjerodajnica",
   "errorSigningTransaction": "Došlo je do pogreške prilikom potpisivanja transakcije",
-  "establishing_tor_connection": "Uspostavljanje torbice",
   "estimated": "procijenjen",
   "estimated_new_fee": "Procijenjena nova naknada",
   "estimated_receive_amount": "Procijenjeni iznos primanja",
@@ -360,7 +320,6 @@
   "export_backup": "Izvezi sigurnosnu kopiju",
   "export_logs": "Izvozni trupci",
   "export_outputs": "Izvoz izlaza",
-  "extend_session": "Proširiti sesiju",
   "extra_id": "Dodatni ID:",
   "extracted_address_content": "Poslat ćete sredstva primatelju\n${recipient_name}",
   "failed_authentication": "Autentifikacija neuspješna. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Fiat Bilans",
   "field_required": "ovo polje je obavezno",
-  "file_saved": "Spremljena datoteka",
   "fill_code": "Molimo vas da ispunite kontrolni kod koji ste dobili na svojoj e-pošti",
   "filter_by": "Filtrirati po",
   "first_wallet_text": "Odličan novčanik za Monero, Bitcoin, Ethereum, Litecoin, i Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Zaboravljena lozinka",
   "freeze": "Zamrznuti",
   "frequently_asked_questions": "Često postavljana pitanja",
-  "from": "Iz",
   "frozen": "Smrznuto",
   "frozen_balance": "Smrznuta ravnoteža",
   "full_balance": "Pun iznos",
   "gas_exceeds_allowance": "Plin potreban transakcijom premašuje dodatak.",
-  "gas_price": "Cijena plina",
   "generate_name": "Generiraj ime",
   "generating_gift_card": "Generiranje darovne kartice",
   "generating_transaction": "Generiranje transakcije",
@@ -413,7 +369,6 @@
   "hide_details": "Sakrij pojedinosti",
   "high_contrast_theme": "Tema visokog kontrasta",
   "home_screen_settings": "Postavke početnog zaslona",
-  "how_to_connect": "Kako se povezati",
   "how_to_use": "Kako koristiti",
   "how_to_use_card": "Kako koristiti ovu karticu",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Nemate dovoljno SOL -a da pokriva transakciju i njegovu transakcijsku naknadu. Ljubazno dodajte više sol u svoj novčanik ili smanjite količinu SOL -a koju šaljete.",
   "insufficient_lamports": "Nemate dovoljno SOL -a da pokriva transakciju i njegovu transakcijsku naknadu. Trebate najmanje ${solValueNeeded} sol. Ljubazno dodajte više sol u svoj novčanik ili smanjite količinu SOL -a koju šaljete",
   "insufficientFundsForRentError": "Nemate dovoljno SOL -a za pokrivanje naknade za transakciju i najamninu za račun. Ljubazno dodajte više sol u svoj novčanik ili smanjite količinu SOL -a koju šaljete",
-  "insufficientFundsForRentErrorReceiver": "Račun prijemnika nema dovoljno SOL -a da pokriva najamninu. Molimo zamolite prijemnika da doda više SOL -a na svoj račun.",
   "introducing_cake_pay": "Predstavljamo Cake Pay!",
   "invalid_input": "Pogrešan unos",
   "invalid_password": "Netočna zaporka",
@@ -471,7 +425,6 @@
   "logout": "Odjava",
   "low_fee": "Niska naknada",
   "low_fee_alert": "Trenutačno koristite niski prioritet mrežne naknade. To bi moglo uzrokovati duga čekanja, različite tečajeve ili otkazane trgovine. Preporučujemo postavljanje veće naknade za bolje iskustvo.",
-  "made_easy": "olakšano",
   "manage_nodes": "Upravljanje čvorovima",
   "manage_pow_nodes": "Upravljanje PoW čvorovima",
   "manage_yats": "Upravljanje Yat",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Poruka",
   "message_verified": "Poruka je uspješno provjerena",
-  "messages": "Poruke",
-  "method": "Metoda",
   "methods": "Metode",
   "min_amount": "Minimalno: ${value}",
   "min_value": "Min.: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero tamna tema",
   "monero_light_theme": "Monero lagana tema",
   "moonpay_alert_text": "Vrijednost iznosa mora biti veća ili jednaka ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Došlo je do pogreške tijekom dohvaćanja NFT -a. Ljubazno provjerite internetsku vezu i pokušajte ponovo.",
   "more_options": "Više opcija",
   "multiple_addresses_detected": "Otkrivene više adresa",
   "mweb_confirmed": "Potvrđen MWeb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Oznaka",
   "new_subaddress_title": "Nova adresa",
   "new_template": "novi predložak",
-  "new_transactions_notifications": "Pošaljite obavijesti o novim transakcijama",
   "new_wallet": "Novi novčanik",
   "newConnection": "Nova veza",
   "no_cards_found": "Nisu pronađene kartice",
@@ -539,7 +488,6 @@
   "normal": "Normalno",
   "note_optional": "Poruka (nije obvezno)",
   "note_tap_to_change": "Poruka (dodirnite za promjenu)",
-  "notification_permission_denied": "Dozvola za obavijest ostalo je odbijeno, molimo vas da ga ručno omogućite u postavkama",
   "nullURIError": "URI je nula",
   "offer_expires_in": "Ponuda istječe za: ",
   "offline": "izvan mreže",
@@ -571,20 +519,8 @@
   "password": "Lozinka",
   "paste": "Zalijepi",
   "pause_wallet_creation": "Mogućnost stvaranja novčanika Haven trenutno je pauzirana.",
-  "payjoin_card_content": "Payjoin je nova značajka za čuvanje privatnosti i ušteda naknada u Bitcoin-u.",
-  "payjoin_details": "Payjoin Pojedinosti",
-  "payjoin_enabled": "Payjoin Omogućeno",
-  "payjoin_enabling_popup_content": "Možete prebaciti Payjoin u izborniku → Privatnost → Koristite Payjoin da biste ga omogućili ili onemogućili kasnije.",
-  "payjoin_enabling_popup_title": "Omogućavanje Payjoin",
-  "payjoin_request_awaiting_tx": "Čekajući transakciju",
-  "payjoin_request_in_progress": "U toku",
-  "payjoin_unavailable": "Payjoin nedostupno",
-  "payjoin_unavailable_sheet_content": "Primanje Payjoin Transakcije zahtijeva da Bitcoin bude spreman za upotrebu. \\ N \\ NAS čim vaš novčanik ima sredstva, Payjoin će biti automatski omogućen.",
-  "payjoin_unavailable_sheet_title": "Zašto je Payjoin nedostupno?",
   "payment_id": "ID plaćanja: ",
-  "payment_made_easy": "Plaćanja su olakšana",
   "payment_was_received": "Vaša uplata je primljena.",
-  "payments": "Isplata",
   "pending": " (u tijeku)",
   "percentageOf": "od ${amount}",
   "pin_at_top": "prikvači ${token} na vrh",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Molimo pokušajte se spojiti na drugi node.",
   "please_wait": "Molimo pričekajte",
   "polygonscan_history": "Povijest PolygonScan",
-  "potential_scam": "Potencijalna prijevara",
   "powered_by": "Omogućio ${title}",
   "pre_seed_button_text": "Razumijem. Prikaži mi moj pristupni izraz",
-  "pre_seed_description": "Na sljedećoj stranici vidjet ćete niz riječi. Ovo je vaše jedinstveno i privatno sjeme i to je jedini način da povratite novčanik u slučaju gubitka ili neispravnosti. Vaša je odgovornost zapisati je i pohraniti na sigurno mjesto izvan aplikacije za novčanik.",
+  "pre_seed_description": "Na sljedećoj ćete stranici vidjeti niz ${words} riječi. Radi se o Vašem jedinstvenom i tajnom pristupnom izrazu koji je ujedno i JEDINI način na koji možete oporaviti svoj novčanik u slučaju gubitka ili kvara. VAŠA je odgovornost zapisati ga te pohraniti na sigurno mjesto izvan Cake Wallet aplikacije.",
   "pre_seed_title": "VAŽNO",
   "prepaid_cards": "Unaprijed plaćene kartice",
   "prevent_screenshots": "Spriječite snimke zaslona i snimanje zaslona",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Nastavite na svom uređaju",
   "proceed_on_device_description": "Slijedite upute zatražene na vašem hardverskom novčaniku",
   "processing": "Obrada",
-  "processing_signed_tx": "Obrada potpisana transakcija",
   "profile": "Profil",
   "provider_error": "${provider} greška",
   "public_key": "Javni ključ",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Čini se da vaš predstavnik nije u dobrom stanju. Dodirnite ovdje za odabir novog",
   "repeat_wallet_password": "Ponovite lozinku za novčanik",
   "repeated_password_is_incorrect": "Ponovljena lozinka je netočna. Molimo ponovite lozinku za novčanik.",
-  "requested": "Tražen",
   "require_for_adding_contacts": "Zahtijeva za dodavanje kontakata",
   "require_for_all_security_and_backup_settings": "Zahtijeva za sve postavke sigurnosti i sigurnosne kopije",
   "require_for_assessing_wallet": "Potreban za pristup novčaniku",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Zahtijeva za slanje u interne novčanike",
   "require_for_sends_to_non_contacts": "Zahtijeva za slanje nekontaktima",
   "require_pin_after": "Zahtijevaj PIN nakon",
-  "required_passphrase": "Prolazna fraza",
   "rescan": "Ponovno skeniranje",
   "resend_code": "Molimo da ga ponovno pošaljete",
   "reset": "Resetiraj",
   "reset_password": "Poništi lozinku",
-  "restore": "Vratiti",
   "restore_active_seed": "Aktivan pristupni izraz",
   "restore_address": "Adresa",
   "restore_bitcoin_description_from_keys": "Oporavi novčanik pomoću WIF niza generiranog iz vlastitih privatnih ključeva (keys)",
@@ -713,10 +644,7 @@
   "search_language": "Jezik pretraživanja",
   "second_intro_content": "Vaš Yat jedinstvena je adresa emojija koja zamjenjuje sve vaše duge heksadecimalne adrese za sve vaše valute.",
   "second_intro_title": "Jedna adresa emojija koja će svima njima vladati",
-  "security": "Sigurnost",
   "security_and_backup": "Sigurnost i sigurnosna kopija",
-  "security_risk": "Sigurnosni rizik",
-  "security_risk_description": "Ova je domena označena kao nesigurna od strane više pružatelja usluga sigurnosti. Ostavite odmah da zaštitite svoju imovinu.",
   "seed_alert_back": "Vrati se natrag",
   "seed_alert_content": "Pristupni izraz jedini je način za oporavak novčanika. Jeste li ga zapisali?",
   "seed_alert_title": "Upozorenje",
@@ -751,6 +679,9 @@
   "seedtype": "Sjemenska vrsta",
   "seedtype_alert_content": "Dijeljenje sjemena s drugim novčanicima moguće je samo s BIP39 sjemenom.",
   "seedtype_alert_title": "Upozorenje o sjemenu",
+  "seedtype_legacy": "Nasljeđe (25 riječi)",
+  "seedtype_polyseed": "Poliseed (16 riječi)",
+  "seedtype_wownero": "WANERO (14 riječi)",
   "select_backup_file": "Odaberite datoteku sigurnosne kopije",
   "select_buy_provider_notice": "Odaberite gornji davatelj kupnje. Ovaj zaslon možete preskočiti postavljanjem zadanog davatelja usluga kupnje u postavkama aplikacija.",
   "select_destination": "Odaberite odredište za datoteku sigurnosne kopije.",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "Pošaljite iz vanjskog novčanika",
   "send_name": "Ime",
   "send_new": "Novi",
-  "send_payjoin": "Pošaljite Payjoin",
   "send_payment_id": "ID plaćanja (nije obvezno)",
   "send_priority": "Trenutno se naknada nalazi na ${transactionPriority} mjestu prioriteta.\nPrioritet transakcije moguće je prilagoditi u postavkama",
   "send_sending": "Slanje...",
@@ -832,9 +762,7 @@
   "show_keys": "Prikaži pristupni izraz/ključ",
   "show_market_place": "Prikaži tržište",
   "show_seed": "Prikaži pristupni izraz",
-  "sign_all": "Potpisati sve",
   "sign_message": "Poruka",
-  "sign_one": "Potpisati jedan",
   "sign_up": "Prijavite se",
   "sign_verify_message": "Potpisati / provjeriti",
   "sign_verify_message_sub": "Potpišite ili provjerite poruku pomoću privatnog ključa",
@@ -863,14 +791,11 @@
   "sort_by": "Poredaj po",
   "spend_key_private": "Spend key (privatni)",
   "spend_key_public": "Spend key (javni)",
-  "starting_tor_proxy": "Početak Tor proxy",
   "status": "Status: ",
-  "step": "Korak",
   "string_default": "Zadano",
   "subaddress_title": "Lista podadresa",
   "subaddresses": "Podadrese",
   "submit_request": "podnesi zahtjev",
-  "success": "Uspjeh",
   "successful": "Uspješno",
   "support_description_guides": "Dokumentacija i podrška za uobičajena pitanja",
   "support_description_live_chat": "Besplatno i brzo! Obučeni predstavnici podrške dostupni su za pomoć",
@@ -878,7 +803,6 @@
   "support_title_guides": "Dokumenti s kolačem kolača",
   "support_title_live_chat": "Podrška uživo",
   "support_title_other_links": "Ostale veze za podršku",
-  "supported": "Potpomognut",
   "swap": "Mijenjati",
   "sweeping_wallet": "Čisti novčanik",
   "sweeping_wallet_alert": "Ovo ne bi trebalo dugo trajati. NE NAPUŠTAJTE OVAJ ZASLON INAČE SE POBREŠENA SREDSTVA MOGU IZGUBITI",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "SINKRONIZIRANJE",
   "sync_status_timed_out": "ISTEKLO",
   "sync_status_unsupported": "Nepodržani čvor",
-  "synchronizing": "Sinkronizirajući",
   "syncing_wallet_alert_content": "Vaš saldo i popis transakcija možda neće biti potpuni sve dok na vrhu ne piše \"SINKRONIZIRANO\". Kliknite/dodirnite da biste saznali više.",
   "syncing_wallet_alert_title": "Vaš novčanik se sinkronizira",
   "template": "Predložak",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Thorchain pružatelj ne podržava Taproot adrese. Promijenite adresu ili odaberite drugog davatelja usluga.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Savjet:",
-  "to": "Do",
   "today": "Danas",
-  "token_already_exists": "Token već postoji",
   "token_contract_address": "Adresa ugovora tokena",
   "token_decimal": "Token decimalni",
   "token_name": "Naziv tokena npr.: Tether",
   "token_symbol": "Simbol tokena npr.: USDT",
   "tokenID": "iskaznica",
-  "ton_extra_info": "Ne zaboravite navesti ID memorandu",
   "tor_connection": "Tor veza",
-  "tor_connection_timeout": "TOR TIMPOUCEN",
-  "tor_experimental": "Ovo je eksperimentalna značajka, nisu sve veze napravljene od podrške za kolače za torte - neke veze mogu koristiti ClearNet, kako bi se u potpunosti usmjerio na APP promet s TOR -om s VPN načinom rada.",
   "tor_only": "Samo Tor",
   "total": "Ukupno",
   "total_saving": "Ukupna ušteda",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "Ako se zaslon ne nastavi nakon 1 minute, provjerite block explorer i svoju e-poštu.",
   "transactions": "Transakcije",
   "transactions_by_date": "Transakcije prema datumu",
-  "transport_type": "Transportni tip",
   "trongrid_history": "Povijest Trongrida",
   "trusted": "vjerovao",
-  "try_again": "Pokušajte ponovo",
   "tx_commit_exception_no_dust_on_change": "Transakcija se odbija s tim iznosom. Pomoću ovih kovanica možete poslati ${min} bez promjene ili ${max} koja vraća promjenu.",
   "tx_commit_failed": "Obveza transakcije nije uspjela. Molimo kontaktirajte podršku.",
   "tx_commit_failed_no_peers": "Transakcija nije uspjela emitirati, pokušajte ponovo u sekundi ili tako",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "Nepotrošeni detalji o novčićima",
   "unspent_coins_title": "Nepotrošeni novčići",
   "unsupported_asset": "Ne podržavamo ovu radnju za ovaj materijal. Izradite ili prijeđite na novčanik podržane vrste sredstava.",
-  "update_session": "Sesija ažuriranja",
   "uptime": "Radno vrijeme",
   "upto": "do ${value}",
   "usb": "USB",
   "use": "Prebaci na",
   "use_card_info_three": "Koristite digitalnu karticu online ili s beskontaktnim metodama plaćanja.",
   "use_card_info_two": "Sredstva se pretvaraju u USD kada se drže na prepaid računu, a ne u digitalnim valutama.",
-  "use_device_theme": "Koristite temu uređaja",
-  "use_payjoin": "Koristite Payjoin",
   "use_ssl": "Koristi SSL",
   "use_suggested": "Koristite predloženo",
   "use_testnet": "Koristite TestNet",
-  "user_rejected_method": "Korisnik odbijena metoda",
   "value": "Vrijednost",
   "value_type": "Tipa vrijednosti",
   "variable_pair_not_supported": "Ovaj par varijabli nije podržan s odabranim burzama",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "Uvijek možete ponovo pogledati ovo sjeme ispod",
   "wallet_group_empty_state_text_one": "Izgleda da nemate nikakve kompatibilne grupe novčanika !\n\n",
   "wallet_group_empty_state_text_two": "Ispod da napravite novi.",
-  "wallet_has_passphrase": "Ovaj novčanik ima prolaznu frazu",
   "wallet_keys": "Pristupni izraz/ključ novčanika",
   "wallet_list_create_new_wallet": "Izradi novi novčanik",
   "wallet_list_edit_group_name": "Uredi naziv grupe",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Novčanici",
   "warning": "Upozorenje",
-  "welcome": "Dobrodošli",
+  "welcome": "Dobrodošli na",
   "welcome_subtitle_new_wallet": "Ako želite započeti svježe, dodirnite Create New Wallet u nastavku i krenite na utrke.",
   "welcome_subtitle_restore_wallet": "Ako imate postojeći novčanik koji želite unijeti u tortu, jednostavno odaberite Vratite postojeći novčanik i prošetat ćemo vas kroz postupak.",
   "welcome_to_cakepay": "Dobro došli u Cake Pay!",
-  "what_is_payjoin": "Što je Payjoin ?",
   "what_is_silent_payments": "Što je tiha plaćanja?",
   "widgets_address": "Adresa",
   "widgets_or": "ili",
@@ -1111,6 +1021,5 @@
   "you_will_get": "Razmijeni u",
   "you_will_receive_estimated_amount": "Primit ćete(procijenjeno )",
   "you_will_send": "Razmijeni iz",
-  "youCanGoBackToYourDapp": "Sada se možete vratiti na svoj dapp",
   "yy": "GG"
 }
\ No newline at end of file
diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb
index c54d6b5b8..ee1c997b0 100644
--- a/res/values/strings_hy.arb
+++ b/res/values/strings_hy.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Ավելացնել նախավճար քարտերի վրա (մինչև ${value})",
   "add_new_node": "Ավելացնել նոր հանգույց",
   "add_new_word": "Ավելացնել նոր բառ",
-  "add_passphrase": "Ավելացնել գաղտնաբառ",
-  "add_passphrase_warning_text": "Մուտքագրեք միայն գաղտնաբառ, եթե նախկինում այս դրամապանակի համար օգտագործեք մեկը: Եթե ​​մուտքագրեք սխալ գաղտնաբառ կամ այս դրամապանակում նախկինում չեք օգտագործել գաղտնաբառ, ապա առկա միջոցներից կամ պատմություն չեք տեսնի:",
   "add_receiver": "Ավելացնել ևս մեկ ստացող (ընտրովի)",
   "add_secret_code": "Կամ ավելացրեք այս գաղտնի կոդը վավերացնող հավելվածում",
   "add_tip": "Ավելացնել Թեյավճար",
   "add_token_disclaimer_check": "Ես հաստատել եմ token-ի պայմանագրի հասցեն և տեղեկատվությունը վստահելի աղբյուրի օգտագործմամբ: Վնասակար կամ սխալ տեղեկատվության ավելացումը կարող է հանգեցնել միջոցների կորստի:",
   "add_token_warning": "Մի խմբագրեք կամ ավելացրեք token-ներ, ինչպես կոչ են անում խարդախները:\nՄիշտ հաստատեք Token-ների հասցեները վստահելի աղբյուրներով:",
   "add_value": "Ավելացնել արժեք",
-  "added_message_for_ata_error": "Սիրով համոզվեք, որ ձեր գործարքը ավարտելու համար բավականաչափ SOL հավասարակշռություն ունեք:",
   "address": "Հասցե",
   "address_book": "Հասցեագիրք",
   "address_book_menu": "Հասցեագիրք",
@@ -55,8 +52,6 @@
   "anonpay_description": "${type} ստեղծել: Ստացողը կարող է ${method} ցանկացած աջակցվող կրիպտոարժույթով, և դուք կստանաք միջոցներ այս դրամապանակում։",
   "apk_update": "APK թարմացում",
   "approve": "Հաստատել",
-  "approve_request": "Հաստատում է հայցը",
-  "approve_tokens": "Հաստատում է նշանները",
   "arrive_in_this_address": "${currency} ${tag}կժամանի այս հասցեում",
   "ascending": "Աճող",
   "ask_each_time": "Հարցնել ամեն անգամ",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Վճարման հաստատման սպասում",
   "background_sync": "Ֆոնային համաժամեցում",
   "background_sync_mode": "Հետին պլանի համաժամացման ռեժիմ",
-  "background_sync_on_battery_low": "Համաժամեցրեք ցածր մարտկոցի վրա",
-  "background_sync_on_charging": "Համաժամացրեք միայն լիցքավորելու ժամանակ",
-  "background_sync_on_device_idle": "Համաժամացրեք միայն այն ժամանակ, երբ սարքը չի օգտագործվում",
-  "background_sync_on_unmetered_network": "Պահանջում են չմշակված ցանց",
   "backup": "Կրկնօրինակ",
   "backup_file": "Կրկնօրինակի ֆայլ",
   "backup_password": "Կրկնօրինակի գաղտնաբառ",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Գնել Bitcoin",
   "buy_now": "Գնել հիմա",
   "buy_provider_unavailable": "Տվյալ պահին մատակարարը անհասանելի է։",
-  "buy_sell_pair_is_not_supported_warning": "Այս արժութային զույգը չի ապահովվում որեւէ մատակարարի կողմից ընտրված վճարման եղանակի համար: Խնդրում ենք ընտրել այլ զույգ կամ փորձել փոխել վճարման եղանակը:",
   "buy_with": "Գնել",
   "by_cake_pay": "Cake Pay-ով",
   "cake_2fa_preset": "Cake 2FA նախապես կանխորոշված",
@@ -124,12 +114,9 @@
   "camera_consent": "Ձեր տեսախցիկը կօգտագործվի ${provider}-ի կողմից ինքնությունը հաստատելու նպատակով: Խնդրում ենք ծանոթանալ նրանց Գաղտնիության Քաղաքականության հետ:",
   "camera_permission_is_required": "Տեսախցիկի թույլտվություն է պահանջվում: \nԽնդրում ենք այն ակտիվացնել հավելվածի կարգավորումներից:",
   "cancel": "Չեղարկել",
-  "cannot_verify": "Չի կարող հաստատել",
-  "cannot_verify_description": "Այս տիրույթը հնարավոր չէ ստուգել: Հաստատելուց առաջ ուշադիր ստուգեք հարցումը:",
   "card_address": "Հասցե։",
   "cardholder_agreement": "Քարտապանի Պայմանագիր",
   "cards": "Քարտեր",
-  "chain_id": "Շղթայի ID",
   "chains": "Շղթաներ",
   "change": "Փոփոխել",
   "change_backup_password_alert": "Ձեր նախորդ կրկնօրինակ ֆայլերը չեն հասանելի լինի ներմուծել նոր կրկնօրինակի գաղտնաբառով: Նոր կրկնօրինակի գաղտնաբառը կօգտագործվի միայն նոր կրկնօրինակ ֆայլերի համար: Վստահ եք, որ ցանկանում եք փոխել կրկնօրինակի գաղտնաբառը?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Վստահ եք, որ ցանկանում եք փոխել ներկայացուցիչներին?",
   "change_rep_successful": "Ներկայացուցչի փոփոխությունը հաջողությամբ կատարվեց",
   "change_selected_exchanges": "Փոխեք ընտրված փոխանակումները",
-  "change_selected_pair": "Փոխեք ընտրված զույգը",
   "change_wallet_alert_content": "Ցանկանում եք փոխել ընթացիկ դրամապանակը ${wallet_name}?",
   "change_wallet_alert_title": "Փոխել ընթացիկ դրամապանակը",
   "choose_a_payment_method": "Ընտրեք վճարման եղանակ",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Հաստատված",
   "congratulations": "Շնորհավորանք!",
   "connect_an_existing_yat": "Միացրեք գոյություն ունեցող Yat-ը",
-  "connect_hw_info_step_1": "Համոզվեք, որ ձեր սարքը միացված է:",
-  "connect_hw_info_step_2": "Միացրեք Bluetooth- ը երկու սարքերի համար, եւ զույգացրեք հեռախոսից կամ միացրեք ձեր սարքերը միասին `օգտագործելով USB մալուխ:",
-  "connect_hw_info_step_3": "Բացեք ձեր սարքը եւ նավարկեք ցանկալի ծպտյալ հավելվածին:",
-  "connect_hw_info_step_4": "Ընտրեք ձեր սարքը տորթի դրամապանակում եւ շարունակեք կարգաբերումը:",
   "connect_yats": "Միացրեք Yat-ները",
   "connect_your_hardware_wallet": "Միացրեք ձեր ապարատային դրամապանակը Bluetooth-ի կամ USB-ի միջոցով",
   "connect_your_hardware_wallet_ios": "Միացրեք ձեր ապարատային դրամապանակը Bluetooth-ի միջոցով",
-  "connected": "Միացված",
   "connection_sync": "Կապ և սինխրոնիզացիա",
   "connectWalletPrompt": "Միացրեք ձեր դրամապանակը WalletConnect-ի միջոցով գործարքներ կատարելու համար",
   "contact": "Կոնտակտ",
@@ -207,8 +188,6 @@
   "copy": "Պատճենել",
   "copy_address": "Պատճենել հասցեն",
   "copy_id": "Պատճենել ID",
-  "copy_payjoin_address": "Պատճենեք վճարման հասցեն",
-  "copy_payjoin_url": "Պատճենել Payjoin url",
   "copyWalletConnectLink": "Պատճենել WalletConnect հղումը dApp-ից և տեղադրել այստեղ",
   "corrupted_seed_notice": "Այս դրամապանակի համար ֆայլերը կոռումպացված են եւ չեն կարողանում բացվել: Խնդրում ենք դիտել սերմերի արտահայտությունը, պահպանել այն եւ վերականգնել դրամապանակը:\n\nԵթե ​​արժեքը դատարկ է, ապա սերմը չկարողացավ ճիշտ վերականգնվել:",
   "countries": "Երկրներ",
@@ -245,22 +224,11 @@
   "descending": "Նվազող",
   "description": "Նկարագրություն",
   "destination_tag": "Նպատակակետի պիտակ:",
-  "deuro_collect_interest": "Հավաքել",
-  "deuro_savings": "dEuro խնայողություններ",
-  "deuro_savings_add": "Ավանդ",
-  "deuro_savings_balance": "Խնայողական հավասարակշռություն",
-  "deuro_savings_collect_interest": "Հավաքեք հետաքրքրություն",
-  "deuro_savings_remove": "Հեռացնել",
-  "deuro_savings_set_approval": "Սահմանել հաստատում",
-  "deuro_savings_subtitle": "Վաստակեք մինչեւ 10% տոկոսադրույքներ ձեր Deuro Stablecoin Holdings- ի համար",
-  "deuro_tx_commited_content": "Գործարքի հաստատման եւ արտացոլվելու համար գործարքի համար կարող է տեւել մի քանի վայրկյան",
-  "device_is_signing": "Սարքը ստորագրում է",
   "dfx_option_description": "Գնեք կրիպտոարժույթ EUR և CHF: Կորպորատիվ և մանրածախ հաճախորդների համար Եվրոպայում",
   "didnt_get_code": "Չեք ստացել կոդը?",
   "digit_pin": "-նիշ ՊԻՆ",
   "digital_and_physical_card": " թվային և ֆիզիկական նախավճարային դեբետային քարտ",
   "disable": "Անջատել",
-  "disable_automatic_exchange_status_updates": "Անջատեք ավտոմատ փոխանակման կարգավիճակի թարմացումները",
   "disable_bulletin": "Անջատել ծառայության վիճակի տեղեկագիրը",
   "disable_buy": "Անջատել գնում գործողությունը",
   "disable_cake_2fa": "Անջատել Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Դրանից անջատելով, վճարների տեմպերը որոշ դեպքերում կարող են անճիշտ լինել, այնպես որ դուք կարող եք վերջ տալ ձեր գործարքների համար վճարների գերավճարների կամ գերավճարների վրա",
   "disable_fiat": "Անջատել ֆիատ",
   "disable_sell": "Անջատել վաճառք գործողությունը",
-  "disable_tor": "Անջատեք Tor- ը",
   "disable_trade_option": "Անջատեք առեւտրի տարբերակը",
   "disableBatteryOptimization": "Անջատել մարտկոցի օպտիմիզացիան",
   "disableBatteryOptimizationDescription": "Դուք ցանկանում եք անջատել մարտկոցի օպտիմիզացիան ֆոնային համաժամացման ավելի ազատ և հարթ ընթացքի համար?",
   "disabled": "Անջատված",
-  "disconnect_session": "Անջատել նստաշրջանը",
   "discount": "Խնայեք ${value}%",
   "display_settings": "Ցուցադրման կարգավորումներ",
   "displayable": "Ցուցադրվող",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Մի կիսեք այս տեղեկատվությունը որևէ մեկի հետ, այդ թվում նաև աջակցության հետ: \n\nՁեր միջոցները կարող են գողանալ կորցնել!",
   "do_not_show_me": "Մի ցուցադրեք ինձ նորից",
   "domain_looks_up": "Դոմեյնի որոնում",
-  "domain_mismatch": "Դոմենի անհամապատասխանություն",
-  "domain_mismatch_description": "Այս կայքը ունի տիրույթ, որը չի համապատասխանում այս խնդրանքի ուղարկողին: Հաստատումը կարող է հանգեցնել միջոցների կորստի:",
   "donation_link_details": "Նվիրատվության հղումի մանրամասներ",
-  "done": "Արված",
   "e_sign_consent": "Էլեկտրոնային ստորագրության համաձայնություն",
   "edit": "Խմբագրել",
   "edit_backup_password": "Փոփոխել Կրկնօրինակի Գաղտնաբառը",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Մենք ստեղծում ենք նոր հասցե ամեն անգամ, երբ դուք օգտագործում եք այն, բայց նախորդ հասցեները շարունակում են աշխատել",
   "email_address": "Էլ. փոստի հասցե",
   "enable": "Միացնել",
-  "enable_builtin_tor": "Միացրեք ներկառուցված ջահը",
   "enable_mempool_api": "Mempool API ճշգրիտ վճարների եւ ամսաթվերի համար",
   "enable_replace_by_fee": "Միացնել փոխարինումը միջնորդավճարով",
   "enable_silent_payments_scanning": "Միացնել Լուռ Վճարումների սկանավորումը",
@@ -333,10 +295,8 @@
   "error_text_template": "Տեսակի անունը և հասցեն չեն կարող պարունակել , '' \" նշանները\nև պետք է լինի 1-ից 106 նիշ երկարությամբ",
   "error_text_wallet_name": "Գաղտնաբառը կարող է պարունակել միայն տառեր, թվեր, _ - նշաններ\nև պետք է լինի 1-ից 33 նիշ երկարությամբ",
   "error_text_xmr": "XMR արժեքը չի կարող գերազանցել հասանելի մնացորդը:\nԿոտորակային թվերի քանակը պետք է լինի 12-ից պակաս կամ հավասար",
-  "error_while_processing": "Նախագծման ժամանակ սխալ է տեղի ունեցել",
   "errorGettingCredentials": "Սխալ. ծանրաբեռնված վստահագրեր ստանալիս",
   "errorSigningTransaction": "Սխալ է տեղի ունեցել գործարքը ստորագրելիս",
-  "establishing_tor_connection": "Չափայնացնում է Tor կապը",
   "estimated": "Գնահատված",
   "estimated_new_fee": "Գնահատված նոր միջնորդավճար",
   "estimated_receive_amount": "Գնահատված ստացված գումար",
@@ -360,7 +320,6 @@
   "export_backup": "Արտահանել կրկնօրինակը",
   "export_logs": "Արտահանման տեղեկամատյաններ",
   "export_outputs": "Արտահանման արդյունքներ",
-  "extend_session": "Ընդլայնված նիստ",
   "extra_id": "Լրացուցիչ ID",
   "extracted_address_content": "Դուք կուղարկեք գումար ${recipient_name}",
   "failed_authentication": "Վավերացումը ձախողվեց. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Fiat մնացորդ",
   "field_required": "Այս դաշտը պարտադիր է",
-  "file_saved": "Ֆայլը պահպանվել է",
   "fill_code": "Խնդրում ենք լրացնել հաստատման կոդը ձեր էլեկտրոնային փոստում",
   "filter_by": "Ֆիլտրել ըստ",
   "first_wallet_text": "Հիանալի հաշվեհամար Monero, Bitcoin, Ethereum, Litecoin և Haven արժույթների համար",
@@ -382,12 +340,10 @@
   "forgot_password": "Մոռացել եմ գաղտնաբառը",
   "freeze": "Կասեցնել",
   "frequently_asked_questions": "Հաճախ տրվող հարցեր",
-  "from": "Դեպի",
   "frozen": "Կասեցված",
   "frozen_balance": "Սառեցված հավասարակշռություն",
   "full_balance": "Լրիվ մնացորդ",
   "gas_exceeds_allowance": "Գործարքով պահանջվող գազը գերազանցում է նպաստը:",
-  "gas_price": "Գազի գին",
   "generate_name": "Գեներացնել անուն",
   "generating_gift_card": "Գեներացնում է նվեր քարտ",
   "generating_transaction": "Ստեղծող գործարք",
@@ -413,7 +369,6 @@
   "hide_details": "Թաքցնել մանրամասները",
   "high_contrast_theme": "Բարձր հակադրության տեսք",
   "home_screen_settings": "Գլխավոր էկրանի կարգավորումներ",
-  "how_to_connect": "Ինչպես միացնել",
   "how_to_use": "Ինչպես օգտագործել",
   "how_to_use_card": "Ինչպես օգտագործել այս քարտը",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Դուք չունեք բավարար SOL՝ գործարքն և գործարքի վարձը ծածկելու համար։ Խնդրում ենք ավելացնել ավելի շատ SOL ձեր դրամապանակում կամ նվազեցնել ուղարկվող SOL-ի քանակը։",
   "insufficient_lamports": "Դուք չունեք բավարար SOL՝ գործարքն և գործարքի վարձը ծածկելու համար։ Ձեզ անհրաժեշտ է առնվազն ${solValueNeeded} SOL։ Խնդրում ենք ավելացնել ավելի շատ SOL ձեր դրամապանակում կամ նվազեցնել ուղարկվող SOL-ի քանակը։",
   "insufficientFundsForRentError": "Ձեր մնացորդը բավարար չէ վարձակալության համար: Խնդրում ենք ավելացնել մնացորդը կամ նվազեցնել ուղարկվող գումարը",
-  "insufficientFundsForRentErrorReceiver": "Ստացողի հաշիվը չունի բավարար SOL, վարձավճարը ծածկելու համար: Խնդրում ենք ստանալ ստացողին ավելի շատ սոլ ավելացնել իրենց հաշվին:",
   "introducing_cake_pay": "Ներկայացնում ենք Cake Pay!",
   "invalid_input": "Սխալ մուտք",
   "invalid_password": "Սխալ գաղտնաբառ",
@@ -471,7 +425,6 @@
   "logout": "Ելք",
   "low_fee": "Ցածր միջնորդավճար",
   "low_fee_alert": "Դուք ներկայումս օգտագործում եք ցածր ցանցային միջնորդավճար: Սա կարող է հանգեցնել երկար սպասելու ժամանակի, տարբեր փոխարժեքների կամ չեղարկված առևտրի: Մենք առաջարկում ենք սահմանել ավելի բարձր միջնորդավճար ավելի լավ փորձ ունենալու համար",
-  "made_easy": "հեշտացրեց",
   "manage_nodes": "Կարգավորել հանգույցները",
   "manage_pow_nodes": "Կարգավորել PoW հանգույցները",
   "manage_yats": "Կառավարել Yats",
@@ -483,8 +436,6 @@
   "memo": "Մեմո:",
   "message": "Հաղորդագրություն",
   "message_verified": "Հաղորդագրությունը հաջողությամբ հաստատվեց",
-  "messages": "Հաղորդագրություններ",
-  "method": "Մեթոդ",
   "methods": "Մեթոդներ",
   "min_amount": "Նվազը: ${value}",
   "min_value": "Նվազը: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero մութ տեսք",
   "monero_light_theme": "Monero պայծառ տեսք",
   "moonpay_alert_text": "Գումարի արժեքը պետք է լինի հավասար կամ ավելի քան ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "NFT- ները հանելիս սխալ է տեղի ունեցել: Սիրով ստուգեք ձեր ինտերնետային կապը եւ կրկին փորձեք:",
   "more_options": "Այլ տարբերակներ",
   "multiple_addresses_detected": "Հայտնաբերվել են բազմաթիվ հասցեներ",
   "mweb_confirmed": "Հաստատված MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Պիտակի անուն",
   "new_subaddress_title": "Նոր հասցե",
   "new_template": "Նոր նմուշ",
-  "new_transactions_notifications": "Ուղարկեք ծանուցումներ նոր գործարքների վերաբերյալ",
   "new_wallet": "Նոր դրամապանակ",
   "newConnection": "Նոր կապ",
   "no_cards_found": "Ոչ մի քարտ չի գտնվել",
@@ -538,7 +487,6 @@
   "normal": "Նորմալ",
   "note_optional": "Նշում (ոչ պարտադիր)",
   "note_tap_to_change": "Նշում (սեղմեք փոխելու համար)",
-  "notification_permission_denied": "Տեղեկացման թույլտվությունը թափանցում է, խնդրում ենք ձեռքով միացնել այն պարամետրերում",
   "nullURIError": "URI-ն դատարկ է",
   "offer_expires_in": "Առաջարկը վաղեմության է հասնում ",
   "offline": "Անցանց",
@@ -570,20 +518,8 @@
   "password": "Գաղտնաբառ",
   "paste": "Տեղադրել",
   "pause_wallet_creation": "Հնարավորություն ստեղծել Haven Դրամապանակ ընթացիկ դադարեցված է",
-  "payjoin_card_content": "Payjoin- ն նոր գաղտնիության պահպանման եւ վճարների պահպանման առանձնահատկություն է Bitcoin- ում:",
-  "payjoin_details": "Payjoin Մանրամասն",
-  "payjoin_enabled": "Payjoin միացված",
-  "payjoin_enabling_popup_content": "Կարող եք անցնել Payjoin ընտրացանկի ներքո → Գաղտնիության → Օգտագործեք Payjoin, միացնելու կամ անջատելու այն ավելի ուշ:",
-  "payjoin_enabling_popup_title": "Միացնել Payjoin",
-  "payjoin_request_awaiting_tx": "Սպասում է գործարքին",
-  "payjoin_request_in_progress": "Ընթացքի մեջ",
-  "payjoin_unavailable": "Payjoin անհասանելի",
-  "payjoin_unavailable_sheet_content": "A Payjoin գործարք ստանալը պահանջում է, որ դուք պատրաստեք Bitcoin- ը պատրաստելու համար:",
-  "payjoin_unavailable_sheet_title": "Ինչու է Payjoin անհասանելի:",
   "payment_id": "Վճարման հերթական համար",
-  "payment_made_easy": "Վճարները հեշտացվել են",
   "payment_was_received": "Վճարումը ստացված է",
-  "payments": "Վճարումներ",
   "pending": " (մշակվում է)",
   "percentageOf": "${amount}-ի տոկոս",
   "pin_at_top": "${token} պին վերևում",
@@ -600,10 +536,9 @@
   "please_try_to_connect_to_another_node": "Խնդրում ենք փորձել միանալ այլ հանգույցի",
   "please_wait": "Խնդրում ենք սպասել",
   "polygonscan_history": "PolygonScan պատմություն",
-  "potential_scam": "Հնարավոր խաբեություն",
   "powered_by": "${title} կողմից ապահովված",
   "pre_seed_button_text": "Ես հասկանում եմ։ Ցույց տվեք իմ սերմը",
-  "pre_seed_description": "Հաջորդ էջում կտեսնեք մի շարք բառեր: Սա ձեր եզակի եւ մասնավոր սերմն է, եւ դա ձեր դրամապանակը վերականգնելու միակ միջոցն է կորստի կամ անսարքության դեպքում: Ձեր պարտականությունն է գրել այն եւ պահել այն անվտանգ վայրում, տորթի դրամապանակի հավելվածից դուրս:",
+  "pre_seed_description": "Հաջորդ էջում դուք կտեսնեք ${words} բառերի շարք։ Սա ձեր յուրահատուկ և գաղտնի սերմն է, որը ձեր դրամապանակը վերականգնելու միակ միջոցն է կորուստի կամ սխալ գործարքի դեպքում։ Դուք պատասխանատու եք այն գրառել և ապահով վայրում պահել Cake Wallet հավելվածից դուրս",
   "pre_seed_title": "ԿԱՐԵՎՈՐ",
   "prepaid_cards": "Նախավճարային քարտեր",
   "prevent_screenshots": "Կանխել էկրանի պատկերները և տեսագրությունը",
@@ -616,7 +551,6 @@
   "proceed_on_device": "Շարունակեք ձեր սարքի վրա",
   "proceed_on_device_description": "Խնդրում ենք հետևել ձեր սարքի վրա ցուցադրվող հրահանգներին",
   "processing": "Վերամշակում",
-  "processing_signed_tx": "Ստորագրված գործարքի վերամշակում",
   "profile": "Պրոֆիլ",
   "provider_error": "${provider} սխալ",
   "public_key": "Հանրային բանալի",
@@ -649,7 +583,6 @@
   "rep_warning_sub": "Ձեր ներկայացուցիչը չի հայտնվում լավ վիճակում։ Սեղմեք այստեղ նոր ներկայացուցիչ ընտրելու համար",
   "repeat_wallet_password": "Վերականգնել դրամապանակի գաղտնաբառ",
   "repeated_password_is_incorrect": "Վերականգնված գաղտնաբառը սխալ է։ Խնդրում ենք վերականգնել դրամապանակի գաղտնաբառը",
-  "requested": "Պահանջել է",
   "require_for_adding_contacts": "Պահանջվում է կոնտակտներ ավելացնելու համար",
   "require_for_all_security_and_backup_settings": "Պահանջվում է բոլոր անվտանգության և կրկնօրինակման կարգավորումների համար",
   "require_for_assessing_wallet": "Պահանջվում է դրամապանակ մուտք գործելու համար",
@@ -660,12 +593,10 @@
   "require_for_sends_to_internal_wallets": "Պահանջվում է ներքին դրամապանակներ ուղարկելու համար",
   "require_for_sends_to_non_contacts": "Պահանջվում է ոչ կոնտակտ անձանց ուղարկելու համար",
   "require_pin_after": "Պահանջվում է PIN-ը հետո",
-  "required_passphrase": "Փոշի",
   "rescan": "Վերասկանավորել",
   "resend_code": "Խնդրում ենք կրկին ուղարկել",
   "reset": "Վերասահմանել",
   "reset_password": "Վերասահմանել գաղտնաբառը",
-  "restore": "Վերականգնել",
   "restore_active_seed": "Ակտիվ սերմ",
   "restore_address": "Հասցե",
   "restore_bitcoin_description_from_keys": "Վերականգնեք ձեր դրամապանակը ձեր գախտնի բանալիներից ստացված WIF տողից",
@@ -712,10 +643,7 @@
   "search_language": "Որոնել լեզու",
   "second_intro_content": "Ձեր Yat-ը միակ եզակի էմոջի հասցե է, որը փոխարինում է ձեր բոլոր արժույթների համար ձեր բոլոր երկար հեքսադեցիմալ հասցեները",
   "second_intro_title": "Մի էմոջի հասցե, որը կառավարում է դրանք բոլորը",
-  "security": "Անվտանգություն",
   "security_and_backup": "Անվտանգություն և կրկնօրինակ",
-  "security_risk": "Անվտանգության ռիսկ",
-  "security_risk_description": "Այս տիրույթը դրոշմված է որպես անվտանգության ոչ անվտանգ `բազմաթիվ անվտանգության մատակարարների կողմից: Անմիջապես թողեք ձեր ակտիվները պաշտպանելու համար:",
   "seed_alert_back": "Վերադառնալ",
   "seed_alert_content": "Սերմը վերականգնելու ձեր դրամապանակի միակ միջոցն է։ Դուք արդեն գրի եք առել այն?",
   "seed_alert_title": "Ուշադրություն",
@@ -750,6 +678,9 @@
   "seedtype": "Սերմի տեսակ",
   "seedtype_alert_content": "Այլ դրամապանակներով սերմերի փոխանակումը հնարավոր է միայն BIP39 SEEDTYPE- ով:",
   "seedtype_alert_title": "SEEDTYPE ALERT",
+  "seedtype_legacy": "Legacy (25 բառ)",
+  "seedtype_polyseed": "Polyseed (16 բառ)",
+  "seedtype_wownero": "Wownero (14 բառ)",
   "select_backup_file": "Ընտրել կրկնօրինակ ֆայլ",
   "select_buy_provider_notice": "Ընտրեք գնման մատակարարը վերևում։ Դուք կարող եք բաց թողնել այս էկրանը ձեր լռելայն գնման մատակարարը հավելվածի կարգավորումներում սահմանելով",
   "select_destination": "Խնդրում ենք ընտրել կրկնօրինակ ֆայլի նպատակակետը",
@@ -772,7 +703,6 @@
   "send_from_external_wallet": "Ուղարկել արտաքին դրամապանակից",
   "send_name": "Անվանում",
   "send_new": "Նոր",
-  "send_payjoin": "Ուղարկել Payjoin",
   "send_payment_id": "Վճարման ID (կամավոր)",
   "send_priority": "Ներկայումս վարձը սահմանված է ${transactionPriority} առաջնահերթությամբ։ Գործարքի առաջնահերթությունը կարող է կարգավորվել կարգավորումներում",
   "send_sending": "Ուղարկվում է...",
@@ -830,9 +760,7 @@
   "show_keys": "Ցուցադրել բանալիներ",
   "show_market_place": "Ցուցադրել շուկան",
   "show_seed": "Ցուցադրել սերմ",
-  "sign_all": "Ստորագրեք բոլորը",
   "sign_message": "Կնքել հաղորդագրություն",
-  "sign_one": "Ստորագրել մեկը",
   "sign_up": "Գրանցվել",
   "sign_verify_message": "Նշեք / ստուգեք",
   "sign_verify_message_sub": "Կնքել կամ ստուգել հաղորդագրությունը ձեր գախտնի բանալիով",
@@ -861,14 +789,11 @@
   "sort_by": "Դասավորել ըստ",
   "spend_key_private": "Վճարման բանալի (գախտնի)",
   "spend_key_public": "Վճարման բանալի (հանրային)",
-  "starting_tor_proxy": "Սկսելով Tor վստահված անձը",
   "status": "Կարգավիճակ՝ ",
-  "step": "Քայլ",
   "string_default": "Լռելայն",
   "subaddress_title": "Ենթահասցեների ցանկ",
   "subaddresses": "Ենթահասցեներ",
   "submit_request": "Ուղարկել հարցում",
-  "success": "Հաջողություն",
   "successful": "Հաջողված",
   "support_description_guides": "Տարածված խնդիրների փաստաթղթավորում և աջակցություն",
   "support_description_live_chat": "Անվճար և արագ աջակցություն! Պատրաստված մասնագետները պատրաստ են օգնել",
@@ -876,7 +801,6 @@
   "support_title_guides": "Տորթ դրամապանակի փաստաթղթեր",
   "support_title_live_chat": "Անմիջական աջակցություն",
   "support_title_other_links": "Այլ աջակցության հղումներ",
-  "supported": "Աջակցել",
   "swap": "Փոխանակել",
   "sweeping_wallet": "Դրամապանակը մաքրվում է",
   "sweeping_wallet_alert": "Սա չի տևի երկար։ Խնդրում ենք չլքել այս էկրանը կամ մաքրված միջոցները կկորչեն։",
@@ -896,7 +820,6 @@
   "sync_status_syncronizing": "ՀԱՄԱԺԱՄԵՑՎՈՒՄ Է",
   "sync_status_timed_out": "Ժամանակը սպառվեց",
   "sync_status_unsupported": "ՉԱՋԱԿՑՎՈՂ ՀԱՆԳՈՒՅՑ,",
-  "synchronizing": "Համաժամանակող",
   "syncing_wallet_alert_content": "Ձեր հաշիվը և գործարքների ցանկը կարող են լինել անավարտ մինչև վերին մասում գրված լինի “ՀԱՂՈՒՄ”։ Սեղմեք/դիպեք ուսումնասիրելու համար։",
   "syncing_wallet_alert_title": "Ձեր դրամապանակը համաժամացվում է",
   "template": "Տարբերակ",
@@ -909,18 +832,13 @@
   "thorchain_taproot_address_not_supported": "ThorChain մատակարարը չի աջակցում Taproot հասցեները: Խնդրում ենք փոխել հասցեն կամ ընտրել այլ մատակարար:",
   "time": "${minutes}ր ${seconds}վ",
   "tip": "Թեյավճար",
-  "to": "Դեպի",
   "today": "Այսօր",
-  "token_already_exists": "Նշանն արդեն գոյություն ունի",
   "token_contract_address": "Token-ի պայմանագրի հասցե",
   "token_decimal": "Token-ի տասանիշ",
   "token_name": "Token-ի անուն, օրինակ՝ Tether",
   "token_symbol": "Token-ի նշան, օրինակ՝ USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Խնդրում ենք մի մոռացեք նշել MEMO ID- ն, երբ փոխանակման համար տոննա գործարքը ուղարկեք",
   "tor_connection": "Tor կապ",
-  "tor_connection_timeout": "Tor կապի ժամկետ",
-  "tor_experimental": "Սա փորձարարական առանձնահատկություն է, ոչ բոլոր կապերը տորթ դրամապանակների աջակցության համար",
   "tor_only": "Միայն Tor",
   "total": "Ընդհանուր",
   "total_saving": "Ընդհանուր խնայողություն",
@@ -981,10 +899,8 @@
   "transaction_sent_notice": "Եթե էկրանը 1 րոպեի ընթացքում չի թարմանում, խնդրում ենք ստուգել բլոկի բացահայտիչը և Ձեր էլ. փոստը",
   "transactions": "Փոխանցումներ",
   "transactions_by_date": "Փոխանցումներ ամսաթվով",
-  "transport_type": "Տրանսպորտի տեսակը",
   "trongrid_history": "TronGrid պատմություն",
   "trusted": "Վստահելի",
-  "try_again": "Կրկին փորձեք",
   "tx_commit_exception_no_dust_on_change": "Փոխանցումը մերժվել է այս գումարով: Այս արժույթներով կարող եք ուղարկել ${min} առանց փոփոխության կամ ${max} որը վերադարձնում է փոփոխությունը",
   "tx_commit_failed": "Փոխանցումը ձախողվել է: Խնդրում ենք դիմել աջակցությանը",
   "tx_commit_failed_no_peers": "Գործարքը չի հաջողվել հեռարձակել, խնդրում ենք կրկին փորձել մեկ վայրկյանում",
@@ -1011,19 +927,15 @@
   "unspent_coins_details_title": "Չծախսված արժույթների մանրամասները",
   "unspent_coins_title": "Չծախսված արժույթներ",
   "unsupported_asset": "Մենք չենք աջակցում այս գործողությունը այս ակտիվի համար։ Խնդրում ենք ստեղծել կամ անցնել աջակցվող ակտիվի տեսակին համապատասխան դրամապանակի։",
-  "update_session": "Թարմացրեք նիստը",
   "uptime": "Աշխատանքային ժամանակ",
   "upto": "մինչև ${value}",
   "usb": "USB",
   "use": "Փոխեք ",
   "use_card_info_three": "Օգտագործեք թվային քարտը առցանց կամ անշփման վճարման մեթոդներով։",
   "use_card_info_two": "Միջոցները փոխարկվում են ԱՄՆ դոլար երբ դրանք պահվում են կանխավճարային հաշվեկշռում, ոչ թե թվային արժույթներում։",
-  "use_device_theme": "Օգտագործեք սարքի թեման",
-  "use_payjoin": "Օգտագործեք Payjoin",
   "use_ssl": "Օգտագործել SSL",
   "use_suggested": "Օգտագործել առաջարկվածը",
   "use_testnet": "Օգտագործել Testnet",
-  "user_rejected_method": "Օգտագործողի մերժված մեթոդը",
   "value": "Արժեք",
   "value_type": "Արժեքի տեսակ",
   "variable_pair_not_supported": "Այս փոփոխականի զույգը չի աջակցվում ընտրված բորսաների հետ",
@@ -1050,7 +962,6 @@
   "wallet_group_description_view_seed": "Միշտ կարող եք կրկին դիտել այս սերմը ներքեւում",
   "wallet_group_empty_state_text_one": "Կարծես թե որեւէ համատեղելի դրամապանակի խմբեր չունեք:\n\nԹակել",
   "wallet_group_empty_state_text_two": "ներքեւում `նորը կազմելու համար:",
-  "wallet_has_passphrase": "Այս դրամապանակն ունի գաղտնաբառ",
   "wallet_keys": "Դրամապանակի սերմ/բանալիներ",
   "wallet_list_create_new_wallet": "Ստեղծել Նոր Դրամապանակ",
   "wallet_list_edit_group_name": "Խմբագրել խմբի անվանումը",
@@ -1075,11 +986,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Դրամապանակներ",
   "warning": "Զգուշացում",
-  "welcome": "Ողջույն",
+  "welcome": "Բարի գալուստ",
   "welcome_subtitle_new_wallet": "Եթե ​​ցանկանում եք սկսել թարմ, հպեք Ստեղծեք նոր դրամապանակ ներքեւում եւ դուրս կգաք ցեղերի:",
   "welcome_subtitle_restore_wallet": "Եթե ​​ունեք գոյություն ունեցող դրամապանակ, որը ցանկանում եք տորթի մեջ մտցնել, պարզապես ընտրեք վերականգնել առկա դրամապանակը, եւ մենք ձեզ քայլելու ենք գործընթացի միջոցով:",
   "welcome_to_cakepay": "Բարի գալուստ Cake Pay!",
-  "what_is_payjoin": "Ինչ է վճարումը ?",
   "what_is_silent_payments": "Ի՞նչ է Լուռ Վճարումները:",
   "widgets_address": "Հասցե",
   "widgets_or": "կամ",
@@ -1109,6 +1019,5 @@
   "you_will_get": "Ստացեք",
   "you_will_receive_estimated_amount": "Դուք կստանաք ( գնահատված )",
   "you_will_send": "Փոխանակեք",
-  "youCanGoBackToYourDapp": "Այժմ կարող եք վերադառնալ ձեր DAPP- ին",
   "yy": "ՏՏ"
 }
\ No newline at end of file
diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb
index 7682903fc..f9a231112 100644
--- a/res/values/strings_id.arb
+++ b/res/values/strings_id.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Tambahkan dana pra-bayar ke kartu (hingga ${value})",
   "add_new_node": "Tambah node baru",
   "add_new_word": "Tambahkan kata baru",
-  "add_passphrase": "Tambahkan frasa sandi",
-  "add_passphrase_warning_text": "Hanya masukkan frasa sandi jika Anda telah menggunakan satu untuk dompet ini di masa lalu. Jika Anda memasukkan frasa sandi yang salah atau belum menggunakan frasa sandi sebelumnya di dompet ini, Anda tidak akan melihat dana atau sejarah yang ada.",
   "add_receiver": "Tambahkan penerima lain (opsional)",
   "add_secret_code": "Atau, tambahkan kode rahasia ini ke aplikasi autentikator",
   "add_tip": "Tambahkan Tip",
   "add_token_disclaimer_check": "Saya telah mengonfirmasi alamat dan informasi kontrak token menggunakan sumber yang memiliki reputasi baik. Menambahkan informasi jahat atau salah dapat mengakibatkan hilangnya dana.",
   "add_token_warning": "Jangan mengedit atau menambahkan token seperti yang diinstruksikan oleh penipu.\nSelalu konfirmasikan alamat token dengan sumber tepercaya!",
   "add_value": "Tambahkan nilai",
-  "added_message_for_ata_error": "Mohon pastikan Anda memiliki saldo SOL yang cukup untuk menyelesaikan transaksi Anda.",
   "address": "Alamat",
   "address_book": "Buku Alamat",
   "address_book_menu": "Buku alamat",
@@ -55,8 +52,6 @@
   "anonpay_description": "Hasilkan ${type}. Penerima dapat ${method} dengan cryptocurrency apa pun yang didukung, dan Anda akan menerima dana di dompet ini.",
   "apk_update": "Pembaruan APK",
   "approve": "Menyetujui",
-  "approve_request": "Menyetujui permintaan",
-  "approve_tokens": "Menyetujui token",
   "arrive_in_this_address": "${currency} ${tag} akan tiba di alamat ini",
   "ascending": "Naik",
   "ask_each_time": "Tanyakan setiap kali",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Menunggu Konfirmasi Pembayaran",
   "background_sync": "Sinkronisasi Latar Belakang",
   "background_sync_mode": "Mode Sinkronisasi Latar Belakang",
-  "background_sync_on_battery_low": "Sinkronisasi pada baterai rendah",
-  "background_sync_on_charging": "Menyinkronkan hanya saat pengisian",
-  "background_sync_on_device_idle": "Menyinkronkan hanya jika perangkat tidak digunakan",
-  "background_sync_on_unmetered_network": "Membutuhkan jaringan yang belum diproduksi",
   "backup": "Cadangan",
   "backup_file": "File cadangan",
   "backup_password": "Kata sandi cadangan",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Beli Bitcoin",
   "buy_now": "Beli sekarang",
   "buy_provider_unavailable": "Penyedia saat ini tidak tersedia.",
-  "buy_sell_pair_is_not_supported_warning": "Pasangan mata uang ini tidak didukung oleh penyedia mana pun untuk metode pembayaran yang dipilih. Pilih pasangan yang berbeda atau coba ubah metode pembayaran.",
   "buy_with": "Beli dengan",
   "by_cake_pay": "oleh Cake Pay",
   "cake_2fa_preset": "Preset Kue 2FA",
@@ -124,12 +114,9 @@
   "camera_consent": "Kamera Anda akan digunakan untuk mengambil gambar untuk tujuan identifikasi oleh ${provider}. Silakan periksa Kebijakan Privasi mereka untuk detailnya.",
   "camera_permission_is_required": "Izin kamera diperlukan.\nSilakan aktifkan dari pengaturan aplikasi.",
   "cancel": "Batal",
-  "cannot_verify": "Tidak dapat memverifikasi",
-  "cannot_verify_description": "Domain ini tidak dapat diverifikasi. Periksa permintaan dengan cermat sebelum menyetujui.",
   "card_address": "Alamat:",
   "cardholder_agreement": "Persetujuan Pemegang Kartu",
   "cards": "Kartu",
-  "chain_id": "ID Rantai",
   "chains": "Rantai",
   "change": "Ubah",
   "change_backup_password_alert": "File cadangan sebelumnya tidak akan tersedia untuk diimpor dengan kata sandi cadangan baru. Kata sandi cadangan baru hanya akan digunakan untuk file cadangan baru. Apakah Anda yakin ingin mengubah kata sandi cadangan?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Apakah Anda yakin ingin mengubah perwakilan?",
   "change_rep_successful": "Berhasil mengubah perwakilan",
   "change_selected_exchanges": "Ubah pertukaran yang dipilih",
-  "change_selected_pair": "Ubah pasangan yang dipilih",
   "change_wallet_alert_content": "Apakah Anda ingin mengganti dompet saat ini ke ${wallet_name}?",
   "change_wallet_alert_title": "Ganti dompet saat ini",
   "choose_a_payment_method": "Pilih metode pembayaran",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Dikonfirmasi",
   "congratulations": "Selamat!",
   "connect_an_existing_yat": "Hubungkan Yat yang ada",
-  "connect_hw_info_step_1": "Pastikan perangkat Anda didukung.",
-  "connect_hw_info_step_2": "Nyalakan Bluetooth untuk kedua perangkat dan pasangkan dari telepon, atau hubungkan perangkat Anda bersama -sama menggunakan kabel USB.",
-  "connect_hw_info_step_3": "Buka kunci perangkat Anda dan arahkan ke aplikasi crypto yang diinginkan.",
-  "connect_hw_info_step_4": "Pilih perangkat Anda di dompet kue dan lanjutkan dengan pengaturan.",
   "connect_yats": "Hubungkan Yats",
   "connect_your_hardware_wallet": "Hubungkan dompet perangkat keras Anda menggunakan Bluetooth atau USB",
   "connect_your_hardware_wallet_ios": "Hubungkan dompet perangkat keras Anda menggunakan Bluetooth",
-  "connected": "Terhubung",
   "connection_sync": "Koneksi dan sinkronisasi",
   "connectWalletPrompt": "Hubungkan dompet Anda dengan WalletConnect untuk melakukan transaksi",
   "contact": "Kontak",
@@ -207,8 +188,6 @@
   "copy": "Salin",
   "copy_address": "Salin Alamat",
   "copy_id": "Salin ID",
-  "copy_payjoin_address": "Salin Alamat Payjoin",
-  "copy_payjoin_url": "Salin Payjoin url",
   "copyWalletConnectLink": "Salin tautan WalletConnect dari dApp dan tempel di sini",
   "corrupted_seed_notice": "File untuk dompet ini rusak dan tidak dapat dibuka. Silakan lihat frasa benih, simpan, dan kembalikan dompet.\n\nJika nilainya kosong, maka benih tidak dapat dipulihkan dengan benar.",
   "countries": "Negara",
@@ -245,22 +224,11 @@
   "descending": "Menurun",
   "description": "Keterangan",
   "destination_tag": "Tag tujuan:",
-  "deuro_collect_interest": "Mengumpulkan",
-  "deuro_savings": "Tabungan dEuro",
-  "deuro_savings_add": "Deposito",
-  "deuro_savings_balance": "Keseimbangan tabungan",
-  "deuro_savings_collect_interest": "Mengumpulkan minat",
-  "deuro_savings_remove": "Menarik",
-  "deuro_savings_set_approval": "Tetapkan persetujuan",
-  "deuro_savings_subtitle": "Hasilkan hingga 10% bunga di Deuro Stablecoin Holdings Anda",
-  "deuro_tx_commited_content": "Mungkin butuh beberapa detik untuk transaksi untuk mengkonfirmasi dan direfleksikan di layar",
-  "device_is_signing": "Perangkat sedang menandatangani",
   "dfx_option_description": "Beli crypto dengan EUR & CHF. Untuk pelanggan ritel dan perusahaan di Eropa",
   "didnt_get_code": "Tidak mendapatkan kode?",
   "digit_pin": "-digit PIN",
   "digital_and_physical_card": " kartu debit pra-bayar digital dan fisik",
   "disable": "Cacat",
-  "disable_automatic_exchange_status_updates": "Nonaktifkan Pembaruan Status Pertukaran Otomatis",
   "disable_bulletin": "Nonaktifkan Buletin Status Layanan",
   "disable_buy": "Nonaktifkan tindakan beli",
   "disable_cake_2fa": "Nonaktifkan Kue 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Dengan mematikan ini, tarif biaya mungkin tidak akurat dalam beberapa kasus, jadi Anda mungkin akan membayar lebih atau membayar biaya untuk transaksi Anda",
   "disable_fiat": "Nonaktifkan fiat",
   "disable_sell": "Nonaktifkan aksi jual",
-  "disable_tor": "Nonaktifkan tor",
   "disable_trade_option": "Nonaktifkan opsi perdagangan",
   "disableBatteryOptimization": "Nonaktifkan optimasi baterai",
   "disableBatteryOptimizationDescription": "Apakah Anda ingin menonaktifkan optimasi baterai untuk membuat sinkronisasi latar belakang berjalan lebih bebas dan lancar?",
   "disabled": "Dinonaktifkan",
-  "disconnect_session": "Sesi Putuskan sambungan",
   "discount": "Hemat ${value}%",
   "display_settings": "Pengaturan tampilan",
   "displayable": "Dapat ditampilkan",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Jangan berikan ini pada siapapun, termasuk dukungan.\n\nDana Anda bisa dan akan dicuri!",
   "do_not_show_me": "Jangan tampilkan ini lagi",
   "domain_looks_up": "Pencarian domain",
-  "domain_mismatch": "Ketidakcocokan Domain",
-  "domain_mismatch_description": "Situs web ini memiliki domain yang tidak cocok dengan pengirim permintaan ini. Menyetujui dapat menyebabkan hilangnya dana.",
   "donation_link_details": "Detail tautan donasi",
-  "done": "Selesai",
   "e_sign_consent": "E-Sign Consent",
   "edit": "Edit",
   "edit_backup_password": "Edit Kata Sandi Cadangan",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Kami menghasilkan alamat baru setiap kali Anda menggunakan satu, tetapi alamat sebelumnya tetap berfungsi",
   "email_address": "Alamat Email",
   "enable": "Memungkinkan",
-  "enable_builtin_tor": "Aktifkan built-in tor",
   "enable_mempool_api": "API Mempool untuk biaya dan tanggal yang akurat",
   "enable_replace_by_fee": "Aktifkan ganti-by-fee",
   "enable_silent_payments_scanning": "Mulailah memindai pembayaran diam, sampai ujung tercapai",
@@ -333,10 +295,8 @@
   "error_text_template": "Nama template dan alamat tidak boleh berisi simbol ` , ' \"\ndan harus antara 1 dan 106 karakter panjang",
   "error_text_wallet_name": "Nama dompet hanya dapat berisi huruf, angka, _ - simbol\ndan harus antara 1 dan 33 karakter panjang",
   "error_text_xmr": "Nilai XMR tidak boleh melebihi saldo yang tersedia.\nJumlah digit pecahan harus kurang atau sama dengan 12",
-  "error_while_processing": "Terjadi kesalahan saat prosedur",
   "errorGettingCredentials": "Gagal: Terjadi kesalahan saat mendapatkan kredensial",
   "errorSigningTransaction": "Terjadi kesalahan saat menandatangani transaksi",
-  "establishing_tor_connection": "Estabilishing Tor Connection",
   "estimated": "Diperkirakan",
   "estimated_new_fee": "Perkiraan biaya baru",
   "estimated_receive_amount": "Diperkirakan jumlah menerima",
@@ -360,7 +320,6 @@
   "export_backup": "Ekspor cadangan",
   "export_logs": "Log ekspor",
   "export_outputs": "Ekspor output",
-  "extend_session": "Perpanjang sesi",
   "extra_id": "ID tambahan:",
   "extracted_address_content": "Anda akan mengirim dana ke\n${recipient_name}",
   "failed_authentication": "Otentikasi gagal. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "API fiat",
   "fiat_balance": "Saldo Fiat",
   "field_required": "Bagian ini diperlukan",
-  "file_saved": "File disimpan",
   "fill_code": "Silakan isi kode verifikasi yang diterima di email Anda",
   "filter_by": "Filter berdasarkan",
   "first_wallet_text": "Dompet luar biasa untuk Monero, Bitcoin, Ethereum, Litecoin, dan Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Lupa Kata Sandi",
   "freeze": "Freeze",
   "frequently_asked_questions": "Pertanyaan yang sering diajukan",
-  "from": "Dari",
   "frozen": "Dibekukan",
   "frozen_balance": "Keseimbangan beku",
   "full_balance": "Saldo Penuh",
   "gas_exceeds_allowance": "Gas yang dibutuhkan oleh transaksi melebihi tunjangan.",
-  "gas_price": "Harga gas",
   "generate_name": "Hasilkan Nama",
   "generating_gift_card": "Membuat Kartu Hadiah",
   "generating_transaction": "Menghasilkan transaksi",
@@ -413,7 +369,6 @@
   "hide_details": "Sembunyikan Rincian",
   "high_contrast_theme": "Tema Kontras Tinggi",
   "home_screen_settings": "Pengaturan layar awal",
-  "how_to_connect": "Cara terhubung",
   "how_to_use": "Cara Penggunaan",
   "how_to_use_card": "Bagaimana menggunakan kartu ini",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Anda tidak memiliki cukup SOL untuk menutupi transaksi dan biaya transaksinya. Mohon tambahkan lebih banyak sol ke dompet Anda atau kurangi jumlah sol yang Anda kirim.",
   "insufficient_lamports": "Anda tidak memiliki cukup SOL untuk menutupi transaksi dan biaya transaksinya. Anda membutuhkan setidaknya ${solValueNeeded} sol. Mohon tambahkan lebih banyak sol ke dompet Anda atau kurangi jumlah sol yang Anda kirim",
   "insufficientFundsForRentError": "Anda tidak memiliki cukup SOL untuk menutupi biaya transaksi dan menyewa untuk akun tersebut. Mohon tambahkan lebih banyak sol ke dompet Anda atau kurangi jumlah sol yang Anda kirim",
-  "insufficientFundsForRentErrorReceiver": "Akun penerima tidak memiliki cukup SOL untuk menutupi sewa. Silakan minta penerima untuk menambahkan lebih banyak SOL ke akun mereka.",
   "introducing_cake_pay": "Perkenalkan Cake Pay!",
   "invalid_input": "Masukan tidak valid",
   "invalid_password": "Kata sandi salah",
@@ -471,7 +425,6 @@
   "logout": "Keluar",
   "low_fee": "Biaya rendah",
   "low_fee_alert": "Anda saat ini menggunakan prioritas biaya jaringan rendah. Ini dapat menyebabkan tunggu yang lama, kurs yang berbeda, atau perdagangan yang dibatalkan. Kami merekomendasikan menetapkan biaya yang lebih tinggi untuk pengalaman yang lebih baik.",
-  "made_easy": "menjadi mudah",
   "manage_nodes": "Kelola node",
   "manage_pow_nodes": "Kelola Node PoW",
   "manage_yats": "Kelola Yats",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Pesan",
   "message_verified": "Pesan itu berhasil diverifikasi",
-  "messages": "Pesan",
-  "method": "Metode",
   "methods": "Metode",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Tema Gelap Monero",
   "monero_light_theme": "Tema Cahaya Monero",
   "moonpay_alert_text": "Nilai jumlah harus lebih atau sama dengan ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Terjadi kesalahan saat mengambil NFT. Mohon periksa koneksi internet Anda dan coba lagi.",
   "more_options": "Opsi Lainnya",
   "multiple_addresses_detected": "Banyak alamat terdeteksi",
   "mweb_confirmed": "Mengkonfirmasi mWeb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Nama label",
   "new_subaddress_title": "Alamat baru",
   "new_template": "Template Baru",
-  "new_transactions_notifications": "Kirim pemberitahuan tentang transaksi baru",
   "new_wallet": "Dompet Baru",
   "newConnection": "Koneksi Baru",
   "no_cards_found": "Tidak ada kartu yang ditemukan",
@@ -539,7 +488,6 @@
   "normal": "Normal",
   "note_optional": "Catatan (opsional)",
   "note_tap_to_change": "Catatan (tap untuk mengubah)",
-  "notification_permission_denied": "Izin pemberitahuan ditolak secara permanen, mohon aktifkan secara manual dalam pengaturan",
   "nullURIError": "URI adalah nol",
   "offer_expires_in": "Penawaran kedaluwarsa dalam: ",
   "offline": "Offline",
@@ -573,20 +521,8 @@
   "password": "Kata Sandi",
   "paste": "Tempel",
   "pause_wallet_creation": "Kemampuan untuk membuat Haven Wallet saat ini dijeda.",
-  "payjoin_card_content": "Payjoin adalah fitur pemeliharaan privasi dan hemat biaya baru di Bitcoin.",
-  "payjoin_details": "Payjoin detail",
-  "payjoin_enabled": "Payjoin diaktifkan",
-  "payjoin_enabling_popup_content": "Anda dapat beralih Payjoin di bawah menu → Privasi → Gunakan Payjoin untuk mengaktifkan atau menonaktifkannya nanti.",
-  "payjoin_enabling_popup_title": "Mengaktifkan Payjoin",
-  "payjoin_request_awaiting_tx": "Menunggu transaksi",
-  "payjoin_request_in_progress": "Sedang berlangsung",
-  "payjoin_unavailable": "Payjoin tidak tersedia",
-  "payjoin_unavailable_sheet_content": "Menerima Payjoin transaksi mengharuskan Anda untuk menyiapkan bitcoin. \\ N \\ nas segera setelah dompet Anda memiliki dana, Payjoin akan diaktifkan secara otomatis.",
-  "payjoin_unavailable_sheet_title": "Mengapa Payjoin tidak tersedia?",
   "payment_id": "ID Pembayaran: ",
-  "payment_made_easy": "Pembayaran dilakukan dengan mudah",
   "payment_was_received": "Pembayaran Anda telah diterima.",
-  "payments": "Pembayaran",
   "pending": " (pending)",
   "percentageOf": "dari ${amount}",
   "pin_at_top": "sematkan ${token} di atas",
@@ -603,10 +539,9 @@
   "please_try_to_connect_to_another_node": "Silakan coba untuk terhubung ke node lain",
   "please_wait": "Harap tunggu",
   "polygonscan_history": "Sejarah PolygonScan",
-  "potential_scam": "Penipuan potensial",
   "powered_by": "Didukung oleh ${title}",
   "pre_seed_button_text": "Saya mengerti. Tampilkan seed saya",
-  "pre_seed_description": "Di halaman berikutnya Anda akan melihat serangkaian kata. Ini adalah benih unik dan pribadi Anda dan ini adalah satu -satunya cara untuk memulihkan dompet Anda jika terjadi kehilangan atau kerusakan. Adalah tanggung jawab Anda untuk menuliskannya dan menyimpannya di tempat yang aman di luar aplikasi Cake Wallet.",
+  "pre_seed_description": "Di halaman berikutnya Anda akan melihat serangkaian kata ${words}. Ini adalah seed unik dan pribadi Anda dan itu SATU-SATUNYA cara untuk mengembalikan dompet Anda jika hilang atau rusak. Ini adalah TANGGUNG JAWAB Anda untuk menuliskannya dan menyimpan di tempat yang aman di luar aplikasi Cake Wallet.",
   "pre_seed_title": "PENTING",
   "prepaid_cards": "Kartu prabayar",
   "prevent_screenshots": "Cegah tangkapan layar dan perekaman layar",
@@ -619,7 +554,6 @@
   "proceed_on_device": "Lanjutkan di perangkat Anda",
   "proceed_on_device_description": "Harap ikuti instruksi yang diminta di dompet perangkat keras Anda",
   "processing": "Pengolahan",
-  "processing_signed_tx": "Memproses transaksi yang ditandatangani",
   "profile": "Profil",
   "provider_error": "${provider} error",
   "public_key": "Kunci publik",
@@ -652,7 +586,6 @@
   "rep_warning_sub": "Perwakilan Anda tampaknya tidak bereputasi baik. Ketuk di sini untuk memilih yang baru",
   "repeat_wallet_password": "Ulangi Kata Sandi Dompet",
   "repeated_password_is_incorrect": "Kata sandi yang diulang tidak benar. Harap ulangi kata sandi dompet lagi.",
-  "requested": "Diminta",
   "require_for_adding_contacts": "Membutuhkan untuk menambahkan kontak",
   "require_for_all_security_and_backup_settings": "Memerlukan untuk semua pengaturan keamanan dan pencadangan",
   "require_for_assessing_wallet": "Diperlukan untuk mengakses dompet",
@@ -663,12 +596,10 @@
   "require_for_sends_to_internal_wallets": "Diperlukan untuk mengirim ke dompet internal",
   "require_for_sends_to_non_contacts": "Wajibkan untuk mengirim ke non-kontak",
   "require_pin_after": "Meminta PIN setelah",
-  "required_passphrase": "Frasa sandi",
   "rescan": "Pindai ulang",
   "resend_code": "Silakan kirim ulang",
   "reset": "Reset",
   "reset_password": "Atur Ulang Kata Sandi",
-  "restore": "Memulihkan",
   "restore_active_seed": "Seed aktif",
   "restore_address": "Alamat",
   "restore_bitcoin_description_from_keys": "Pulihkan dompet Anda dari string WIF yang dihasilkan dari private keys Anda",
@@ -716,10 +647,7 @@
   "search_language": "Cari bahasa",
   "second_intro_content": "Yat Anda adalah satu alamat emoji yang unik yang menggantikan semua alamat heksadesimal panjang Anda untuk semua mata uang Anda.",
   "second_intro_title": "Satu alamat emoji untuk menguasainya semua",
-  "security": "Keamanan",
   "security_and_backup": "Keamanan dan cadangan",
-  "security_risk": "Risiko keamanan",
-  "security_risk_description": "Domain ini ditandai sebagai tidak aman oleh beberapa penyedia keamanan. Segera pergi untuk melindungi aset Anda.",
   "seed_alert_back": "Kembali",
   "seed_alert_content": "Seed adalah satu-satunya cara untuk mengembalikan dompet Anda. Apakah Anda sudah menuliskannya?",
   "seed_alert_title": "Perhatian",
@@ -754,6 +682,9 @@
   "seedtype": "Seedtype",
   "seedtype_alert_content": "Berbagi biji dengan dompet lain hanya dimungkinkan dengan BIP39 seedtype.",
   "seedtype_alert_title": "Peringatan seedtype",
+  "seedtype_legacy": "Legacy (25 kata)",
+  "seedtype_polyseed": "Polyseed (16 kata)",
+  "seedtype_wownero": "Wownero (14 kata)",
   "select_backup_file": "Pilih file cadangan",
   "select_buy_provider_notice": "Pilih penyedia beli di atas. Anda dapat melewatkan layar ini dengan mengatur penyedia pembelian default Anda di pengaturan aplikasi.",
   "select_destination": "Silakan pilih tujuan untuk file cadangan.",
@@ -777,7 +708,6 @@
   "send_from_external_wallet": "Kirim dari dompet eksternal",
   "send_name": "Nama",
   "send_new": "Baru",
-  "send_payjoin": "Mengirim Payjoin",
   "send_payment_id": "ID Pembayaran (opsional)",
   "send_priority": "Saat ini biaya diatur dengan prioritas ${transactionPriority}.\nPrioritas transaksi dapat diubah pada pengaturan",
   "send_sending": "Mengirim...",
@@ -835,9 +765,7 @@
   "show_keys": "Tampilkan seed/kunci",
   "show_market_place": "Tampilkan Pasar",
   "show_seed": "Tampilkan seed",
-  "sign_all": "Menandatangani semua",
   "sign_message": "Pesan tanda",
-  "sign_one": "Tanda satu",
   "sign_up": "Daftar",
   "sign_verify_message": "Tanda / verifikasi",
   "sign_verify_message_sub": "Menandatangani atau memverifikasi pesan menggunakan kunci pribadi Anda",
@@ -866,14 +794,11 @@
   "sort_by": "Sortir dengan",
   "spend_key_private": "Kunci pengeluaran (privat)",
   "spend_key_public": "Kunci pengeluaran (publik)",
-  "starting_tor_proxy": "Mulai untuk proxy",
   "status": "Status: ",
-  "step": "Melangkah",
   "string_default": "Bawaan",
   "subaddress_title": "Daftar sub-alamat",
   "subaddresses": "Sub-alamat",
   "submit_request": "kirim permintaan",
-  "success": "Kesuksesan",
   "successful": "Berhasil",
   "support_description_guides": "Dokumentasi dan dukungan untuk masalah umum",
   "support_description_live_chat": "Gratis dan Cepat! Perwakilan dukungan terlatih tersedia untuk membantu",
@@ -881,7 +806,6 @@
   "support_title_guides": "DOKS DOKO CAKE",
   "support_title_live_chat": "Dukungan langsung",
   "support_title_other_links": "Tautan dukungan lainnya",
-  "supported": "Didukung",
   "swap": "Menukar",
   "sweeping_wallet": "Dompet menyapu",
   "sweeping_wallet_alert": "Ini seharusnya tidak memakan waktu lama. Jangan tinggalkan layar ini atau dana swept mungkin hilang.",
@@ -901,7 +825,6 @@
   "sync_status_syncronizing": "SEDANG SINKRONISASI",
   "sync_status_timed_out": "WAKTU HABIS",
   "sync_status_unsupported": "Node yang tidak didukung",
-  "synchronizing": "Sinkronisasi",
   "syncing_wallet_alert_content": "Saldo dan daftar transaksi Anda mungkin belum lengkap sampai tertulis “SYNCHRONIZED” di bagian atas. Klik/ketuk untuk mempelajari lebih lanjut.",
   "syncing_wallet_alert_title": "Dompet Anda sedang disinkronkan",
   "template": "Template",
@@ -914,18 +837,13 @@
   "thorchain_taproot_address_not_supported": "Penyedia Thorchain tidak mendukung alamat Taproot. Harap ubah alamatnya atau pilih penyedia yang berbeda.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Tip:",
-  "to": "Ke",
   "today": "Hari ini",
-  "token_already_exists": "Token sudah ada",
   "token_contract_address": "Alamat kontrak token",
   "token_decimal": "Desimal token",
   "token_name": "Nama token misalnya: Tether",
   "token_symbol": "Simbol token misalnya: USDT",
   "tokenID": "PENGENAL",
-  "ton_extra_info": "Harap jangan lupa untuk menentukan ID memo saat mengirim transaksi ton untuk pertukaran",
   "tor_connection": "koneksi Tor",
-  "tor_connection_timeout": "Tor Connection Timeout",
-  "tor_experimental": "Ini adalah fitur eksperimental, tidak semua koneksi yang terbuat dari dukungan dompet kue untuk routing - beberapa koneksi dapat menggunakan clearnet, untuk sepenuhnya merutekan aplikasi lalu lintas menggunakan untuk mode VPN.",
   "tor_only": "Hanya Tor",
   "total": "Total",
   "total_saving": "Total Pembayaran",
@@ -986,10 +904,8 @@
   "transaction_sent_notice": "Jika layar tidak bergerak setelah 1 menit, periksa block explorer dan email Anda.",
   "transactions": "Transaksi",
   "transactions_by_date": "Transaksi berdasarkan tanggal",
-  "transport_type": "Jenis transportasi",
   "trongrid_history": "Sejarah Trongrid",
   "trusted": "Dipercayai",
-  "try_again": "Coba lagi",
   "tx_commit_exception_no_dust_on_change": "Transaksi ditolak dengan jumlah ini. Dengan koin ini Anda dapat mengirim ${min} tanpa perubahan atau ${max} yang mengembalikan perubahan.",
   "tx_commit_failed": "Transaksi Gagal. Silakan hubungi Dukungan.",
   "tx_commit_failed_no_peers": "Transaksi gagal untuk disiarkan, silakan coba lagi sebentar lagi",
@@ -1016,19 +932,15 @@
   "unspent_coins_details_title": "Rincian koin yang tidak terpakai",
   "unspent_coins_title": "Koin yang tidak terpakai",
   "unsupported_asset": "Kami tidak mendukung tindakan ini untuk aset ini. Harap buat atau alihkan ke dompet dari jenis aset yang didukung.",
-  "update_session": "Perbarui sesi",
   "uptime": "Uptime",
   "upto": "hingga ${value}",
   "usb": "USB",
   "use": "Beralih ke ",
   "use_card_info_three": "Gunakan kartu digital secara online atau dengan metode pembayaran tanpa kontak.",
   "use_card_info_two": "Dana dikonversi ke USD ketika disimpan dalam akun pra-bayar, bukan dalam mata uang digital.",
-  "use_device_theme": "Gunakan tema perangkat",
-  "use_payjoin": "Menggunakan Payjoin",
   "use_ssl": "Gunakan SSL",
   "use_suggested": "Gunakan yang Disarankan",
   "use_testnet": "Gunakan TestNet",
-  "user_rejected_method": "Metode yang ditolak pengguna",
   "value": "Nilai",
   "value_type": "Jenis Nilai",
   "variable_pair_not_supported": "Pasangan variabel ini tidak didukung dengan bursa yang dipilih",
@@ -1055,7 +967,6 @@
   "wallet_group_description_view_seed": "Anda selalu dapat melihat benih ini lagi di bawah",
   "wallet_group_empty_state_text_one": "Sepertinya Anda tidak memiliki grup dompet yang kompatibel !\n\n tap",
   "wallet_group_empty_state_text_two": "di bawah ini untuk membuat yang baru.",
-  "wallet_has_passphrase": "Dompet ini memiliki frasa sandi",
   "wallet_keys": "Seed/kunci dompet",
   "wallet_list_create_new_wallet": "Buat Dompet Baru",
   "wallet_list_edit_group_name": "Edit Nama Grup",
@@ -1080,11 +991,10 @@
   "walletConnect": "DompetConnect",
   "wallets": "Dompet",
   "warning": "Peringatan",
-  "welcome": "Selamat datang",
+  "welcome": "Selamat datang di",
   "welcome_subtitle_new_wallet": "Jika Anda ingin memulai segar, ketuk membuat dompet baru di bawah ini dan Anda akan pergi ke balapan.",
   "welcome_subtitle_restore_wallet": "Jika Anda memiliki dompet yang ada yang ingin Anda bawa ke dalam kue, cukup pilih kembalikan dompet yang ada dan kami akan memandu Anda melalui prosesnya.",
   "welcome_to_cakepay": "Selamat Datang di Cake Pay!",
-  "what_is_payjoin": "Apa itu Payjoin ?",
   "what_is_silent_payments": "Apa itu pembayaran diam?",
   "widgets_address": "Alamat",
   "widgets_or": "atau",
@@ -1114,6 +1024,5 @@
   "you_will_get": "Konversi ke",
   "you_will_receive_estimated_amount": "Anda akan menerima(estimasi )",
   "you_will_send": "Konversi dari",
-  "youCanGoBackToYourDapp": "Anda dapat kembali ke dapp Anda sekarang",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 9d03f7947..25d02d9d0 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Aggiungi fondi prepagati alle carte (fino a ${value})",
   "add_new_node": "Aggiungi nuovo nodo",
   "add_new_word": "Aggiungi nuova parola",
-  "add_passphrase": "Aggiungi passphrase",
-  "add_passphrase_warning_text": "Inserisci una passphrase solo se ne hai usato uno per questo portafoglio in passato. Se si inserisce la passphrase sbagliata o non hai prima utilizzato una passphrase su questo portafoglio, non vedrai nessuno dei fondi o della storia esistenti.",
   "add_receiver": "Aggiungi un altro ricevitore (opzionale)",
   "add_secret_code": "Oppure aggiungi questo codice segreto a un'app di autenticazione",
   "add_tip": "Aggiungi suggerimento",
   "add_token_disclaimer_check": "Ho confermato l'indirizzo e le informazioni del contratto token utilizzando una fonte attendibile. L'aggiunta di informazioni dannose o errate può comportare una perdita di fondi.",
   "add_token_warning": "Non modificare o aggiungere token come indicato dai truffatori.\nConferma sempre gli indirizzi dei token con fonti attendibili!",
   "add_value": "Aggiungi valore",
-  "added_message_for_ata_error": "Si prega di assicurati di avere abbastanza equilibrio sol per completare la transazione.",
   "address": "Indirizzo",
   "address_book": "Rubrica indirizzi",
   "address_book_menu": "Rubrica indirizzi",
@@ -55,8 +52,6 @@
   "anonpay_description": "Genera ${type}. Il destinatario può ${method} con qualsiasi criptovaluta supportata, e riceverai fondi in questo portafoglio.",
   "apk_update": "Aggiornamento APK",
   "approve": "Approvare",
-  "approve_request": "Approvare la richiesta",
-  "approve_tokens": "Approvare i token",
   "arrive_in_this_address": "${currency} ${tag}arriverà a questo indirizzo",
   "ascending": "Ascendente",
   "ask_each_time": "Chiedi ogni volta",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "In attesa di conferma del pagamento",
   "background_sync": "Sincronizzazione in background",
   "background_sync_mode": "Modalità di sincronizzazione in background",
-  "background_sync_on_battery_low": "Sincronizza sulla batteria bassa",
-  "background_sync_on_charging": "Sincronizzare solo quando si carica",
-  "background_sync_on_device_idle": "Sincronizzare solo quando il dispositivo non viene utilizzato",
-  "background_sync_on_unmetered_network": "Richiedono una rete non riservata",
   "backup": "Backup",
   "backup_file": "Backup file",
   "backup_password": "Backup password",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Acquista Bitcoin",
   "buy_now": "Acquista ora",
   "buy_provider_unavailable": "Provider attualmente non disponibile.",
-  "buy_sell_pair_is_not_supported_warning": "Questa coppia di valute non è supportata da nessun provider per il metodo di pagamento selezionato. Scegli una coppia diversa o prova a modificare il metodo di pagamento.",
   "buy_with": "Acquista con",
   "by_cake_pay": "da Cake Pay",
   "cake_2fa_preset": "Preset Cake 2FA",
@@ -124,12 +114,9 @@
   "camera_consent": "La tua fotocamera verrà utilizzata per acquisire un'immagine a scopo identificativo da ${provider}. Si prega di controllare la loro Informativa sulla privacy per i dettagli.",
   "camera_permission_is_required": "È richiesta l'autorizzazione della fotocamera.\nAbilitalo dalle impostazioni dell'app.",
   "cancel": "Cancella",
-  "cannot_verify": "Non può verificare",
-  "cannot_verify_description": "Questo dominio non può essere verificato. Controlla attentamente la richiesta prima di approvare.",
   "card_address": "Indirizzo:",
   "cardholder_agreement": "Contratto del titolare della carta",
   "cards": "Carte",
-  "chain_id": "ID catena",
   "chains": "Catene",
   "change": "Cambia",
   "change_backup_password_alert": "I tuoi file di backup precedenti non potranno essere importati con la nuova password di backup. La nuova password di backup verrà usata soltanto per i nuovi file di backup. Sei sicuro di voler cambiare la tua password di backup?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Sei sicuro di voler cambiare rappresentanti?",
   "change_rep_successful": "Rappresentante modificato con successo",
   "change_selected_exchanges": "Modificare gli Exchange selezionati",
-  "change_selected_pair": "Modifica coppia selezionata",
   "change_wallet_alert_content": "Sei sicuro di voler cambiare il portafoglio attuale con ${wallet_name}?",
   "change_wallet_alert_title": "Cambia portafoglio attuale",
   "choose_a_payment_method": "Scegli un metodo di pagamento",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Confermato",
   "congratulations": "Congratulazioni!",
   "connect_an_existing_yat": "Collegare un Yat esistente",
-  "connect_hw_info_step_1": "Assicurati che il tuo dispositivo sia acceso.",
-  "connect_hw_info_step_2": "Accendi Bluetooth per entrambi i dispositivi e abbinali dal telefono o collega i dispositivi utilizzando un cavo USB.",
-  "connect_hw_info_step_3": "Sblocca il dispositivo e naviga nell'app crittografica desiderata.",
-  "connect_hw_info_step_4": "Seleziona il tuo dispositivo nel portafoglio Cake e continua con l'installazione.",
   "connect_yats": "Connetti Yats",
   "connect_your_hardware_wallet": "Collega il tuo portafoglio hardware tramite Bluetooth o USB",
   "connect_your_hardware_wallet_ios": "Collega il tuo portafoglio hardware tramite Bluetooth",
-  "connected": "Collegato",
   "connection_sync": "Connessione e sincronizzazione",
   "connectWalletPrompt": "Collega il tuo portafoglio con WalletConnect per effettuare transazioni",
   "contact": "Contatta",
@@ -207,8 +188,6 @@
   "copy": "Copia",
   "copy_address": "Copia Indirizzo",
   "copy_id": "Copia ID",
-  "copy_payjoin_address": "Copia l'indirizzo PayJoin",
-  "copy_payjoin_url": "Copia Payjoin url",
   "copyWalletConnectLink": "Copia il collegamento WalletConnect dalla dApp e incollalo qui",
   "corrupted_seed_notice": "I file per questo portafoglio sono corrotti e non è possibile aprirli. Visualizza la frase del seme, salvala e ripristina il portafoglio.\n\nSe il valore è vuoto, non è stato possibile recuperare correttamente il seme.",
   "countries": "Paesi",
@@ -245,22 +224,11 @@
   "descending": "Discendente",
   "description": "Descrizione",
   "destination_tag": "Tag destinazione:",
-  "deuro_collect_interest": "Raccogliere",
-  "deuro_savings": "Risparmio di dEuro",
-  "deuro_savings_add": "Depositare",
-  "deuro_savings_balance": "Saldo di risparmio",
-  "deuro_savings_collect_interest": "Raccogliere interesse",
-  "deuro_savings_remove": "Ritirare",
-  "deuro_savings_set_approval": "Impostare l'approvazione",
-  "deuro_savings_subtitle": "Guadagna fino al 10% di interesse su Deuro StableCoin Holdings",
-  "deuro_tx_commited_content": "Potrebbero essere necessari un paio di secondi per confermare la transazione ed essere riflessa sullo schermo",
-  "device_is_signing": "Il dispositivo sta firmando",
   "dfx_option_description": "Acquista Crypto con EUR & CHF. Per i clienti al dettaglio e aziendali in Europa",
   "didnt_get_code": "Non hai ricevuto il codice?",
   "digit_pin": "-cifre PIN",
   "digital_and_physical_card": "carta di debito prepagata digitale e fisica",
   "disable": "Disabilita",
-  "disable_automatic_exchange_status_updates": "Disabilita gli aggiornamenti sullo stato automatico di scambio",
   "disable_bulletin": "Disabilita bollettino dello stato del servizio",
   "disable_buy": "Disabilita l'azione di acquisto",
   "disable_cake_2fa": "Disabilita Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Disattivando quest'opzione, i tassi delle commissioni potrebbero essere inaccurati in alcuni casi, quindi potresti finire per pagare troppo o troppo poco le commissioni per le tue transazioni",
   "disable_fiat": "Disabilita fiat",
   "disable_sell": "Disabilita l'azione di vendita",
-  "disable_tor": "Disabilita Tor",
   "disable_trade_option": "Disabilita l'opzione di scambio",
   "disableBatteryOptimization": "Disabilita l'ottimizzazione della batteria",
   "disableBatteryOptimizationDescription": "Vuoi disabilitare l'ottimizzazione della batteria per migliorare la sincronizzazione in background?",
   "disabled": "Disabilitato",
-  "disconnect_session": "Sessione di disconnessione",
   "discount": "Risparmia ${value}%",
   "display_settings": "Impostazioni di visualizzazione",
   "displayable": "Visualizzabile",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Non condividerli con nessun altro, incluso il supporto.\n\nI tuoi fondi possono essere e saranno rubati!",
   "do_not_show_me": "Non mostrarmelo di nuovo",
   "domain_looks_up": "Cerca domini",
-  "domain_mismatch": "Dominio Mismatch",
-  "domain_mismatch_description": "Questo sito Web ha un dominio che non corrisponde al mittente di questa richiesta. L'approvazione può comportare la perdita di fondi.",
   "donation_link_details": "Dettagli del link di donazione",
-  "done": "Fatto",
   "e_sign_consent": "Consenso alla firma elettronica",
   "edit": "Modifica",
   "edit_backup_password": "Modifica Password Backup",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Generiamo nuovi indirizzi ogni volta che ne utilizzi uno, ma gli indirizzi precedenti continuano a funzionare",
   "email_address": "Indirizzo e-mail",
   "enable": "Abilita",
-  "enable_builtin_tor": "Abilita buildi-in tor",
   "enable_mempool_api": "API Mempool per commissioni e date accurate",
   "enable_replace_by_fee": "Abilita Replace-By-Fee",
   "enable_silent_payments_scanning": "Inizia a scansionare le transazioni inviate al tuo indirizzo Silent Payments",
@@ -333,10 +295,8 @@
   "error_text_template": "Il nome del modello e l'indirizzo non possono contenere i simboli ` , ' \" \ne devono avere una lunghezza compresa tra 1 e 106 caratteri",
   "error_text_wallet_name": "Il nome del portafoglio può contenere solo lettere, numeri, _ - simboli\ne deve avere una lunghezza compresa tra 1 e 33 caratteri",
   "error_text_xmr": "Il valore in XMR non può eccedere il saldo disponibile.\nIl numero delle cifre decimali deve essere inferiore o uguale a 12",
-  "error_while_processing": "Si è verificato un errore durante la promozione",
   "errorGettingCredentials": "Non riuscito: errore durante il recupero delle credenziali",
   "errorSigningTransaction": "Si è verificato un errore durante la firma della transazione",
-  "establishing_tor_connection": "Connessione TOR di esame",
   "estimated": "Stimato",
   "estimated_new_fee": "Nuova commissione stimata",
   "estimated_receive_amount": "Importo di ricezione stimato",
@@ -360,7 +320,6 @@
   "export_backup": "Esporta backup",
   "export_logs": "Esporta log",
   "export_outputs": "Esporta output",
-  "extend_session": "Estendere la sessione",
   "extra_id": "Extra ID:",
   "extracted_address_content": "Invierai i tuoi fondi a\n${recipient_name}",
   "failed_authentication": "Autenticazione fallita. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Saldo fiat",
   "field_required": "Questo campo è obbligatorio",
-  "file_saved": "File salvato",
   "fill_code": "Compila il codice di verifica fornito alla tua email",
   "filter_by": "Filtra per",
   "first_wallet_text": "Portafoglio fantastico per Monero, Bitcoin, Ethereum, Litecoin, e Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Password dimenticata",
   "freeze": "Congela",
   "frequently_asked_questions": "Domande frequenti",
-  "from": "Da",
   "frozen": "Congelato",
   "frozen_balance": "Saldo Congelato",
   "full_balance": "Saldo Completo",
   "gas_exceeds_allowance": "Il Gas richiesto dalla transazione supera il limite consentito.",
-  "gas_price": "Prezzo del gas",
   "generate_name": "Genera nome",
   "generating_gift_card": "Generazione carta regalo",
   "generating_transaction": "Generazione di transazione",
@@ -413,7 +369,6 @@
   "hide_details": "Nascondi dettagli",
   "high_contrast_theme": "Tema ad alto contrasto",
   "home_screen_settings": "Impostazioni della schermata iniziale",
-  "how_to_connect": "Come connettersi",
   "how_to_use": "Come usare",
   "how_to_use_card": "Come usare questa carta",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Non hai abbastanza SOL per coprire la transazione e la sua quota di transazione. Aggiungi più SOL al tuo portafoglio, o riduci l'importo di SOL che stai inviando.",
   "insufficient_lamports": "Non hai abbastanza SOL per coprire la transazione e la sua quota di transazione. Hai bisogno di almeno ${solValueNeeded} SOL. Aggiungi più SOL al tuo portafoglio, o riduci l'importo di SOL che stai inviando",
   "insufficientFundsForRentError": "Non hai abbastanza SOL per coprire la tassa di transazione e l'affitto per il conto. Aggiungi più SOL al tuo portafoglio, o riduci l'importo di SOL che stai inviando",
-  "insufficientFundsForRentErrorReceiver": "L'account del destinatario non ha abbastanza SOL per coprire l'affitto. Si prega di chiedere al destinatario di aggiungere più SOL al loro account.",
   "introducing_cake_pay": "Vi presentiamo Cake Pay!",
   "invalid_input": "Inserimento non valido",
   "invalid_password": "Password non valida",
@@ -471,7 +425,6 @@
   "logout": "Logout",
   "low_fee": "Tariffa bassa",
   "low_fee_alert": "Attualmente stai utilizzando una priorità a tariffa di rete bassa. Ciò potrebbe causare lunghe attese, tariffe diverse o operazioni annullate. Ti consigliamo di impostare una tariffa più alta per un'esperienza migliore.",
-  "made_easy": "reso facile",
   "manage_nodes": "Gestisci i nodi",
   "manage_pow_nodes": "Gestisci i nodi PoW",
   "manage_yats": "Gestisci gli Yat",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Messaggio",
   "message_verified": "Il messaggio è stato verificato con successo",
-  "messages": "Messaggi",
-  "method": "Metodo",
   "methods": "Metodi",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Tema scuro Monero",
   "monero_light_theme": "Tema chiaro Monero",
   "moonpay_alert_text": "Il valore dell'importo deve essere maggiore o uguale a ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Si è verificato un errore durante il recupero di NFT. Si prega di controllare la tua connessione Internet e riprovare.",
   "more_options": "Altre opzioni",
   "multiple_addresses_detected": "Più indirizzi rilevati",
   "mweb_confirmed": "MWeb confermato",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Nome etichetta",
   "new_subaddress_title": "Nuovo indirizzo",
   "new_template": "Nuovo modello",
-  "new_transactions_notifications": "Invia notifiche su nuove transazioni",
   "new_wallet": "Nuovo portafoglio",
   "newConnection": "Nuova connessione",
   "no_cards_found": "Nessuna carta trovata",
@@ -539,7 +488,6 @@
   "normal": "Normale",
   "note_optional": "Nota (opzionale)",
   "note_tap_to_change": "Nota (clicca per cambiare)",
-  "notification_permission_denied": "L'autorizzazione alla notifica è stata negato per via per via per via per via per via per via per via per via, per favore, abilitalo manualmente",
   "nullURIError": "L'URI è nullo",
   "offer_expires_in": "L'offerta termina tra: ",
   "offline": "Offline",
@@ -572,20 +520,8 @@
   "password": "Password",
   "paste": "Incolla",
   "pause_wallet_creation": "La possibilità di creare Wallet Haven è attualmente sospesa.",
-  "payjoin_card_content": "Payjoin è una nuova funzionalità di conservazione della privacy e di risparmio di tasse in Bitcoin.",
-  "payjoin_details": "Payjoin dettagli",
-  "payjoin_enabled": "Payjoin abilitato",
-  "payjoin_enabling_popup_content": "È possibile attivare Payjoin sotto menu → privacy → usa Payjoin per abilitarlo o disabilitarlo in seguito.",
-  "payjoin_enabling_popup_title": "Abilitazione Payjoin",
-  "payjoin_request_awaiting_tx": "In attesa di transazione",
-  "payjoin_request_in_progress": "In corso",
-  "payjoin_unavailable": "Payjoin non disponibile",
-  "payjoin_unavailable_sheet_content": "La ricezione di una transazione Payjoin richiede di avere Bitcoin pronto per l'uso. \\ Ns non appena il tuo portafoglio ha fondi, Payjoin verrà automaticamente abilitato.",
-  "payjoin_unavailable_sheet_title": "Perché Payjoin non è disponibile?",
   "payment_id": "ID Pagamento: ",
-  "payment_made_easy": "I pagamenti resi facilmente",
   "payment_was_received": "Il tuo pagamento è stato ricevuto.",
-  "payments": "Pagamenti",
   "pending": " (non confermati)",
   "percentageOf": "di ${amount}",
   "pin_at_top": "fissa ${token} in alto",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "Gentilmente prova a connetterti ad un altro nodo",
   "please_wait": "Attendere prego",
   "polygonscan_history": "Cronologia PolygonScan",
-  "potential_scam": "Potenziale truffa",
   "powered_by": "Sviluppato da ${title}",
   "pre_seed_button_text": "Ho capito. Mostrami il seme",
-  "pre_seed_description": "Nella pagina successiva vedrai una serie di parole. Questo è il tuo seme unico e privato ed è l'unico modo per recuperare il portafoglio in caso di perdita o malfunzionamento. È tua responsabilità scriverlo e archiviarlo in un posto sicuro al di fuori dell'app per il portafoglio Cake.",
+  "pre_seed_description": "Nella pagina seguente ti sarà mostrata una serie di parole ${words}. Questo è il tuo seme unico e privato ed è l'UNICO modo per recuperare il tuo portafoglio in caso di perdita o malfunzionamento. E' TUA responsabilità trascriverlo e conservarlo in un posto sicuro fuori dall'app Cake Wallet.",
   "pre_seed_title": "IMPORTANTE",
   "prepaid_cards": "Carte prepagata",
   "prevent_screenshots": "Impedisci screenshot e registrazione dello schermo",
@@ -618,7 +553,6 @@
   "proceed_on_device": "Procedi sul tuo dispositivo",
   "proceed_on_device_description": "Segui le istruzioni richieste sul portafoglio hardware",
   "processing": "Elaborazione",
-  "processing_signed_tx": "Elaborazione della transazione firmata",
   "profile": "Profilo",
   "provider_error": "${provider} errore",
   "public_key": "Chiave pubblica",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "Il tuo rappresentante non sembra essere in regola. Tocca qui per selezionarne uno nuovo",
   "repeat_wallet_password": "Ripeti la password del portafoglio",
   "repeated_password_is_incorrect": "La password ripetuta non è corretta. Si prega di ripetere di nuovo la password del portafoglio.",
-  "requested": "Richiesto",
   "require_for_adding_contacts": "Richiedi per l'aggiunta di contatti",
   "require_for_all_security_and_backup_settings": "Richiedi per tutte le impostazioni di sicurezza e backup",
   "require_for_assessing_wallet": "Richiedi per l'accesso al portafoglio",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "Richiedi per invii a portafogli interni",
   "require_for_sends_to_non_contacts": "Richiedi per invii a non contatti",
   "require_pin_after": "Richiedi PIN dopo",
-  "required_passphrase": "Passphrase",
   "rescan": "Scansiona di nuovo",
   "resend_code": "Per favore, invialo nuovamente",
   "reset": "Ripristina",
   "reset_password": "Reimposta password",
-  "restore": "Ripristinare",
   "restore_active_seed": "Seme attivo",
   "restore_address": "Indirizzo",
   "restore_bitcoin_description_from_keys": "Recupera il tuo portafoglio da una stringa WIF generata dalle tue chiavi private",
@@ -714,10 +645,7 @@
   "search_language": "Cerca lingua",
   "second_intro_content": "Il tuo Yat è un unico indirizzo emoji univoco che sostituisce i lunghi indirizzi per tutte le tue valute.",
   "second_intro_title": "Un indirizzo emoji per domarli tutti",
-  "security": "Sicurezza",
   "security_and_backup": "Sicurezza e backup",
-  "security_risk": "Rischio di sicurezza",
-  "security_risk_description": "Questo dominio è contrassegnato come non sicuro da più fornitori di sicurezza. Lascia immediatamente per proteggere le tue risorse.",
   "seed_alert_back": "Torna indietro",
   "seed_alert_content": "Il seme è l'unico modo per recuperare il tuo portafoglio. L'hai trascritto?",
   "seed_alert_title": "Attenzione",
@@ -752,6 +680,9 @@
   "seedtype": "Seedtype",
   "seedtype_alert_content": "La condivisione di semi con altri portafogli è possibile solo con Bip39 SeedType.",
   "seedtype_alert_title": "Avviso seedType",
+  "seedtype_legacy": "Legacy (25 parole)",
+  "seedtype_polyseed": "Polyseed (16 parole)",
+  "seedtype_wownero": "Wownero (14 parole)",
   "select_backup_file": "Seleziona file di backup",
   "select_buy_provider_notice": "Seleziona un provider di acquisto sopra. È possibile saltare questa schermata impostando il provider di acquisto predefinito nelle impostazioni dell'app.",
   "select_destination": "Seleziona la destinazione per il file di backup.",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "Invia dal portafoglio esterno",
   "send_name": "Nome",
   "send_new": "Nuovo",
-  "send_payjoin": "Inviare Payjoin",
   "send_payment_id": "ID Pagamento (opzionale)",
   "send_priority": "Attualmente la commissione è impostata a priorità ${transactionPriority} .\nLa priorità della transazione può essere modificata nelle impostazioni",
   "send_sending": "Invio...",
@@ -833,9 +763,7 @@
   "show_keys": "Mostra seme/chiavi",
   "show_market_place": "Mostra mercato",
   "show_seed": "Mostra seme",
-  "sign_all": "Firma tutto",
   "sign_message": "Firma messaggio",
-  "sign_one": "Segna uno",
   "sign_up": "Registrati",
   "sign_verify_message": "Firmare / verificare",
   "sign_verify_message_sub": "Firma o verifica un messaggio utilizzando la chiave privata",
@@ -864,14 +792,11 @@
   "sort_by": "Ordina per",
   "spend_key_private": "Chiave di spesa (privata)",
   "spend_key_public": "Chiave di spesa (pubblica)",
-  "starting_tor_proxy": "Avvio del proxy di Tor",
   "status": "Stato: ",
-  "step": "Fare un passo",
   "string_default": "Predefinito",
   "subaddress_title": "Lista sottoindirizzi",
   "subaddresses": "Sottoindirizzi",
   "submit_request": "invia una richiesta",
-  "success": "Successo",
   "successful": "Riuscito",
   "support_description_guides": "Documentazione e supporto per problemi comuni",
   "support_description_live_chat": "Gratuito e veloce! I rappresentanti di supporto qualificati sono disponibili per assistervi",
@@ -879,7 +804,6 @@
   "support_title_guides": "Documentazione Cake Wallet",
   "support_title_live_chat": "Supporto in tempo reale",
   "support_title_other_links": "Altri collegamenti di supporto",
-  "supported": "Supportato",
   "swap": "Scambio",
   "sweeping_wallet": "Svuota portafoglio",
   "sweeping_wallet_alert": "Questo non dovrebbe richiedere molto tempo. NON LASCIARE QUESTA SCHERMATA O I FONDI DA TRASFERIRE POTREBBERO ANDARE PERSI",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "SINCRONIZZAZIONE",
   "sync_status_timed_out": "TIMED OUT",
   "sync_status_unsupported": "NODO NON SUPPORTATO",
-  "synchronizing": "Sincronizzazione",
   "syncing_wallet_alert_content": "Il saldo e l'elenco delle transazioni potrebbero non essere completi fin quando non viene visualizzato \"SINCRONIZZATO\" in alto. Clicca/tocca per saperne di più.",
   "syncing_wallet_alert_title": "Il tuo portafoglio si sta sincronizzando",
   "template": "Modello",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "Il provider di Thorchain non supporta gli indirizzi di TapRoot. Si prega di modificare l'indirizzo o selezionare un fornitore diverso.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Suggerimento:",
-  "to": "A",
   "today": "Oggi",
-  "token_already_exists": "Il token esiste già",
   "token_contract_address": "Indirizzo del contratto token",
   "token_decimal": "Decimale del token",
   "token_name": "Nome del token, ad esempio: Tether",
   "token_symbol": "Simbolo del token, ad esempio: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Non dimenticare di specificare l'ID memo durante l'invio della transazione Ton per lo scambio",
   "tor_connection": "Connessione Tor",
-  "tor_connection_timeout": "Timeout di connessione TOR",
-  "tor_experimental": "Questa è una funzionalità sperimentale, non tutte le connessioni realizzate con il supporto per il portafoglio di torta per routing - alcune connessioni possono utilizzare ClearNet, al fine di instradare completamente il traffico di app per l'uso del traffico con la modalità VPN.",
   "tor_only": "Solo Tor",
   "total": "Totale",
   "total_saving": "Risparmio totale",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "Se la schermata non procede dopo 1 minuto, controlla un block explorer e la tua email.",
   "transactions": "Transazioni",
   "transactions_by_date": "Transazioni per data",
-  "transport_type": "Tipo di trasporto",
   "trongrid_history": "Cronologia TronGrid",
   "trusted": "Fidato",
-  "try_again": "Riprova",
   "tx_commit_exception_no_dust_on_change": "La transazione viene respinta con questo importo. Con queste monete è possibile inviare ${min} senza modifiche o ${max} che restituisce il cambiamento.",
   "tx_commit_failed": "Commit di transazione non riuscita. Si prega di contattare il supporto.",
   "tx_commit_failed_no_peers": "Errore nella trasmissione della transazione, si prega di provare nuovamente",
@@ -1014,19 +930,15 @@
   "unspent_coins_details_title": "Dettagli sulle monete non spese",
   "unspent_coins_title": "Monete non spese",
   "unsupported_asset": "Non supportiamo questa azione per questa risorsa. Crea o passa a un portafoglio di un tipo di asset supportato.",
-  "update_session": "Sessione di aggiornamento",
   "uptime": "Uptime",
   "upto": "fino a ${value}",
   "usb": "USB",
   "use": "Passa a ",
   "use_card_info_three": "Utilizza la carta digitale online o con metodi di pagamento contactless.",
   "use_card_info_two": "I fondi vengono convertiti in USD quando sono detenuti nel conto prepagato, non in valute digitali.",
-  "use_device_theme": "Usa il tema del dispositivo",
-  "use_payjoin": "Utilizzo Payjoin",
   "use_ssl": "Usa SSL",
   "use_suggested": "Usa suggerito",
   "use_testnet": "Usa TestNet",
-  "user_rejected_method": "Metodo respinto dall'utente",
   "value": "Valore",
   "value_type": "Tipo di valore",
   "variable_pair_not_supported": "Questa coppia di variabili non è supportata con gli scambi selezionati",
@@ -1054,7 +966,6 @@
   "wallet_group_description_view_seed": "Puoi sempre visualizzare di nuovo questo seme sotto",
   "wallet_group_empty_state_text_one": "Sembra che tu non abbia alcun gruppo di portafoglio compatibile!\n\nPremi",
   "wallet_group_empty_state_text_two": "Di seguito per crearne uno nuovo.",
-  "wallet_has_passphrase": "Questo portafoglio ha una passphrase",
   "wallet_keys": "Seme Portafoglio /chiavi",
   "wallet_list_create_new_wallet": "Crea Nuovo Portafoglio",
   "wallet_list_edit_group_name": "Modifica nome del gruppo",
@@ -1080,11 +991,9 @@
   "wallets": "Portafogli",
   "warning": "Attenzione",
   "welcome": "Benvenuto",
-  "welcome_only": "Benvenuto",
   "welcome_subtitle_new_wallet": "Se vuoi ricominciare da capo, premi Crea un nuovo portafoglio qui sotto.",
   "welcome_subtitle_restore_wallet": "Se hai un portafoglio esistente che vuoi importare in Cake Wallet, scegli semplicemente il ripristino del portafoglio esistente e ti guideremo attraverso il processo.",
   "welcome_to_cakepay": "Benvenuto in Cake Pay!",
-  "what_is_payjoin": "Cos'è PayJoin ?",
   "what_is_silent_payments": "Che cos'è Silent Payments?",
   "widgets_address": "Indirizzo",
   "widgets_or": "o",
@@ -1114,6 +1023,5 @@
   "you_will_get": "Converti a",
   "you_will_receive_estimated_amount": "Riceverai(stimato )",
   "you_will_send": "Conveti da",
-  "youCanGoBackToYourDapp": "Puoi tornare al tuo DApp ora",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index c92a6dab1..6a3a5da72 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "プリペイド資金をカードに追加します（最大 ${value}）",
   "add_new_node": "新しいノードを追加",
   "add_new_word": "新しい単語を追加",
-  "add_passphrase": "パスフレーズを追加します",
-  "add_passphrase_warning_text": "過去にこのウォレットに使用した場合にのみ、パスフレーズを入力してください。間違ったパスフレーズに入ったり、このウォレットでパスフレーズを使用したことがない場合、既存の資金や歴史はありません。",
   "add_receiver": "別のレシーバーを追加します（オプション）",
   "add_secret_code": "または、このシークレット コードを認証アプリに追加します",
   "add_tip": "ヒントを追加",
   "add_token_disclaimer_check": "信頼できる情報源を使用して、トークン コントラクトのアドレスと情報を確認しました。 悪意のある情報や不正確な情報を追加すると、資金が失われる可能性があります。",
   "add_token_warning": "詐欺師の指示に従ってトークンを編集または追加しないでください。\nトークン アドレスは常に信頼できる情報源で確認してください。",
   "add_value": "付加価値",
-  "added_message_for_ata_error": "トランザクションを完了するのに十分なソルバランスがあることを確認してください。",
   "address": "住所",
   "address_book": "住所録",
   "address_book_menu": "住所録",
@@ -55,8 +52,6 @@
   "anonpay_description": "${type} を生成します。受取人はサポートされている任意の暗号通貨で ${method} でき、あなたはこのウォレットで資金を受け取ります。",
   "apk_update": "APKアップデート",
   "approve": "承認する",
-  "approve_request": "リクエストを承認します",
-  "approve_tokens": "トークンを承認します",
   "arrive_in_this_address": "${currency} ${tag}はこの住所に到着します",
   "ascending": "上昇",
   "ask_each_time": "毎回尋ねてください",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "支払い確認を待っています",
   "background_sync": "背景同期",
   "background_sync_mode": "バックグラウンド同期モード",
-  "background_sync_on_battery_low": "低いバッテリーで同期します",
-  "background_sync_on_charging": "充電の場合にのみ同期します",
-  "background_sync_on_device_idle": "デバイスが使用されていない場合にのみ同期します",
-  "background_sync_on_unmetered_network": "未成年のネットワークが必要です",
   "backup": "バックアップ",
   "backup_file": "バックアップファイル",
   "backup_password": "バックアップパスワード",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "ビットコインを購入する",
   "buy_now": "今すぐ購入",
   "buy_provider_unavailable": "現在、プロバイダーは利用できません。",
-  "buy_sell_pair_is_not_supported_warning": "この通貨ペアは、選択した支払い方法のプロバイダーによってサポートされていません。別のペアを選択するか、支払い方法を変更してみてください。",
   "buy_with": "で購入",
   "by_cake_pay": "by Cake Pay",
   "cake_2fa_preset": "ケーキ 2FA プリセット",
@@ -124,12 +114,9 @@
   "camera_consent": "あなたのカメラは、${provider}_ までに識別目的で画像を撮影するために使用されます。詳細については、プライバシー ポリシーをご確認ください。",
   "camera_permission_is_required": "カメラの許可が必要です。\nアプリの設定から有効にしてください。",
   "cancel": "キャンセル",
-  "cannot_verify": "確認できません",
-  "cannot_verify_description": "このドメインを検証することはできません。承認する前に、リクエストを注意深く確認してください。",
   "card_address": "住所:",
   "cardholder_agreement": "カード所有者契約",
   "cards": "カード",
-  "chain_id": "チェーンID",
   "chains": "チェーン",
   "change": "変化する",
   "change_backup_password_alert": "以前のバックアップファイルは、新しいバックアップパスワードでインポートできなくなります。 新しいバックアップパスワードは、新しいバックアップファイルにのみ使用されます。 バックアップパスワードを変更してもよろしいですか？",
@@ -144,7 +131,6 @@
   "change_rep_message": "代表者を変更してもよろしいですか?",
   "change_rep_successful": "代表者の変更に成功しました",
   "change_selected_exchanges": "選択した交換を変更します",
-  "change_selected_pair": "選択したペアを変更します",
   "change_wallet_alert_content": "現在のウォレットをに変更しますか ${wallet_name}?",
   "change_wallet_alert_title": "現在のウォレットを変更する",
   "choose_a_payment_method": "支払い方法を選択します",
@@ -182,14 +168,9 @@
   "confirmed_tx": "確認済み",
   "congratulations": "おめでとうございます！",
   "connect_an_existing_yat": "既存のYatを接続します",
-  "connect_hw_info_step_1": "デバイスが電源を入れていることを確認してください。",
-  "connect_hw_info_step_2": "両方のデバイスのBluetoothをオンにして電話からペアリングするか、USBケーブルを使用してデバイスを一緒に接続します。",
-  "connect_hw_info_step_3": "デバイスのロックを解除し、目的のCryptoアプリに移動します。",
-  "connect_hw_info_step_4": "ケーキウォレットでデバイスを選択し、セットアップを続行します。",
   "connect_yats": "Yatsを接続します",
   "connect_your_hardware_wallet": "BluetoothまたはUSBを使用して、ハードウェアウォレットを接続します",
   "connect_your_hardware_wallet_ios": "Bluetoothを使用してハードウェアウォレットを接続します",
-  "connected": "接続",
   "connection_sync": "接続と同期",
   "connectWalletPrompt": "ウォレットを WalletConnect に接続して取引を行う",
   "contact": "接触",
@@ -207,8 +188,6 @@
   "copy": "コピー",
   "copy_address": "住所をコピー",
   "copy_id": "IDをコピー",
-  "copy_payjoin_address": "Payjoinアドレスをコピーします",
-  "copy_payjoin_url": "Payjoin urlをコピーします",
   "copyWalletConnectLink": "dApp から WalletConnect リンクをコピーし、ここに貼り付けます",
   "corrupted_seed_notice": "このウォレットのファイルは破損しており、開くことができません。シードフレーズを表示し、保存し、財布を復元してください。\n\n値が空の場合、種子を正しく回復することができませんでした。",
   "countries": "国",
@@ -245,22 +224,11 @@
   "descending": "下降",
   "description": "説明",
   "destination_tag": "宛先タグ:",
-  "deuro_collect_interest": "集める",
-  "deuro_savings": "dEuro Savings",
-  "deuro_savings_add": "デポジット",
-  "deuro_savings_balance": "貯蓄バランス",
-  "deuro_savings_collect_interest": "興味を集めます",
-  "deuro_savings_remove": "撤回する",
-  "deuro_savings_set_approval": "承認を設定します",
-  "deuro_savings_subtitle": "Deuro Stablecoin Holdingsで最大10％の利息を稼ぐ",
-  "deuro_tx_commited_content": "トランザクションが確認され、画面に反映されるまでに数秒かかる場合があります",
-  "device_is_signing": "デバイスが署名しています",
   "dfx_option_description": "EUR＆CHFで暗号を購入します。ヨーロッパの小売および企業の顧客向け",
   "didnt_get_code": "コードを取得しませんか？",
   "digit_pin": "桁ピン",
   "digital_and_physical_card": "デジタルおよび物理プリペイドデビットカード",
   "disable": "無効にする",
-  "disable_automatic_exchange_status_updates": "自動交換ステータスの更新を無効にします",
   "disable_bulletin": "サービスステータス速報を無効にします",
   "disable_buy": "購入アクションを無効にする",
   "disable_cake_2fa": "Cake 2FA を無効にする",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "これをオフにすることで、料金金利は場合によっては不正確になる可能性があるため、取引の費用が過払いまたは不足している可能性があります",
   "disable_fiat": "フィアットを無効にする",
   "disable_sell": "販売アクションを無効にする",
-  "disable_tor": "torを無効にします",
   "disable_trade_option": "取引オプションを無効にします",
   "disableBatteryOptimization": "バッテリーの最適化を無効にします",
   "disableBatteryOptimizationDescription": "バックグラウンドシンクをより自由かつスムーズに実行するために、バッテリーの最適化を無効にしたいですか？",
   "disabled": "無効",
-  "disconnect_session": "セッションを切断します",
   "discount": "${value}％を節約",
   "display_settings": "表示設定",
   "displayable": "表示可能",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "サポートを含め、これらを他の誰とも共有しないでください。\n\nあなたの資金は盗まれる可能性があります!",
   "do_not_show_me": "また僕にこれを見せないでください",
   "domain_looks_up": "ドメイン検索",
-  "domain_mismatch": "ドメインの不一致",
-  "domain_mismatch_description": "このWebサイトには、このリクエストの送信者と一致しないドメインがあります。承認すると、資金の損失につながる可能性があります。",
   "donation_link_details": "寄付リンクの詳細",
-  "done": "終わり",
   "e_sign_consent": "電子署名の同意",
   "edit": "編集",
   "edit_backup_password": "バックアップパスワードの編集",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "使用するたびに新しいアドレスが生成されますが、以前のアドレスは引き続き機能します",
   "email_address": "メールアドレス",
   "enable": "有効にする",
-  "enable_builtin_tor": "組み込みのTORを有効にします",
   "enable_mempool_api": "正確な料金と日付のMempool API",
   "enable_replace_by_fee": "交換ごとに有効にします",
   "enable_silent_payments_scanning": "先端に達するまで、サイレント決済のスキャンを開始します",
@@ -333,10 +295,8 @@
   "error_text_template": "テンプレートの名前とアドレスに含めることはできません ` , ' \" シンボル\n1〜106文字の長さである必要があります",
   "error_text_wallet_name": "ウォレット名には、文字、数字、_-記号のみを含めることができます\n長さは1〜33文字である必要があります",
   "error_text_xmr": "XMR値は利用可能な残高を超えることはできません.\n小数桁数は12以下でなければなりません",
-  "error_while_processing": "処理中にエラーが発生しました",
   "errorGettingCredentials": "失敗: 認証情報の取得中にエラーが発生しました",
   "errorSigningTransaction": "トランザクションの署名中にエラーが発生しました",
-  "establishing_tor_connection": "TOR接続を確立します",
   "estimated": "推定",
   "estimated_new_fee": "推定新しい料金",
   "estimated_receive_amount": "推定受信金額",
@@ -360,7 +320,6 @@
   "export_backup": "バックアップのエクスポート",
   "export_logs": "ログをエクスポートします",
   "export_outputs": "エクスポート出力",
-  "extend_session": "セッションを拡張します",
   "extra_id": "追加ID:",
   "extracted_address_content": "に送金します\n${recipient_name}",
   "failed_authentication": "認証失敗. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "不換紙幣 API",
   "fiat_balance": "フィアットバランス",
   "field_required": "この項目は必須です",
-  "file_saved": "保存されたファイル",
   "fill_code": "メールアドレスに記載されている確認コードを入力してください",
   "filter_by": "でフィルタリング",
   "first_wallet_text": "Monero、Bitcoin、Ethereum、Litecoin、Haven用の素晴らしいウォレット",
@@ -382,12 +340,10 @@
   "forgot_password": "パスワードを忘れた",
   "freeze": "氷結",
   "frequently_asked_questions": "よくある質問",
-  "from": "から",
   "frozen": "凍った",
   "frozen_balance": "凍結バランス",
   "full_balance": "フルバランス",
   "gas_exceeds_allowance": "取引に必要なガスは、手当を超えています。",
-  "gas_price": "ガス価格",
   "generate_name": "名前の生成",
   "generated_gift_card": "ギフトカードの生成",
   "generating_gift_card": "ギフトカードの生成",
@@ -414,7 +370,6 @@
   "hide_details": "詳細を非表示",
   "high_contrast_theme": "ハイコントラストテーマ",
   "home_screen_settings": "ホーム画面の設定",
-  "how_to_connect": "接続方法",
   "how_to_use": "使い方",
   "how_to_use_card": "このカードの使用方法",
   "id": "ID: ",
@@ -432,7 +387,6 @@
   "insufficient_lamport_for_tx": "トランザクションとその取引手数料をカバーするのに十分なSOLがありません。財布にソルを追加するか、送信するソル量を減らしてください。",
   "insufficient_lamports": "トランザクションとその取引手数料をカバーするのに十分なSOLがありません。少なくとも${solValueNeeded} solが必要です。財布にソルを追加するか、送信するソル量を減らしてください",
   "insufficientFundsForRentError": "アカウントの取引料金とレンタルをカバーするのに十分なソルがありません。財布にソルを追加するか、送信するソル量を減らしてください",
-  "insufficientFundsForRentErrorReceiver": "受信者のアカウントには、家賃をカバーするのに十分なソルがありません。レシーバーにアカウントにソルを追加するように依頼してください。",
   "introducing_cake_pay": "序章Cake Pay！",
   "invalid_input": "無効入力",
   "invalid_password": "無効なパスワード",
@@ -472,7 +426,6 @@
   "logout": "ログアウト",
   "low_fee": "低料金",
   "low_fee_alert": "現在、低ネットワーク料金優先度を使用しています。これにより、長い待ち時間、異なるレート、またはキャンセルされた取引が発生する可能性があります。より良い体験のために、より高い料金を設定することをお勧めします。",
-  "made_easy": "簡単になりました",
   "manage_nodes": "ノードの管理",
   "manage_pow_nodes": "PoWノードの管理",
   "manage_yats": "Yatsを管理する",
@@ -484,8 +437,6 @@
   "memo": "メモ:",
   "message": "メッセージ",
   "message_verified": "メッセージは正常に検証されました",
-  "messages": "メッセージ",
-  "method": "方法",
   "methods": "メソッド",
   "min_amount": "最小: ${value}",
   "min_value": "分: ${value} ${currency}",
@@ -498,7 +449,6 @@
   "monero_dark_theme": "モネロダークテーマ",
   "monero_light_theme": "モネロ ライト テーマ",
   "moonpay_alert_text": "金額の値は以上でなければなりません ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "NFTの取得中にエラーが発生しました。インターネット接続を確認して、もう一度やり直してください。",
   "more_options": "その他のオプション",
   "multiple_addresses_detected": "複数のアドレスが検出されました",
   "mweb_confirmed": "確認されたMWEB",
@@ -515,7 +465,6 @@
   "new_subaddress_label_name": "ラベル名",
   "new_subaddress_title": "新しいアドレス",
   "new_template": "新しいテンプレート",
-  "new_transactions_notifications": "新しいトランザクションに関する通知を送信します",
   "new_wallet": "新しいウォレット",
   "newConnection": "新しい接続",
   "no_cards_found": "カードは見つかりません",
@@ -540,7 +489,6 @@
   "normal": "普通",
   "note_optional": "注（オプション）",
   "note_tap_to_change": "注（タップして変更）",
-  "notification_permission_denied": "通知の許可はまったく拒否されました。設定で手動で有効にしてください",
   "nullURIError": "URIがnullです",
   "offer_expires_in": "で有効期限が切れます: ",
   "offline": "オフライン",
@@ -572,20 +520,8 @@
   "password": "パスワード",
   "paste": "ペースト",
   "pause_wallet_creation": "Haven Wallet を作成する機能は現在一時停止されています。",
-  "payjoin_card_content": "Payjoinは、Bitcoinの新しいプライバシーを提供し、有料の機能です。",
-  "payjoin_details": "Payjoin 詳細",
-  "payjoin_enabled": "Payjoin enabled",
-  "payjoin_enabling_popup_content": "メニュー→[プライバシー]→[ Payjoinを使用して、後で有効または無効にすることもできます。",
-  "payjoin_enabling_popup_title": "Payjoinを有効にする",
-  "payjoin_request_awaiting_tx": "トランザクションを待っています",
-  "payjoin_request_in_progress": "進行中",
-  "payjoin_unavailable": "Payjoin利用できません",
-  "payjoin_unavailable_sheet_content": "Payjoinトランザクションを受信するには、ビットコインを使用できるようにする必要があります。\\ n \\ nasのウォレットに資金があるとすぐに、 Payjoinが自動的に有効になります。",
-  "payjoin_unavailable_sheet_title": "Payjoinが利用できないのはなぜですか？",
   "payment_id": "支払いID: ",
-  "payment_made_easy": "支払いは簡単になりました",
   "payment_was_received": "お支払いを受け取りました。",
-  "payments": "支払い",
   "pending": " (保留中)",
   "percentageOf": "of ${amount}",
   "pin_at_top": "${token} を上部に固定します",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "別のノードに接続してみてください",
   "please_wait": "お待ちください",
   "polygonscan_history": "ポリゴンスキャン履歴",
-  "potential_scam": "潜在的な詐欺",
   "powered_by": "搭載 ${title}",
   "pre_seed_button_text": "わかります。 種を見せて",
-  "pre_seed_description": "次のページには、一連の単語が表示されます。これはあなたのユニークでプライベートな種であり、損失や誤動作の場合に財布を回復する唯一の方法です。それを書き留めて、ケーキウォレットアプリの外の安全な場所に保管するのはあなたの責任です。",
+  "pre_seed_description": "次のページでは、一連の${words}語が表示されます。 これはあなたのユニークでプライベートなシードであり、紛失や誤動作が発生した場合にウォレットを回復する唯一の方法です。 それを書き留めて、Cake Wallet アプリの外の安全な場所に保管するのはあなたの責任です。",
   "pre_seed_title": "重要",
   "prepaid_cards": "プリペイドカード",
   "prevent_screenshots": "スクリーンショットと画面録画を防止する",
@@ -618,7 +553,6 @@
   "proceed_on_device": "デバイスに進みます",
   "proceed_on_device_description": "ハードウェアウォレットにプロンプ​​トされた指示に従ってください",
   "processing": "処理",
-  "processing_signed_tx": "署名されたトランザクションの処理",
   "profile": "プロフィール",
   "provider_error": "${provider} エラー",
   "public_key": "公開鍵",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "あなたの代表者は良好な状態ではないようです。ここをタップして、新しいものを選択します",
   "repeat_wallet_password": "ウォレットパスワードを繰り返します",
   "repeated_password_is_incorrect": "繰り返しパスワードが正しくありません。ウォレットのパスワードをもう一度繰り返してください。",
-  "requested": "リクエスト",
   "require_for_adding_contacts": "連絡先の追加に必要",
   "require_for_all_security_and_backup_settings": "すべてのセキュリティおよびバックアップ設定に必須",
   "require_for_assessing_wallet": "ウォレットにアクセスするために必要です",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "内部ウォレットへの送信に必須",
   "require_for_sends_to_non_contacts": "非連絡先への送信に必須",
   "require_pin_after": "後に PIN が必要",
-  "required_passphrase": "パスフレーズ",
   "rescan": "再スキャン",
   "resend_code": "再送してください",
   "reset": "リセットする",
   "reset_password": "パスワードのリセット",
-  "restore": "復元する",
   "restore_active_seed": "アクティブシード",
   "restore_address": "住所",
   "restore_bitcoin_description_from_keys": "秘密鍵から生成されたWIF文字列からウォレットを復元します",
@@ -714,10 +645,7 @@
   "search_language": "検索言語",
   "second_intro_content": "Yatは、すべての通貨のすべての長い16進アドレスを置き換える単一の一意の絵文字アドレスです。",
   "second_intro_title": "それらすべてを支配する1つの絵文字アドレス",
-  "security": "安全",
   "security_and_backup": "セキュリティとバックアップ",
-  "security_risk": "セキュリティリスク",
-  "security_risk_description": "このドメインは、複数のセキュリティプロバイダーによって安全でないとフラグが付けられています。あなたの資産を保護するためにすぐに出発します。",
   "seed_alert_back": "戻る",
   "seed_alert_content": "種子はあなたの財布を回復する唯一の方法です。 書き留めましたか？",
   "seed_alert_title": "注意",
@@ -752,6 +680,9 @@
   "seedtype": "SeedType",
   "seedtype_alert_content": "他の財布と種子を共有することは、BIP39 SeedTypeでのみ可能です。",
   "seedtype_alert_title": "SeedTypeアラート",
+  "seedtype_legacy": "レガシー（25語）",
+  "seedtype_polyseed": "ポリシード（16語）",
+  "seedtype_wownero": "wownero（14ワード）",
   "select_backup_file": "バックアップファイルを選択",
   "select_buy_provider_notice": "上記の購入プロバイダーを選択してください。デフォルトの購入プロバイダーをアプリ設定で設定して、この画面をスキップできます。",
   "select_destination": "バックアップファイルの保存先を選択してください。",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "外部ウォレットから送信します",
   "send_name": "名前",
   "send_new": "新着",
-  "send_payjoin": "送信 Payjoin",
   "send_payment_id": "支払いID (オプショナル)",
   "send_priority": "現在、料金は ${transactionPriority} 優先度.\nトランザクションの優先度は設定で調整できます",
   "send_sending": "送信...",
@@ -833,9 +763,7 @@
   "show_keys": "シード/キーを表示する",
   "show_market_place": "マーケットプレイスを表示",
   "show_seed": "シードを表示",
-  "sign_all": "すべてに署名します",
   "sign_message": "署名メッセージ",
-  "sign_one": "1つに署名します",
   "sign_up": "サインアップ",
   "sign_verify_message": "署名 /検証",
   "sign_verify_message_sub": "秘密鍵を使用してメッセージに署名または確認します",
@@ -864,14 +792,11 @@
   "sort_by": "並び替え",
   "spend_key_private": "キーを使う (プライベート)",
   "spend_key_public": "キーを使う (パブリック)",
-  "starting_tor_proxy": "プロキシを開始します",
   "status": "状態: ",
-  "step": "ステップ",
   "string_default": "デフォルト",
   "subaddress_title": "サブアドレス一覧",
   "subaddresses": "サブアドレス",
   "submit_request": "リクエストを送信する",
-  "success": "成功",
   "successful": "成功",
   "support_description_guides": "一般的な問題のドキュメントとサポート",
   "support_description_live_chat": "無料で速い！訓練されたサポート担当者が支援することができます",
@@ -879,7 +804,6 @@
   "support_title_guides": "ケーキウォレットドキュメント",
   "support_title_live_chat": "ライブサポート",
   "support_title_other_links": "その他のサポートリンク",
-  "supported": "サポート",
   "swap": "スワップ",
   "sweeping_wallet": "スイープウォレット",
   "sweeping_wallet_alert": "これには時間がかかりません。この画面から離れないでください。そうしないと、スイープ ファンドが失われる可能性があります",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "同期",
   "sync_status_timed_out": "タイムアウトしました",
   "sync_status_unsupported": "サポートされていないノード",
-  "synchronizing": "同期",
   "syncing_wallet_alert_content": "上部に「同期済み」と表示されるまで、残高と取引リストが完了していない可能性があります。詳細については、クリック/タップしてください。",
   "syncing_wallet_alert_title": "ウォレットは同期中です",
   "template": "テンプレート",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "Thorchainプロバイダーは、TapRootアドレスをサポートしていません。アドレスを変更するか、別のプロバイダーを選択してください。",
   "time": "${minutes}m ${seconds}s",
   "tip": "ヒント: ",
-  "to": "に",
   "today": "今日",
-  "token_already_exists": "トークンはすでに存在します",
   "token_contract_address": "トークンコントラクトアドレス",
   "token_decimal": "トークン10進数",
   "token_name": "トークン名 例: Tether",
   "token_symbol": "トークンシンボル 例: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Exchangeのトントランザクションを送信しながら、メモIDを指定することを忘れないでください",
   "tor_connection": "Tor接続",
-  "tor_connection_timeout": "TOR接続タイムアウト",
-  "tor_experimental": "これは実験的な機能であり、ケーキウォレットサポートTORルーティングから作成されたすべての接続ではありません。一部の接続では、APPトラフィックをVPNモードで完全にルーティングするために、ClearNetを使用する場合があります。",
   "tor_only": "Torのみ",
   "total": "合計",
   "total_saving": "合計節約額",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "1分経っても画面が進まない場合は、ブロックエクスプローラーとメールアドレスを確認してください。",
   "transactions": "取引",
   "transactions_by_date": "日付ごとの取引",
-  "transport_type": "輸送タイプ",
   "trongrid_history": "トロンリッドの歴史",
   "trusted": "信頼できる",
-  "try_again": "もう一度やり直してください",
   "tx_commit_exception_no_dust_on_change": "この金額ではトランザクションは拒否されます。 これらのコインを使用すると、おつりなしの ${min} またはおつりを返す ${max} を送信できます。",
   "tx_commit_failed": "トランザクションコミットは失敗しました。サポートに連絡してください。",
   "tx_commit_failed_no_peers": "トランザクションはブロードキャストに失敗しました。一瞬かそこらで再試行してください",
@@ -1014,19 +930,15 @@
   "unspent_coins_details_title": "未使用のコインの詳細",
   "unspent_coins_title": "未使用のコイン",
   "unsupported_asset": "このアセットに対するこのアクションはサポートされていません。サポートされているアセットタイプのウォレットを作成するか、ウォレットに切り替えてください。",
-  "update_session": "セッションを更新します",
   "uptime": "稼働時間",
   "upto": "up up ${value}",
   "usb": "USB",
   "use": "使用する ",
   "use_card_info_three": "デジタルカードをオンラインまたは非接触型決済方法で使用してください。",
   "use_card_info_two": "デジタル通貨ではなく、プリペイドアカウントで保持されている場合、資金は米ドルに変換されます。",
-  "use_device_theme": "デバイステーマを使用します",
-  "use_payjoin": "使用 Payjoin",
   "use_ssl": "SSLを使用する",
   "use_suggested": "推奨を使用",
   "use_testnet": "テストネットを使用します",
-  "user_rejected_method": "ユーザーは拒否された方法",
   "value": "価値",
   "value_type": "値タイプ",
   "variable_pair_not_supported": "この変数ペアは、選択した取引所ではサポートされていません",
@@ -1053,7 +965,6 @@
   "wallet_group_description_view_seed": "いつでもこの種を再び見ることができます",
   "wallet_group_empty_state_text_one": "互換性のあるウォレットグループがないようです!\n\nタップ",
   "wallet_group_empty_state_text_two": "以下に新しいものを作るために。",
-  "wallet_has_passphrase": "このウォレットにはパスフレーズがあります",
   "wallet_keys": "ウォレットシード/キー",
   "wallet_list_create_new_wallet": "新しいウォレットを作成",
   "wallet_list_edit_group_name": "グループ名を編集します",
@@ -1078,11 +989,10 @@
   "walletConnect": "ウォレットコネクト",
   "wallets": "財布",
   "warning": "警告",
-  "welcome": "いらっしゃいませ",
+  "welcome": "ようこそ に",
   "welcome_subtitle_new_wallet": "新鮮な開始したい場合は、以下の新しい財布を作成すると、レースに出かけることができます。",
   "welcome_subtitle_restore_wallet": "ケーキに持ち込みたい既存のウォレットがある場合は、既存のウォレットを復元するだけで、プロセスを説明します。",
   "welcome_to_cakepay": "Cake Payへようこそ！",
-  "what_is_payjoin": "Payjoin ?とは何ですか",
   "what_is_silent_payments": "サイレント支払いとは何ですか？",
   "widgets_address": "住所",
   "widgets_or": "または",
@@ -1112,6 +1022,5 @@
   "you_will_get": "に変換",
   "you_will_receive_estimated_amount": "あなたは(推定)を受け取ります",
   "you_will_send": "から変換",
-  "youCanGoBackToYourDapp": "あなたは今あなたのダップに戻ることができます",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 0184673d7..d16e18a53 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -1,5 +1,5 @@
 {
-  "about_cake_pay": "Cake Pay를 사용하면 가상 자산으로 기프트 카드를 쉽게 구매하여 미국 내 150,000개 이상의 가맹점에서 즉시 사용할 수 있습니다.",
+  "about_cake_pay": "Cake Pay를 사용하면 미국 내 150,000개 이상의 가맹점에서 즉시 사용할 수 있는 가상 자산이 포함된 기프트 카드를 쉽게 구입할 수 있습니다.",
   "account": "계정",
   "accounts": "계정",
   "accounts_subaddresses": "계정 및 하위 주소",
@@ -7,792 +7,721 @@
   "active": "활성",
   "active_cards": "활성 카드",
   "activeConnectionsPrompt": "활성 연결이 여기에 표시됩니다",
-  "add": "추가",
-  "add_contact": "연락처 추가",
-  "add_contact_to_address_book": "이 연락처를 주소록에 추가하시겠습니까?",
-  "add_custom_node": "새 사용자 지정 노드 추가",
-  "add_custom_redemption": "사용자 지정 사용 추가",
-  "add_fund_to_card": "카드에 선불 자금 추가 (${value}까지)",
+  "add": "더하다",
+  "add_contact": "주소록에 추가",
+  "add_contact_to_address_book": "이 연락처를 주소록에 추가 하시겠습니까?",
+  "add_custom_node": "새 사용자 정의 노드 추가",
+  "add_custom_redemption": "사용자 지정 상환 추가",
+  "add_fund_to_card": "카드에 선불 금액 추가(최대 ${value})",
   "add_new_node": "새 노드 추가",
-  "add_new_word": "새 단어 추가",
-  "add_passphrase": "암호 구문 추가",
-  "add_passphrase_warning_text": "과거에 이 지갑에 암호 구문을 사용한 경우에만 입력하십시오. 잘못된 암호 구문을 입력하거나 이 지갑에서 암호 구문을 사용한 적이 없다면 기존 자금이나 내역이 보이지 않습니다.",
-  "add_receiver": "다른 수신자 추가 (선택 사항)",
-  "add_secret_code": "또는 이 비밀 코드를 인증 앱에 추가하세요",
+  "add_new_word": "새로운 단어 추가",
+  "add_receiver": "다른 수신기 추가(선택 사항)",
+  "add_secret_code": "또는 이 비밀 코드를 인증 앱에 추가하세요.",
   "add_tip": "팁 추가",
-  "add_token_disclaimer_check": "신뢰할 수 있는 출처를 통해 토큰 계약 주소와 정보를 확인했습니다. 악의적이거나 잘못된 정보를 추가하면 자금 손실이 발생할 수 있습니다.",
-  "add_token_warning": "사기꾼의 지시에 따라 토큰을 편집하거나 추가하지 마십시오.\n항상 신뢰할 수 있는 출처를 통해 토큰 주소를 확인하십시오!",
+  "add_token_disclaimer_check": "신뢰할 수 있는 출처를 통해 토큰 컨트랙트 주소와 정보를 확인했습니다. 악의적이거나 잘못된 정보를 추가하면 자금 손실이 발생할 수 있습니다.",
+  "add_token_warning": "사기꾼의 지시에 따라 토큰을 편집하거나 추가하지 마십시오.\n항상 신뢰할 수 있는 출처를 통해 토큰 주소를 확인하세요!",
   "add_value": "값 추가",
-  "added_message_for_ata_error": "거래를 완료하기에 충분한 SOL 잔액이 있는지 확인하십시오.",
   "address": "주소",
   "address_book": "주소록",
   "address_book_menu": "주소록",
-  "address_detected": "주소가 감지되었습니다",
-  "address_from_domain": "이 주소는 Unstoppable Domains의 ${domain}에서 온 것입니다",
-  "address_from_yat": "이 주소는 Yat의 ${emoji}에서 온 것입니다",
-  "address_label": "주소 라벨",
-  "address_remove_contact": "연락처 제거",
-  "address_remove_content": "선택한 연락처를 정말로 제거하시겠습니까?",
-  "addresses": "주소",
+  "address_detected": "주소 감지",
+  "address_from_domain": "이 주소는 ${domain} 의 주소입니다 Unstoppable Domains",
+  "address_from_yat": "이 주소는 ${emoji} 의 주소입니다 Yat",
+  "address_label": "Address label",
+  "address_remove_contact": "연락처 삭제",
+  "address_remove_content": "선택한 연락처를 삭제 하시겠습니까?",
+  "addresses": "구애",
   "advanced_settings": "고급 설정",
-  "aggressive": "적극적",
-  "agree": "동의",
-  "agree_and_continue": "동의하고 계속하기",
-  "agree_to": "계정을 생성함으로써 다음에 동의합니다 ",
-  "alert_notice": "알림",
-  "all": "전체",
-  "all_coins": "모든 코인",
-  "all_trades": "모든 거래",
-  "all_transactions": "모든 트랜잭션",
+  "aggressive": "지나치게 열심인",
+  "agree": "동의하다",
+  "agree_and_continue": "동의 및 계속",
+  "agree_to": "계정을 생성하면 ",
+  "alert_notice": "알아채다",
+  "all": "모든",
+  "all_coins": "모든 동전",
+  "all_trades": "A모든 거래",
+  "all_transactions": "모든 거래 창구",
   "alphabetical": "알파벳순",
-  "already_have_account": "이미 계정이 있으신가요?",
-  "always": "항상",
-  "amount": "금액: ",
-  "amount_is_below_minimum_limit": "수수료 차감 후 잔액이 교환에 필요한 최소 금액(${min})보다 적습니다",
-  "amount_is_estimate": "수령 금액은 예상치입니다",
-  "amount_is_guaranteed": "수령 금액은 보장됩니다",
-  "and": "및",
-  "anonpay_description": "${type} 생성. 수신자는 지원되는 모든 암호화폐로 ${method}할 수 있으며, 귀하는 이 지갑으로 자금을 받게 됩니다.",
+  "already_have_account": "이미 계정이 있습니까?",
+  "always": "언제나",
+  "amount": "양: ",
+  "amount_is_below_minimum_limit": "수수료 후 잔액은 Exchange (${min})에 필요한 최소 금액보다 적습니다.",
+  "amount_is_estimate": "수신 금액은 견적입니다",
+  "amount_is_guaranteed": "수령 금액이 보장됩니다.",
+  "and": "그리고",
+  "anonpay_description": "${type} 생성. 수신자는 지원되는 모든 암호화폐로 ${method}할 수 있으며 이 지갑에서 자금을 받게 됩니다.",
   "apk_update": "APK 업데이트",
-  "approve": "승인",
-  "approve_request": "요청 승인",
-  "approve_tokens": "토큰을 승인합니다",
+  "approve": "승인하다",
   "arrive_in_this_address": "${currency} ${tag}이(가) 이 주소로 도착합니다",
   "ascending": "오름차순",
-  "ask_each_time": "매번 묻기",
-  "auth_store_ban_timeout": "차단_시간 초과",
-  "auth_store_banned_for": "다음 시간 동안 차단됨 ",
-  "auth_store_banned_minutes": " 분",
+  "ask_each_time": "매번 물어보십시오",
+  "auth_store_ban_timeout": "타임 아웃 금지",
+  "auth_store_banned_for": "금지",
+  "auth_store_banned_minutes": " 의사록",
   "auth_store_incorrect_password": "잘못된 PIN",
-  "authenticated": "인증됨",
-  "authentication": "인증",
-  "auto_generate_addresses": "주소 자동 생성",
-  "auto_generate_subaddresses": "하위 주소 자동 생성",
-  "automatic": "자동",
-  "available_balance": "사용 가능 잔액",
-  "available_balance_description": "“사용 가능 잔액” 또는 “확정 잔액”은 즉시 사용할 수 있는 자금입니다. 자금이 아래 잔액에는 표시되지만 위 잔액에는 표시되지 않는 경우, 들어오는 자금이 더 많은 네트워크 확인을 받을 때까지 몇 분 정도 기다려야 합니다. 더 많은 확인을 받은 후 사용할 수 있게 됩니다.",
-  "avg_savings": "평균 절약액",
-  "awaitDAppProcessing": "dApp이 처리를 완료할 때까지 기다려 주십시오.",
+  "authenticated": "인증",
+  "authentication": "입증",
+  "auto_generate_addresses": "자동 생성 주소",
+  "auto_generate_subaddresses": "자동 생성 서브 아드 드레스",
+  "automatic": "자동적 인",
+  "available_balance": "사용 가능한 잔액",
+  "available_balance_description": "이 지갑에서 사용할 수 있는 잔액입니다. 이 잔액은 블록체인에서 가져온 것이며, Cake Wallet이 사용할 수 없습니다.",
+  "avg_savings": "평균 절감액",
+  "awaitDAppProcessing": "dApp이 처리를 마칠 때까지 기다려주세요.",
   "awaiting_payment_confirmation": "결제 확인 대기 중",
-  "background_sync": "백그라운드 동기화",
+  "background_sync": "배경 동기화",
   "background_sync_mode": "백그라운드 동기화 모드",
-  "background_sync_on_battery_low": "배터리 부족 시 동기화",
-  "background_sync_on_charging": "충전 중일 때만 동기화",
-  "background_sync_on_device_idle": "기기를 사용하지 않을 때만 동기화",
-  "background_sync_on_unmetered_network": "무제한 네트워크 필요",
-  "backup": "백업",
+  "backup": "지원",
   "backup_file": "백업 파일",
   "backup_password": "백업 비밀번호",
-  "balance": "잔액",
+  "balance": "균형",
   "balance_page": "잔액 페이지",
   "bill_amount": "청구 금액",
-  "billing_address_info": "청구지 주소를 묻는 경우 배송 주소를 제공하세요",
-  "biometric_auth_reason": "인증하려면 지문을 스캔하세요",
+  "billing_address_info": "청구서 수신 주소를 묻는 메시지가 표시되면 배송 주소를 입력하세요.",
+  "biometric_auth_reason": "지문을 스캔하여 인증",
   "bitcoin_dark_theme": "비트코인 다크 테마",
   "bitcoin_light_theme": "비트코인 라이트 테마",
-  "bitcoin_payments_require_1_confirmation": "비트코인 결제는 1번의 확인이 필요하며, 이는 20분 이상 소요될 수 있습니다. 기다려 주셔서 감사합니다! 결제가 확인되면 이메일로 알려드립니다.",
+  "bitcoin_payments_require_1_confirmation": "비트코인 결제는 1번의 확인이 필요하며 20분 이상이 소요될 수 있습니다. 기다려 주셔서 감사합니다! 결제가 확인되면 이메일이 전송됩니다.",
   "block_height": "블록 높이",
-  "block_remaining": "1 블록 남음",
-  "Blocks_remaining": "${status} 블록 남음",
+  "block_remaining": "남은 블록 1 개",
+  "Blocks_remaining": "${status} 남은 블록",
   "bluetooth": "블루투스",
-  "bright_theme": "밝은 테마",
-  "bump_fee": "수수료 인상",
-  "buy": "구매",
-  "buy_alert_content": "현재 비트코인, 이더리움, 라이트코인, 모네로만 구매를 지원합니다. 비트코인, 이더리움, 라이트코인 또는 모네로 지갑을 생성하거나 전환하세요.",
-  "buy_bitcoin": "비트코인 구매",
-  "buy_now": "지금 구매",
-  "buy_provider_unavailable": "제공 업체를 현재 사용할 수 없습니다.",
-  "buy_sell_pair_is_not_supported_warning": "선택한 결제 방법으로는 이 통화 쌍이 어떤 제공 업체에서도 지원되지 않습니다. 다른 쌍을 선택하거나 결제 방법을 변경해 보세요.",
-  "buy_with": "다음으로 구매",
-  "by_cake_pay": "Cake Pay 제공",
-  "cake_2fa_preset": "Cake 2FA 사전 설정",
-  "cake_dark_theme": "Cake 다크 테마",
-  "cake_pay_account_note": "이메일 주소만으로 가입하여 카드를 확인하고 구매하세요. 일부는 할인된 가격으로도 이용 가능합니다!",
+  "bright_theme": "선명한",
+  "bump_fee": "범프 요금",
+  "buy": "구입",
+  "buy_alert_content": "현재 Bitcoin, Ethereum, Litecoin 및 Monero 구매만 지원합니다. Bitcoin, Ethereum, Litecoin 또는 Monero 지갑을 생성하거나 전환하십시오.",
+  "buy_bitcoin": "비트 코인 구매",
+  "buy_now": "지금 구매하십시오",
+  "buy_provider_unavailable": "제공자는 현재 사용할 수 없습니다.",
+  "buy_with": "구매",
+  "by_cake_pay": "Cake Pay로",
+  "cake_2fa_preset": "케이크 2FA 프리셋",
+  "cake_dark_theme": "케이크 다크 테마",
+  "cake_pay_account_note": "이메일 주소로 가입하면 카드를 보고 구매할 수 있습니다. 일부는 할인된 가격으로 사용 가능합니다!",
   "cake_pay_learn_more": "앱에서 즉시 기프트 카드를 구매하고 사용하세요!\n자세히 알아보려면 왼쪽에서 오른쪽으로 스와이프하세요.",
-  "cake_pay_save_order": "카드는 영업일 기준 1일 이내에 이메일로 발송됩니다.\n주문 ID를 저장하세요:",
-  "cake_pay_subtitle": "전 세계 선불 카드 및 기프트 카드 구매",
+  "cake_pay_save_order": "카드는 영업일 1 일 이내에 이메일로 전자 메일로 보내야합니다. \n 주문 ID 저장 :",
+  "cake_pay_subtitle": "전세계 선불 카드와 기프트 카드를 구입하십시오",
   "cake_pay_web_cards_subtitle": "전 세계 선불 카드 및 기프트 카드 구매",
-  "cake_pay_web_cards_title": "Cake Pay 웹 카드",
-  "cake_seeds_save_disclaimer": "이 단어들을 안전한 곳에 저장하세요! 새 기기에서 지갑을 복구하려면 이 단어들이 필요합니다.",
+  "cake_pay_web_cards_title": "케이크페이 웹카드",
+  "cake_seeds_save_disclaimer": "이 단어를 안전한 장소에 저장하십시오! 새 장치에서 지갑을 복원하려면이 단어가 필요합니다.",
   "cake_wallet": "Cake Wallet",
-  "cakepay_confirm_no_vpn": "프록시 또는 VPN을 사용하고 있지 않음을 확인합니다",
+  "cakepay_confirm_no_vpn": "프록시 나 VPN을 사용하지 않는지 확인합니다.",
   "cakepay_confirm_purchase": "구매 확인",
-  "cakepay_confirm_terms_agreed": "여기에 제시된 이용 약관에 동의합니다:",
-  "cakepay_confirm_voided_refund": "제한된 국가에서의 사용 시도는 환불이 무효화됨을 이해합니다",
-  "cakepay_ios_not_available": "죄송합니다. 이 기프트 카드는 iOS에서 사용할 수 없습니다. 대신 Android나 저희 웹사이트를 통해 구매할 수 있습니다.",
+  "cakepay_confirm_terms_agreed": "여기에 제시된 이용 약관에 동의합니다.",
+  "cakepay_confirm_voided_refund": "제한된 국가의 상환 시도는 환불을 무효화한다는 것을 이해합니다.",
+  "cakepay_ios_not_available": "죄송합니다.이 기프트 카드는 iOS에서 사용할 수 없습니다. Android 또는 웹 사이트를 통해 구매할 수 있습니다.",
   "cakepay_prepaid_card": "CakePay 선불 직불 카드",
-  "camera_consent": "${provider}에서 신원 확인 목적으로 이미지를 캡처하기 위해 카메라를 사용합니다. 자세한 내용은 해당 업체의 개인정보 보호정책을 확인하세요.",
+  "camera_consent": "귀하의 카메라는 ${provider}의 식별 목적으로 이미지를 캡처하는 데 사용됩니다. 자세한 내용은 해당 개인정보 보호정책을 확인하세요.",
   "camera_permission_is_required": "카메라 권한이 필요합니다.\n앱 설정에서 활성화해 주세요.",
   "cancel": "취소",
-  "cannot_verify": "확인할 수 없음",
-  "cannot_verify_description": "이 도메인은 확인할 수 없습니다. 승인하기 전에 요청을 주의 깊게 확인하세요.",
   "card_address": "주소:",
-  "cardholder_agreement": "카드 소지자 계약",
+  "cardholder_agreement": "카드 소유자 계약",
   "cards": "카드",
-  "chain_id": "체인 ID",
-  "chains": "체인",
-  "change": "변경",
-  "change_backup_password_alert": "이전 백업 파일은 새 백업 비밀번호로 가져올 수 없습니다. 새 백업 비밀번호는 새 백업 파일에만 사용됩니다. 백업 비밀번호를 변경하시겠습니까?",
+  "chains": "쇠사슬",
+  "change": "변화",
+  "change_backup_password_alert": "이전 백업 파일은 새 백업 암호로 가져올 수 없습니다. 새 백업 암호는 새 백업 파일에만 사용됩니다. 백업 비밀번호를 변경 하시겠습니까?",
   "change_currency": "통화 변경",
-  "change_current_node": "현재 노드를 ${node}(으)로 변경하시겠습니까?",
+  "change_current_node": "현재 노드를 다음으로 변경 하시겠습니까 ${node}?",
   "change_current_node_title": "현재 노드 변경",
-  "change_exchange_provider": "스왑 제공 업체 변경",
+  "change_exchange_provider": "스왑 제공 업체를 변경하십시오",
   "change_language": "언어 변경",
-  "change_language_to": "언어를 ${language}(으)로 변경하시겠습니까?",
+  "change_language_to": "언어를로 변경 ${language}?",
   "change_password": "비밀번호 변경",
-  "change_rep": "대표자 변경",
-  "change_rep_message": "정말로 대표자를 변경하시겠습니까?",
-  "change_rep_successful": "대표자가 성공적으로 변경되었습니다",
-  "change_selected_exchanges": "선택한 교환소 변경",
-  "change_selected_pair": "선택한 쌍 변경",
-  "change_wallet_alert_content": "현재 지갑을 ${wallet_name}(으)로 변경하시겠습니까?",
+  "change_rep": "대표를 변경하십시오",
+  "change_rep_message": "대표를 바꾸고 싶습니까?",
+  "change_rep_successful": "대리인이 성공적으로 변경되었습니다",
+  "change_selected_exchanges": "선택된 거래소 변경",
+  "change_wallet_alert_content": "현재 지갑을 다음으로 변경 하시겠습니까 ${wallet_name}?",
   "change_wallet_alert_title": "현재 지갑 변경",
-  "choose_a_payment_method": "결제 방법 선택",
-  "choose_a_provider": "제공 업체 선택",
-  "choose_account": "계정 선택",
-  "choose_address": "\n\n주소를 선택하세요:",
-  "choose_card_value": "카드 금액 선택",
-  "choose_derivation": "지갑 파생 경로 선택",
-  "choose_from_available_options": "사용 가능한 옵션 중에서 선택하세요:",
+  "choose_a_payment_method": "결제 방법을 선택하십시오",
+  "choose_a_provider": "제공자를 선택하십시오",
+  "choose_account": "계정을 선택하십시오",
+  "choose_address": "\n\n주소를 선택하십시오:",
+  "choose_card_value": "카드 값을 선택하십시오",
+  "choose_derivation": "지갑 파생을 선택하십시오",
+  "choose_from_available_options": "사용 가능한 옵션에서 선택:",
   "choose_one": "하나 선택",
-  "choose_relay": "사용할 릴레이를 선택하세요",
-  "choose_wallet_currency": "지갑 통화를 선택하세요:",
-  "choose_wallet_group": "지갑 그룹 선택",
-  "clear": "지우기",
+  "choose_relay": "사용할 릴레이를 선택해주세요",
+  "choose_wallet_currency": "지갑 통화를 선택하십시오:",
+  "choose_wallet_group": "지갑 그룹을 선택하십시오",
+  "clear": "명확한",
   "clearnet_link": "클리어넷 링크",
-  "close": "닫기",
-  "coin_control": "코인 제어 (선택 사항)",
-  "cold_or_recover_wallet": "Cupcake의 읽기 전용 지갑 또는 콜드 월렛을 추가하거나 페이퍼 월렛을 복구합니다",
-  "collection_address": "컬렉션 주소",
+  "close": "닫다",
+  "coin_control": "코인 제어 (옵션)",
+  "cold_or_recover_wallet": "Cupcake 또는 차가운 지갑에서 읽기 전용 지갑을 추가하거나 종이 지갑을 복구하십시오.",
+  "collection_address": "수집 주소",
   "collection_description": "컬렉션 설명",
-  "collection_name": "컬렉션 이름",
+  "collection_name": "수집 이름",
   "color_theme": "색상 테마",
-  "commit_transaction_amount_fee": "트랜잭션 커밋\n금액: ${amount}\n수수료: ${fee}",
+  "commit_transaction_amount_fee": "커밋 거래\n양: ${amount}\n보수: ${fee}",
   "confirm": "확인",
-  "confirm_delete_template": "이 작업은 이 템플릿을 삭제합니다. 계속하시겠습니까?",
-  "confirm_delete_wallet": "이 작업은 이 지갑을 삭제합니다. 계속하시겠습니까?",
-  "confirm_fee_deduction": "수수료 차감 확인",
-  "confirm_fee_deduction_content": "출금액에서 수수료를 차감하는 데 동의하십니까?",
-  "confirm_passphrase": "암호 구문 확인",
+  "confirm_delete_template": "이 작업은이 템플릿을 삭제합니다. 계속 하시겠습니까?",
+  "confirm_delete_wallet": "이 작업은이 지갑을 삭제합니다. 계속 하시겠습니까?",
+  "confirm_fee_deduction": "수수료 공제를 확인하십시오",
+  "confirm_fee_deduction_content": "출력에서 수수료를 공제하는 데 동의하십니까?",
+  "confirm_passphrase": "암호를 확인하십시오",
   "confirm_sending": "전송 확인",
-  "confirm_silent_payments_switch_node": "현재 노드는 사일런트 페이먼트를 지원하지 않습니다.\\n\\nCake Wallet은 스캔하는 동안 호환되는 노드로 전환됩니다.",
-  "confirm_transaction": "트랜잭션 확인",
+  "confirm_silent_payments_switch_node": "현재 노드는 무음 지불을 지원하지 않습니다 \\ ncake 지갑은 스캔을 위해 호환 가능한 노드로 전환됩니다.",
+  "confirm_transaction": "거래 확인",
   "confirmations": "확인",
-  "confirmed": "확정 잔액",
-  "confirmed_tx": "확정됨",
+  "confirmed": "확인된 잔액",
+  "confirmed_tx": "확인",
   "congratulations": "축하합니다!",
   "connect_an_existing_yat": "기존 Yat 연결",
-  "connect_hw_info_step_1": "장치의 전원이 켜져 있는지 확인하십시오.",
-  "connect_hw_info_step_2": "두 장치 모두에 Bluetooth를 켜고 전화에서 페어링하거나 USB 케이블을 사용하여 장치를 함께 연결하십시오.",
-  "connect_hw_info_step_3": "장치를 잠금 해제하고 원하는 암호화 앱으로 이동하십시오.",
-  "connect_hw_info_step_4": "케이크 지갑에서 장치를 선택하고 설정을 계속하십시오.",
-  "connect_yats": "Yat 연결",
-  "connect_your_hardware_wallet": "블루투스 또는 USB를 사용하여 하드웨어 지갑 연결",
-  "connect_your_hardware_wallet_ios": "블루투스를 사용하여 하드웨어 지갑 연결",
-  "connected": "연결됨",
+  "connect_yats": "야츠 연결",
+  "connect_your_hardware_wallet": "Bluetooth 또는 USB를 사용하여 하드웨어 지갑을 연결하십시오",
+  "connect_your_hardware_wallet_ios": "Bluetooth를 사용하여 하드웨어 지갑을 연결하십시오",
   "connection_sync": "연결 및 동기화",
-  "connectWalletPrompt": "거래를 하려면 WalletConnect로 지갑을 연결하세요",
-  "contact": "연락처",
-  "contact_list_contacts": "연락처",
+  "connectWalletPrompt": "거래를 하려면 WalletConnect에 지갑을 연결하세요.",
+  "contact": "접촉",
+  "contact_list_contacts": "콘택트 렌즈",
   "contact_list_wallets": "내 지갑",
-  "contact_name": "연락처 이름",
-  "contact_name_exists": "해당 이름의 연락처가 이미 존재합니다. 다른 이름을 선택하십시오.",
-  "contact_support": "고객 지원 문의",
-  "continue_text": "계속",
-  "contract_warning": "이 계약 주소는 잠재적으로 사기일 수 있다는 플래그가 지정되었습니다. 주의하여 진행하십시오.",
-  "contractName": "계약 이름",
-  "contractSymbol": "계약 심볼",
-  "copied_key_to_clipboard": "${key} 클립보드에 복사됨",
-  "copied_to_clipboard": "클립보드에 복사됨",
-  "copy": "복사",
+  "contact_name": "담당자 이름",
+  "contact_name_exists": "해당 이름을 가진 연락처가 이미 존재합니다. 다른 이름을 선택하세요.",
+  "contact_support": "지원팀에 문의",
+  "continue_text": "잇다",
+  "contract_warning": "이 계약 주소는 잠재적으로 사기성으로 표시되었습니다. 주의해서 계속 진행하십시오.",
+  "contractName": "계약명",
+  "contractSymbol": "계약 기호",
+  "copied_key_to_clipboard": "복사 ${key} 클립 보드로",
+  "copied_to_clipboard": "클립 보드에 복사",
+  "copy": "부",
   "copy_address": "주소 복사",
-  "copy_id": "ID 복사",
-  "copy_payjoin_address": "Payjoin 주소를 복사하십시오",
-  "copy_payjoin_url": "Payjoin url을 복사하십시오",
-  "copyWalletConnectLink": "dApp에서 WalletConnect 링크를 복사하여 여기에 붙여넣으세요",
-  "corrupted_seed_notice": "이 지갑의 파일이 손상되어 열 수 없습니다. 시드 구문을 보고 저장한 다음 지갑을 복구하세요.\n\n값이 비어 있으면 시드를 올바르게 복구할 수 없었습니다.",
+  "copy_id": "부 ID",
+  "copyWalletConnectLink": "dApp에서 WalletConnect 링크를 복사하여 여기에 붙여넣으세요.",
+  "corrupted_seed_notice": "이 지갑의 파일은 손상되어 열 수 없습니다. 씨앗 문구를보고 저장하고 지갑을 복원하십시오.\n\n값이 비어 있으면 씨앗을 올바르게 회수 할 수 없었습니다.",
   "countries": "국가",
-  "create_account": "계정 생성",
+  "create_account": "계정 만들기",
   "create_backup": "백업 생성",
-  "create_donation_link": "기부 링크 생성",
+  "create_donation_link": "기부 링크 만들기",
   "create_invoice": "인보이스 생성",
-  "create_new": "새 지갑 생성",
-  "create_new_account": "새 계정 생성",
-  "create_new_seed": "새 시드 생성",
-  "creating_new_wallet": "새 지갑 생성 중",
+  "create_new": "새 월렛 만들기",
+  "create_new_account": "새 계정을 만들",
+  "create_new_seed": "새 씨앗을 만듭니다",
+  "creating_new_wallet": "새 지갑 생성",
   "creating_new_wallet_error": "오류: ${description}",
-  "creation_date": "생성 날짜",
-  "custom": "사용자 지정",
-  "custom_drag": "사용자 지정 (길게 누르고 드래그)",
-  "custom_redeem_amount": "사용자 지정 사용 금액",
-  "custom_value": "사용자 지정 값",
-  "dark_theme": "다크 테마",
+  "creation_date": "생산 일",
+  "custom": "커스텀",
+  "custom_drag": "사용자 정의 (홀드 앤 드래그)",
+  "custom_redeem_amount": "사용자 지정 상환 금액",
+  "custom_value": "맞춤 가치",
+  "dark_theme": "어두운",
   "debit_card": "직불 카드",
-  "debit_card_terms": "이 디지털 지갑에 결제 카드 번호(및 결제 카드 번호에 해당하는 자격 증명)를 저장하고 사용하는 것은 해당 카드 발급사와의 카드 소지자 계약 이용 약관(수시로 효력 발생)의 적용을 받습니다.",
-  "decimal_places_error": "소수 자릿수가 너무 많습니다",
-  "decimals_cannot_be_zero": "토큰 소수 자릿수는 0이 될 수 없습니다.",
-  "decred_info_card_details": "Decred는 “SPV”로 알려진 분산형 및 개인 정보 보호 동기화 방법을 사용하며, 이는 일반 비트코인 지갑보다 오래 걸립니다. 자세히 알아보려면 아래를 탭하세요.",
-  "decred_info_title": "Decred 동기화",
-  "default_buy_provider": "기본 구매 제공 업체",
-  "default_sell_provider": "기본 판매 제공 업체",
-  "delete": "삭제",
+  "debit_card_terms": "이 디지털 지갑에 있는 귀하의 지불 카드 번호(및 귀하의 지불 카드 번호에 해당하는 자격 증명)의 저장 및 사용은 부터 발효되는 지불 카드 발행자와의 해당 카드 소지자 계약의 이용 약관을 따릅니다. 수시로.",
+  "decimal_places_error": "소수점 이하 자릿수가 너무 많습니다.",
+  "decimals_cannot_be_zero": "토큰 소수점은 0이 될 수 없습니다.",
+  "decred_info_card_details": "Decred는 정상적인 비트 코인 지갑보다 더 오래 걸리는 \"SPV\"로 알려진 분산 및 개인 정보 보호 동기화 방법을 사용합니다. 자세한 내용은 아래를 누릅니다.",
+  "decred_info_title": "Decred의 동기화",
+  "default_buy_provider": "기본 구매 제공자",
+  "default_sell_provider": "기본 판매 공급자",
+  "delete": "지우다",
   "delete_account": "계정 삭제",
   "delete_wallet": "지갑 삭제",
-  "delete_wallet_confirm_message": "${wallet_name} 지갑을 정말로 삭제하시겠습니까?",
-  "deleteConnectionConfirmationPrompt": "연결을 삭제하시겠습니까?",
-  "denominations": "액면가",
+  "delete_wallet_confirm_message": "${wallet_name} 지갑을 삭제하시겠습니까?",
+  "deleteConnectionConfirmationPrompt": "다음 연결을 삭제하시겠습니까?",
+  "denominations": "교파",
   "derivationpath": "파생 경로",
   "descending": "내림차순",
   "description": "설명",
   "destination_tag": "목적지 태그:",
-  "deuro_collect_interest": "모으다",
-  "deuro_savings": "도로 저축",
-  "deuro_savings_add": "보증금",
-  "deuro_savings_balance": "저축 잔고",
-  "deuro_savings_collect_interest": "관심을 모으십시오",
-  "deuro_savings_remove": "철회하다",
-  "deuro_savings_set_approval": "승인을 설정하십시오",
-  "deuro_savings_subtitle": "Deuro Stablecoin Holdings에 최대 10%의이자를 받으십시오.",
-  "deuro_tx_commited_content": "트랜잭션이 확인하고 화면에 반영되는 데 몇 초가 걸릴 수 있습니다.",
-  "device_is_signing": "장치가 서명 중입니다",
-  "dfx_option_description": "EUR 및 CHF로 암호화폐 구매. 유럽의 개인 및 기업 고객 대상",
-  "didnt_get_code": "코드를 받지 못했나요?",
-  "digit_pin": "자리 PIN",
-  "digital_and_physical_card": " 디지털 및 실물 선불 직불 카드",
-  "disable": "비활성화",
-  "disable_automatic_exchange_status_updates": "자동 교환 상태 업데이트를 비활성화합니다",
-  "disable_bulletin": "서비스 상태 게시판 비활성화",
-  "disable_buy": "구매 기능 비활성화",
-  "disable_cake_2fa": "Cake 2FA 비활성화",
+  "dfx_option_description": "EUR & CHF로 암호화를 구입하십시오. 유럽의 소매 및 기업 고객을 위해",
+  "didnt_get_code": "코드를 받지 못하셨습니까?",
+  "digit_pin": "숫자 PIN",
+  "digital_and_physical_card": " 디지털 및 실제 선불 직불 카드",
+  "disable": "장애를 입히다",
+  "disable_bulletin": "서비스 상태 게시판을 비활성화합니다",
+  "disable_buy": "구매 행동 비활성화",
+  "disable_cake_2fa": "케이크 2FA 비활성화",
   "disable_exchange": "교환 비활성화",
-  "disable_exchange_option": "교환 옵션 비활성화",
-  "disable_fee_api_warning": "이 기능을 끄면 경우에 따라 수수료율이 정확하지 않을 수 있으며, 트랜잭션 수수료를 과다 또는 과소 지불할 수 있습니다.",
+  "disable_exchange_option": "교환 옵션을 비활성화합니다",
+  "disable_fee_api_warning": "이것을 끄면 경우에 따라 수수료가 부정확 할 수 있으므로 거래 수수료를 초과 지불하거나 지불 할 수 있습니다.",
   "disable_fiat": "법정화폐 비활성화",
   "disable_sell": "판매 조치 비활성화",
-  "disable_tor": "Tor를 비활성화하십시오",
   "disable_trade_option": "거래 옵션 비활성화",
-  "disableBatteryOptimization": "배터리 최적화 비활성화",
-  "disableBatteryOptimizationDescription": "백그라운드 동기화가 더 자유롭고 원활하게 실행되도록 배터리 최적화를 비활성화하시겠습니까?",
-  "disabled": "비활성화됨",
-  "disconnect_session": "세션 연결 해제",
+  "disableBatteryOptimization": "배터리 최적화를 비활성화합니다",
+  "disableBatteryOptimizationDescription": "백그라운드 동기화를보다 자유롭고 매끄럽게 실행하기 위해 배터리 최적화를 비활성화하고 싶습니까?",
+  "disabled": "장애가 있는",
   "discount": "${value}% 절약",
-  "display_settings": "표시 설정",
+  "display_settings": "디스플레이 설정",
   "displayable": "표시 가능",
-  "do_not_have_enough_gas_asset": "현재 블록체인 네트워크 상태에서 트랜잭션을 생성하기에 ${currency}이(가) 충분하지 않습니다. 다른 자산을 보내는 경우에도 블록체인 네트워크 수수료를 지불하기 위해 더 많은 ${currency}이(가) 필요합니다.",
-  "do_not_send": "보내지 않음",
-  "do_not_share_warning_text": "지원을 포함하여 다른 누구와도 공유하지 마십시오.\n\n자금이 도난당할 수 있습니다!",
-  "do_not_show_me": "다시 표시하지 않음",
+  "do_not_have_enough_gas_asset": "현재 블록체인 네트워크 조건으로 거래를 하기에는 ${currency}이(가) 충분하지 않습니다. 다른 자산을 보내더라도 블록체인 네트워크 수수료를 지불하려면 ${currency}가 더 필요합니다.",
+  "do_not_send": "보내지 마세요",
+  "do_not_share_warning_text": "지원을 포함하여 다른 사람과 이러한 정보를 공유하지 마십시오.\n\n귀하의 자금은 도난당할 수 있고 도난당할 수 있습니다!",
+  "do_not_show_me": "나를 다시 표시하지 않음",
   "domain_looks_up": "도메인 조회",
-  "domain_mismatch": "도메인 불일치",
-  "domain_mismatch_description": "이 웹사이트의 도메인이 이 요청의 발신자와 일치하지 않습니다. 승인하면 자금 손실로 이어질 수 있습니다.",
-  "donation_link_details": "기부 링크 세부 정보",
-  "done": "완료",
+  "donation_link_details": "기부 링크 세부정보",
   "e_sign_consent": "전자 서명 동의",
-  "edit": "편집",
-  "edit_backup_password": "백업 비밀번호 편집",
+  "edit": "편집하다",
+  "edit_backup_password": "편집 백업 암호",
   "edit_node": "노드 편집",
   "edit_token": "토큰 편집",
-  "electrum_address_disclaimer": "사용할 때마다 새 주소를 생성하지만 이전 주소도 계속 작동합니다",
+  "electrum_address_disclaimer": "사용할 때마다 새 주소가 생성되지만 이전 주소는 계속 작동합니다.",
   "email_address": "이메일 주소",
-  "enable": "활성화",
-  "enable_builtin_tor": "내장 Tor를 활성화하십시오",
-  "enable_mempool_api": "정확한 수수료 및 날짜를 위한 Mempool API",
-  "enable_replace_by_fee": "RBF(Replace-By-Fee) 활성화",
-  "enable_silent_payments_scanning": "사일런트 페이먼트 주소로 전송된 트랜잭션 스캔 시작",
-  "enabled": "활성화됨",
+  "enable": "할 수 있게 하다",
+  "enable_mempool_api": "정확한 수수료 및 날짜에 대한 Mempool API",
+  "enable_replace_by_fee": "대체별로 활성화하십시오",
+  "enable_silent_payments_scanning": "팁에 도달 할 때까지 사일런트 지불을 스캔하기 시작합니다.",
+  "enabled": "사용",
   "enter_amount": "금액 입력",
-  "enter_backup_password": "여기에 백업 비밀번호 입력",
+  "enter_backup_password": "여기에 백업 비밀번호를 입력하세요.",
   "enter_code": "코드 입력",
-  "enter_seed_phrase": "시드 구문 입력",
+  "enter_seed_phrase": "시드 문구를 입력하십시오",
   "enter_totp_code": "TOTP 코드를 입력하세요.",
-  "enter_wallet_password": "지갑 비밀번호 입력",
+  "enter_wallet_password": "지갑 암호를 입력하십시오",
   "enter_your_note": "메모를 입력하세요…",
-  "enter_your_pin": "PIN 입력",
-  "enter_your_pin_again": "PIN 다시 입력",
-  "enterTokenID": "토큰 ID 입력",
-  "enterWalletConnectURI": "WalletConnect URI 입력",
+  "enter_your_pin": "PIN을 입력하십시오",
+  "enter_your_pin_again": "다시 핀을 입력",
+  "enterTokenID": "토큰 ID를 입력하세요",
+  "enterWalletConnectURI": "WalletConnect URI를 입력하세요.",
   "error": "오류",
-  "error_dialog_content": "죄송합니다. 오류가 발생했습니다.\n\n애플리케이션 개선을 위해 오류 보고서를 지원팀에 보내주세요.",
-  "error_text_account_name": "계정 이름은 문자, 숫자만 포함할 수 있으며\n1~15자 사이여야 합니다.",
-  "error_text_address": "지갑 주소는 암호화폐 유형과\n일치해야 합니다.",
-  "error_text_amount": "금액은 숫자만 포함할 수 있습니다.",
-  "error_text_contact_name": "연락처 이름에는 ` , ' \" 기호를 포함할 수 없으며\n1~32자 사이여야 합니다.",
-  "error_text_crypto_currency": "소수 자릿수는\n12자리 이하여야 합니다.",
-  "error_text_fiat": "금액 값이 사용 가능 잔액을 초과할 수 없습니다.\n소수 자릿수는 2자리 이하여야 합니다.",
-  "error_text_input_above_maximum_limit": "금액이 최대 한도를 초과합니다.",
-  "error_text_input_below_minimum_limit": "금액이 최소 한도 미만입니다.",
-  "error_text_keys": "지갑 키는 16진수로 64자만 포함할 수 있습니다.",
-  "error_text_limits_loading_failed": "${provider} 거래가 생성되지 않았습니다. 한도 로딩 실패",
-  "error_text_maximum_limit": "${provider} 거래가 생성되지 않았습니다. 금액이 최대값(${max} ${currency})보다 큽니다.",
-  "error_text_minimal_limit": "${provider} 거래가 생성되지 않았습니다. 금액이 최소값(${min} ${currency})보다 작습니다.",
-  "error_text_node_address": "IPv4 주소를 입력하세요.",
-  "error_text_node_port": "노드 포트는 0에서 65535 사이의 숫자만 포함할 수 있습니다.",
-  "error_text_node_proxy_address": "<IPv4 주소>:<포트> 형식으로 입력하세요. 예: 127.0.0.1:9050",
-  "error_text_payment_id": "결제 ID는 16진수로 16~64자만 포함할 수 있습니다.",
-  "error_text_subaddress_name": "하위 주소 이름에는 ` , ' \" 기호를 포함할 수 없으며\n1~20자 사이여야 합니다.",
-  "error_text_template": "템플릿 이름과 주소에는 ` , ' \" 기호를 포함할 수 없으며\n1~106자 사이여야 합니다.",
-  "error_text_wallet_name": "지갑 이름은 문자, 숫자, _ - 기호만 포함할 수 있으며\n1~33자 사이여야 합니다.",
-  "error_text_xmr": "XMR 값이 사용 가능 잔액을 초과할 수 없습니다.\n소수 자릿수는 12자리 이하여야 합니다.",
-  "error_while_processing": "처리 중 오류가 발생했습니다",
-  "errorGettingCredentials": "실패: 자격 증명을 가져오는 중 오류 발생",
-  "errorSigningTransaction": "트랜잭션 서명 중 오류가 발생했습니다",
-  "establishing_tor_connection": "Tor 연결을 실행합니다",
+  "error_dialog_content": "죄송합니다. 오류가 발생했습니다.\n\n오류 보고서를 지원 팀에 보내 응용 프로그램을 개선하십시오.",
+  "error_text_account_name": "계정 이름은 문자, 숫자 만 포함 할 수 있습니다\n1 ~ 15 자 사이 여야합니다",
+  "error_text_address": "지갑 주소는 유형과 일치해야합니다\n암호 화폐",
+  "error_text_amount": "금액은 숫자 만 포함 할 수 있습니다",
+  "error_text_contact_name": "담당자 이름은 포함 할 수 없습니다 ` , ' \" 기호\n1 자에서 32 자 사이 여야합니다",
+  "error_text_crypto_currency": "소수 자릿수\n12 이하 여야합니다",
+  "error_text_fiat": "금액은 사용 가능한 잔액을 초과 할 수 없습니다.\n소수 자릿수는 2보다 작거나 같아야합니다",
+  "error_text_input_above_maximum_limit": "금액이 최대 값보다 많습니다.",
+  "error_text_input_below_minimum_limit": "금액이 최소보다 적습니다.",
+  "error_text_keys": "지갑 키는 16 진수로 64 자만 포함 할 수 있습니다",
+  "error_text_limits_loading_failed": "거래 ${provider} 가 생성되지 않습니다. 로딩 실패",
+  "error_text_maximum_limit": "거래 ${provider} 가 생성되지 않습니다. 금액이 최대 값보다 많습니다. ${max} ${currency}",
+  "error_text_minimal_limit": "거래 ${provider} 가 생성되지 않습니다. 금액이 최소보다 적습니다. ${min} ${currency}",
+  "error_text_node_address": "iPv4 주소를 입력하십시오",
+  "error_text_node_port": "노드 포트는 0에서 65535 사이의 숫자 만 포함 할 수 있습니다",
+  "error_text_node_proxy_address": "<IPv4 주소>:<포트>를 입력하십시오(예: 127.0.0.1:9050).",
+  "error_text_payment_id": "지불 ID는 16 ~ 64 자의 16 진 문자 만 포함 할 수 있습니다",
+  "error_text_subaddress_name": "하위 주소 이름은 포함 할 수 없습니다 ` , ' \" 기호 \n1 ~ 20 자 사이 여야합니다",
+  "error_text_template": "템플릿 이름과 주소는 포함 할 수 없습니다 ` , ' \" 기호 \n1 ~ 106 자 사이 여야합니다",
+  "error_text_wallet_name": "지갑 이름은 문자, 숫자, _ - 기호만 포함할 수 있습니다.\n1~33자 사이여야 합니다.",
+  "error_text_xmr": "XMR 값은 사용 가능한 잔액을 초과 할 수 없습니다.\n소수 자릿수는 12 이하 여야합니다",
+  "errorGettingCredentials": "실패: 자격 증명을 가져오는 중 오류가 발생했습니다.",
+  "errorSigningTransaction": "거래에 서명하는 동안 오류가 발생했습니다.",
   "estimated": "예상",
-  "estimated_new_fee": "예상 새 수수료",
-  "estimated_receive_amount": "예상 수령 금액",
-  "etherscan_history": "Etherscan 내역",
+  "estimated_new_fee": "예상 새로운 수수료",
+  "estimated_receive_amount": "예상 수신 금액",
+  "etherscan_history": "이더스캔 역사",
   "event": "이벤트",
   "events": "이벤트",
   "exchange": "교환",
-  "exchange_incorrect_current_wallet_for_xmr": "Cake Wallet 모네로 잔액에서 XMR을 스왑하려면 먼저 모네로 지갑으로 전환하세요.",
+  "exchange_incorrect_current_wallet_for_xmr": "케이크 지갑 Monero Balance에서 XMR을 교체하려면 먼저 Monero 지갑으로 전환하십시오.",
   "exchange_new_template": "새 템플릿",
-  "exchange_provider_unsupported": "${providerName}은(는) 더 이상 지원되지 않습니다!",
-  "exchange_result_confirm": "확인을 누르면 ${walletName} 지갑에서 아래 표시된 주소로 ${fetchingLabel} ${from}을(를) 보냅니다. 또는 외부 지갑에서 아래 주소/QR 코드로 보낼 수 있습니다.\n\n계속하려면 확인을 누르거나 뒤로 가서 금액을 변경하세요.",
-  "exchange_result_description": "다음 페이지에 표시된 주소로 최소 ${fetchingLabel} ${from}을(를) 보내야 합니다. ${fetchingLabel} ${from}보다 적은 금액을 보내면 전환되지 않거나 환불되지 않을 수 있습니다.",
-  "exchange_result_write_down_ID": "*위에 표시된 ID를 복사하거나 적어두세요.",
-  "exchange_result_write_down_trade_id": "계속하려면 거래 ID를 복사하거나 적어두세요.",
-  "exchange_sync_alert_content": "지갑이 동기화될 때까지 기다려 주세요.",
-  "exchange_trade_result_confirm": "Cake Wallet에서 보내기를 누르면 ${walletName} 지갑에서 아래 표시된 주소로 ${fetchingLabel} ${from}을(를) 보냅니다. 또는 외부 지갑에서 보내기 세부 정보 페이지의 주소/QR 코드로 보낼 수 있습니다.\n\n계속하려면 버튼 중 하나를 누르거나 뒤로 가서 금액을 변경하세요.",
-  "expired": "만료됨",
+  "exchange_provider_unsupported": "${providerName}은 더 이상 지원되지 않습니다!",
+  "exchange_result_confirm": "확인을 누르면 전송됩니다 ${fetchingLabel} ${from} 지갑에서 ${walletName} 아래 주소로. 또는 외부 지갑에서 아래 주소로 보낼 수 있습니다 / QR 코드로 보낼 수 있습니다.\n\n확인을 눌러 계속하거나 금액을 변경하려면 돌아가십시오.",
+  "exchange_result_description": "다음 페이지에 표시된 주소로 최소 ${fetchingLabel} ${from} 를 보내야합니다. ${fetchingLabel} ${from} 보다 적은 금액을 보내면 변환되지 않고 환불되지 않을 수 있습니다.",
+  "exchange_result_write_down_ID": "*위에 표시된 ID를 복사하거나 적어 두십시오.",
+  "exchange_result_write_down_trade_id": "계속하려면 거래 ID를 복사하거나 적어 두십시오..",
+  "exchange_sync_alert_content": "지갑이 동기화 될 때까지 기다리십시오",
+  "exchange_trade_result_confirm": "Cake 지갑에서 보내기를 누르면 ${walletName}이라는 지갑에서 아래에 표시된 주소로 ${fetchingLabel} ${from}을 보내는 것입니다. 또는 외부 지갑에서 외부 지갑 세부 정보 페이지에서 주소 / QR 코드로 보낼 수 있습니다.",
+  "expired": "만료",
   "expires": "만료",
-  "expiresOn": "만료일",
-  "expiry_and_validity": "만료 및 유효성",
+  "expiresOn": "만료 날짜",
+  "expiry_and_validity": "만료와 타당성",
   "export_backup": "백업 내보내기",
-  "export_logs": "로그 내보내기",
-  "export_outputs": "출력 내보내기",
-  "extend_session": "세션 연장",
+  "export_logs": "내보내기 로그",
+  "export_outputs": "내보내기 출력",
   "extra_id": "추가 ID:",
-  "extracted_address_content": "다음 주소로 자금을 보냅니다\n${recipient_name}",
+  "extracted_address_content": "당신은에 자금을 보낼 것입니다\n${recipient_name}",
   "failed_authentication": "인증 실패. ${state_error}",
   "faq": "FAQ",
-  "features": "기능",
-  "fee_less_than_min": "선택한 수수료가 최소값보다 작습니다. 트랜잭션을 보낼 수 있도록 수수료를 높여주세요.",
-  "fee_rate": "수수료율",
-  "fetching": "가져오는 중",
-  "fiat_api": "법정화폐 API",
-  "fiat_balance": "법정화폐 잔액",
+  "features": "특징",
+  "fee_less_than_min": "선택된 수수료는 최소값보다 적습니다. 거래를 보낼 수있는 수수료를 늘리십시오.",
+  "fee_rate": "수수료",
+  "fetching": "가져 오는 중",
+  "fiat_api": "명목 화폐 API",
+  "fiat_balance": "피아트 잔액",
   "field_required": "이 필드는 필수입니다",
-  "file_saved": "파일 저장됨",
-  "fill_code": "이메일로 제공된 인증 코드를 입력하세요",
-  "filter_by": "필터 기준",
-  "first_wallet_text": "모네로, 비트코인, 이더리움, 라이트코인, 헤이븐을 위한 멋진 지갑",
-  "fixed_pair_not_supported": "이 고정 쌍은 선택한 스왑 서비스에서 지원되지 않습니다",
-  "fixed_rate": "고정 환율",
-  "fixed_rate_alert": "고정 환율 모드가 선택되면 수령 금액을 입력할 수 있습니다. 고정 환율 모드로 전환하시겠습니까?",
+  "fill_code": "이메일에 제공된 인증 코드를 입력하세요.",
+  "filter_by": "필터링 기준",
+  "first_wallet_text": "Monero, Bitcoin, Ethereum, Litecoin 및 Haven을 위한 멋진 지갑",
+  "fixed_pair_not_supported": "이 고정 쌍은 선택한 스왑 서비스에서 지원되지 않습니다.",
+  "fixed_rate": "고정 비율",
+  "fixed_rate_alert": "고정 금리 모드 체크시 수취 금액 입력이 가능합니다. 고정 속도 모드로 전환 하시겠습니까?",
   "forgot_password": "비밀번호 찾기",
-  "freeze": "동결",
+  "freeze": "얼다",
   "frequently_asked_questions": "자주 묻는 질문",
-  "from": "보내는 통화",
-  "frozen": "동결됨",
-  "frozen_balance": "동결 잔액",
-  "full_balance": "전체 잔액",
-  "gas_exceeds_allowance": "트랜잭션에 필요한 가스가 허용 한도를 초과합니다.",
-  "gas_price": "가스 가격",
+  "frozen": "겨울 왕국",
+  "frozen_balance": "냉동 균형",
+  "full_balance": "풀 밸런스",
+  "gas_exceeds_allowance": "거래에 필요한 가스는 수당을 초과합니다.",
   "generate_name": "이름 생성",
   "generating_gift_card": "기프트 카드 생성 중",
-  "generating_transaction": "트랜잭션 생성 중",
-  "get_a": "받기 ",
-  "get_card_note": " 디지털 통화로 재충전할 수 있습니다. 추가 정보는 필요하지 않습니다!",
-  "get_your_yat": "Yat 받기",
+  "generating_transaction": "거래 생성",
+  "get_a": "가져오기",
+  "get_card_note": " 디지털 통화로 충전할 수 있습니다. 추가 정보가 필요하지 않습니다!",
+  "get_your_yat": "당신의 Yat를 얻으십시오",
   "gift_card_amount": "기프트 카드 금액",
-  "gift_card_balance_note": "잔액이 남은 기프트 카드가 여기에 표시됩니다",
+  "gift_card_balance_note": "잔액이 남아 있는 기프트 카드가 여기에 표시됩니다.",
   "gift_card_is_generated": "기프트 카드가 생성되었습니다",
   "gift_card_number": "기프트 카드 번호",
-  "gift_card_redeemed_note": "사용한 기프트 카드가 여기에 표시됩니다",
+  "gift_card_redeemed_note": "사용한 기프트 카드가 여기에 표시됩니다.",
   "gift_cards": "기프트 카드",
-  "gift_cards_unavailable": "기프트 카드는 현재 모네로, 비트코인, 라이트코인으로만 구매할 수 있습니다",
-  "got_it": "확인",
+  "gift_cards_unavailable": "기프트 카드는 현재 Monero, Bitcoin 및 Litecoin을 통해서만 구매할 수 있습니다.",
+  "got_it": "알았다",
   "gross_balance": "총 잔액",
-  "group_by_type": "유형별 그룹화",
+  "group_by_type": "유형별 그룹",
   "haven_app": "Haven by Cake Wallet",
-  "haven_app_wallet_text": "Haven을 위한 멋진 지갑",
-  "help": "도움말",
+  "haven_app_wallet_text": "Awesome wallet for Haven",
+  "help": "돕다",
   "hidden_addresses": "숨겨진 주소",
-  "hidden_balance": "숨겨진 잔액",
-  "hide": "숨기기",
+  "hidden_balance": "숨겨진 균형",
+  "hide": "숨다",
   "hide_details": "세부 정보 숨기기",
   "high_contrast_theme": "고대비 테마",
   "home_screen_settings": "홈 화면 설정",
-  "how_to_connect": "연결 방법",
-  "how_to_use": "사용 방법",
-  "how_to_use_card": "이 카드 사용 방법",
+  "how_to_use": "사용하는 방법",
+  "how_to_use_card": "이 카드를 사용하는 방법",
   "id": "ID: ",
-  "if_you_dont_see_your_device": "위에 기기가 보이지 않으면 Ledger가 켜져 있고 잠금 해제되어 있는지 확인하세요!",
-  "ignor": "무시",
-  "import": "가져오기",
+  "if_you_dont_see_your_device": "위의 장치가 표시되지 않으면 원장이 깨어 있고 잠금 해제되었는지 확인하십시오!",
+  "ignor": "무시하다",
+  "import": "수입",
   "importNFTs": "NFT 가져오기",
   "in_store": "매장 내",
-  "incoming": "수신",
-  "incorrect_seed": "입력한 텍스트가 유효하지 않습니다.",
-  "incorrect_seed_option": "잘못되었습니다. 다시 시도하세요.",
-  "incorrect_seed_option_back": "잘못되었습니다. 시드가 올바르게 저장되었는지 확인하고 다시 시도하세요.",
+  "incoming": "들어오는",
+  "incorrect_seed": "입력하신 텍스트가 유효하지 않습니다.",
+  "incorrect_seed_option": "잘못된. 다시 시도하십시오",
+  "incorrect_seed_option_back": "잘못된. 씨앗이 올바르게 저장되어 있는지 확인하고 다시 시도하십시오.",
   "inputs": "입력",
-  "insufficient_funds_for_tx": "트랜잭션을 성공적으로 실행하기에 자금이 부족합니다.",
-  "insufficient_lamport_for_tx": "트랜잭션 및 트랜잭션 수수료를 충당하기에 SOL이 부족합니다. 지갑에 SOL을 더 추가하거나 보내는 SOL 금액을 줄이세요.",
-  "insufficient_lamports": "트랜잭션 및 트랜잭션 수수료를 충당하기에 SOL이 부족합니다. 최소 ${solValueNeeded} SOL이 필요합니다. 지갑에 SOL을 더 추가하거나 보내는 SOL 금액을 줄이세요.",
-  "insufficientFundsForRentError": "계정의 트랜잭션 수수료 및 렌트를 충당하기에 SOL이 부족합니다. 지갑에 SOL을 더 추가하거나 보내는 SOL 금액을 줄이세요.",
-  "insufficientFundsForRentErrorReceiver": "수신기의 계정에는 임대료를 충당하기에 충분한 SOL이 없습니다. 수신기에게 계정에 더 많은 솔을 추가하도록 요청하십시오.",
-  "introducing_cake_pay": "Cake Pay를 소개합니다!",
+  "insufficient_funds_for_tx": "거래를 성공적으로 실행하기위한 자금이 충분하지 않습니다.",
+  "insufficient_lamport_for_tx": "거래 및 거래 수수료를 충당하기에 충분한 SOL이 없습니다. 지갑에 더 많은 솔을 추가하거나 보내는 솔을 줄입니다.",
+  "insufficient_lamports": "거래 및 거래 수수료를 충당하기에 충분한 SOL이 없습니다. 최소 ${solValueNeeded} sol이 필요합니다. 지갑에 더 많은 솔을 추가하거나 보내는 솔을 줄이십시오.",
+  "insufficientFundsForRentError": "거래 수수료와 계좌 임대료를 충당하기에 충분한 SOL이 없습니다. 지갑에 더 많은 솔을 추가하거나 보내는 솔을 줄이십시오.",
+  "introducing_cake_pay": "소개 Cake Pay!",
   "invalid_input": "잘못된 입력",
-  "invalid_password": "잘못된 비밀번호",
-  "invoice_details": "인보이스 세부 정보",
-  "is_percentage": "는",
+  "invalid_password": "유효하지 않은 비밀번호",
+  "invoice_details": "인보이스 세부정보",
+  "is_percentage": "이다",
   "keys": "키",
-  "last_30_days": "최근 30일",
+  "last_30_days": "지난 30일",
   "learn_more": "더 알아보기",
-  "ledger_connection_error": "Ledger 연결에 실패했습니다. 다시 시도하세요.",
-  "ledger_error_device_locked": "Ledger가 잠겨 있습니다",
-  "ledger_error_tx_rejected_by_user": "기기에서 트랜잭션 거부됨",
-  "ledger_error_wrong_app": "Ledger에서 올바른 앱을 열었는지 확인하세요.",
-  "ledger_please_enable_bluetooth": "Ledger를 감지하려면 블루투스를 활성화하세요.",
-  "legacy": "레거시",
-  "light_theme": "라이트 테마",
-  "litecoin_enable_mweb_sync": "MWEB 스캔 활성화",
-  "litecoin_mweb": "MWEB",
-  "litecoin_mweb_allow_coins": "MWEB 코인 허용",
-  "litecoin_mweb_always_scan": "MWEB 항상 스캔 설정",
-  "litecoin_mweb_description": "MWEB는 라이트코인에 더 빠르고, 저렴하며, 더 비공개적인 트랜잭션을 제공하는 새로운 프로토콜입니다.",
-  "litecoin_mweb_dismiss": "닫기",
-  "litecoin_mweb_display_card": "MWEB 카드 표시",
-  "litecoin_mweb_enable": "MWEB 활성화",
-  "litecoin_mweb_enable_later": "표시 설정에서 MWEB를 다시 활성화하도록 선택할 수 있습니다.",
-  "litecoin_mweb_logs": "MWEB 로그",
-  "litecoin_mweb_node": "MWEB 노드",
-  "litecoin_mweb_pegin": "페그 인",
-  "litecoin_mweb_pegout": "페그 아웃",
-  "litecoin_mweb_scanning": "MWEB 스캔 중",
-  "litecoin_mweb_settings": "MWEB 설정",
-  "litecoin_mweb_warning": "MWEB를 사용하면 초기에 약 600MB의 데이터가 다운로드되며 네트워크 속도에 따라 최대 30분이 소요될 수 있습니다. 이 초기 데이터는 한 번만 다운로드되며 모든 라이트코인 지갑에서 사용할 수 있습니다.",
-  "litecoin_what_is_mweb": "MWEB란 무엇인가요?",
-  "live_fee_rates": "API를 통한 실시간 수수료율",
-  "load_more": "더 로드",
-  "loading_your_wallet": "지갑 로딩 중",
+  "ledger_connection_error": "원장에 연결하지 못했습니다. 다시 시도하십시오.",
+  "ledger_error_device_locked": "원장이 잠겨 있습니다",
+  "ledger_error_tx_rejected_by_user": "장치에서 거래가 거부되었습니다",
+  "ledger_error_wrong_app": "원장에서 올바른 앱을 반대하는지 확인하십시오.",
+  "ledger_please_enable_bluetooth": "Bluetooth가 원장을 감지 할 수 있도록하십시오",
+  "legacy": "유산",
+  "light_theme": "빛",
+  "litecoin_enable_mweb_sync": "mweb 스캔을 활성화합니다",
+  "litecoin_mweb": "mweb",
+  "litecoin_mweb_allow_coins": "mweb 코인을 허용하십시오",
+  "litecoin_mweb_always_scan": "mweb는 항상 스캔을 설정합니다",
+  "litecoin_mweb_description": "MWEB는 Litecoin에 더 빠르고 저렴하며 개인 거래를 제공하는 새로운 프로토콜입니다.",
+  "litecoin_mweb_dismiss": "해고하다",
+  "litecoin_mweb_display_card": "mweb 카드를 보여주십시오",
+  "litecoin_mweb_enable": "mweb 활성화",
+  "litecoin_mweb_enable_later": "디스플레이 설정에서 MWEB를 다시 활성화하도록 선택할 수 있습니다.",
+  "litecoin_mweb_logs": "mweb 로그",
+  "litecoin_mweb_node": "mweb 노드",
+  "litecoin_mweb_pegin": "페그를 입력하십시오",
+  "litecoin_mweb_pegout": "죽다",
+  "litecoin_mweb_scanning": "mweb 스캔",
+  "litecoin_mweb_settings": "mweb 설정",
+  "litecoin_mweb_warning": "MWEB를 사용하면 처음에는 ~ 600MB의 데이터를 다운로드하며 네트워크 속도에 따라 최대 30 분이 소요될 수 있습니다. 이 초기 데이터는 한 번만 다운로드하여 모든 조명 지갑에 사용할 수 있습니다.",
+  "litecoin_what_is_mweb": "MWEB 란 무엇입니까?",
+  "live_fee_rates": "API를 통한 라이브 요금 요금",
+  "load_more": "더로드하십시오",
+  "loading_your_wallet": "지갑 넣기",
   "login": "로그인",
   "logout": "로그아웃",
   "low_fee": "낮은 수수료",
-  "low_fee_alert": "현재 낮은 네트워크 수수료 우선순위를 사용하고 있습니다. 이로 인해 대기 시간이 길어지거나, 환율이 달라지거나, 거래가 취소될 수 있습니다. 더 나은 경험을 위해 더 높은 수수료를 설정하는 것이 좋습니다.",
-  "made_easy": "쉽게 만들었습니다",
+  "low_fee_alert": "현재 낮은 네트워크 요금 우선 순위를 사용하고 있습니다. 이로 인해 긴 대기 시간, 다른 요금 또는 취소된 거래가 발생할 수 있습니다. 더 나은 경험을 위해 더 높은 요금을 설정하는 것이 좋습니다.",
   "manage_nodes": "노드 관리",
   "manage_pow_nodes": "PoW 노드 관리",
-  "manage_yats": "Yat 관리",
+  "manage_yats": "관리하다 Yats",
   "mark_as_redeemed": "사용한 것으로 표시",
   "market_place": "마켓플레이스",
   "matrix_green_dark_theme": "매트릭스 그린 다크 테마",
   "max_amount": "최대: ${value}",
-  "max_value": "최대: ${value} ${currency}",
+  "max_value": "맥스: ${value} ${currency}",
   "memo": "메모:",
   "message": "메시지",
   "message_verified": "메시지가 성공적으로 확인되었습니다",
-  "messages": "메시지",
-  "method": "방법",
-  "methods": "방법",
+  "methods": "행동 양식",
   "min_amount": "최소: ${value}",
   "min_value": "최소: ${value} ${currency}",
   "mint_address": "민트 주소",
-  "minutes_to_pin_code": "${minute} 분",
-  "mm": "MM",
-  "modify_2fa": "Cake 2FA 수정",
+  "minutes_to_pin_code": "${minute}분",
+  "mm": "mm",
+  "modify_2fa": "수정 케이크 2FA",
   "monero_com": "Monero.com by Cake Wallet",
-  "monero_com_wallet_text": "모네로를 위한 멋진 지갑",
+  "monero_com_wallet_text": "Awesome wallet for Monero",
   "monero_dark_theme": "모네로 다크 테마",
   "monero_light_theme": "모네로 라이트 테마",
-  "moonpay_alert_text": "금액 값은 ${minAmount} ${fiatCurrency} 이상이어야 합니다",
-  "moralis_nft_error": "NFT를 가져오는 중 오류가 발생했습니다. 인터넷 연결을 확인하고 다시 시도하십시오.",
+  "moonpay_alert_text": "금액은 다음보다 크거나 같아야합니다 ${minAmount} ${fiatCurrency}",
   "more_options": "추가 옵션",
-  "multiple_addresses_detected": "여러 주소 감지됨",
-  "mweb_confirmed": "확정된 MWEB",
-  "mweb_unconfirmed": "미확정 MWEB",
+  "multiple_addresses_detected": "여러 주소가 감지되었습니다",
+  "mweb_confirmed": "확인 mweb",
+  "mweb_unconfirmed": "확인되지 않은 mweb",
   "name": "이름",
-  "nano_current_rep": "현재 대표자",
-  "nano_gpt_thanks_message": "NanoGPT를 사용해 주셔서 감사합니다! 트랜잭션 완료 후 브라우저로 돌아가는 것을 잊지 마세요!",
-  "nano_pick_new_rep": "새 대표자 선택",
-  "nanogpt_subtitle": "모든 최신 모델 (GPT-4, Claude).\n구독 없이 암호화폐로 결제.",
-  "narrow": "좁게",
-  "new_first_wallet_text": "암호화폐를 안전하게 보관하는 것은 식은 죽 먹기",
-  "new_node_testing": "새 노드 테스트 중",
-  "new_subaddress_create": "생성",
+  "nano_current_rep": "현재 대표",
+  "nano_gpt_thanks_message": "Nanogpt를 사용해 주셔서 감사합니다! 거래가 완료된 후 브라우저로 돌아가는 것을 잊지 마십시오!",
+  "nano_pick_new_rep": "새로운 담당자를 선택하십시오",
+  "nanogpt_subtitle": "모든 최신 모델 (GPT-4, Claude). \\ nno 구독, Crypto로 지불하십시오.",
+  "narrow": "좁은",
+  "new_first_wallet_text": "암호화를 안전하게 유지하는 것은 케이크 조각입니다",
+  "new_node_testing": "새로운 노드 테스트",
+  "new_subaddress_create": "몹시 떠들어 대다",
   "new_subaddress_label_name": "라벨 이름",
   "new_subaddress_title": "새 주소",
   "new_template": "새 템플릿",
-  "new_transactions_notifications": "새 트랜잭션 알림 보내기",
-  "new_wallet": "새 지갑",
-  "newConnection": "새 연결",
-  "no_cards_found": "카드를 찾을 수 없습니다",
-  "no_extra_detail": "추가 세부 정보 없음",
-  "no_id_needed": "ID 필요 없음!",
-  "no_id_required": "ID 필요 없음. 충전하고 어디서나 사용하세요",
-  "no_providers_available": "사용 가능한 제공 업체 없음",
-  "no_relay_on_domain": "사용자 도메인에 릴레이가 없거나 릴레이를 사용할 수 없습니다. 사용할 릴레이를 선택하세요.",
+  "new_wallet": "새 월렛",
+  "newConnection": "새로운 연결",
+  "no_cards_found": "카드를 찾지 못했습니다",
+  "no_extra_detail": "추가 세부 정보가 없습니다",
+  "no_id_needed": "ID가 필요하지 않습니다!",
+  "no_id_required": "신분증이 필요하지 않습니다. 충전하고 어디에서나 사용하세요",
+  "no_providers_available": "제공되는 제공자가 없습니다",
+  "no_relay_on_domain": "사용자 도메인에 릴레이가 없거나 릴레이를 사용할 수 없습니다. 사용할 릴레이를 선택해주세요.",
   "no_relays": "릴레이 없음",
-  "no_relays_message": "이 사용자의 Nostr NIP-05 기록을 찾았지만 릴레이가 포함되어 있지 않습니다. 수신자에게 Nostr 기록에 릴레이를 추가하도록 지시하세요.",
+  "no_relays_message": "이 사용자에 대한 Nostr NIP-05 레코드를 찾았지만 릴레이가 포함되어 있지 않습니다. 수신자에게 Nostr 기록에 릴레이를 추가하도록 지시하십시오.",
   "node_address": "노드 주소",
   "node_connection_failed": "연결 실패",
-  "node_connection_successful": "연결 성공",
-  "node_new": "새 노드",
+  "node_connection_successful": "성공적으로 연결되었습니다.",
+  "node_new": "새로운 노드",
   "node_port": "노드 포트",
   "node_reset_settings_title": "설정 초기화",
   "node_test": "테스트",
   "nodes": "노드",
-  "nodes_list_reset_to_default_message": "설정을 기본값으로 초기화하시겠습니까?",
-  "none_of_selected_providers_can_exchange": "선택한 제공 업체 중 이 스왑을 할 수 있는 곳이 없습니다",
-  "noNFTYet": "아직 NFT 없음",
-  "normal": "보통",
-  "note_optional": "메모 (선택 사항)",
-  "note_tap_to_change": "메모 (탭하여 변경)",
-  "notification_permission_denied": "알림 권한이 영구적으로 거부되었습니다. 설정에서 수동으로 활성화하세요.",
-  "nullURIError": "URI가 null입니다",
-  "offer_expires_in": "오퍼 만료 시간: ",
+  "nodes_list_reset_to_default_message": "설정을 기본값으로 재설정 하시겠습니까?",
+  "none_of_selected_providers_can_exchange": "선택한 공급자 중 어느 것도이 교환을 할 수 없습니다",
+  "noNFTYet": "아직 NFT가 없습니다",
+  "normal": "정상",
+  "note_optional": "참고 (선택 사항)",
+  "note_tap_to_change": "메모 (변경하려면 탭하세요)",
+  "nullURIError": "URI가 null입니다.",
+  "offer_expires_in": "쿠폰 만료일: ",
   "offline": "오프라인",
-  "ok": "확인",
-  "old_fee": "이전 수수료",
-  "onion_link": "Onion 링크",
+  "ok": "승인",
+  "old_fee": "옛 수수료",
+  "onion_link": "양파 링크",
   "online": "온라인",
-  "onramper_option_description": "다양한 결제 방법으로 빠르게 암호화폐 구매. 대부분의 국가에서 사용 가능. 스프레드 및 수수료는 다양함.",
+  "onramper_option_description": "많은 결제 방법으로 암호화를 신속하게 구입하십시오. 대부분의 국가에서 사용할 수 있습니다. 스프레드와 수수료는 다양합니다.",
   "open_gift_card": "기프트 카드 열기",
-  "open_wallet": "지갑 열기",
+  "open_wallet": "오픈 지갑",
   "optional_description": "선택적 설명",
   "optional_email_hint": "선택적 수취인 알림 이메일",
   "optional_name": "선택적 수신자 이름",
-  "optionally_order_card": "선택적으로 실물 카드 주문.",
-  "orbot_running_alert": "이 노드에 연결하기 전에 Orbot이 실행 중인지 확인하세요.",
-  "order_by": "정렬 기준",
+  "optionally_order_card": "선택적으로 실제 카드를 주문하십시오.",
+  "orbot_running_alert": "이 노드에 연결하기 전에 Orbot이 실행 중인지 확인하십시오.",
+  "order_by": "주문",
   "order_id": "주문 ID",
-  "order_physical_card": "실물 카드 주문",
+  "order_physical_card": "물리적 카드 주문",
   "other_settings": "기타 설정",
-  "outdated_electrum_wallet_description": "Cake에서 생성된 새 비트코인 지갑은 이제 24단어 시드를 사용합니다. 새 비트코인 지갑을 생성하고 모든 자금을 새 24단어 지갑으로 이전하고 12단어 시드를 사용하는 지갑 사용을 중단해야 합니다. 자금 보호를 위해 즉시 이 작업을 수행하십시오.",
-  "outdated_electrum_wallet_receive_warning": "이 지갑에 12단어 시드가 있고 Cake에서 생성된 경우 이 지갑에 비트코인을 입금하지 마십시오. 이 지갑으로 전송된 모든 BTC는 손실될 수 있습니다. 새 24단어 지갑을 생성(오른쪽 상단 메뉴 탭, 지갑 선택, 새 지갑 생성 선택, 비트코인 선택)하고 즉시 BTC를 그곳으로 옮기십시오. Cake의 새 (24단어) BTC 지갑은 안전합니다.",
-  "outgoing": "발신",
+  "outdated_electrum_wallet_description": "Cake에서 생성 된 새로운 비트 코인 지갑에는 이제 24 단어 시드가 있습니다. 새로운 비트 코인 지갑을 생성하고 모든 자금을 새로운 24 단어 지갑으로 이체하고 12 단어 시드가있는 지갑 사용을 중지해야합니다. 자금을 확보하려면 즉시이 작업을 수행하십시오.",
+  "outdated_electrum_wallet_receive_warning": "이 지갑에 12 단어 시드가 있고 Cake에서 생성 된 경우이 지갑에 비트 코인을 입금하지 마십시오. 이 지갑으로 전송 된 모든 BTC는 손실 될 수 있습니다. 새로운 24 단어 지갑을 생성하고 (오른쪽 상단의 메뉴를 탭하고 지갑을 선택한 다음 새 지갑 생성을 선택한 다음 비트 코인을 선택하십시오) 즉시 BTC를 그곳으로 이동하십시오. Cake의 새로운 (24 단어) BTC 지갑은 안전합니다",
+  "outgoing": "나가는",
   "outputs": "출력",
-  "overshot": "초과",
-  "overwrite_amount": "금액 덮어쓰기",
-  "pairingInvalidEvent": "페어링 잘못된 이벤트",
-  "passphrase": "암호 구문 (선택 사항)",
-  "passphrase_view_keys": "암호 구문",
-  "passphrases_doesnt_match": "암호 구문이 일치하지 않습니다. 다시 시도하세요.",
-  "password": "비밀번호",
-  "paste": "붙여넣기",
-  "pause_wallet_creation": "현재 Haven 지갑 생성 기능이 일시 중지되었습니다.",
-  "payjoin_card_content": "Payjoin는 Bitcoin의 새로운 개인 정보 보호 및 수수료 절약 기능입니다.",
-  "payjoin_details": "Payjoin 세부 정보",
-  "payjoin_enabled": "Payjoin enabled",
-  "payjoin_enabling_popup_content": "메뉴 → 개인 정보 → → Payjoin를 사용하여 나중에 활성화하거나 비활성화 할 수 있습니다.",
-  "payjoin_enabling_popup_title": "활성화 Payjoin",
-  "payjoin_request_awaiting_tx": "거래를 기다리고 있습니다",
-  "payjoin_request_in_progress": "진행 중",
-  "payjoin_unavailable": "Payjoin Aailable",
-  "payjoin_unavailable_sheet_content": "Payjoin 트랜잭션을 수신하려면 비트 코인을 사용할 준비가되어 있어야합니다. \\ n \\ nas 지갑이 자금이 자금이 있으면 Payjoin가 자동으로 활성화됩니다.",
-  "payjoin_unavailable_sheet_title": "Payjoin를 사용할 수없는 이유는 무엇입니까?",
-  "payment_id": "결제 ID: ",
-  "payment_made_easy": "지불은 쉽게 만들었습니다",
+  "overshot": "오버 샷",
+  "overwrite_amount": "Overwrite amount",
+  "pairingInvalidEvent": "잘못된 이벤트 페어링",
+  "passphrase": "암호화 (선택 사항)",
+  "passphrases_doesnt_match": "패스 프레이즈가 일치하지 않습니다. 다시 시도하십시오",
+  "password": "암호",
+  "paste": "풀",
+  "pause_wallet_creation": "Haven Wallet 생성 기능이 현재 일시 중지되었습니다.",
+  "payment_id": "지불 ID: ",
   "payment_was_received": "결제가 접수되었습니다.",
-  "payments": "지불",
-  "pending": " (대기 중)",
-  "percentageOf": "${amount}의",
-  "pin_at_top": "${token} 상단에 고정",
+  "pending": " (보류 중)",
+  "percentageOf": "${amount} 중",
+  "pin_at_top": "상단에 ${token} 고정",
   "pin_is_incorrect": "PIN이 잘못되었습니다",
   "pin_number": "PIN 번호",
   "placeholder_contacts": "연락처가 여기에 표시됩니다",
-  "placeholder_transactions": "트랜잭션이 여기에 표시됩니다",
-  "please_choose_one": "하나를 선택하세요",
-  "please_fill_totp": "다른 기기에 표시된 8자리 코드를 입력하세요",
-  "please_make_selection": "지갑을 생성하거나 복구하려면 아래에서 선택하세요.",
-  "please_reference_document": "자세한 내용은 아래 문서를 참조하세요.",
-  "please_select": "선택하세요:",
-  "please_select_backup_file": "백업 파일을 선택하고 백업 비밀번호를 입력하세요.",
-  "please_try_to_connect_to_another_node": "다른 노드에 연결해 보세요",
-  "please_wait": "기다려 주세요",
-  "polygonscan_history": "PolygonScan 내역",
-  "potential_scam": "잠재적 사기",
-  "powered_by": "${title} 제공",
-  "pre_seed_button_text": "이해했습니다. 시드를 보여주세요",
-  "pre_seed_description": "다음 페이지에서 일련의 단어를 보게 됩니다. 이것은 귀하의 고유하고 비공개적인 시드이며, 분실 또는 오작동 시 지갑을 복구할 수 있는 유일한 방법입니다. Cake Wallet 앱 외부에 안전한 장소에 적어두고 보관하는 것은 귀하의 책임입니다.",
-  "pre_seed_title": "중요",
+  "placeholder_transactions": "거래가 여기에 표시됩니다",
+  "please_choose_one": "하나를 선택하십시오",
+  "please_fill_totp": "다른 기기에 있는 8자리 코드를 입력하세요.",
+  "please_make_selection": "아래에서 선택하십시오 지갑 만들기 또는 복구.",
+  "please_reference_document": "자세한 내용은 아래 문서를 참조하십시오.",
+  "please_select": "선택 해주세요:",
+  "please_select_backup_file": "백업 파일을 선택하고 백업 암호를 입력하십시오.",
+  "please_try_to_connect_to_another_node": "다른 노드에 연결을 시도하십시오",
+  "please_wait": "기다리세요",
+  "polygonscan_history": "다각형 스캔 기록",
+  "powered_by": "에 의해 구동 ${title}",
+  "pre_seed_button_text": "이해 했어요. 내 씨앗을 보여줘",
+  "pre_seed_description": "다음 페이지에서 ${words} 개의 단어를 볼 수 있습니다. 이것은 귀하의 고유하고 개인적인 시드이며 분실 또는 오작동시 지갑을 복구하는 유일한 방법입니다. 기록해두고 Cake Wallet 앱 외부의 안전한 장소에 보관하는 것은 귀하의 책임입니다.",
+  "pre_seed_title": "중대한",
   "prepaid_cards": "선불 카드",
   "prevent_screenshots": "스크린샷 및 화면 녹화 방지",
   "primary_address": "기본 주소",
-  "privacy": "개인 정보 보호",
-  "privacy_policy": "개인정보 보호정책",
-  "privacy_settings": "개인 정보 보호 설정",
+  "privacy": "프라이버시",
+  "privacy_policy": "개인 정보 보호 정책",
+  "privacy_settings": "개인정보 설정",
   "private_key": "개인 키",
   "proceed_after_one_minute": "1분 후에도 화면이 진행되지 않으면 이메일을 확인하세요.",
-  "proceed_on_device": "기기에서 진행",
-  "proceed_on_device_description": "하드웨어 지갑에 표시되는 지침을 따르세요.",
-  "processing": "처리 중",
-  "processing_signed_tx": "서명 된 거래 처리",
+  "proceed_on_device": "장치를 진행하십시오",
+  "proceed_on_device_description": "하드웨어 지갑에 표시된 지침을 따르십시오",
+  "processing": "처리",
   "profile": "프로필",
   "provider_error": "${provider} 오류",
   "public_key": "공개 키",
   "purchase_gift_card": "기프트 카드 구매",
-  "purple_dark_theme": "보라색 다크 테마",
-  "qr_fullscreen": "전체 화면 QR 코드를 열려면 탭하세요",
-  "qr_payment_amount": "이 QR 코드에는 결제 금액이 포함되어 있습니다. 현재 값을 덮어쓰시겠습니까?",
+  "purple_dark_theme": "보라색 어두운 테마",
+  "qr_fullscreen": "전체 화면 QR 코드를 열려면 탭하세요.",
+  "qr_payment_amount": "This QR code contains a payment amount. Do you want to overwrite the current value?",
   "quantity": "수량",
-  "question_to_disable_2fa": "Cake 2FA를 비활성화하시겠습니까? 더 이상 지갑 및 특정 기능에 액세스하는 데 2FA 코드가 필요하지 않습니다.",
-  "receivable_balance": "수취 가능 잔액",
-  "receive": "받기",
-  "receive_amount": "금액",
-  "received": "받음",
-  "recipient_address": "수신자 주소",
+  "question_to_disable_2fa": "Cake 2FA를 비활성화하시겠습니까? 지갑 및 특정 기능에 액세스하는 데 더 이상 2FA 코드가 필요하지 않습니다.",
+  "receivable_balance": "채권 잔액",
+  "receive": "받다",
+  "receive_amount": "양",
+  "received": "받았습니다",
+  "recipient_address": "받는 사람 주소",
   "reconnect": "다시 연결",
-  "reconnect_alert_text": "정말 다시 연결하시겠습니까?",
-  "reconnect_your_hardware_wallet": "하드웨어 지갑 다시 연결",
-  "reconnection": "재연결",
-  "red_dark_theme": "빨간색 다크 테마",
-  "red_light_theme": "빨간색 라이트 테마",
-  "redeemed": "사용됨",
+  "reconnect_alert_text": "다시 연결 하시겠습니까?",
+  "reconnect_your_hardware_wallet": "하드웨어 지갑을 다시 연결하십시오",
+  "reconnection": "재 연결",
+  "red_dark_theme": "빨간 어두운 테마",
+  "red_light_theme": "빨간불 테마",
+  "redeemed": "구함",
   "refund_address": "환불 주소",
-  "reject": "거부",
-  "remaining": "남음",
-  "remove": "제거",
+  "reject": "거부하다",
+  "remaining": "남은",
+  "remove": "없애다",
   "remove_node": "노드 제거",
-  "remove_node_message": "선택한 노드를 정말로 제거하시겠습니까?",
-  "rename": "이름 변경",
-  "rep_warning": "대표자 경고",
-  "rep_warning_sub": "귀하의 대표자가 정상 상태가 아닌 것 같습니다. 여기를 탭하여 새 대표자를 선택하세요.",
-  "repeat_wallet_password": "지갑 비밀번호 다시 입력",
-  "repeated_password_is_incorrect": "반복 입력한 비밀번호가 잘못되었습니다. 지갑 비밀번호를 다시 입력하세요.",
-  "requested": "요청됨",
-  "require_for_adding_contacts": "연락처 추가 시 필요",
+  "remove_node_message": "선택한 노드를 제거 하시겠습니까?",
+  "rename": "이름 바꾸기",
+  "rep_warning": "대표 경고",
+  "rep_warning_sub": "귀하의 대표는 양호한 상태가 아닌 것 같습니다. 새 것을 선택하려면 여기를 탭하십시오",
+  "repeat_wallet_password": "지갑 암호를 반복하십시오",
+  "repeated_password_is_incorrect": "반복 된 비밀번호가 올바르지 않습니다. 지갑 암호를 다시 반복하십시오.",
+  "require_for_adding_contacts": "연락처 추가에 필요",
   "require_for_all_security_and_backup_settings": "모든 보안 및 백업 설정에 필요",
-  "require_for_assessing_wallet": "지갑 접근 시 필요",
-  "require_for_creating_new_wallets": "새 지갑 생성 시 필요",
-  "require_for_exchanges_to_external_wallets": "외부 지갑으로 교환 시 필요",
-  "require_for_exchanges_to_internal_wallets": "내부 지갑으로 교환 시 필요",
-  "require_for_sends_to_contacts": "연락처로 전송 시 필요",
-  "require_for_sends_to_internal_wallets": "내부 지갑으로 전송 시 필요",
-  "require_for_sends_to_non_contacts": "연락처 외 대상으로 전송 시 필요",
-  "require_pin_after": "다음 시간 후 PIN 필요",
-  "required_passphrase": "암호 구문",
-  "rescan": "재스캔",
+  "require_for_assessing_wallet": "지갑 접근을 위해 필요",
+  "require_for_creating_new_wallets": "새 지갑 생성에 필요",
+  "require_for_exchanges_to_external_wallets": "외부 지갑으로의 교환을 위해 필요",
+  "require_for_exchanges_to_internal_wallets": "내부 지갑으로의 교환에 필요",
+  "require_for_sends_to_contacts": "연락처로 보내기에 필요",
+  "require_for_sends_to_internal_wallets": "내부 지갑으로 보내는 데 필요",
+  "require_for_sends_to_non_contacts": "비접촉자에게 보내는 데 필요",
+  "require_pin_after": "다음 이후에 PIN 필요",
+  "rescan": "재검색",
   "resend_code": "다시 보내주세요",
-  "reset": "초기화",
+  "reset": "다시 놓기",
   "reset_password": "비밀번호 재설정",
-  "restore": "복구",
-  "restore_active_seed": "활성 시드",
+  "restore_active_seed": "활성 종자",
   "restore_address": "주소",
-  "restore_bitcoin_description_from_keys": "개인 키에서 생성된 WIF 문자열로 지갑 복구",
-  "restore_bitcoin_description_from_seed": "24단어 조합 코드로 지갑 복구",
-  "restore_bitcoin_title_from_keys": "WIF에서 복구",
-  "restore_description_from_backup": "백업 파일에서 전체 Cake Wallet 앱을 복구할 수 있습니다",
-  "restore_description_from_hardware_wallet": "Ledger 하드웨어 지갑에서 복구",
-  "restore_description_from_keys": "개인 키에서 저장된 키 입력으로 지갑 복구",
-  "restore_description_from_seed": "25단어 또는 13단어 조합 코드로 지갑 복구",
-  "restore_description_from_seed_keys": "안전한 장소에 저장한 시드/키로 지갑 복구",
-  "restore_existing_wallet": "기존 지갑 복구",
-  "restore_from_date_or_blockheight": "이 지갑을 생성하기 며칠 전의 날짜를 입력하세요. 또는 블록 높이를 아는 경우 대신 입력하세요",
-  "restore_from_seed_placeholder": "여기에 시드를 입력하거나 붙여넣으세요",
-  "restore_new_seed": "새 시드",
-  "restore_next": "다음",
-  "restore_recover": "복구",
-  "restore_restore_wallet": "지갑 복구",
-  "restore_seed_keys_restore": "시드/키 복구",
-  "restore_spend_key_private": "지출 키 (개인)",
-  "restore_title_from_backup": "백업에서 복구",
-  "restore_title_from_hardware_wallet": "하드웨어 지갑에서 복구",
-  "restore_title_from_keys": "키에서 복구",
-  "restore_title_from_seed": "시드에서 복구",
-  "restore_title_from_seed_keys": "시드/키에서 복구",
-  "restore_view_key_private": "보기 키 (개인)",
-  "restore_wallet": "지갑 복구",
+  "restore_bitcoin_description_from_keys": "개인 키에서 생성 된 WIF 문자열에서 지갑 복원",
+  "restore_bitcoin_description_from_seed": "24 단어 조합 코드에서 지갑 복원",
+  "restore_bitcoin_title_from_keys": "WIF에서 복원",
+  "restore_description_from_backup": "백업 파일에서 전체 Cake Wallet 앱을 복원 할 수 있습니다.",
+  "restore_description_from_hardware_wallet": "원장 하드웨어 지갑에서 복원하십시오",
+  "restore_description_from_keys": "개인 키에서 저장된 생성 된 키 스트로크에서 월렛 복원",
+  "restore_description_from_seed": "25 단어 또는 13 단어 조합 코드에서 지갑을 복원하십시오.",
+  "restore_description_from_seed_keys": "안전한 장소에 저장 한 종자 / 키로 지갑을 되 찾으십시오.",
+  "restore_existing_wallet": "기존 지갑을 복원하십시오",
+  "restore_from_date_or_blockheight": "이 지갑을 생성하기 며칠 전에 날짜를 입력하십시오. 또는 블록 높이를 알고있는 경우 대신 입력하십시오.",
+  "restore_from_seed_placeholder": "여기에 코드 문구를 입력하거나 붙여 넣으십시오.",
+  "restore_new_seed": "새로운 씨앗",
+  "restore_next": "다음 것",
+  "restore_recover": "다시 덮다",
+  "restore_restore_wallet": "월렛 복원",
+  "restore_seed_keys_restore": "종자 / 키 복원",
+  "restore_spend_key_private": "지출 키 (은밀한)",
+  "restore_title_from_backup": "백업 파일에서 복원",
+  "restore_title_from_hardware_wallet": "하드웨어 지갑에서 복원하십시오",
+  "restore_title_from_keys": "키에서 복원",
+  "restore_title_from_seed": "종자에서 복원",
+  "restore_title_from_seed_keys": "시드 / 키에서 복원",
+  "restore_view_key_private": "키보기 (은밀한)",
+  "restore_wallet": "월렛 복원",
   "restore_wallet_name": "지갑 이름",
-  "restore_wallet_restore_description": "지갑 복구 설명",
-  "robinhood_option_description": "직불 카드, 은행 계좌 또는 Robinhood 잔액을 사용하여 즉시 구매 및 이체. 미국 전용.",
-  "router_no_route": "${name}에 대해 정의된 경로 없음",
-  "save": "저장",
-  "save_backup_password": "백업 비밀번호를 저장했는지 확인하세요. 없으면 백업 파일을 가져올 수 없습니다.",
+  "restore_wallet_restore_description": "월렛 복원 설명",
+  "robinhood_option_description": "직불 카드, 은행 계좌 또는 Robinhood 잔액을 사용하여 즉시 구매 및 양도하십시오. 미국 만.",
+  "router_no_route": "에 정의 된 경로가 없습니다 ${name}",
+  "save": "구하다",
+  "save_backup_password": "백업 암호를 저장했는지 확인하십시오. 그것 없이는 백업 파일을 가져올 수 없습니다.",
   "save_backup_password_alert": "백업 비밀번호 저장",
   "save_to_downloads": "다운로드에 저장",
   "saved_the_trade_id": "거래 ID를 저장했습니다",
-  "scan_one_block": "블록 하나 스캔",
+  "scan_one_block": "하나의 블록을 스캔하십시오",
   "scan_qr_code": "QR 코드 스캔",
-  "scan_qr_code_to_get_address": "주소를 얻으려면 QR 코드를 스캔하세요",
-  "scan_qr_on_device": "다른 기기에서 이 QR 코드 스캔",
-  "search": "검색",
-  "search_add_token": "토큰 검색 / 추가",
-  "search_category": "카테고리 검색",
+  "scan_qr_code_to_get_address": "QR 코드를 스캔하여 주소를 얻습니다.",
+  "scan_qr_on_device": "다른 기기에서 이 QR 코드를 스캔하세요.",
+  "search": "찾다",
+  "search_add_token": "검색 / 토큰 추가",
+  "search_category": "검색 카테고리",
   "search_currency": "통화 검색",
-  "search_language": "언어 검색",
-  "second_intro_content": "Yat은 모든 통화에 대한 긴 16진수 주소를 대체하는 고유한 이모지 주소입니다.",
-  "second_intro_title": "하나의 이모지 주소로 모든 것을",
-  "security": "보안",
+  "search_language": "검색 언어",
+  "second_intro_content": "귀하의 Yat는 귀하의 모든 통화에 대해 긴 16진수 주소를 모두 대체하는 고유한 단일 이모지 주소입니다.",
+  "second_intro_title": "그들을 모두 지배하는 하나의 이모티콘 주소",
   "security_and_backup": "보안 및 백업",
-  "security_risk": "보안 위험",
-  "security_risk_description": "이 도메인은 여러 보안 제공 업체에서 안전하지 않다고 플래그 지정되었습니다. 자산을 보호하려면 즉시 나가십시오.",
-  "seed_alert_back": "뒤로 가기",
-  "seed_alert_content": "시드는 지갑을 복구하는 유일한 방법입니다. 적어두셨습니까?",
+  "seed_alert_back": "돌아 가기",
+  "seed_alert_content": "씨앗은 지갑을 복구하는 유일한 방법입니다. 적어 보셨나요?",
   "seed_alert_title": "주의",
-  "seed_alert_yes": "네, 했습니다",
-  "seed_choose": "시드 언어 선택",
-  "seed_display_path": "메뉴 -> 보안 및 백업 -> 키/시드 표시",
-  "seed_hex_form": "지갑 시드 (16진수 형식)",
+  "seed_alert_yes": "네, 있어요",
+  "seed_choose": "시드 언어를 선택하십시오",
+  "seed_display_path": "메뉴 -> 보안 및 백업 -> 키/씨앗 표시",
+  "seed_hex_form": "지갑 씨앗 (16 진 양식)",
   "seed_key": "시드 키",
-  "seed_language": "시드 언어",
-  "seed_language_chinese": "중국어",
-  "seed_language_chinese_traditional": "중국어 (번체)",
-  "seed_language_czech": "체코어",
-  "seed_language_dutch": "네덜란드어",
+  "seed_language": "종자 언어",
+  "seed_language_chinese": "중국말",
+  "seed_language_chinese_traditional": "중국 전통)",
+  "seed_language_czech": "체코 사람",
+  "seed_language_dutch": "네덜란드 사람",
   "seed_language_english": "영어",
-  "seed_language_french": "프랑스어",
-  "seed_language_german": "독일어",
-  "seed_language_italian": "이탈리아어",
+  "seed_language_french": "프랑스 국민",
+  "seed_language_german": "독일 사람",
+  "seed_language_italian": "이탈리아 사람",
   "seed_language_japanese": "일본어",
-  "seed_language_korean": "한국어",
-  "seed_language_next": "다음",
-  "seed_language_portuguese": "포르투갈어",
-  "seed_language_russian": "러시아어",
-  "seed_language_spanish": "스페인어",
-  "seed_phrase_length": "시드 구문 길이",
-  "seed_position_question_one": "시드 구문의",
-  "seed_position_question_two": "번째 단어는 무엇입니까?",
-  "seed_reminder": "휴대폰을 분실하거나 초기화할 경우를 대비해 적어두세요.",
+  "seed_language_korean": "한국인",
+  "seed_language_next": "다음 것",
+  "seed_language_portuguese": "포르투갈 인",
+  "seed_language_russian": "러시아인",
+  "seed_language_spanish": "스페인의",
+  "seed_phrase_length": "시드 문구 길이",
+  "seed_position_question_one": "무엇입니까",
+  "seed_position_question_two": "당신의 씨앗 문구의 말?",
+  "seed_reminder": "휴대 전화를 분실하거나 닦을 경우를 대비해 적어 두세요.",
   "seed_share": "시드 공유",
-  "seed_title": "시드",
-  "seed_verified": "시드 확인됨",
-  "seed_verified_subtext": "저장된 시드를 사용하여 나중에 기기 손상 또는 분실 시 이 지갑을 복구할 수 있습니다.\n\n다음에서 이 시드를 다시 볼 수 있습니다.",
-  "seedtype": "시드 유형",
-  "seedtype_alert_content": "다른 지갑과의 시드 공유는 BIP39 시드 유형에서만 가능합니다.",
-  "seedtype_alert_title": "시드 유형 알림",
+  "seed_title": "씨",
+  "seed_verified": "종자 확인",
+  "seed_verified_subtext": "나중에 저장된 씨앗을 사용하여 부패 또는 장치를 잃을 때이 지갑을 복원 할 수 있습니다.\n\n이 씨앗을 다시 볼 수 있습니다.",
+  "seedtype": "시드 타입",
+  "seedtype_alert_content": "다른 지갑과 씨앗을 공유하는 것은 BIP39 SeedType에서만 가능합니다.",
+  "seedtype_alert_title": "종자 경보",
+  "seedtype_legacy": "레거시 (25 단어)",
+  "seedtype_polyseed": "다문 (16 단어)",
+  "seedtype_wownero": "Wownero (14 단어)",
   "select_backup_file": "백업 파일 선택",
-  "select_buy_provider_notice": "위에서 구매 제공 업체를 선택하세요. 앱 설정에서 기본 구매 제공 업체를 설정하여 이 화면을 건너뛸 수 있습니다.",
-  "select_destination": "백업 파일의 대상을 선택하세요.",
-  "select_hw_account_below": "아래에서 복구할 계정을 선택하세요:",
-  "select_sell_provider_notice": "위에서 판매 제공 업체를 선택하세요. 앱 설정에서 기본 판매 제공 업체를 설정하여 이 화면을 건너뛸 수 있습니다.",
-  "select_your_country": "국가를 선택하세요",
-  "selected_trocador_provider": "선택된 Trocador 제공 업체",
-  "sell": "판매",
-  "sell_alert_content": "현재 비트코인, 이더리움, 라이트코인 판매만 지원합니다. 비트코인, 이더리움 또는 라이트코인 지갑을 생성하거나 전환하세요.",
-  "sell_monero_com_alert_content": "모네로 판매는 아직 지원되지 않습니다.",
-  "send": "보내기",
+  "select_buy_provider_notice": "위의 구매 제공자를 선택하십시오. 앱 설정에서 기본 구매 제공자를 설정 하여이 화면을 건너 뛸 수 있습니다.",
+  "select_destination": "백업 파일의 대상을 선택하십시오.",
+  "select_hw_account_below": "아래를 복원 할 계정을 선택하십시오.",
+  "select_sell_provider_notice": "위에서 판매 공급자를 선택하세요. 앱 설정에서 기본 판매 공급자를 설정하면 이 화면을 건너뛸 수 있습니다.",
+  "select_your_country": "국가를 선택하십시오",
+  "selected_trocador_provider": "선정 된 트로 코더 제공 업체",
+  "sell": "팔다",
+  "sell_alert_content": "현재 Bitcoin, Ethereum 및 Litecoin의 판매만 지원합니다. Bitcoin, Ethereum 또는 Litecoin 지갑을 생성하거나 전환하십시오.",
+  "sell_monero_com_alert_content": "지원되지 않습니다.",
+  "send": "보내다",
   "send_address": "${cryptoCurrency} 주소",
-  "send_amount": "금액:",
-  "send_change_to_you": "잔돈, 귀하에게:",
-  "send_creating_transaction": "트랜잭션 생성 중",
-  "send_error_currency": "통화는 숫자만 포함할 수 있습니다",
-  "send_error_minimum_value": "최소 금액 값은 0.01입니다",
+  "send_amount": "양:",
+  "send_change_to_you": "당신에게 변경 :",
+  "send_creating_transaction": "거래 생성",
+  "send_error_currency": "통화는 숫자 만 포함 할 수 있습니다",
+  "send_error_minimum_value": "금액의 최소값은 0.01입니다",
   "send_estimated_fee": "예상 수수료:",
-  "send_fee": "수수료:",
-  "send_from_cake_wallet": "Cake Wallet에서 보내기",
-  "send_from_external_wallet": "외부 지갑에서 보내기",
+  "send_fee": "회비:",
+  "send_from_cake_wallet": "케이크 지갑에서 보내십시오",
+  "send_from_external_wallet": "외부 지갑에서 보내십시오",
   "send_name": "이름",
-  "send_new": "새로 만들기",
-  "send_payjoin": "보내다 Payjoin",
-  "send_payment_id": "결제 ID (선택 사항)",
-  "send_priority": "현재 수수료는 ${transactionPriority} 우선순위로 설정되어 있습니다.\n트랜잭션 우선순위는 설정에서 조정할 수 있습니다.",
-  "send_sending": "보내는 중...",
-  "send_success": "${crypto}이(가) 성공적으로 전송되었습니다",
+  "send_new": "새로운",
+  "send_payment_id": "지불 ID (optional)",
+  "send_priority": "현재 수수료는 ${transactionPriority} 우선 순위.\n거래 우선 순위는 설정에서 조정할 수 있습니다",
+  "send_sending": "배상...",
+  "send_success": "${crypto}가 성공적으로 전송되었습니다",
   "send_templates": "템플릿",
-  "send_title": "보내기",
-  "send_to_this_address": "${currency} ${tag}을(를) 이 주소로 보내기",
-  "send_xmr": "XMR 보내기",
-  "send_your_wallet": "내 지갑",
-  "sending": "보내는 중",
+  "send_title": "보내다",
+  "send_to_this_address": "이 주소로 ${currency} ${tag}송금",
+  "send_xmr": "보내다 XMR",
+  "send_your_wallet": "지갑",
+  "sending": "배상",
   "sent": "보냄",
-  "service_health_disabled": "서비스 상태 게시판 비활성화됨",
-  "service_health_disabled_message": "이것은 서비스 상태 게시판 페이지이며, 설정 -> 개인 정보 보호에서 이 페이지를 활성화할 수 있습니다.",
-  "set_a_pin": "PIN 설정",
-  "set_up_a_wallet": "지갑 설정",
+  "service_health_disabled": "서비스 건강 게시판이 장애가되었습니다",
+  "service_health_disabled_message": "이것은 서비스 건강 게시판 페이지입니다. 설정 에서이 페이지를 활성화 할 수 있습니다 -> 개인 정보",
+  "set_a_pin": "핀을 설정하십시오",
+  "set_up_a_wallet": "지갑을 설정하십시오",
   "settings": "설정",
-  "settings_all": "전체",
+  "settings_all": "모든",
   "settings_allow_biometrical_authentication": "생체 인증 허용",
   "settings_can_be_changed_later": "이 설정은 나중에 앱 설정에서 변경할 수 있습니다.",
   "settings_change_language": "언어 변경",
@@ -800,318 +729,298 @@
   "settings_currency": "통화",
   "settings_current_node": "현재 노드",
   "settings_dark_mode": "다크 모드",
-  "settings_display_balance": "잔액 표시",
-  "settings_display_on_dashboard_list": "대시보드 목록에 표시",
-  "settings_fee_priority": "수수료 우선순위",
+  "settings_display_balance": "디스플레이 잔액",
+  "settings_display_on_dashboard_list": "대시 보드 목록에 표시",
+  "settings_fee_priority": "수수료 우선",
   "settings_nodes": "노드",
   "settings_none": "없음",
-  "settings_only_trades": "거래만",
-  "settings_only_transactions": "트랜잭션만",
-  "settings_personal": "개인",
+  "settings_only_trades": "거래 만",
+  "settings_only_transactions": "거래 만",
+  "settings_personal": "개인적인",
   "settings_save_recipient_address": "수신자 주소 저장",
-  "settings_support": "지원",
+  "settings_support": "지원하다",
   "settings_terms_and_conditions": "이용 약관",
   "settings_title": "설정",
   "settings_trades": "거래",
-  "settings_transactions": "트랜잭션",
+  "settings_transactions": "업무",
   "settings_wallets": "지갑",
-  "setup_2fa": "Cake 2FA 설정",
-  "setup_2fa_text": "Cake 2FA는 두 번째 인증 요소로 TOTP를 사용합니다.\n\nCake 2FA의 TOTP는 SHA-512 및 8자리 지원이 필요하며 이는 보안을 강화합니다. 자세한 정보 및 지원되는 앱은 가이드에서 찾을 수 있습니다.",
-  "setup_pin": "PIN 설정",
+  "setup_2fa": "케이크 2FA 설정",
+  "setup_2fa_text": "Cake 2FA는 TOTP를 두 번째 인증 요소로 사용하여 작동합니다.\n\nCake 2FA의 TOTP에는 SHA-512 및 8자리 지원이 필요합니다. 이는 보안을 강화합니다. 자세한 정보와 지원되는 앱은 가이드에서 확인할 수 있습니다.",
+  "setup_pin": "설정 PIN",
   "setup_successful": "PIN이 성공적으로 설정되었습니다!",
   "setup_totp_recommended": "TOTP 설정",
-  "setup_warning_2fa_text": "Cake 2FA는 지갑의 특정 작업에 대한 두 번째 인증입니다. 콜드 스토리지처럼 안전하지는 않습니다.\n\n2FA 앱 또는 TOTP 키에 대한 액세스 권한을 잃으면 이 지갑에 대한 액세스 권한도 잃게 됩니다. 니모닉 시드에서 지갑을 복구해야 합니다.\n\n2FA 또는 니모닉 시드에 대한 액세스 권한을 잃으면 Cake 지원팀에서 도움을 드릴 수 없습니다.\nCake 2FA를 사용하기 전에 가이드를 읽어보는 것이 좋습니다.",
-  "setup_your_debit_card": "직불 카드 설정",
-  "share": "공유",
+  "setup_warning_2fa_text": "Cake 2FA는 지갑의 특정 작업에 대한 두 번째 인증입니다. 냉장 보관만큼 안전하지 않습니다.\n\n2FA 앱 또는 TOTP 키에 대한 액세스 권한을 상실하면 이 지갑에 대한 액세스 권한도 잃게 됩니다. 니모닉 시드에서 지갑을 복원해야 합니다.\n\n2FA 또는 니모닉 시드에 액세스할 수 없는 경우 Cake 지원팀에서 도움을 드릴 수 없습니다.\nCake 2FA를 사용하기 전에 가이드를 읽어 보시기 바랍니다.",
+  "setup_your_debit_card": "직불카드 설정",
+  "share": "공유하다",
   "share_address": "주소 공유",
-  "shared_seed_wallet_groups": "공유 시드 지갑 그룹",
-  "show": "표시",
-  "show_address_book_popup": "주소록 팝업 표시",
-  "show_balance": "길게 눌러 잔액 표시",
-  "show_balance_toast": "길게 눌러 잔액 숨기기 또는 표시",
-  "show_details": "세부 정보 표시",
-  "show_keys": "시드/키 표시",
+  "shared_seed_wallet_groups": "공유 종자 지갑 그룹",
+  "show": "보여주다",
+  "show_address_book_popup": "주소록 팝업을 보여주십시오",
+  "show_balance": "균형을 보여주기 위해 긴 언론",
+  "show_balance_toast": "균형을 숨기거나 보여주기 위해 긴 누르십시오",
+  "show_details": "세부정보 표시",
+  "show_keys": "시드 / 키 표시",
   "show_market_place": "마켓플레이스 표시",
-  "show_seed": "시드 표시",
-  "sign_all": "모두 서명",
-  "sign_message": "메시지 서명",
-  "sign_one": "하나 서명",
+  "show_seed": "종자 표시",
+  "sign_message": "서명 메시지",
   "sign_up": "가입",
-  "sign_verify_message": "서명 / 검증",
-  "sign_verify_message_sub": "개인 키를 사용하여 메시지 서명 또는 검증",
-  "sign_verify_title": "서명 / 검증",
+  "sign_verify_message": "메시지에 서명하거나 확인하십시오",
+  "sign_verify_message_sub": "개인 키를 사용하여 메시지에 서명하거나 확인하십시오",
+  "sign_verify_title": "서명 / 확인",
   "signature": "서명",
-  "signature_invalid_error": "주어진 메시지에 대한 서명이 유효하지 않습니다",
-  "signTransaction": "트랜잭션 서명",
-  "signup_for_card_accept_terms": "카드에 가입하고 약관에 동의하세요.",
-  "silent_payment": "사일런트 페이먼트",
-  "silent_payments": "사일런트 페이먼트",
-  "silent_payments_always_scan": "사일런트 페이먼트 항상 스캔 설정",
-  "silent_payments_disclaimer": "새 주소는 새 신원이 아닙니다. 다른 라벨이 있는 기존 신원의 재사용입니다.",
-  "silent_payments_display_card": "사일런트 페이먼트 카드 표시",
-  "silent_payments_scan_from_date": "날짜부터 스캔",
-  "silent_payments_scan_from_date_or_blockheight": "들어오는 사일런트 페이먼트 스캔을 시작할 블록 높이를 입력하거나 대신 날짜를 사용하세요. 지갑이 모든 블록을 계속 스캔할지 또는 지정된 높이만 확인할지 선택할 수 있습니다.",
-  "silent_payments_scan_from_height": "블록 높이부터 스캔",
-  "silent_payments_scanned_tip": "팁까지 스캔됨! (${tip})",
-  "silent_payments_scanning": "사일런트 페이먼트 스캔 중",
-  "silent_payments_settings": "사일런트 페이먼트 설정",
-  "single_seed_wallets_group": "단일 시드 지갑",
-  "slidable": "슬라이드 가능",
-  "solana_create_associated_token_account_exception": "수신자 주소에 대한 연관 토큰 계정 생성 오류.",
-  "solana_no_associated_token_account_exception": "이 주소에 대한 연관 토큰 계정이 없습니다.",
-  "solana_sign_native_transaction_rent_exception": "트랜잭션을 완료할 수 없습니다. 트랜잭션 후 렌트에 필요한 SOL이 부족합니다. SOL 잔액을 충전하거나 보내는 SOL 금액을 줄이세요.",
-  "solana_sign_spl_token_transaction_rent_exception": "트랜잭션을 완료할 수 없습니다. 트랜잭션 후 렌트에 필요한 SOL이 부족합니다. SOL 잔액을 충전하세요.",
+  "signature_invalid_error": "서명은 주어진 메시지에 유효하지 않습니다",
+  "signTransaction": "거래 서명",
+  "signup_for_card_accept_terms": "카드에 가입하고 약관에 동의합니다.",
+  "silent_payment": "조용한 지불",
+  "silent_payments": "조용한 지불",
+  "silent_payments_always_scan": "무음금을 항상 스캔합니다",
+  "silent_payments_disclaimer": "새로운 주소는 새로운 정체성이 아닙니다. 다른 레이블로 기존 신원을 재사용하는 것입니다.",
+  "silent_payments_display_card": "사일런트 지불 카드 표시",
+  "silent_payments_scan_from_date": "날짜부터 스캔하십시오",
+  "silent_payments_scan_from_date_or_blockheight": "들어오는 사일런트 결제를 위해 스캔을 시작하려는 블록 높이를 입력하거나 대신 날짜를 사용하십시오. 지갑이 모든 블록을 계속 스캔하는지 여부를 선택하거나 지정된 높이 만 확인할 수 있습니다.",
+  "silent_payments_scan_from_height": "블록 높이에서 스캔하십시오",
+  "silent_payments_scanned_tip": "팁을 스캔했습니다! (${tip})",
+  "silent_payments_scanning": "조용한 지불 스캔",
+  "silent_payments_settings": "조용한 지불 설정",
+  "single_seed_wallets_group": "단일 씨앗 지갑",
+  "slidable": "슬라이딩 가능",
+  "solana_create_associated_token_account_exception": "오류 생성 관련 토큰 계정 수령자 주소에 대한 계정.",
+  "solana_no_associated_token_account_exception": "이 주소에는 관련 토큰 계정이 없습니다.",
+  "solana_sign_native_transaction_rent_exception": "거래는 완료 될 수 없습니다. 거래 후 SOL이 임대료로 남았습니다. SOL 밸런스를 친절하게 위로 올리거나 보내는 솔의 양을 줄입니다.",
+  "solana_sign_spl_token_transaction_rent_exception": "거래는 완료 될 수 없습니다. 거래 후 SOL이 임대료로 남았습니다. SOL 균형을 친절하게 위에 올리십시오.",
   "sort_by": "정렬 기준",
-  "spend_key_private": "지출 키 (개인)",
-  "spend_key_public": "지출 키 (공개)",
-  "starting_tor_proxy": "Tor 프록시 시작",
-  "status": "상태: ",
-  "step": "단계",
-  "string_default": "기본값",
+  "spend_key_private": "지출 키 (은밀한)",
+  "spend_key_public": "지출 키 (공공의)",
+  "status": "지위: ",
+  "string_default": "기본",
   "subaddress_title": "하위 주소 목록",
   "subaddresses": "하위 주소",
-  "submit_request": "요청 제출",
-  "success": "성공",
-  "successful": "성공적",
-  "support_description_guides": "일반적인 문제에 대한 문서 및 지원",
-  "support_description_live_chat": "무료 및 빠름! 숙련된 지원 담당자가 도움을 드릴 수 있습니다",
-  "support_description_other_links": "커뮤니티에 가입하거나 다른 방법을 통해 저희 또는 파트너에게 연락하세요",
-  "support_title_guides": "Cake Wallet 문서",
+  "submit_request": "요청을 제출",
+  "successful": "성공적인",
+  "support_description_guides": "일반적인 문제에 대한 문서화 및 지원",
+  "support_description_live_chat": "자유롭고 빠릅니다! 훈련 된 지원 담당자가 지원할 수 있습니다",
+  "support_description_other_links": "다른 방법을 통해 커뮤니티에 가입하거나 파트너에게 연락하십시오.",
+  "support_title_guides": "케이크 지갑 문서",
   "support_title_live_chat": "실시간 지원",
-  "support_title_other_links": "기타 지원 링크",
-  "supported": "지원됨",
-  "swap": "스왑",
-  "sweeping_wallet": "지갑 스윕 중",
-  "sweeping_wallet_alert": "오래 걸리지 않습니다. 이 화면을 떠나거나 스윕된 자금을 잃을 수 있습니다.",
-  "switchToETHWallet": "이더리움 지갑으로 전환하고 다시 시도하세요",
-  "switchToEVMCompatibleWallet": "EVM 호환 지갑(이더리움, 폴리곤)으로 전환하고 다시 시도하세요",
-  "symbol": "심볼",
+  "support_title_other_links": "다른 지원 링크",
+  "swap": "교환",
+  "sweeping_wallet": "스위핑 지갑",
+  "sweeping_wallet_alert": "오래 걸리지 않습니다. 이 화면을 떠나지 마십시오. 그렇지 않으면 스웹트 자금이 손실될 수 있습니다.",
+  "switchToETHWallet": "이더리움 지갑으로 전환한 후 다시 시도해 주세요.",
+  "switchToEVMCompatibleWallet": "EVM 호환 지갑으로 전환 후 다시 시도해 주세요. (이더리움, 폴리곤)",
+  "symbol": "상징",
   "sync_all_wallets": "모든 지갑 동기화",
-  "sync_status_attempting_scan": "스캔 시도 중",
+  "sync_status_attempting_scan": "스캔 시도",
   "sync_status_attempting_sync": "동기화 시도 중",
   "sync_status_connected": "연결됨",
   "sync_status_connecting": "연결 중",
-  "sync_status_failed_connect": "연결 끊김",
-  "sync_status_not_connected": "연결되지 않음",
-  "sync_status_starting_scan": "스캔 시작 중 (${height}부터)",
-  "sync_status_starting_sync": "동기화 시작 중",
-  "sync_status_syncronized": "동기화됨",
-  "sync_status_syncronizing": "동기화 중",
+  "sync_status_failed_connect": "연결 해제",
+  "sync_status_not_connected": "연결되지 않은",
+  "sync_status_starting_scan": "시작 스캔 (${height} 에서)",
+  "sync_status_starting_sync": "동기화 시작",
+  "sync_status_syncronized": "동기화",
+  "sync_status_syncronizing": "동기화",
   "sync_status_timed_out": "시간 초과",
-  "sync_status_unsupported": "지원되지 않는 노드",
-  "synchronizing": "동기화 중",
-  "syncing_wallet_alert_content": "상단에 “동기화됨”이라고 표시될 때까지 잔액 및 트랜잭션 목록이 완전하지 않을 수 있습니다. 자세히 알아보려면 클릭/탭하세요.",
+  "sync_status_unsupported": "지원되지 않은 노드",
+  "syncing_wallet_alert_content": "상단에 \"동기화됨\"이라고 표시될 때까지 잔액 및 거래 목록이 완전하지 않을 수 있습니다. 자세히 알아보려면 클릭/탭하세요.",
   "syncing_wallet_alert_title": "지갑 동기화 중",
-  "template": "템플릿",
+  "template": "주형",
   "template_name": "템플릿 이름",
-  "testnet_coins_no_value": "테스트넷 코인은 가치가 없습니다",
-  "third_intro_content": "Yat은 Cake Wallet 외부에서도 사용됩니다. 지구상의 모든 지갑 주소는 Yat으로 대체될 수 있습니다!",
-  "third_intro_title": "Yat은 다른 것과 잘 어울립니다",
-  "this_pair_is_not_supported_warning": "현재 선택된 교환소에서는 이 쌍이 지원되지 않습니다. 다른 교환소를 선택하세요.",
-  "thorchain_contract_address_not_supported": "THORChain은 계약 주소로 보내는 것을 지원하지 않습니다",
-  "thorchain_taproot_address_not_supported": "ThorChain 제공 업체는 Taproot 주소를 지원하지 않습니다. 주소를 변경하거나 다른 제공 업체를 선택하세요.",
-  "time": "${minutes}분 ${seconds}초",
+  "testnet_coins_no_value": "Testnet 코인은 가치가 없습니다",
+  "third_intro_content": "Yats는 Cake Wallet 밖에서도 살고 있습니다. 지구상의 모든 지갑 주소는 Yat!",
+  "third_intro_title": "Yat는 다른 사람들과 잘 놉니다.",
+  "this_pair_is_not_supported_warning": "이 쌍은 현재 선택된 교환으로 지원되지 않습니다. 다른 교환을 선택하십시오.",
+  "thorchain_contract_address_not_supported": "Thorchain은 계약 주소로 보내는 것을 지원하지 않습니다",
+  "thorchain_taproot_address_not_supported": "Thorchain 제공 업체는 Taproot 주소를 지원하지 않습니다. 주소를 변경하거나 다른 공급자를 선택하십시오.",
+  "time": "${minutes}m ${seconds}s",
   "tip": "팁:",
-  "to": "받는 통화",
   "today": "오늘",
-  "token_already_exists": "토큰이 이미 존재합니다",
   "token_contract_address": "토큰 계약 주소",
-  "token_decimal": "토큰 소수 자릿수",
-  "token_name": "토큰 이름 (예: Tether)",
-  "token_symbol": "토큰 심볼 (예: USDT)",
+  "token_decimal": "토큰 십진수",
+  "token_name": "토큰 이름 예: Tether",
+  "token_symbol": "토큰 기호 예: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "교환을 위해 TON 트랜잭션을 보내는 동안 메모 ID를 지정하는 것을 잊지 마십시오.",
-  "tor_connection": "Tor 연결",
-  "tor_connection_timeout": "Tor 연결 시간 초과",
-  "tor_experimental": "이것은 케이크 지갑 지원 Tor 라우팅으로 만든 모든 연결을 실험적인 기능입니다. 일부 연결은 Clearnet을 사용할 수 있습니다.",
-  "tor_only": "Tor 전용",
-  "total": "합계",
-  "total_saving": "총 절약액",
-  "totp_2fa_failure": "잘못된 코드입니다. 다른 코드를 시도하거나 새 비밀 키를 생성하세요. 8자리 코드와 SHA512를 지원하는 호환 2FA 앱을 사용하세요.",
-  "totp_2fa_success": "성공! 이 지갑에 Cake 2FA가 활성화되었습니다. 지갑 액세스 권한을 잃을 경우를 대비하여 니모닉 시드를 저장하는 것을 잊지 마세요.",
+  "tor_connection": "토르 연결",
+  "tor_only": "Tor 뿐",
+  "total": "총",
+  "total_saving": "총 절감액",
+  "totp_2fa_failure": "잘못된 코드입니다. 다른 코드를 시도하거나 새 비밀 키를 생성하십시오. 8자리 코드와 SHA512를 지원하는 호환되는 2FA 앱을 사용하세요.",
+  "totp_2fa_success": "성공! 이 지갑에 케이크 2FA가 활성화되었습니다. 지갑 액세스 권한을 잃을 경우를 대비하여 니모닉 시드를 저장하는 것을 잊지 마십시오.",
   "totp_auth_url": "TOTP 인증 URL",
   "totp_code": "TOTP 코드",
   "totp_secret_code": "TOTP 비밀 코드",
-  "totp_verification_success": "검증 성공!",
-  "track": "추적",
-  "trade_details_copied": "${title} 클립보드에 복사됨",
-  "trade_details_created_at": "생성 날짜",
-  "trade_details_fetching": "가져오는 중",
+  "totp_verification_success": "확인 성공!",
+  "track": "길",
+  "trade_details_copied": "${title} 클립 보드에 복사",
+  "trade_details_created_at": "에 작성",
+  "trade_details_fetching": "가져 오는 중",
   "trade_details_id": "ID",
   "trade_details_pair": "쌍",
-  "trade_details_provider": "제공 업체",
+  "trade_details_provider": "공급자",
   "trade_details_state": "상태",
-  "trade_details_title": "거래 세부 정보",
-  "trade_for_not_created": "${title}에 대한 거래가 생성되지 않았습니다.",
-  "trade_history_title": "거래 내역",
-  "trade_id": "거래 ID:",
-  "trade_id_not_found": "${title}의 거래 ${tradeId}를 찾을 수 없습니다.",
-  "trade_is_powered_by": "이 거래는 ${provider}에서 제공합니다",
-  "trade_not_created": "거래가 생성되지 않음",
-  "trade_not_found": "거래를 찾을 수 없음.",
-  "trade_state_btc_sent": "BTC 전송됨",
-  "trade_state_complete": "완료",
+  "trade_details_title": "거래 세부 사항",
+  "trade_for_not_created": "거래 ${title} 생성되지 않습니다.",
+  "trade_history_title": "무역 역사",
+  "trade_id": "무역 ID:",
+  "trade_id_not_found": "무역 ${tradeId} 의 ${title} 찾을 수 없습니다.",
+  "trade_is_powered_by": "이 거래는 ${provider}",
+  "trade_not_created": "거래가 생성되지 않았습니다",
+  "trade_not_found": "거래를 찾을 수 없습니다.",
+  "trade_state_btc_sent": "보냄",
+  "trade_state_complete": "완전한",
   "trade_state_confirming": "확인 중",
-  "trade_state_created": "생성됨",
-  "trade_state_finished": "완료됨",
-  "trade_state_paid": "지불됨",
-  "trade_state_paid_unconfirmed": "지불됨 (미확인)",
+  "trade_state_created": "만들어진",
+  "trade_state_finished": "끝마친",
+  "trade_state_paid": "유료",
+  "trade_state_paid_unconfirmed": "미확인 유료",
   "trade_state_pending": "대기 중",
-  "trade_state_timeout": "시간 초과",
-  "trade_state_to_be_created": "생성 예정",
-  "trade_state_traded": "거래됨",
-  "trade_state_trading": "거래 중",
-  "trade_state_underpaid": "과소 지불됨",
-  "trade_state_unpaid": "미지불",
+  "trade_state_timeout": "타임 아웃",
+  "trade_state_to_be_created": "만들려면",
+  "trade_state_traded": "거래",
+  "trade_state_trading": "거래",
+  "trade_state_underpaid": "미지급",
+  "trade_state_unpaid": "미지급",
   "trades": "거래",
-  "transaction_cost": "트랜잭션 비용",
-  "transaction_details_amount": "금액",
-  "transaction_details_copied": "${title} 클립보드에 복사됨",
+  "transaction_cost": "거래 비용",
+  "transaction_details_amount": "양",
+  "transaction_details_copied": "${title} 클립 보드에 복사",
   "transaction_details_date": "날짜",
-  "transaction_details_fee": "수수료",
-  "transaction_details_height": "높이",
-  "transaction_details_recipient_address": "수신자 주소",
-  "transaction_details_source_address": "송신자 주소",
-  "transaction_details_title": "트랜잭션 세부 정보",
+  "transaction_details_fee": "회비",
+  "transaction_details_height": "신장",
+  "transaction_details_recipient_address": "받는 사람 주소",
+  "transaction_details_source_address": "소스 주소",
+  "transaction_details_title": "상세 거래 내역",
   "transaction_details_transaction_id": "트랜잭션 ID",
-  "transaction_key": "트랜잭션 키",
-  "transaction_priority_fast": "빠름",
-  "transaction_priority_fastest": "가장 빠름",
-  "transaction_priority_medium": "중간",
-  "transaction_priority_regular": "보통",
-  "transaction_priority_slow": "느림",
-  "transaction_sent": "트랜잭션 전송됨!",
-  "transaction_sent_notice": "1분 후에도 화면이 진행되지 않으면 블록 탐색기와 이메일을 확인하세요.",
-  "transactions": "트랜잭션",
-  "transactions_by_date": "날짜별 트랜잭션",
-  "transport_type": "전송 유형",
-  "trongrid_history": "TronGrid 내역",
-  "trusted": "신뢰됨",
-  "try_again": "다시 시도하십시오",
-  "tx_commit_exception_no_dust_on_change": "이 금액으로는 트랜잭션이 거부됩니다. 이 코인으로는 잔돈 없이 ${min}을(를) 보내거나 잔돈이 반환되는 ${max}을(를) 보낼 수 있습니다.",
-  "tx_commit_failed": "트랜잭션 커밋 실패. 지원팀에 문의하세요.",
-  "tx_commit_failed_no_peers": "트랜잭션 전파 실패. 잠시 후 다시 시도하세요.",
-  "tx_invalid_input": "이 유형의 결제에 잘못된 입력 유형을 사용하고 있습니다.",
-  "tx_no_dust_exception": "너무 적은 금액을 보내 트랜잭션이 거부되었습니다. 금액을 늘려보세요.",
-  "tx_not_enough_inputs_exception": "사용 가능한 입력이 충분하지 않습니다. 코인 제어에서 더 많이 선택하세요.",
-  "tx_rejected_bip68_final": "트랜잭션에 미확인 입력이 있으며 수수료로 교체(RBF)하지 못했습니다.",
-  "tx_rejected_dust_change": "네트워크 규칙에 의해 트랜잭션 거부됨, 낮은 잔돈 금액 (더스트). 전체 보내기를 시도하거나 금액을 줄이세요.",
-  "tx_rejected_dust_output": "네트워크 규칙에 의해 트랜잭션 거부됨, 낮은 출력 금액 (더스트). 금액을 늘리세요.",
-  "tx_rejected_dust_output_send_all": "네트워크 규칙에 의해 트랜잭션 거부됨, 낮은 출력 금액 (더스트). 코인 제어에서 선택한 코인 잔액을 확인하세요.",
-  "tx_rejected_vout_negative": "이 트랜잭션 수수료를 지불하기에 잔액이 부족합니다. 코인 제어에서 코인 잔액을 확인하세요.",
-  "tx_wrong_balance_exception": "이 금액을 보내기에 ${currency}이(가) 충분하지 않습니다.",
-  "tx_wrong_balance_with_amount_exception": "총 금액 ${amount}을(를) 보내기에 ${currency}이(가) 충분하지 않습니다.",
-  "tx_zero_fee_exception": "수수료 0으로 트랜잭션을 보낼 수 없습니다. 요율을 높이거나 연결을 확인하여 최신 예상치를 확인하세요.",
-  "unavailable_balance": "사용 불가 잔액",
-  "unavailable_balance_description": "사용 불가 잔액: 이 총액에는 보류 중인 트랜잭션에 잠긴 자금과 코인 제어 설정에서 적극적으로 동결한 자금이 포함됩니다. 잠긴 잔액은 해당 트랜잭션이 완료되면 사용할 수 있게 되며, 동결된 잔액은 동결 해제를 결정할 때까지 트랜잭션에 액세스할 수 없습니다.",
-  "unconfirmed": "미확정 잔액",
-  "understand": "이해합니다",
-  "unlock": "잠금 해제",
-  "unmatched_currencies": "현재 지갑 통화가 스캔된 QR의 통화와 일치하지 않습니다.",
-  "unrestricted_background_service": "제한 없는 백그라운드 서비스",
-  "unrestricted_background_service_notice": "백그라운드 동기화를 활성화하려면 제한 없는 백그라운드 서비스를 활성화해야 합니다.",
-  "unspent_change": "잔돈",
-  "unspent_coins_details_title": "미사용 코인 세부 정보",
-  "unspent_coins_title": "미사용 코인",
-  "unsupported_asset": "이 자산에 대해 이 작업을 지원하지 않습니다. 지원되는 자산 유형의 지갑을 생성하거나 전환하세요.",
-  "update_session": "세션 업데이트",
+  "transaction_key": "거래 키",
+  "transaction_priority_fast": "빠른",
+  "transaction_priority_fastest": "가장 빠른",
+  "transaction_priority_medium": "매질",
+  "transaction_priority_regular": "정규병",
+  "transaction_priority_slow": "느린",
+  "transaction_sent": "거래가 전송되었습니다!",
+  "transaction_sent_notice": "1분 후에도 화면이 진행되지 않으면 블록 익스플로러와 이메일을 확인하세요.",
+  "transactions": "업무",
+  "transactions_by_date": "날짜 별 거래",
+  "trongrid_history": "트롱 트리드 역사",
+  "trusted": "신뢰할 수 있는",
+  "tx_commit_exception_no_dust_on_change": "이 금액으로 거래가 거부되었습니다. 이 코인을 사용하면 거스름돈 없이 ${min}를 보내거나 거스름돈을 반환하는 ${max}를 보낼 수 있습니다.",
+  "tx_commit_failed": "거래 커밋이 실패했습니다. 지원에 연락하십시오.",
+  "tx_commit_failed_no_peers": "트랜잭션이 방송에 실패했는데 1 초 정도 후에 다시 시도하십시오.",
+  "tx_invalid_input": "이 유형의 지불에 잘못 입력 유형을 사용하고 있습니다.",
+  "tx_no_dust_exception": "너무 작은 금액을 보내면 거래가 거부됩니다. 금액을 늘리십시오.",
+  "tx_not_enough_inputs_exception": "사용 가능한 입력이 충분하지 않습니다. 코인 컨트롤에서 더 많은 것을 선택하십시오",
+  "tx_rejected_bip68_final": "거래는 확인되지 않은 입력을 받았으며 수수료로 교체하지 못했습니다.",
+  "tx_rejected_dust_change": "네트워크 규칙, 낮은 변경 금액 (먼지)에 의해 거부 된 거래. 전부를 보내거나 금액을 줄이십시오.",
+  "tx_rejected_dust_output": "네트워크 규칙, 낮은 출력 금액 (먼지)에 의해 거부 된 거래. 금액을 늘리십시오.",
+  "tx_rejected_dust_output_send_all": "네트워크 규칙, 낮은 출력 금액 (먼지)에 의해 거부 된 거래. 동전 제어에서 선택한 동전의 균형을 확인하십시오.",
+  "tx_rejected_vout_negative": "이 거래 수수료를 지불하기에 잔액이 충분하지 않습니다. 동전 통제하에 동전의 균형을 확인하십시오.",
+  "tx_wrong_balance_exception": "이 금액을 보내기에 충분한 ${currency}가 충분하지 않습니다.",
+  "tx_wrong_balance_with_amount_exception": "충분하지 않습니다 ${currency} 총 ${amount} 총 금액을 보내십시오.",
+  "tx_zero_fee_exception": "0 수수료로 거래를 보낼 수 없습니다. 최신 견적에 대해서는 속도를 높이거나 연결을 확인하십시오.",
+  "unavailable_balance": "사용할 수 없는 잔액",
+  "unavailable_balance_description": "사용할 수 없는 잔액: 이 총계에는 보류 중인 거래에 잠겨 있는 자금과 코인 관리 설정에서 적극적으로 동결된 자금이 포함됩니다. 잠긴 잔액은 해당 거래가 완료되면 사용할 수 있게 되며, 동결된 잔액은 동결을 해제하기 전까지 거래에 액세스할 수 없습니다.",
+  "unconfirmed": "확인되지 않은 잔액",
+  "understand": "이해 했어요",
+  "unlock": "터놓다",
+  "unmatched_currencies": "현재 지갑의 통화가 스캔한 QR의 통화와 일치하지 않습니다.",
+  "unrestricted_background_service": "무제한 배경 서비스",
+  "unrestricted_background_service_notice": "배경 동기화를 활성화하려면 무제한 배경 서비스를 활성화해야합니다.",
+  "unspent_change": "변화",
+  "unspent_coins_details_title": "사용하지 않은 동전 세부 정보",
+  "unspent_coins_title": "사용하지 않은 동전",
+  "unsupported_asset": "이 저작물에 대해 이 작업을 지원하지 않습니다. 지원되는 자산 유형의 지갑을 생성하거나 전환하십시오.",
   "uptime": "가동 시간",
-  "upto": "${value}까지",
+  "upto": "최대 ${value}",
   "usb": "USB",
-  "use": "다음으로 전환 ",
-  "use_card_info_three": "디지털 카드를 온라인 또는 비접촉 결제 방법으로 사용하세요.",
-  "use_card_info_two": "자금은 디지털 통화가 아닌 선불 계정에 보관될 때 USD로 변환됩니다.",
-  "use_device_theme": "장치 테마를 사용하십시오",
-  "use_payjoin": "사용 Payjoin",
+  "use": "사용하다 ",
+  "use_card_info_three": "디지털 카드를 온라인 또는 비접촉식 결제 수단으로 사용하십시오.",
+  "use_card_info_two": "디지털 화폐가 아닌 선불 계정에 보유하면 자금이 USD로 변환됩니다.",
   "use_ssl": "SSL 사용",
-  "use_suggested": "제안 사용",
-  "use_testnet": "테스트넷 사용",
-  "user_rejected_method": "사용자가 방법 거부",
+  "use_suggested": "추천 사용",
+  "use_testnet": "TestNet을 사용하십시오",
   "value": "값",
-  "value_type": "값 유형",
-  "variable_pair_not_supported": "선택한 교환소에서는 이 변동 쌍이 지원되지 않습니다.",
+  "value_type": "가치 유형",
+  "variable_pair_not_supported": "이 변수 쌍은 선택한 교환에서 지원되지 않습니다.",
   "verification": "검증",
-  "verify_message": "메시지 검증",
-  "verify_seed": "시드 검증",
-  "verify_with_2fa": "Cake 2FA로 검증",
+  "verify_message": "메시지를 확인하십시오",
+  "verify_seed": "씨앗을 확인하십시오",
+  "verify_with_2fa": "케이크 2FA로 확인",
   "version": "버전 ${currentVersion}",
   "view_all": "모두 보기",
-  "view_in_block_explorer": "블록 탐색기에서 보기",
-  "view_key_private": "보기 키 (개인)",
-  "view_key_public": "보기 키 (공개)",
-  "view_transaction_on": "다음에서 트랜잭션 보기 ",
-  "voting_weight": "투표 가중치",
-  "waitFewSecondForTxUpdate": "트랜잭션이 트랜잭션 내역에 반영될 때까지 몇 초간 기다려 주십시오",
+  "view_in_block_explorer": "View in Block Explorer",
+  "view_key_private": "키보기(은밀한)",
+  "view_key_public": "키보기 (공공의)",
+  "view_transaction_on": "View Transaction on ",
+  "voting_weight": "투표 중량",
+  "waitFewSecondForTxUpdate": "거래 내역에 거래가 반영될 때까지 몇 초 정도 기다려 주세요.",
   "wallet": "지갑",
   "wallet_group": "지갑 그룹",
-  "wallet_group_description_existing_seed": "이 지갑에 기존 시드를 사용하도록 선택했습니다. 확인하거나 적어두어야 하는 경우 시드를 다시 확인할 수 있습니다.",
-  "wallet_group_description_four": "완전히 새로운 시드로 지갑을 생성합니다.",
-  "wallet_group_description_one": "Cake Wallet에서는 다음을 생성할 수 있습니다",
-  "wallet_group_description_open_wallet": "그렇지 않으면 계속해서 지갑을 열 수 있습니다",
-  "wallet_group_description_three": "사용 가능한 지갑 및/또는 지갑 그룹 화면을 봅니다. 또는 다음을 선택합니다",
-  "wallet_group_description_two": "시드를 공유할 기존 지갑을 선택하여. 각 지갑 그룹에는 각 통화 유형의 단일 지갑이 포함될 수 있습니다.\n\n다음을 선택할 수 있습니다",
-  "wallet_group_description_view_seed": "다음에서 이 시드를 항상 다시 볼 수 있습니다",
-  "wallet_group_empty_state_text_one": "호환되는 지갑 그룹이 없는 것 같습니다!\n\n탭",
-  "wallet_group_empty_state_text_two": "아래에서 새 그룹을 만듭니다.",
-  "wallet_has_passphrase": "이 지갑에는 암호 구문이 있습니다",
-  "wallet_keys": "지갑 시드/키",
-  "wallet_list_create_new_wallet": "새 지갑 생성",
+  "wallet_group_description_existing_seed": "이 지갑에 기존 씨앗을 사용하기로 선택했습니다. 확인하거나 작성 해야하는 경우 씨앗을 다시 확인할 수 있습니다.",
+  "wallet_group_description_four": "완전히 새로운 씨앗으로 지갑을 만듭니다.",
+  "wallet_group_description_one": "케이크 지갑에서는 a를 만들 수 있습니다",
+  "wallet_group_description_open_wallet": "그렇지 않으면 지갑을 계속 열 수 있습니다",
+  "wallet_group_description_three": "사용 가능한 지갑 및/또는 지갑 그룹 스크린을 볼 수 있습니다. 또는 선택하십시오",
+  "wallet_group_description_two": "씨앗을 공유 할 기존 지갑을 선택함으로써. 각 지갑 그룹은 각 통화 유형의 단일 지갑을 포함 할 수 있습니다. \n\n",
+  "wallet_group_description_view_seed": "이 씨앗을 언제든지 다시 볼 수 있습니다",
+  "wallet_group_empty_state_text_one": "호환 지갑 그룹이없는 것 같습니다 !\n\n TAP",
+  "wallet_group_empty_state_text_two": "아래에서 새로운 것을 만들기 위해.",
+  "wallet_keys": "지갑 시드 / 키",
+  "wallet_list_create_new_wallet": "새 월렛 만들기",
   "wallet_list_edit_group_name": "그룹 이름 편집",
-  "wallet_list_edit_wallet": "지갑 편집",
-  "wallet_list_failed_to_load": "${wallet_name} 지갑 로드 실패. ${error}",
-  "wallet_list_failed_to_remove": "${wallet_name} 지갑 제거 실패. ${error}",
-  "wallet_list_load_wallet": "지갑 로드",
-  "wallet_list_loading_wallet": "${wallet_name} 지갑 로딩 중",
-  "wallet_list_removing_wallet": "${wallet_name} 지갑 제거 중",
-  "wallet_list_restore_wallet": "지갑 복구",
-  "wallet_list_title": "모네로 지갑",
+  "wallet_list_edit_wallet": "지갑 수정",
+  "wallet_list_failed_to_load": "불러 오지 못했습니다 ${wallet_name} 지갑. ${error}",
+  "wallet_list_failed_to_remove": "제거하지 못했습니다 ${wallet_name} 지갑. ${error}",
+  "wallet_list_load_wallet": "지갑로드",
+  "wallet_list_loading_wallet": "로딩 ${wallet_name} 지갑",
+  "wallet_list_removing_wallet": "풀이 ${wallet_name} 지갑",
+  "wallet_list_restore_wallet": "월렛 복원",
+  "wallet_list_title": "모네로 월렛",
   "wallet_list_wallet_name": "지갑 이름",
-  "wallet_menu": "메뉴",
+  "wallet_menu": "월렛 메뉴",
   "wallet_name": "지갑 이름",
-  "wallet_name_exists": "해당 이름의 지갑이 이미 존재합니다. 다른 이름을 선택하거나 먼저 다른 지갑의 이름을 변경하십시오.",
-  "wallet_password_is_empty": "지갑 비밀번호가 비어 있습니다. 지갑 비밀번호는 비워둘 수 없습니다.",
+  "wallet_name_exists": "해당 이름의 지갑이 이미 존재합니다.",
+  "wallet_password_is_empty": "지갑 암호는 비어 있습니다. 지갑 암호는 비어 있지 않아야합니다",
   "wallet_recovery_height": "복구 높이",
-  "wallet_restoration_store_incorrect_seed_length": "잘못된 시드 길이",
+  "wallet_restoration_store_incorrect_seed_length": "시드 길이가 잘못되었습니다",
   "wallet_seed": "지갑 시드",
   "wallet_seed_legacy": "레거시 지갑 시드",
-  "wallet_store_monero_wallet": "모네로 지갑",
-  "walletConnect": "WalletConnect",
+  "wallet_store_monero_wallet": "모네로 월렛",
+  "walletConnect": "월렛커넥트",
   "wallets": "지갑",
   "warning": "경고",
-  "welcome": "환영",
-  "welcome_subtitle_new_wallet": "새로 시작하려면 아래의 새 지갑 생성을 탭하면 바로 시작할 수 있습니다.",
-  "welcome_subtitle_restore_wallet": "Cake로 가져오려는 기존 지갑이 있는 경우 기존 지갑 복구를 선택하면 과정을 안내해 드립니다.",
+  "welcome": "환영 에",
+  "welcome_subtitle_new_wallet": "신선하게 시작하려면 아래에서 새 지갑을 만들면 레이스로 떠날 것입니다.",
+  "welcome_subtitle_restore_wallet": "케이크에 가져 오려는 기존 지갑이 있다면 기존 지갑 복원을 선택하면 프로세스를 안내해 드리겠습니다.",
   "welcome_to_cakepay": "Cake Pay에 오신 것을 환영합니다!",
-  "what_is_payjoin": "Payjoin ?이란?",
-  "what_is_silent_payments": "사일런트 페이먼트란 무엇인가요?",
+  "what_is_silent_payments": "조용한 지불이란 무엇입니까?",
   "widgets_address": "주소",
   "widgets_or": "또는",
-  "widgets_restore_from_blockheight": "블록 높이에서 복구",
-  "widgets_restore_from_date": "날짜에서 복구",
-  "widgets_seed": "시드",
+  "widgets_restore_from_blockheight": "블록 높이에서 복원",
+  "widgets_restore_from_date": "날짜에서 복원",
+  "widgets_seed": "씨",
   "wouoldLikeToConnect": "연결하고 싶습니다",
-  "write_down_backup_password": "백업 파일 가져오기에 사용되는 백업 비밀번호를 적어두세요.",
-  "xlm_extra_info": "교환을 위해 XLM 트랜잭션을 보낼 때 메모 ID를 지정하는 것을 잊지 마세요.",
-  "xmr_available_balance": "사용 가능 잔액",
-  "xmr_full_balance": "전체 잔액",
+  "write_down_backup_password": "백업 파일 가져 오기에 사용되는 백업 암호를 적어 두십시오.",
+  "xlm_extra_info": "교환을 위해 XLM 거래를 보낼 때 메모 ID를 지정하는 것을 잊지 마십시오",
+  "xmr_available_balance": "사용 가능한 잔액",
+  "xmr_full_balance": "풀 밸런스",
   "xmr_hidden": "숨김",
   "xmr_to_error": "XMR.TO 오류",
-  "xmr_to_error_description": "잘못된 금액입니다. 소수점 이하 최대 8자리",
-  "xrp_extra_info": "교환을 위해 XRP 트랜잭션을 보낼 때 목적지 태그를 지정하는 것을 잊지 마세요.",
+  "xmr_to_error_description": "금액이 잘못되었습니다. 소수점 이하 최대 8 자리",
+  "xrp_extra_info": "교환을 위해 XRP 트랜잭션을 보내는 동안 대상 태그를 지정하는 것을 잊지 마십시오",
   "yat": "Yat",
   "yat_address": "Yat 주소",
-  "yat_alert_content": "Cake Wallet 사용자는 이제 고유한 이모지 기반 사용자 이름으로 좋아하는 모든 통화를 보내고 받을 수 있습니다.",
-  "yat_alert_title": "Yat으로 암호화폐를 더 쉽게 보내고 받으세요",
+  "yat_alert_content": "Cake Wallet 사용자는 이제 독특한 이모티콘 기반 사용자 이름으로 좋아하는 모든 통화를 보내고 받을 수 있습니다.",
+  "yat_alert_title": "Yat으로 더 쉽게 암호화폐를 보내고 받으십시오.",
   "yat_error": "Yat 오류",
-  "yat_error_content": "이 Yat과 연결된 주소가 없습니다. 다른 Yat을 시도하세요",
-  "yat_popup_content": "이제 짧은 이모지 기반 사용자 이름인 Yat으로 Cake Wallet에서 암호화폐를 보내고 받을 수 있습니다. 설정 화면에서 언제든지 Yat을 관리하세요.",
-  "yat_popup_title": "지갑 주소를 이모지로 만들 수 있습니다.",
+  "yat_error_content": "이 Yat와 연결된 주소가 없습니다. 다른 Yat 시도",
+  "yat_popup_content": "이제 Yat(이모티콘 기반의 짧은 사용자 이름)으로 Cake Wallet에서 암호화폐를 보내고 받을 수 있습니다. 설정 화면에서 언제든지 Yats 관리",
+  "yat_popup_title": "지갑 주소를 이모티콘으로 만들 수 있습니다.",
   "yesterday": "어제",
-  "you_now_have_debit_card": "이제 직불 카드가 있습니다",
-  "you_pay": "지불 금액",
-  "you_will_get": "전환 대상",
-  "you_will_receive_estimated_amount": "받게 될 금액 (예상)",
-  "you_will_send": "전환 출처",
-  "youCanGoBackToYourDapp": "이제 dApp으로 돌아갈 수 있습니다",
+  "you_now_have_debit_card": "이제 직불카드가 있습니다.",
+  "you_pay": "당신이 지불합니다",
+  "you_will_get": "로 변환하다",
+  "you_will_receive_estimated_amount": "(추정 )을 받게됩니다.",
+  "you_will_send": "다음에서 변환",
+  "YY": "YY",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb
index 9b158be76..d7ba8d7a6 100644
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "ကတ်များသို့ ကြိုတင်ငွေပေးငွေများ ထည့်ပါ (${value} အထိ)",
   "add_new_node": "နှာခေါင်း အသစ်ထည့်ပါ။",
   "add_new_word": "စကားလုံးအသစ်ထည့်ပါ။",
-  "add_passphrase": "passphrase ထည့်ပါ",
-  "add_passphrase_warning_text": "အကယ်. သင်သည်ယခင်ကဤပိုက်ဆံအိတ်အတွက်တစ်ခုသုံးခဲ့လျှင် passphrase တစ်ခုသာရိုက်ထည့်ပါ။ အကယ်. သင်သည်မှားယွင်းသော passphrase ကို 0 င်ရောက်ခြင်းသို့မဟုတ်ဤပိုက်ဆံအိတ်ပေါ်တွင် passphrase မသုံးပါကလက်ရှိရန်ပုံငွေများသို့မဟုတ်သမိုင်းကိုသင်မတွေ့ရပါ။",
   "add_receiver": "အခြားလက်ခံသူ ထည့်ပါ (ချန်လှပ်ထားနိုင်သည်)",
   "add_secret_code": "သို့မဟုတ် ဤလျှို့ဝှက်ကုဒ်ကို အထောက်အထားစိစစ်ခြင်းအက်ပ်တစ်ခုသို့ ထည့်ပါ။",
   "add_tip": "အကြံပြုချက်ထည့်ပါ။",
   "add_token_disclaimer_check": "ဂုဏ်သိက္ခာရှိသော အရင်းအမြစ်ကို အသုံးပြု၍ တိုကင်စာချုပ်လိပ်စာနှင့် အချက်အလက်ကို ကျွန်ုပ်အတည်ပြုပြီးဖြစ်သည်။ အန္တရာယ်ရှိသော သို့မဟုတ် မမှန်ကန်သော အချက်အလက်များကို ထည့်သွင်းခြင်းသည် ရန်ပုံငွေများ ဆုံးရှုံးသွားနိုင်သည်။",
   "add_token_warning": "လိမ်လည်သူများ ညွှန်ကြားထားသည့်အတိုင်း တိုကင်များကို တည်းဖြတ်ခြင်း သို့မဟုတ် မထည့်ပါနှင့်။\nဂုဏ်သိက္ခာရှိသော အရင်းအမြစ်များဖြင့် အမြဲတမ်း တိုကင်လိပ်စာများကို အတည်ပြုပါ။",
   "add_value": "တန်ဖိုးထည့်ပါ။",
-  "added_message_for_ata_error": "ကြင်နာစွာသင့်ငွေပေးငွေယူကိုဖြည့်စွက်ရန်သင်အလုံအလောက် sol မျှတမှုရှိသည်။",
   "address": "လိပ်စာ",
   "address_book": "လိပ်စာစာအုပ်",
   "address_book_menu": "လိပ်စာစာအုပ်",
@@ -55,8 +52,6 @@
   "anonpay_description": "${type} ကို ဖန်တီးပါ။ လက်ခံသူက ${method} ကို ပံ့ပိုးပေးထားသည့် cryptocurrency တစ်ခုခုဖြင့် လုပ်ဆောင်နိုင်ပြီး၊ သင်သည် ဤပိုက်ဆံအိတ်တွင် ရံပုံငွေများ ရရှိမည်ဖြစ်သည်။",
   "apk_update": "APK အပ်ဒိတ်",
   "approve": "လက်မခံပါ။",
-  "approve_request": "တောင်းဆိုမှုကိုအတည်ပြု",
-  "approve_tokens": "တိုကင်အတည်ပြု",
   "arrive_in_this_address": "${currency} ${tag}ဤလိပ်စာသို့ ရောက်ရှိပါမည်။",
   "ascending": "တက်",
   "ask_each_time": "တစ်ခုချင်းစီကိုအချိန်မေးပါ",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "ငွေပေးချေမှု အတည်ပြုချက်ကို စောင့်မျှော်နေပါသည်။",
   "background_sync": "နောက်ခံထပ်တူပြုခြင်း",
   "background_sync_mode": "နောက်ခံထပ်တူပြုခြင်း mode ကို",
-  "background_sync_on_battery_low": "အနိမ့်ဘက်ထရီအပေါ်တစ်ပြိုင်တည်းချိန်ကိုက်",
-  "background_sync_on_charging": "အားသွင်းသည့်အခါသာထပ်တူပြုခြင်း",
-  "background_sync_on_device_idle": "စက်ကိုအသုံးမပြုသည့်စက်ကိုသာတစ်ပြိုင်တည်းချိန်ကိုက်ပါ",
-  "background_sync_on_unmetered_network": "unmetred ကွန်ယက်လိုအပ်သည်",
   "backup": "မိတ္တူ",
   "backup_file": "အရန်ဖိုင်",
   "backup_password": "စကားဝှက်ကို အရန်သိမ်းဆည်းပါ။",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Bitcoin ကိုဝယ်ပါ။",
   "buy_now": "အခုဝယ်ပါ",
   "buy_provider_unavailable": "လက်ရှိတွင်လက်ရှိမရနိုင်ပါ။",
-  "buy_sell_pair_is_not_supported_warning": "ဤငွေကြေးအတွဲကိုရွေးချယ်ထားသောငွေပေးချေမှုနည်းလမ်းအတွက်မည်သည့်ပံ့ပိုးသူမှမထောက်ပံ့ပါ။ ကျေးဇူးပြု. မတူညီသောစုံတွဲကိုရွေးချယ်ပါသို့မဟုတ်ငွေပေးချေမှုနည်းလမ်းကိုပြောင်းလဲရန်ကြိုးစားပါ။",
   "buy_with": "အတူဝယ်ပါ။",
   "by_cake_pay": "Cake Pay ဖြင့်",
   "cake_2fa_preset": "ကိတ်မုန့် 2FA ကြိုတင်သတ်မှတ်",
@@ -124,12 +114,9 @@
   "camera_consent": "မှတ်ပုံတင်ခြင်းရည်ရွယ်ချက်များအတွက် ${provider} တွင် သင့်ကင်မရာကို အသုံးပြုပါမည်။ အသေးစိတ်အတွက် ၎င်းတို့၏ ကိုယ်ရေးကိုယ်တာမူဝါဒကို စစ်ဆေးပါ။",
   "camera_permission_is_required": "ကင်မရာခွင့်ပြုချက် လိုအပ်ပါသည်။\nအက်ပ်ဆက်တင်များမှ ၎င်းကိုဖွင့်ပါ။",
   "cancel": "မလုပ်တော့",
-  "cannot_verify": "အတည်ပြုလို့မရပါ",
-  "cannot_verify_description": "ဒီဒိုမိန်းကိုအတည်မပြုနိုင်ပါ။ အတည်ပြုခြင်းမပြုမီတောင်းဆိုမှုကိုဂရုတစိုက်စစ်ဆေးပါ။",
   "card_address": "လိပ်စာ-",
   "cardholder_agreement": "ကတ်ကိုင်ဆောင်သူ သဘောတူညီချက်",
   "cards": "ကတ်များ",
-  "chain_id": "Chain ID Chain ID",
   "chains": "ဆွဲကြိုး",
   "change": "ပြောင်းလဲပါ။",
   "change_backup_password_alert": "အရန်စကားဝှက်အသစ်ဖြင့် သင်၏ယခင်မိတ္တူဖိုင်များကို တင်သွင်းရန် မရနိုင်ပါ။ အရန်စကားဝှက်အသစ်ကို အရန်ဖိုင်အသစ်အတွက်သာ အသုံးပြုပါမည်။ အရန်စကားဝှက်ကို ပြောင်းလိုသည်မှာ သေချာပါသလား။",
@@ -144,7 +131,6 @@
   "change_rep_message": "ကိုယ်စားလှယ်ပြောင်းလိုသည်မှာ သေချာပါသလား။",
   "change_rep_successful": "အောင်မြင်စွာကိုယ်စားလှယ်ပြောင်းလဲသွားတယ်",
   "change_selected_exchanges": "ရွေးချယ်ထားသောအပြန်အလှန်ဖလှယ်မှုကိုပြောင်းလဲပါ",
-  "change_selected_pair": "ရွေးချယ်ထားသည့်စုံတွဲကိုပြောင်းပါ",
   "change_wallet_alert_content": "လက်ရှိပိုက်ဆံအိတ်ကို ${wallet_name} သို့ ပြောင်းလိုပါသလား။",
   "change_wallet_alert_title": "လက်ရှိပိုက်ဆံအိတ်ကို ပြောင်းပါ။",
   "choose_a_payment_method": "ငွေပေးချေမှုနည်းလမ်းကိုရွေးချယ်ပါ",
@@ -182,14 +168,9 @@
   "confirmed_tx": "အတည်ပြုသည်",
   "congratulations": "ဂုဏ်ယူပါသည်။",
   "connect_an_existing_yat": "ရှိပြီးသား Yat ကို ချိတ်ဆက်ပါ။",
-  "connect_hw_info_step_1": "သင်၏ device ကိုသေချာအောင်လုပ်ပါ။",
-  "connect_hw_info_step_2": "ကိရိယာနှစ်ခုလုံးအတွက် Bluetooth ကိုဖွင့ ်. ဖုန်းမှတွဲပါ, သို့မဟုတ်သင်၏ကိရိယာများကို USB ကြိုးဖြင့်ချိတ်ဆက်ပါ။",
-  "connect_hw_info_step_3": "သင်၏ device ကိုသော့ဖွင့်ပြီးလိုချင်သော crypto app သို့သွားပါ။",
-  "connect_hw_info_step_4": "Cake Wallet တွင်သင်၏ device ကိုရွေးချယ်ပြီး setup ကိုဆက်လုပ်ပါ။",
   "connect_yats": "Yats ကိုချိတ်ဆက်ပါ။",
   "connect_your_hardware_wallet": "သင်၏ hardware ပိုက်ဆံအိတ်ကို Bluetooth သို့မဟုတ် USB ကို သုံး. ချိတ်ဆက်ပါ",
   "connect_your_hardware_wallet_ios": "သင်၏ hardware ပိုက်ဆံအိတ်ကို Bluetooth ကို အသုံးပြု. ချိတ်ဆက်ပါ",
-  "connected": "ချိတ်ဆက်ထားသော",
   "connection_sync": "ချိတ်ဆက်မှုနှင့် ထပ်တူပြုခြင်း။",
   "connectWalletPrompt": "အရောင်းအဝယ်ပြုလုပ်ရန် သင့်ပိုက်ဆံအိတ်ကို WalletConnect နှင့် ချိတ်ဆက်ပါ။",
   "contact": "ဆက်သွယ်ရန်",
@@ -207,8 +188,6 @@
   "copy": "ကော်ပီ",
   "copy_address": "လိပ်စာကို ကူးယူပါ။",
   "copy_id": "ID ကူးယူပါ။",
-  "copy_payjoin_address": "Payjoin လိပ်စာကိုကူးယူပါ",
-  "copy_payjoin_url": "Payjoin URL ကိုကူးယူပါ",
   "copyWalletConnectLink": "dApp မှ WalletConnect လင့်ခ်ကို ကူးယူပြီး ဤနေရာတွင် ကူးထည့်ပါ။",
   "corrupted_seed_notice": "ဤပိုက်ဆံအိတ်အတွက်ဖိုင်များသည်အကျင့်ပျက်ခြစားမှုများနှင့်မဖွင့်နိုင်ပါ။ ကျေးဇူးပြု. မျိုးစေ့များကိုကြည့်ပါ, ၎င်းကိုသိမ်းဆည်းပါ, ပိုက်ဆံအိတ်ကိုပြန်ယူပါ။\n\nအကယ်. တန်ဖိုးသည်အချည်းနှီးဖြစ်ပါကမျိုးစေ့ကိုမှန်ကန်စွာပြန်လည်ကောင်းမွန်မရရှိနိုင်ပါ။",
   "countries": "နိုင်ငံများ",
@@ -245,22 +224,11 @@
   "descending": "ဆင်း",
   "description": "ဖော်ပြချက်",
   "destination_tag": "ခရီးဆုံးအမှတ်-",
-  "deuro_collect_interest": "စုဝေး",
-  "deuro_savings": "dEuro ငွေစု",
-  "deuro_savings_add": "အပ်ငေှ",
-  "deuro_savings_balance": "ငွေစုချိန်ခွင်လျှာ",
-  "deuro_savings_collect_interest": "အကျိုးစီးပွားစုဆောင်းပါ",
-  "deuro_savings_remove": "ဆုတ်ခွာ",
-  "deuro_savings_set_approval": "အတည်ပြုချက်ကိုသတ်မှတ်ပါ",
-  "deuro_savings_subtitle": "သင်၏ Deuro Stabloin Holdings တွင် 10% အထိစိတ်ဝင်စားပါ",
-  "deuro_tx_commited_content": "၎င်းသည်ငွေပေးငွေယူကိုအတည်ပြုရန်နှင့်မျက်နှာပြင်ပေါ်တွင်ထင်ဟပ်ရန်စက္ကန့်အနည်းငယ်ကြာနိုင်သည်",
-  "device_is_signing": "ကိရိယာလက်မှတ်ထိုးနေသည်",
   "dfx_option_description": "Crypto ကို EUR & CHF ဖြင့် 0 ယ်ပါ။ လက်လီရောင်းဝယ်မှုနှင့်ဥရောပရှိကော်ပိုရိတ်ဖောက်သည်များအတွက်",
   "didnt_get_code": "ကုဒ်ကို မရဘူးလား?",
   "digit_pin": "-ဂဏန်း PIN",
   "digital_and_physical_card": "  ဒစ်ဂျစ်တယ်နှင့် ရုပ်ပိုင်းဆိုင်ရာ ကြိုတင်ငွေပေးချေသော ဒက်ဘစ်ကတ်",
   "disable": "ပိတ်ပါ။",
-  "disable_automatic_exchange_status_updates": "အလိုအလျောက်လဲလှယ် status ကို updates များကို disable လုပ်ပါ",
   "disable_bulletin": "ဝန်ဆောင်မှုအခြေအနေစာစောင်ကိုပိတ်ပါ",
   "disable_buy": "ဝယ်ယူမှု လုပ်ဆောင်ချက်ကို ပိတ်ပါ။",
   "disable_cake_2fa": "ကိတ်မုန့် 2FA ကို ပိတ်ပါ။",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "ဤအရာကိုဖွင့်ခြင်းအားဖြင့်အချို့သောကိစ္စရပ်များတွင်အခကြေးငွေနှုန်းထားများသည်တိကျမှုရှိနိုင်သည်,",
   "disable_fiat": "Fiat ကိုပိတ်ပါ။",
   "disable_sell": "ရောင်းချခြင်းလုပ်ဆောင်ချက်ကို ပိတ်ပါ။",
-  "disable_tor": "Tor ကိုပိတ်ပါ",
   "disable_trade_option": "ကုန်သွယ်ရေး option ကိုပိတ်ပါ",
   "disableBatteryOptimization": "ဘက်ထရီ optimization ကိုပိတ်ပါ",
   "disableBatteryOptimizationDescription": "နောက်ခံထပ်တူပြုခြင်းနှင့်ချောချောမွေ့မွေ့ပြုလုပ်နိုင်ရန်ဘက်ထရီ optimization ကိုသင်ပိတ်ထားလိုပါသလား။",
   "disabled": "မသန်စွမ်း",
-  "disconnect_session": "session ကိုအဆက်ပြတ်",
   "discount": "${value}% ချွေတာ",
   "display_settings": "ပြသရန် ဆက်တင်များ",
   "displayable": "ပြသနိုင်သည်။",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "ပံ့ပိုးကူညီမှုအပါအဝင် ဤအရာများကို အခြားမည်သူနှင့်မျှ မမျှဝေပါနှင့်။\n\nသင့်ငွေများကို ခိုးယူခံရနိုင်သည်!",
   "do_not_show_me": "ဒါကို ထပ်မပြနဲ့",
   "domain_looks_up": "ဒိုမိန်းရှာဖွေမှုများ",
-  "domain_mismatch": "ဒိုမိန်းမတိုက်ဆိုင်",
-  "domain_mismatch_description": "ဤ 0 က်ဘ်ဆိုက်တွင်ဤတောင်းဆိုမှုကိုပေးပို့သူနှင့်မကိုက်ညီသောဒိုမိန်းရှိသည်။ အတည်ပြုခြင်းသည်ရန်ပုံငွေများဆုံးရှုံးမှုကိုဖြစ်ပေါ်စေနိုင်သည်။",
   "donation_link_details": "လှူဒါန်းရန်လင့်ခ်အသေးစိတ်",
-  "done": "ပြီးပြီ",
   "e_sign_consent": "E-Sign သဘောတူညီချက်",
   "edit": "တည်းဖြတ်ပါ။",
   "edit_backup_password": "Backup Password ကို တည်းဖြတ်ပါ။",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "သင်အသုံးပြုသည့်အချိန်တိုင်းတွင် ကျွန်ုပ်တို့သည် လိပ်စာအသစ်များကို ထုတ်ပေးသော်လည်း ယခင်လိပ်စာများသည် ဆက်လက်အလုပ်လုပ်နေပါသည်။",
   "email_address": "အီးမေးလ်လိပ်စာ",
   "enable": "စွမ်းဆောင်နိုင်စေ",
-  "enable_builtin_tor": "built-in Tor ကို Enable လုပ်ပါ",
   "enable_mempool_api": "Mempool API တိကျသောအခကြေးငွေနှင့်ရက်စွဲများအတွက်",
   "enable_replace_by_fee": "အစားထိုး - by- အခကြေးငွေ enable",
   "enable_silent_payments_scanning": "အစွန်အဖျားသို့ရောက်ရှိသည်အထိအသံတိတ်ငွေပေးချေမှုကိုစကင်ဖတ်စစ်ဆေးပါ",
@@ -333,10 +295,8 @@
   "error_text_template": "နမူနာပုံစံအမည်နှင့် လိပ်စာတွင် ` , ' \" သင်္ကေတများ မပါဝင်နိုင်ပါ\nနှင့် စာလုံးအရှည် 1 နှင့် 106 ကြား ရှိရမည်",
   "error_text_wallet_name": "ပိုက်ဆံအိတ်အမည်တွင် စာလုံးများ၊ နံပါတ်များ၊ _ - သင်္ကေတများသာ ပါဝင်နိုင်သည် \n နှင့် စာလုံးအရှည် 1 နှင့် 33 ကြားရှိရမည်",
   "error_text_xmr": "XMR တန်ဖိုးသည် ရနိုင်သောလက်ကျန်ကို ကျော်လွန်၍မရပါ။\nအပိုင်းကိန်းဂဏန်းများ သည် 12 နှင့် လျော့နည်းရမည်",
-  "error_while_processing": "procesing နေစဉ်အမှားတစ်ခုဖြစ်ပွားခဲ့သည်",
   "errorGettingCredentials": "မအောင်မြင်ပါ- အထောက်အထားများ ရယူနေစဉ် အမှားအယွင်း",
   "errorSigningTransaction": "ငွေပေးငွေယူ လက်မှတ်ထိုးစဉ် အမှားအယွင်းတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။",
-  "establishing_tor_connection": "Tor connection ကို estabilishing",
   "estimated": "ခန့်မှန်း",
   "estimated_new_fee": "ခန့်မှန်းသစ်ခန့်မှန်း",
   "estimated_receive_amount": "ခန့်မှန်းရရှိသောပမာဏ",
@@ -360,7 +320,6 @@
   "export_backup": "အရန်ကူးထုတ်ရန်",
   "export_logs": "ပို့ကုန်မှတ်တမ်းများ",
   "export_outputs": "ပို့ကုန်ထုတ်ကုန်များ",
-  "extend_session": "session တစ်ခုတိုးချဲ့",
   "extra_id": "အပို ID-",
   "extracted_address_content": "သင်သည် \n${recipient_name} သို့ ရန်ပုံငွေများ ပေးပို့ပါမည်",
   "failed_authentication": "အထောက်အထားစိစစ်ခြင်း မအောင်မြင်ပါ။. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Fiat Balance",
   "field_required": "ဤစာကွက်လပ်မှာဖြည့်ရန်လိုအပ်ပါသည်",
-  "file_saved": "သိမ်းဆည်းထားသည့်ဖိုင်",
   "fill_code": "သင့်အီးမေးလ်သို့ ပေးထားသည့် အတည်ပြုကုဒ်ကို ဖြည့်ပါ။",
   "filter_by": "အလိုက် စစ်ထုတ်ပါ။",
   "first_wallet_text": "Monero၊ Bitcoin၊ Ethereum၊ Litecoin နှင့် Haven အတွက် အလွန်ကောင်းမွန်သော ပိုက်ဆံအိတ်",
@@ -382,12 +340,10 @@
   "forgot_password": "စကားဝှက်မေ့နေပါသလား",
   "freeze": "အေးခဲ",
   "frequently_asked_questions": "မေးလေ့ရှိသောမေးခွန်းများ",
-  "from": "မှ",
   "frozen": "ဖြူဖြူ",
   "frozen_balance": "လက်ကျန်ငွေ",
   "full_balance": "Balance အပြည့်",
   "gas_exceeds_allowance": "ငွေပေးငွေယူမှလိုအပ်သောဓာတ်ငွေ့ထောက်ပံ့ကြေးကျော်လွန်။",
-  "gas_price": "ဓာတ်ငွေ့စျေးနှုန်း",
   "generate_name": "အမည်ဖန်တီးပါ။",
   "generating_gift_card": "လက်ဆောင်ကတ်ထုတ်ပေးခြင်း။",
   "generating_transaction": "ငွေပေးငွေယူကိုထုတ်လုပ်",
@@ -413,7 +369,6 @@
   "hide_details": "အသေးစိတ်ကို ဝှက်ပါ။",
   "high_contrast_theme": "အလင်းအမှောင် မြင့်မားသော အပြင်အဆင်",
   "home_screen_settings": "ပင်မစခရင် ဆက်တင်များ",
-  "how_to_connect": "ဘယ်လိုချိတ်ဆက်ရမလဲ",
   "how_to_use": "အသုံးပြုနည်း",
   "how_to_use_card": "ဒီကတ်ကို ဘယ်လိုသုံးမလဲ။",
   "id": "ID:",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "သငျသညျငွေပေးငွေယူနှင့်၎င်း၏ငွေပေးငွေယူကြေးကိုဖုံးလွှမ်းရန် sol ရှိသည်မဟုတ်ကြဘူး။ ကြင်နာစွာသင်၏ပိုက်ဆံအိတ်သို့ပိုမို sol ကိုထပ်ထည့်ပါသို့မဟုတ်သင်ပို့လွှတ်ခြင်း sol ပမာဏကိုလျှော့ချပါ။",
   "insufficient_lamports": "သငျသညျငွေပေးငွေယူနှင့်၎င်း၏ငွေပေးငွေယူကြေးကိုဖုံးလွှမ်းရန် sol ရှိသည်မဟုတ်ကြဘူး။ သင်အနည်းဆုံး ${solValueNeeded} s ကိုလိုအပ်ပါတယ်။ ကြင်နာစွာသင်၏ပိုက်ဆံအိတ်သို့ပိုမို sol ကိုထပ်ထည့်ပါသို့မဟုတ်သင်ပို့နေသော sol ပမာဏကိုလျှော့ချပါ",
   "insufficientFundsForRentError": "သင်ငွေပေးချေမှုအခကြေးငွေကိုဖုံးအုပ်ရန်နှင့်အကောင့်ငှားရန်လုံလောက်သော sol ရှိသည်မဟုတ်ကြဘူး။ ကြင်နာစွာသင်၏ပိုက်ဆံအိတ်သို့ပိုမို sol ကိုပိုမိုထည့်ပါသို့မဟုတ်သင်ပို့ခြင်း sol ပမာဏကိုလျှော့ချပါ",
-  "insufficientFundsForRentErrorReceiver": "လက်ခံသူ၏အကောင့်တွင်အိမ်ငှားခကိုဖုံးအုပ်ရန်အစွမ်းမရှိနိုင်ပါ။ ကျေးဇူးပြု. လက်ခံသူအားသူတို့၏အကောင့်သို့ထပ်မံထည့်သွင်းရန်တောင်းဆိုပါ။",
   "introducing_cake_pay": "Cake Pay ကို မိတ်ဆက်ခြင်း။",
   "invalid_input": "ထည့်သွင်းမှု မမှန်ကန်ပါ။",
   "invalid_password": "မမှန်ကန်သောစကားဝှက်",
@@ -471,7 +425,6 @@
   "logout": "ထွက်လိုက်ပါ။",
   "low_fee": "အနိမ့်ကြေး",
   "low_fee_alert": "သင်သည် လက်ရှိတွင် သက်သာသော ကွန်ရက်အခကြေးငွေဦးစားပေးကို အသုံးပြုနေပါသည်။ ၎င်းသည် အကြာကြီးစောင့်ဆိုင်းခြင်း၊ မတူညီသောနှုန်းထားများ သို့မဟုတ် ပယ်ဖျက်ထားသော ကုန်သွယ်မှုများကို ဖြစ်စေနိုင်သည်။ ပိုမိုကောင်းမွန်သော အတွေ့အကြုံအတွက် ပိုမိုမြင့်မားသော အခကြေးငွေ သတ်မှတ်ပေးရန် အကြံပြုအပ်ပါသည်။",
-  "made_easy": "လွယ်ကူပါတယ်",
   "manage_nodes": "ဆုံမှတ်များကို စီမံပါ။",
   "manage_pow_nodes": "PoW Nodes ကို စီမံပါ။",
   "manage_yats": "Yats ကို စီမံပါ။",
@@ -483,8 +436,6 @@
   "memo": "မှတ်စုတို:",
   "message": "မက်ဆေ့ချ်",
   "message_verified": "မက်ဆေ့ခ်ျကိုအောင်မြင်စွာအတည်ပြုခဲ့သည်",
-  "messages": "မက်ဆေ့ခ်ျ",
-  "method": "နည်းလမ်း",
   "methods": "နည်းလမ်းများ",
   "min_amount": "အနည်းဆုံး- ${value}",
   "min_value": "အနည်းဆုံး- ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero Dark အပြင်အဆင်",
   "monero_light_theme": "Monero Light အပြင်အဆင်",
   "moonpay_alert_text": "ပမာဏ၏တန်ဖိုးသည် ${minAmount} ${fiatCurrency} နှင့် ပိုနေရမည်",
-  "moralis_nft_error": "nfts ရယူနေစဉ်အမှားတစ်ခုဖြစ်ပွားခဲ့သည်။ သင်၏အင်တာနက်ဆက်သွယ်မှုကိုကြင်နာစွာစစ်ဆေးပြီးထပ်ကြိုးစားပါ။",
   "more_options": "နောက်ထပ် ရွေးချယ်စရာများ",
   "multiple_addresses_detected": "အများအပြားလိပ်စာများရှာဖွေတွေ့ရှိ",
   "mweb_confirmed": "အတည်ပြုလိုက် mweb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "အညွှန်းအမည်",
   "new_subaddress_title": "လိပ်စာအသစ်",
   "new_template": "ပုံစံအသစ်",
-  "new_transactions_notifications": "အသစ်သောအရောင်းအဝယ်အကြောင်းသတိပေးချက်များပေးပို့ပါ",
   "new_wallet": "ပိုက်ဆံအိတ်အသစ်",
   "newConnection": "ချိတ်ဆက်မှုအသစ်",
   "no_cards_found": "ကဒ်များမရှိပါ",
@@ -539,7 +488,6 @@
   "normal": "ပုံမှန်",
   "note_optional": "မှတ်ချက် (ချန်လှပ်ထားနိုင်သည်)",
   "note_tap_to_change": "မှတ်ချက် (ပြောင်းလဲရန် တို့ပါ)",
-  "notification_permission_denied": "အသိပေးချက်ခွင့်ပြုချက်ကိုအစက်အပြောက်ကိုငြင်းဆိုခဲ့သည်, ကျေးဇူးပြု. ၎င်းကိုချိန်ညှိချက်များတွင်လက်ဖြင့်ပြုလုပ်ပါ",
   "nullURIError": "URI သည် null ဖြစ်သည်။",
   "offer_expires_in": "ကမ်းလှမ်းချက် သက်တမ်းကုန်သည်:",
   "offline": "အော့ဖ်လိုင်း",
@@ -571,20 +519,8 @@
   "password": "စကားဝှက်",
   "paste": "ငါးပိ",
   "pause_wallet_creation": "Haven Wallet ဖန်တီးနိုင်မှုကို လောလောဆယ် ခေတ္တရပ်ထားသည်။",
-  "payjoin_card_content": "Payjoin Bitcoin တွင် privacy ကိုထိန်းသိမ်းထားခြင်းနှင့်အခကြေးငွေသက်သာသည့်အင်္ဂါရပ်အသစ်တစ်ခုဖြစ်သည်။",
-  "payjoin_details": "Payjoin အသေးစိတ်အချက်အလက်များ %% အသေးစိတ်အချက်အလက်များ",
-  "payjoin_enabled": "Payjoin enabled",
-  "payjoin_enabling_popup_content": "menu Payjoin Payjoin Payjoin Payjoin Payjoin → privacy → enable လုပ်ရန် Payjoin Payjoin ကိုသုံးပါ။",
-  "payjoin_enabling_popup_title": "Payjoin Payjoin enable",
-  "payjoin_request_awaiting_tx": "ငွေပေးငွေယူစောင့်ဆိုင်း",
-  "payjoin_request_in_progress": "ဆောင်ရွက်ဆဲဖြစ်သည်",
-  "payjoin_unavailable": "Payjoin မရနိုင်သော",
-  "payjoin_unavailable_sheet_content": "Payjoin ငွေပေးချေမှုကိုလက်ခံရန်သင့်အား Bitcoin ကိုအသုံးပြုရန်အဆင်သင့်ဖြစ်ရန်လိုအပ်သည်။ \\ n \\ ns ပိုက်ဆံအိတ်သည်ရန်ပုံငွေများရှိပါက Payjoin သည်အလိုအလျောက်ဖွင့်ထားလိမ့်မည်။",
-  "payjoin_unavailable_sheet_title": "Payjoin Payjoin မရနိုင်ပါကဘာကြောင့်လဲ။",
   "payment_id": "ငွေပေးချေမှု ID:",
-  "payment_made_easy": "ငွေပေးချေမှုလွယ်ကူသောလုပ်",
   "payment_was_received": "သင့်ငွေပေးချေမှုကို လက်ခံရရှိခဲ့သည်။",
-  "payments": "ငွေပေးချေမှု",
   "pending": " (ဆိုင်းငံ့)",
   "percentageOf": "${amount} ၏",
   "pin_at_top": "အပေါ်တွင် ${token} ပင်ထိုးပါ။",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "အခြား node သို့ ချိတ်ဆက်ရန် ကြိုးစားပါ။",
   "please_wait": "ကျေးဇူးပြုပြီးခဏစောင့်ပါ",
   "polygonscan_history": "PolygonScan မှတ်တမ်း",
-  "potential_scam": "အလားအလာရှိသောလိမ်လည်မှု",
   "powered_by": "${title} မှ ပံ့ပိုးပေးသည်",
   "pre_seed_button_text": "ကျွန်တော်နားလည်ပါတယ်။ ငါ့အမျိုးအနွယ်ကို ပြလော့",
-  "pre_seed_description": "နောက်စာမျက်နှာမှာစကားလုံးတစ်လုံးကိုတွေ့ရလိမ့်မယ်။ ၎င်းသည်သင်၏ထူးခြားသည့်နှင့်ပုဂ္ဂလိကမျိုးစေ့ဖြစ်ပြီးဆုံးရှုံးမှုသို့မဟုတ်ချွတ်ယွင်းမှုကိစ္စတွင်သင်၏ပိုက်ဆံအိတ်ကိုပြန်လည်ရယူရန်တစ်ခုတည်းသောနည်းလမ်းဖြစ်သည်။ ၎င်းကိုရေးရန်နှင့်၎င်းကို Cake Wallet App အပြင်ဘက်တွင်လုံခြုံသောနေရာ၌သိမ်းဆည်းရန်သင်၏တာ 0 န်ဖြစ်သည်။",
+  "pre_seed_description": "နောက်စာမျက်နှာတွင် ${words} စကားလုံးများ အတွဲလိုက်ကို တွေ့ရပါမည်။ ၎င်းသည် သင်၏ထူးခြားပြီး သီးသန့်မျိုးစေ့ဖြစ်ပြီး ပျောက်ဆုံးခြင်း သို့မဟုတ် ချွတ်ယွင်းမှုရှိပါက သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူရန် တစ်ခုတည်းသောနည်းလမ်းဖြစ်သည်။ ၎င်းကို Cake Wallet အက်ပ်၏အပြင်ဘက်တွင် လုံခြုံသောနေရာတွင် သိမ်းဆည်းရန်မှာ သင်၏တာဝန်ဖြစ်သည်။",
   "pre_seed_title": "အရေးကြီးသည်။",
   "prepaid_cards": "ကြိုတင်ငွေဖြည့်ကဒ်များ",
   "prevent_screenshots": "ဖန်သားပြင်ဓာတ်ပုံများနှင့် မျက်နှာပြင်ရိုက်ကူးခြင်းကို တားဆီးပါ။",
@@ -617,7 +552,6 @@
   "proceed_on_device": "သင့်စက်ပေါ်တွင်ဆက်လက်ဆောင်ရွက်ပါ",
   "proceed_on_device_description": "သင်၏ hardware ပိုက်ဆံအိတ်ပေါ်ရှိညွှန်ကြားချက်များကိုလိုက်နာပါ",
   "processing": "လုပ်ကိုင်ခြင်း",
-  "processing_signed_tx": "ထုတ်ယူခြင်းလက်မှတ်ရေးထိုးငွေလွှဲလုပ်ငန်း",
   "profile": "ကိုယ်ရေးအကျဉ်း",
   "provider_error": "${provider} အမှား",
   "public_key": "အများသူငှာသော့",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "သင်၏ကိုယ်စားလှယ်သည်ကောင်းမွန်သောရပ်တည်မှုတွင်မဖြစ်သင့်ပါ။ အသစ်တစ်ခုကိုရွေးချယ်ရန်ဤနေရာတွင်အသာပုတ်ပါ",
   "repeat_wallet_password": "ပိုက်ဆံအိတ်စကားဝှက်ကိုပြန်လုပ်ပါ",
   "repeated_password_is_incorrect": "ထပ်ခါတလဲလဲစကားဝှက်မမှန်ကန်ပါ ကျေးဇူးပြုပြီးပိုက်ဆံအိတ်စကားဝှက်ကိုပြန်လုပ်ပါ။",
-  "requested": "တောင်းဆိုခဲ့သည်",
   "require_for_adding_contacts": "အဆက်အသွယ်များထည့်ရန် လိုအပ်သည်။",
   "require_for_all_security_and_backup_settings": "လုံခြုံရေးနှင့် အရန်ဆက်တင်များအားလုံးအတွက် လိုအပ်ပါသည်။",
   "require_for_assessing_wallet": "ပိုက်ဆံအိတ်ကို ဝင်သုံးရန် လိုအပ်သည်။",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "အတွင်းပိုင်း ပိုက်ဆံအိတ်များသို့ ပေးပို့ရန် လိုအပ်သည်။",
   "require_for_sends_to_non_contacts": "အဆက်အသွယ်မရှိသူများထံ ပေးပို့ရန် လိုအပ်သည်။",
   "require_pin_after": "ပြီးနောက် PIN လိုအပ်ပါသည်။",
-  "required_passphrase": "စကားဝှက်PPRase",
   "rescan": "ပြန်စကင်န်လုပ်ပါ။",
   "resend_code": "ကျေးဇူးပြု၍ ပြန်ပို့ပါ။",
   "reset": "ပြန်လည်သတ်မှတ်ပါ။",
   "reset_password": "လျှို့ဝှတ်နံပါတ်အားမူလအတိုင်းပြန်လုပ်သည်",
-  "restore": "ပြန်လည်တည်ထောင်",
   "restore_active_seed": "တက်ကြွသောအစေ့",
   "restore_address": "လိပ်စာ",
   "restore_bitcoin_description_from_keys": "သင့်ကိုယ်ပိုင်သော့များမှ ထုတ်လုပ်ထားသော WIF စာကြောင်းမှ သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ။",
@@ -713,10 +644,7 @@
   "search_language": "ဘာသာစကားရှာပါ။",
   "second_intro_content": "သင်၏ Yat သည် သင့်ငွေကြေးအားလုံးအတွက် သင်၏ ရှည်လျားသော ဆဋ္ဌမကိန်းဂဏန်းများအားလုံးကို အစားထိုးသည့် တစ်မူထူးခြားသော အီမိုဂျီလိပ်စာတစ်ခုဖြစ်သည်။",
   "second_intro_title": "၎င်းတို့အားလုံးကို အုပ်ချုပ်ရန် အီမိုဂျီလိပ်စာတစ်ခု",
-  "security": "လုံခွုံရေး",
   "security_and_backup": "လုံခြုံရေးနှင့် မိတ္တူ",
-  "security_risk": "လုံခြုံရေးအန္တရာယ်",
-  "security_risk_description": "ဒီဒိုမိန်းကိုလုံခြုံရေးပံ့ပိုးပေးသူတွေရဲ့လုံခြုံမှုမရှိဘူး။ သင်၏ပိုင်ဆိုင်မှုများကိုကာကွယ်ရန်ချက်ချင်းချန်ထားပါ။",
   "seed_alert_back": "ပြန်သွားသည်",
   "seed_alert_content": "မျိုးစေ့သည် သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူရန် တစ်ခုတည်းသောနည်းလမ်းဖြစ်သည်။ ရေးပြီးပြီလား။",
   "seed_alert_title": "အာရုံ",
@@ -751,6 +679,9 @@
   "seedtype": "မျိုးပွားခြင်း",
   "seedtype_alert_content": "အခြားပိုက်ဆံအိတ်များနှင့်မျိုးစေ့များကိုမျှဝေခြင်းသည် BIP39 sebyspe ဖြင့်သာဖြစ်သည်။",
   "seedtype_alert_title": "ပျိုးပင်သတိပေးချက်",
+  "seedtype_legacy": "အမွေအနှစ် (စကားလုံး 25 လုံး)",
+  "seedtype_polyseed": "polyseed (စကားလုံး 16 လုံး)",
+  "seedtype_wownero": "Wownero (စကားလုံး 14 လုံး)",
   "select_backup_file": "အရန်ဖိုင်ကို ရွေးပါ။",
   "select_buy_provider_notice": "အပေါ်ကဝယ်သူတစ် ဦး ကိုရွေးချယ်ပါ။ သင်၏ default 0 ယ်သူအား app settings တွင် setting လုပ်ခြင်းဖြင့်ဤ screen ကိုကျော်သွားနိုင်သည်။",
   "select_destination": "အရန်ဖိုင်အတွက် ဦးတည်ရာကို ရွေးပါ။",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "ပြင်ပပိုက်ဆံအိတ်မှပေးပို့ပါ",
   "send_name": "နာမည်",
   "send_new": "အသစ်",
-  "send_payjoin": "Payjoin ကိုပို့ပါ",
   "send_payment_id": "ငွေပေးချေမှု ID (ချန်လှပ်ထား)",
   "send_priority": "လောလောဆယ်အခကြေးငွေကို ${transactionPriority} ဦးစားပေးတွင် သတ်မှတ်ထားပါသည်။\nငွေပေးငွေယူဦးစားပေးကို ဆက်တင်များတွင် ချိန်ညှိနိုင်ပါသည်။",
   "send_sending": "ပို့နေသည်...",
@@ -832,9 +762,7 @@
   "show_keys": "မျိုးစေ့ /သော့များကို ပြပါ။",
   "show_market_place": "စျေးကွက်ကိုပြသပါ။",
   "show_seed": "မျိုးစေ့ကိုပြပါ။",
-  "sign_all": "အားလုံးလက်မှတ်ထိုးပါ",
   "sign_message": "လက်မှတ်စာ",
-  "sign_one": "လက်မှတ်ထိုးပါ",
   "sign_up": "ဆိုင်းအပ်",
   "sign_verify_message": "လက်မှတ်ထိုး / အတည်ပြုရန်",
   "sign_verify_message_sub": "သင်၏ကိုယ်ပိုင်သော့ကို သုံး. မက်ဆေ့ခ်ျကိုလက်မှတ်ထိုးပါ",
@@ -863,14 +791,11 @@
   "sort_by": "အလိုက်စဥ်သည်",
   "spend_key_private": "သော့သုံးရန် (သီးသန့်)",
   "spend_key_public": "သုံးစွဲရန်သော့ (အများပြည်သူ)",
-  "starting_tor_proxy": "Tor proxy ကိုစတင်ခြင်း",
   "status": "အခြေအနေ:",
-  "step": "လှမ်း",
   "string_default": "ပျက်ကွက်ခြင်း",
   "subaddress_title": "လိပ်စာစာရင်း",
   "subaddresses": "လိပ်စာများ",
   "submit_request": "တောင်းဆိုချက်တစ်ခုတင်ပြပါ။",
-  "success": "အောင်မြင်ခြင်း",
   "successful": "အောင်မြင်တယ်။",
   "support_description_guides": "ဘုံပြ issues နာများအတွက်စာရွက်စာတမ်းများနှင့်ထောက်ခံမှု",
   "support_description_live_chat": "အခမဲ့နှင့်အစာရှောင်ခြင်း! လေ့ကျင့်ထားသောထောက်ခံသူကိုယ်စားလှယ်များသည်ကူညီနိုင်သည်",
@@ -878,7 +803,6 @@
   "support_title_guides": "ကိတ်မုန့်ပိုက်ဆံအိတ်များ",
   "support_title_live_chat": "တိုက်ရိုက်ပံ့ပိုးမှု",
   "support_title_other_links": "အခြားအထောက်အပံ့လင့်များ",
-  "supported": "ထောက်ပံ့ခဲ့သည်",
   "swap": "လဲလှယ်",
   "sweeping_wallet": "ိုက်ဆံအိတ် တံမြက်လှည်း",
   "sweeping_wallet_alert": "ဒါက ကြာကြာမခံသင့်ပါဘူး။ ဤစခရင်ကို ချန်မထားပါနှင့် သို့မဟုတ် ထုတ်ယူထားသော ရန်ပုံငွေများ ဆုံးရှုံးနိုင်သည်",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "ထပ်တူပြုခြင်း။",
   "sync_status_timed_out": "ထွက်အချိန်ကုန်",
   "sync_status_unsupported": "node မထောက်ပံ့ node ကို",
-  "synchronizing": "ထပ်တူပြုခြင်း",
   "syncing_wallet_alert_content": "သင်၏လက်ကျန်နှင့် ငွေပေးငွေယူစာရင်းသည် ထိပ်တွင် \"Synchronizeed\" ဟုပြောသည်အထိ မပြီးမြောက်နိုင်ပါ။ ပိုမိုလေ့လာရန် နှိပ်/နှိပ်ပါ။",
   "syncing_wallet_alert_title": "သင့်ပိုက်ဆံအိတ်ကို စင့်ခ်လုပ်နေပါသည်။",
   "template": "ပုံစံခွက်",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Thorchain Provider သည် Taproot လိပ်စာများကိုမထောက်ခံပါ။ ကျေးဇူးပြု. လိပ်စာကိုပြောင်းပါသို့မဟုတ်အခြားပံ့ပိုးပေးသူကိုရွေးချယ်ပါ။",
   "time": "${minutes}m ${seconds}s",
   "tip": "အကြံပြုချက်-",
-  "to": "သို့",
   "today": "ဒီနေ့",
-  "token_already_exists": "တိုကင်ရှိပြီးသား",
   "token_contract_address": "တိုကင်စာချုပ်လိပ်စာ",
   "token_decimal": "တိုကင်ဒဿမ",
   "token_name": "တိုကင်အမည် ဥပမာ- Tether",
   "token_symbol": "တိုကင်သင်္ကေတ ဥပမာ- USDT",
   "tokenID": "အမှတ်သညာ",
-  "ton_extra_info": "ငွေလဲလှယ်မှုအတွက်တန်ပြန်ငွေပေးငွေယူကိုပို့နေစဉ် Memo ID ကိုသတ်မှတ်ရန်မမေ့ပါနှင့်",
   "tor_connection": "Tor ချိတ်ဆက်မှု",
-  "tor_connection_timeout": "Tor Connection အချိန်ကုန်",
-  "tor_experimental": "၎င်းသည်စမ်းသပ်အင်္ဂါရပ်တစ်ခုဖြစ်ပြီးကိတ်မုန့်ပိုက်ဆံအိတ်ကိုပံ့ပိုးပေးသော Tor Routing မှပြုလုပ်သောဆက်သွယ်မှုအားလုံးမှာ Connections သည် Concernet ကို အသုံးပြု. VPN tor ကို VPN Mode ဖြင့် Tor ကို အသုံးပြု. Concernet ကိုသုံးနိုင်သည်။",
   "tor_only": "Tor သာ",
   "total": "လုံးဝသော",
   "total_saving": "စုစုပေါင်းစုဆောင်းငွေ",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "မျက်နှာပြင်သည် ၁ မိနစ်အကြာတွင် ဆက်လက်မလုပ်ဆောင်ပါက၊ ပိတ်ဆို့ရှာဖွေသူနှင့် သင့်အီးမေးလ်ကို စစ်ဆေးပါ။",
   "transactions": "ငွေပေးငွေယူ",
   "transactions_by_date": "ရက်စွဲအလိုက် ငွေလွှဲမှုများ",
-  "transport_type": "သယ်ယူပို့ဆောင်ရေးအမျိုးအစား",
   "trongrid_history": "Trongrid သမိုင်း",
   "trusted": "ယုံတယ်။",
-  "try_again": "ထပ်ကြိုးစားပါ",
   "tx_commit_exception_no_dust_on_change": "အဆိုပါငွေပေးငွေယူကဒီပမာဏနှင့်အတူပယ်ချခံရသည်။ ဤဒင်္ဂါးပြားများနှင့်အတူပြောင်းလဲမှုကိုပြန်လည်ပြောင်းလဲခြင်းသို့မဟုတ် ${min} မပါဘဲ ${max} ပေးပို့နိုင်သည်။",
   "tx_commit_failed": "ငွေပေးငွေယူကျူးလွန်မှုပျက်ကွက်။ ကျေးဇူးပြုပြီးပံ့ပိုးမှုဆက်သွယ်ပါ။",
   "tx_commit_failed_no_peers": "ငွေပေးငွေယူထုတ်လွှင့်ရန်ပျက်ကွက်ပါက ကျေးဇူးပြု. ဒုတိယသို့မဟုတ်ထိုအတိုင်းထပ်မံကြိုးစားပါ",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "အသုံးမဝင်သော အကြွေစေ့အသေးစိတ်များ",
   "unspent_coins_title": "အသုံးမဝင်သော အကြွေစေ့များ",
   "unsupported_asset": "ဤပိုင်ဆိုင်မှုအတွက် ဤလုပ်ဆောင်ချက်ကို ကျွန်ုပ်တို့ မပံ့ပိုးပါ။ ကျေးဇူးပြု၍ ပံ့ပိုးပေးထားသော ပိုင်ဆိုင်မှုအမျိုးအစား၏ ပိုက်ဆံအိတ်ကို ဖန်တီးပါ သို့မဟုတ် ပြောင်းပါ။",
-  "update_session": "update session ကို",
   "uptime": "အထက်က",
   "upto": "${value} အထိ",
   "usb": "ယူအက်စ်ဘီ",
   "use": "သို့ပြောင်းပါ။",
   "use_card_info_three": "ဒစ်ဂျစ်တယ်ကတ်ကို အွန်လိုင်း သို့မဟုတ် ထိတွေ့မှုမဲ့ ငွေပေးချေမှုနည်းလမ်းများဖြင့် အသုံးပြုပါ။",
   "use_card_info_two": "ဒစ်ဂျစ်တယ်ငွေကြေးများဖြင့်မဟုတ်ဘဲ ကြိုတင်ငွေပေးချေသည့်အကောင့်တွင် သိမ်းထားသည့်အခါ ရန်ပုံငွေများကို USD သို့ ပြောင်းလဲပါသည်။",
-  "use_device_theme": "Device Theme ကိုသုံးပါ",
-  "use_payjoin": "Payjoin Chair ကိုအသုံးပြုပါ",
   "use_ssl": "SSL ကိုသုံးပါ။",
   "use_suggested": "အကြံပြုထားသည်ကို အသုံးပြုပါ။",
   "use_testnet": "testnet ကိုသုံးပါ",
-  "user_rejected_method": "အသုံးပြုသူသည်နည်းလမ်းကိုငြင်းပယ်ခဲ့သည်",
   "value": "အဘိုး",
   "value_type": "Value အမျိုးအစား",
   "variable_pair_not_supported": "ရွေးချယ်ထားသော ဖလှယ်မှုများဖြင့် ဤပြောင်းလဲနိုင်သောအတွဲကို ပံ့ပိုးမထားပါ။",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "သင်သည်ဤမျိုးစေ့ကိုနောက်တဖန်ရှုမြင်နိုင်သည်",
   "wallet_group_empty_state_text_one": "သင့်တွင်သဟဇာတဖြစ်သောပိုက်ဆံအိတ်အုပ်စုများမရှိပါ။ !\n\n ကိုအသာပုတ်ပါ",
   "wallet_group_empty_state_text_two": "အသစ်တစ်ခုကိုတစ်ခုလုပ်ဖို့အောက်တွင်ဖော်ပြထားသော။",
-  "wallet_has_passphrase": "ဒီပိုက်ဆံအိတ်က passphrase ရှိတယ်",
   "wallet_keys": "ပိုက်ဆံအိတ် အစေ့/သော့များ",
   "wallet_list_create_new_wallet": "Wallet အသစ်ဖန်တီးပါ။",
   "wallet_list_edit_group_name": "အုပ်စုအမည်ကိုတည်းဖြတ်ပါ",
@@ -1077,11 +988,10 @@
   "walletConnect": "Wallet ချိတ်ဆက်မှု",
   "wallets": "ပိုက်ဆံအိတ်",
   "warning": "သတိပေးချက်",
-  "welcome": "ဝမ်းသာစွာနှုတ်ဆက်ခြင်း",
+  "welcome": "မှကြိုဆိုပါတယ်။",
   "welcome_subtitle_new_wallet": "လတ်ဆတ်စွာစတင်လိုပါကအောက်ကပိုက်ဆံအိတ်အသစ်ကိုဖန်တီးပါ။",
   "welcome_subtitle_restore_wallet": "အကယ်. သင့်တွင်သင်ကိတ်မုန့်ထဲသို့ယူဆောင်လိုသောလက်ရှိပိုက်ဆံအိတ်ရှိပါက Restore Lestore Wallet ကိုရွေးပါ။",
   "welcome_to_cakepay": "Cake Pay မှကြိုဆိုပါသည်။",
-  "what_is_payjoin": "Payjoin ဆိုတာဘာလဲ ?#",
   "what_is_silent_payments": "အသံတိတ်ငွေပေးချေမှုဆိုတာဘာလဲ",
   "widgets_address": "လိပ်စာ",
   "widgets_or": "သို့မဟုတ်",
@@ -1111,6 +1021,5 @@
   "you_will_get": "သို့ပြောင်းပါ။",
   "you_will_receive_estimated_amount": "သင် ( ခန့်မှန်းခြေ ) လက်ခံရရှိလိမ့်မည်",
   "you_will_send": "မှပြောင်းပါ။",
-  "youCanGoBackToYourDapp": "သငျသညျယခုသင်၏ dapp ကိုပြန်သွားနိုင်ပါတယ်",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 948798b0a..55e588f62 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Voeg prepaid tegoed toe aan de kaarten (tot ${value})",
   "add_new_node": "Voeg een nieuw knooppunt toe",
   "add_new_word": "Nieuw woord toevoegen",
-  "add_passphrase": "Voeg wachtwoordzin toe",
-  "add_passphrase_warning_text": "Voer alleen een wachtwoordzin in als u er in het verleden een voor deze portemonnee hebt gebruikt. Als u de verkeerde wachtwoordzin invoert of nog niet eerder op deze portemonnee een wachtwoordzin hebt gebruikt, ziet u geen bestaande fondsen of geschiedenis.",
   "add_receiver": "Nog een ontvanger toevoegen (optioneel)",
   "add_secret_code": "Of voeg deze geheime code toe aan een authenticator-app",
   "add_tip": "Tip toevoegen",
   "add_token_disclaimer_check": "Ik heb het adres en de informatie van het tokencontract bevestigd met behulp van een betrouwbare bron. Het toevoegen van kwaadaardige of onjuiste informatie kan leiden tot verlies van geld.",
   "add_token_warning": "Bewerk of voeg geen tokens toe volgens de instructies van oplichters.\nBevestig tokenadressen altijd met betrouwbare bronnen!",
   "add_value": "Waarde toevoegen",
-  "added_message_for_ata_error": "Zorg ervoor dat u voldoende SOL -balans hebt om uw transactie te voltooien.",
   "address": "Adres",
   "address_book": "Adresboek",
   "address_book_menu": "Adresboek",
@@ -55,8 +52,6 @@
   "anonpay_description": "Genereer ${type}. De ontvanger kan ${method} gebruiken met elke ondersteunde cryptocurrency en u ontvangt geld in deze portemonnee",
   "apk_update": "APK-update",
   "approve": "Goedkeuren",
-  "approve_request": "Het verzoek goedkeuren",
-  "approve_tokens": "Tokens goedkeuren",
   "arrive_in_this_address": "${currency} ${tag}komt aan op dit adres",
   "ascending": "Stijgend",
   "ask_each_time": "Vraag het elke keer",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "In afwachting van betalingsbevestiging",
   "background_sync": "Achtergrondsynchronisatie",
   "background_sync_mode": "Achtergrondsynchronisatiemodus",
-  "background_sync_on_battery_low": "Synchroniseren op lage batterij",
-  "background_sync_on_charging": "Synchroniseer alleen bij het opladen",
-  "background_sync_on_device_idle": "Synchroniseer alleen wanneer het apparaat niet wordt gebruikt",
-  "background_sync_on_unmetered_network": "Vereist een onvermekte netwerk",
   "backup": "Back-up",
   "backup_file": "Backup bestand",
   "backup_password": "Reservewachtwoord",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Koop Bitcoin",
   "buy_now": "Koop nu",
   "buy_provider_unavailable": "Provider momenteel niet beschikbaar.",
-  "buy_sell_pair_is_not_supported_warning": "Dit valutapaar wordt door een provider niet ondersteund voor de geselecteerde betaalmethode. Kies een ander paar of probeer de betaalmethode te wijzigen.",
   "buy_with": "Koop met",
   "by_cake_pay": "door Cake Pay",
   "cake_2fa_preset": "Taart 2FA Voorinstelling",
@@ -124,12 +114,9 @@
   "camera_consent": "Uw camera wordt gebruikt om vóór ${provider} een beeld vast te leggen voor identificatiedoeleinden. Raadpleeg hun privacybeleid voor meer informatie.",
   "camera_permission_is_required": "Cameratoestemming is vereist.\nSchakel dit in via de app-instellingen.",
   "cancel": "Annuleer",
-  "cannot_verify": "Kan niet verifiëren",
-  "cannot_verify_description": "Dit domein kan niet worden geverifieerd. Controleer het verzoek zorgvuldig voordat u het goedkeurt.",
   "card_address": "Adres:",
   "cardholder_agreement": "Kaarthouderovereenkomst",
   "cards": "Kaarten",
-  "chain_id": "Keten -ID",
   "chains": "Ketens",
   "change": "Verandering",
   "change_backup_password_alert": "Uw vorige back-upbestanden kunnen niet worden geïmporteerd met een nieuw back-upwachtwoord. Het nieuwe back-upwachtwoord wordt alleen gebruikt voor nieuwe back-upbestanden. Weet u zeker dat u het back-upwachtwoord wilt wijzigen?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Weet u zeker dat u van vertegenwoordiger wilt veranderen?",
   "change_rep_successful": "Met succes veranderde vertegenwoordiger",
   "change_selected_exchanges": "Wijzig geselecteerde uitwisselingen",
-  "change_selected_pair": "Wijzig geselecteerd paar",
   "change_wallet_alert_content": "Wilt u de huidige portemonnee wijzigen in ${wallet_name}?",
   "change_wallet_alert_title": "Wijzig huidige portemonnee",
   "choose_a_payment_method": "Kies een betaalmethode",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Bevestigd",
   "congratulations": "gefeliciteerd!",
   "connect_an_existing_yat": "Verbind een bestaande Yat",
-  "connect_hw_info_step_1": "Zorg ervoor dat uw apparaat is ingeschakeld.",
-  "connect_hw_info_step_2": "Zet Bluetooth aan voor beide apparaten en combineer ze van de telefoon, of sluit uw apparaten samen met een USB -kabel.",
-  "connect_hw_info_step_3": "Ontgrendel uw apparaat en navigeer naar de gewenste crypto -app.",
-  "connect_hw_info_step_4": "Selecteer uw apparaat in cake -portemonnee en ga verder met de opstelling.",
   "connect_yats": "Verbind Yats",
   "connect_your_hardware_wallet": "Sluit uw hardware -portemonnee aan met Bluetooth of USB",
   "connect_your_hardware_wallet_ios": "Sluit uw hardware -portemonnee aan met Bluetooth",
-  "connected": "Aangesloten",
   "connection_sync": "Verbinding en synchronisatie",
   "connectWalletPrompt": "Verbind uw portemonnee met WalletConnect om transacties uit te voeren",
   "contact": "Contact",
@@ -207,8 +188,6 @@
   "copy": "Kopiëren",
   "copy_address": "Adres kopiëren",
   "copy_id": "ID kopiëren",
-  "copy_payjoin_address": "Payjoin -adres kopiëren",
-  "copy_payjoin_url": "Kopieer Payjoin url",
   "copyWalletConnectLink": "Kopieer de WalletConnect-link van dApp en plak deze hier",
   "corrupted_seed_notice": "De bestanden voor deze portemonnee zijn beschadigd en kunnen niet worden geopend. Bekijk de zaadzin, bewaar deze en herstel de portemonnee.\n\nAls de waarde leeg is, kon het zaad niet correct worden hersteld.",
   "countries": "Landen",
@@ -245,22 +224,11 @@
   "descending": "Aflopend",
   "description": "Beschrijving",
   "destination_tag": "Bestemmingstag:",
-  "deuro_collect_interest": "Verzamelen",
-  "deuro_savings": "dEuro -besparingen",
-  "deuro_savings_add": "Borg",
-  "deuro_savings_balance": "Spaarbalans",
-  "deuro_savings_collect_interest": "Verzamel interesse",
-  "deuro_savings_remove": "Terugtrekken",
-  "deuro_savings_set_approval": "Goedkeuring instellen",
-  "deuro_savings_subtitle": "Verdien tot 10% rente op uw Deuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Het kan een paar seconden duren voordat de transactie wordt bevestigd en weerspiegeld op het scherm",
-  "device_is_signing": "Apparaat ondertekent",
   "dfx_option_description": "Koop crypto met EUR & CHF. Voor retail- en zakelijke klanten in Europa",
   "didnt_get_code": "Geen code?",
   "digit_pin": "-cijferige PIN",
   "digital_and_physical_card": "digitale en fysieke prepaid debetkaart",
   "disable": "Uitzetten",
-  "disable_automatic_exchange_status_updates": "Schakel automatische uitwisselingsstatusupdates uit",
   "disable_bulletin": "Schakel servicestatus Bulletin uit",
   "disable_buy": "Koopactie uitschakelen",
   "disable_cake_2fa": "Taart 2FA uitschakelen",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Door dit uit te schakelen, kunnen de tarieven in sommige gevallen onnauwkeurig zijn, dus u kunt de vergoedingen voor uw transacties te veel betalen of te weinig betalen",
   "disable_fiat": "Schakel Fiat uit",
   "disable_sell": "Verkoopactie uitschakelen",
-  "disable_tor": "Schakel Tor uit",
   "disable_trade_option": "Schakel handelsoptie uit",
   "disableBatteryOptimization": "Schakel de batterijoptimalisatie uit",
   "disableBatteryOptimizationDescription": "Wilt u de optimalisatie van de batterij uitschakelen om achtergrondsynchronisatie te laten werken, vrijer en soepeler?",
   "disabled": "Gehandicapt",
-  "disconnect_session": "Koppel de sessie los",
   "discount": "Bespaar ${value}%",
   "display_settings": "Weergave-instellingen",
   "displayable": "Weer te geven",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Deel deze met niemand anders, ook niet met support.\n\nUw geld kan en zal worden gestolen!",
   "do_not_show_me": "laat me dit niet opnieuw zien",
   "domain_looks_up": "Domein opzoeken",
-  "domain_mismatch": "Domein mismatch",
-  "domain_mismatch_description": "Deze website heeft een domein dat niet overeenkomt met de afzender van dit verzoek. Goedkeuring kan leiden tot verlies van fondsen.",
   "donation_link_details": "Details van de donatielink",
-  "done": "Klaar",
   "e_sign_consent": "Toestemming e-ondertekenen",
   "edit": "Bewerk",
   "edit_backup_password": "Bewerk back-upwachtwoord",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "We genereren nieuwe adressen elke keer dat u er een gebruikt, maar eerdere adressen blijven werken",
   "email_address": "E-mailadres",
   "enable": "Inschakelen",
-  "enable_builtin_tor": "Schakel ingebouwde tor in",
   "enable_mempool_api": "Mempool API voor nauwkeurige kosten en datums",
   "enable_replace_by_fee": "Schakel vervangen door een fee",
   "enable_silent_payments_scanning": "Begin met het scannen van stille betalingen, totdat de tip is bereikt",
@@ -333,10 +295,8 @@
   "error_text_template": "Sjabloonnaam en -adres mogen niet bevatten ` , ' \" symbolen\nen moet tussen de 1 en 106 tekens lang zijn",
   "error_text_wallet_name": "Naam portemonnee kan alleen letters, cijfers , _ - symbolen bevatten\nen moet tussen de 1 en 33 tekens lang zijn",
   "error_text_xmr": "XMR-waarde kan het beschikbare saldo niet overschrijden.\nHet aantal breukcijfers moet kleiner zijn dan of gelijk zijn aan 12",
-  "error_while_processing": "Er is een fout opgetreden tijdens het procederen",
   "errorGettingCredentials": "Mislukt: fout bij het ophalen van inloggegevens",
   "errorSigningTransaction": "Er is een fout opgetreden tijdens het ondertekenen van de transactie",
-  "establishing_tor_connection": "Estabilishing Tor -verbinding",
   "estimated": "Geschatte",
   "estimated_new_fee": "Geschatte nieuwe vergoeding",
   "estimated_receive_amount": "Geschat ontvangen bedrag",
@@ -360,7 +320,6 @@
   "export_backup": "Back-up exporteren",
   "export_logs": "Exporteer logboeken",
   "export_outputs": "Exportuitgangen exporteren",
-  "extend_session": "Sessie verlengen",
   "extra_id": "Extra ID:",
   "extracted_address_content": "U stuurt geld naar\n${recipient_name}",
   "failed_authentication": "Mislukte authenticatie. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Fiat Balans",
   "field_required": "dit veld is verplicht",
-  "file_saved": "Bestand opgeslagen",
   "fill_code": "Vul de verificatiecode in die u in uw e-mail hebt ontvangen",
   "filter_by": "Filteren op",
   "first_wallet_text": "Geweldige portemonnee voor Monero, Bitcoin, Ethereum, Litecoin, en Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Wachtwoord vergeten",
   "freeze": "Bevriezen",
   "frequently_asked_questions": "Veelgestelde vragen",
-  "from": "Van",
   "frozen": "Bevroren",
   "frozen_balance": "Bevroren balans",
   "full_balance": "Volledig saldo",
   "gas_exceeds_allowance": "Gas vereist door transactie overschrijdt de vergoeding.",
-  "gas_price": "Gasprijs",
   "generate_name": "Naam genereren",
   "generating_gift_card": "Cadeaubon genereren",
   "generating_transaction": "Transactie genereren",
@@ -413,7 +369,6 @@
   "hide_details": "Details verbergen",
   "high_contrast_theme": "Thema met hoog contrast",
   "home_screen_settings": "Instellingen voor het startscherm",
-  "how_to_connect": "Hoe verbinding te maken",
   "how_to_use": "Hoe te gebruiken",
   "how_to_use_card": "Hoe deze kaart te gebruiken",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "U hebt niet genoeg SOL om de transactie en de transactiekosten te dekken. Voeg vriendelijk meer SOL toe aan uw portemonnee of verminder de SOL -hoeveelheid die u verzendt.",
   "insufficient_lamports": "U hebt niet genoeg SOL om de transactie en de transactiekosten te dekken. Je hebt minstens ${solValueNeeded} sol nodig. Voeg vriendelijk meer Sol toe aan uw portemonnee of verminder de SOL -hoeveelheid die u verzendt",
   "insufficientFundsForRentError": "U hebt niet genoeg SOL om de transactiekosten en huur voor de rekening te dekken. Voeg vriendelijk meer SOL toe aan uw portemonnee of verminder de SOL -hoeveelheid die u verzendt",
-  "insufficientFundsForRentErrorReceiver": "De account van de ontvanger heeft niet genoeg SOL om de huur te dekken. Vraag de ontvanger om meer SOL aan hun account toe te voegen.",
   "introducing_cake_pay": "Introductie van Cake Pay!",
   "invalid_input": "Ongeldige invoer",
   "invalid_password": "Ongeldig wachtwoord",
@@ -471,7 +425,6 @@
   "logout": "Uitloggen",
   "low_fee": "Lage vergoeding",
   "low_fee_alert": "U gebruikt momenteel een lage prioriteit voor netwerkkosten. Dit kan lange wachttijden, andere tarieven of geannuleerde transacties veroorzaken. We raden aan een hogere vergoeding in te stellen voor een betere ervaring.",
-  "made_easy": "gemakkelijk gemaakt",
   "manage_nodes": "Beheer knooppunten",
   "manage_pow_nodes": "PoW-knooppunten beheren",
   "manage_yats": "Yats beheren",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Bericht",
   "message_verified": "Het bericht is succesvol geverifieerd",
-  "messages": "Berichten",
-  "method": "Methode",
   "methods": "Methoden",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero donker thema",
   "monero_light_theme": "Monero Light-thema",
   "moonpay_alert_text": "Waarde van het bedrag moet meer of gelijk zijn aan ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Er is een fout opgetreden bij het ophalen van NFT's. Controleer uw internetverbinding vriendelijk en probeer het opnieuw.",
   "more_options": "Meer opties",
   "multiple_addresses_detected": "Meerdere adressen gedetecteerd",
   "mweb_confirmed": "Bevestigde MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Label naam",
   "new_subaddress_title": "Nieuw adres",
   "new_template": "Nieuwe sjabloon",
-  "new_transactions_notifications": "Stuur meldingen over nieuwe transacties",
   "new_wallet": "Nieuwe portemonnee",
   "newConnection": "Nieuwe verbinding",
   "no_cards_found": "Geen kaarten gevonden",
@@ -539,7 +488,6 @@
   "normal": "Normaal",
   "note_optional": "Opmerking (optioneel)",
   "note_tap_to_change": "Opmerking (tik om te wijzigen)",
-  "notification_permission_denied": "Meldingstoestemming is permanent geweigerd, schakel het handmatig in instellingen in",
   "nullURIError": "URI is nul",
   "offer_expires_in": "Aanbieding verloopt over: ",
   "offline": "Offline",
@@ -571,20 +519,8 @@
   "password": "Wachtwoord",
   "paste": "Plakken",
   "pause_wallet_creation": "De mogelijkheid om Haven Wallet te maken is momenteel onderbroken.",
-  "payjoin_card_content": "Payjoin is een nieuwe functie voor privacybehoud en fee-sparende functie in Bitcoin.",
-  "payjoin_details": "Payjoin details",
-  "payjoin_enabled": "Payjoin ingeschakeld",
-  "payjoin_enabling_popup_content": "U kunt Payjoin onder menu → privacy → Privacy → gebruiken Payjoin om het later in te schakelen of uit te schakelen.",
-  "payjoin_enabling_popup_title": "Payjoin Inschakelen",
-  "payjoin_request_awaiting_tx": "In afwachting van transactie",
-  "payjoin_request_in_progress": "In uitvoering",
-  "payjoin_unavailable": "Payjoin niet beschikbaar",
-  "payjoin_unavailable_sheet_content": "Het ontvangen van een Payjoin -transactie vereist dat u Bitcoin klaar hebt om te gebruiken. \\ N \\ NAS Zodra uw portemonnee geld heeft, wordt Payjoin automatisch ingeschakeld.",
-  "payjoin_unavailable_sheet_title": "Waarom is Payjoin niet beschikbaar?",
   "payment_id": "Betaling ID: ",
-  "payment_made_easy": "Betalingen gemakkelijk gemaakt",
   "payment_was_received": "Uw betaling is ontvangen.",
-  "payments": "Betalingen",
   "pending": " (in afwachting)",
   "percentageOf": "van ${amount}",
   "pin_at_top": "speld ${token} bovenaan",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Probeer verbinding te maken met een ander knooppunt",
   "please_wait": "Even geduld aub",
   "polygonscan_history": "PolygonScan-geschiedenis",
-  "potential_scam": "Potentiële zwendel",
   "powered_by": "Aangedreven door ${title}",
   "pre_seed_button_text": "Ik begrijp het. Laat me mijn zaad zien",
-  "pre_seed_description": "Op de volgende pagina ziet u een reeks woorden. Dit is uw unieke en privézaad en het is de enige manier om uw portemonnee te herstellen in geval van verlies of storing. Het is uw verantwoordelijkheid om het op te schrijven en op te slaan op een veilige plek buiten de cake -portemonnee -app.",
+  "pre_seed_description": "Op de volgende pagina ziet u een reeks van ${words} woorden. Dit is uw unieke en persoonlijke zaadje en het is de ENIGE manier om uw portemonnee te herstellen in geval van verlies of storing. Het is JOUW verantwoordelijkheid om het op te schrijven en op een veilige plaats op te slaan buiten de Cake Wallet app.",
   "pre_seed_title": "BELANGRIJK",
   "prepaid_cards": "Prepaid-kaarten",
   "prevent_screenshots": "Voorkom screenshots en schermopname",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Ga verder met uw apparaat",
   "proceed_on_device_description": "Volg de instructies die zijn aangevraagd op uw hardware -portemonnee",
   "processing": "Verwerking",
-  "processing_signed_tx": "Verwerking ondertekende transactie",
   "profile": "Profiel",
   "provider_error": "${provider} fout",
   "public_key": "Publieke sleutel",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Uw vertegenwoordiger lijkt niet goed te staan. Tik hier om een ​​nieuwe te selecteren",
   "repeat_wallet_password": "Herhaal het Wallet -wachtwoord",
   "repeated_password_is_incorrect": "Herhaald wachtwoord is onjuist. Herhaal het Wallet -wachtwoord opnieuw.",
-  "requested": "Gevraagd",
   "require_for_adding_contacts": "Vereist voor het toevoegen van contacten",
   "require_for_all_security_and_backup_settings": "Vereist voor alle beveiligings- en back-upinstellingen",
   "require_for_assessing_wallet": "Vereist voor toegang tot portemonnee",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Vereist voor verzendingen naar interne portefeuilles",
   "require_for_sends_to_non_contacts": "Vereist voor verzendingen naar niet-contacten",
   "require_pin_after": "Pincode vereist na",
-  "required_passphrase": "Wachtwoordzin",
   "rescan": "Opnieuw scannen",
   "resend_code": "Stuur het alstublieft opnieuw",
   "reset": "Reset",
   "reset_password": "Wachtwoord resetten",
-  "restore": "Herstellen",
   "restore_active_seed": "Actief zaad",
   "restore_address": "Adres",
   "restore_bitcoin_description_from_keys": "Herstel uw portemonnee van de gegenereerde WIF-string van uw privésleutels",
@@ -713,10 +644,7 @@
   "search_language": "Zoektaal",
   "second_intro_content": "Je Yat is een enkel uniek emoji-adres dat al je lange hexadecimale adressen vervangt voor al je valuta's.",
   "second_intro_title": "Eén emoji-adres om ze allemaal te regeren",
-  "security": "Beveiliging",
   "security_and_backup": "Beveiliging en back-up",
-  "security_risk": "Beveiligingsrisico",
-  "security_risk_description": "Dit domein wordt door meerdere beveiligingsproviders gemarkeerd als onveilig. Vertrek onmiddellijk om uw vermogen te beschermen.",
   "seed_alert_back": "Ga terug",
   "seed_alert_content": "Het zaad is de enige manier om uw portemonnee te herstellen. Heb je het opgeschreven?",
   "seed_alert_title": "Aandacht",
@@ -751,6 +679,9 @@
   "seedtype": "Zaadtype",
   "seedtype_alert_content": "Het delen van zaden met andere portefeuilles is alleen mogelijk met BIP39 SeedType.",
   "seedtype_alert_title": "Zaadtype alert",
+  "seedtype_legacy": "Legacy (25 woorden)",
+  "seedtype_polyseed": "Polyseed (16 woorden)",
+  "seedtype_wownero": "WOWNERO (14 woorden)",
   "select_backup_file": "Selecteer een back-upbestand",
   "select_buy_provider_notice": "Selecteer hierboven een koopprovider. U kunt dit scherm overslaan door uw standaard kopenprovider in te stellen in app -instellingen.",
   "select_destination": "Selecteer de bestemming voor het back-upbestand.",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "Stuur vanuit een externe portemonnee",
   "send_name": "Naam",
   "send_new": "Nieuw",
-  "send_payjoin": "Versturen Payjoin",
   "send_payment_id": "Betaling ID (facultatief)",
   "send_priority": "Momenteel is de vergoeding vastgesteld op ${transactionPriority} prioriteit.\nTransactieprioriteit kan worden aangepast in de instellingen",
   "send_sending": "Bezig met verzenden...",
@@ -832,9 +762,7 @@
   "show_keys": "Toon zaad/sleutels",
   "show_market_place": "Toon Marktplaats",
   "show_seed": "Toon zaad",
-  "sign_all": "Teken alles",
   "sign_message": "Aanmeldingsbericht",
-  "sign_one": "Ondertekenen een",
   "sign_up": "Aanmelden",
   "sign_verify_message": "Teken of verifieer bericht",
   "sign_verify_message_sub": "Teken of verifieer een bericht met uw privésleutel",
@@ -863,14 +791,11 @@
   "sort_by": "Sorteer op",
   "spend_key_private": "Sleutel uitgeven (privaat)",
   "spend_key_public": "Sleutel uitgeven (openbaar)",
-  "starting_tor_proxy": "Tor Proxy starten",
   "status": "Staat: ",
-  "step": "Stap",
   "string_default": "Standaard",
   "subaddress_title": "Subadreslijst",
   "subaddresses": "Subadressen",
   "submit_request": "een verzoek indienen",
-  "success": "Succes",
   "successful": "Succesvol",
   "support_description_guides": "Documentatie en ondersteuning voor gemeenschappelijke problemen",
   "support_description_live_chat": "Gratis en snel! Getrainde ondersteuningsvertegenwoordigers zijn beschikbaar om te helpen",
@@ -878,7 +803,6 @@
   "support_title_guides": "Cake -portemonnee documenten",
   "support_title_live_chat": "Live ondersteuning",
   "support_title_other_links": "Andere ondersteuningslinks",
-  "supported": "Ondersteund",
   "swap": "Ruil",
   "sweeping_wallet": "Vegende portemonnee",
   "sweeping_wallet_alert": "Dit duurt niet lang. VERLAAT DIT SCHERM NIET, ANDERS KAN HET SWEPT-GELD VERLOREN WORDEN",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "SYNCHRONISEREN",
   "sync_status_timed_out": "Uitgeput",
   "sync_status_unsupported": "Niet ondersteund knooppunt",
-  "synchronizing": "Synchronisatie",
   "syncing_wallet_alert_content": "Uw saldo- en transactielijst is mogelijk pas compleet als er bovenaan 'GESYNCHRONISEERD' staat. Klik/tik voor meer informatie.",
   "syncing_wallet_alert_title": "Uw portemonnee wordt gesynchroniseerd",
   "template": "Sjabloon",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "De Thorchain -provider ondersteunt geen Taprooot -adressen. Wijzig het adres of selecteer een andere provider.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Tip:",
-  "to": "Naar",
   "today": "Vandaag",
-  "token_already_exists": "Token bestaat al",
   "token_contract_address": "Token contractadres",
   "token_decimal": "Token decimaal",
   "token_name": "Tokennaam bijv.: Tether",
   "token_symbol": "Tokensymbool bijv.: USDT",
   "tokenID": "ID kaart",
-  "ton_extra_info": "Vergeet niet om de memo -ID op te geven tijdens het verzenden van de ton -transactie voor de uitwisseling",
   "tor_connection": "Tor-verbinding",
-  "tor_connection_timeout": "Tor -verbindingstime -out",
-  "tor_experimental": "Dit is een experimentele functie, niet alle verbindingen gemaakt van Cake Wallet Support Tor Routing - Sommige verbindingen kunnen ClearNet gebruiken, om app -verkeer volledig te routeren Tor met VPN -modus.",
   "tor_only": "Alleen Tor",
   "total": "Totaal",
   "total_saving": "Totale besparingen",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "Als het scherm na 1 minuut niet verder gaat, controleer dan een blokverkenner en je e-mail.",
   "transactions": "Transacties",
   "transactions_by_date": "Transacties op datum",
-  "transport_type": "Transporttype",
   "trongrid_history": "Trongrid geschiedenis",
   "trusted": "vertrouwd",
-  "try_again": "Probeer het opnieuw",
   "tx_commit_exception_no_dust_on_change": "De transactie wordt afgewezen met dit bedrag. Met deze munten kunt u ${min} verzenden zonder verandering of ${max} die wijziging retourneert.",
   "tx_commit_failed": "Transactiebewissing is mislukt. Neem contact op met de ondersteuning.",
   "tx_commit_failed_no_peers": "De transactie is niet uitgezonden, probeer het opnieuw binnen een seconde of zo",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "Details van niet-uitgegeven munten",
   "unspent_coins_title": "Ongebruikte munten",
   "unsupported_asset": "We ondersteunen deze actie niet voor dit item. Maak of schakel over naar een portemonnee van een ondersteund activatype.",
-  "update_session": "Updatesessie",
   "uptime": "Uptime",
   "upto": "tot ${value}",
   "usb": "USB",
   "use": "Gebruik ",
   "use_card_info_three": "Gebruik de digitale kaart online of met contactloze betaalmethoden.",
   "use_card_info_two": "Tegoeden worden omgezet naar USD wanneer ze op de prepaid-rekening staan, niet in digitale valuta.",
-  "use_device_theme": "Gebruik apparaatthema",
-  "use_payjoin": "Gebruik Payjoin",
   "use_ssl": "Gebruik SSL",
   "use_suggested": "Gebruik aanbevolen",
   "use_testnet": "Gebruik testnet",
-  "user_rejected_method": "Gebruiker afgewezen methode",
   "value": "Waarde",
   "value_type": "Waarde type",
   "variable_pair_not_supported": "Dit variabelenpaar wordt niet ondersteund met de geselecteerde uitwisselingen",
@@ -1053,7 +965,6 @@
   "wallet_group_description_view_seed": "Je kunt dit zaad altijd opnieuw bekijken",
   "wallet_group_empty_state_text_one": "Het lijkt erop dat je geen compatibele portemonnee -groepen hebt !\n\n TAP",
   "wallet_group_empty_state_text_two": "hieronder om een ​​nieuwe te maken.",
-  "wallet_has_passphrase": "Deze portemonnee heeft een wachtwoordzin",
   "wallet_keys": "Portemonnee zaad/sleutels",
   "wallet_list_create_new_wallet": "Maak een nieuwe portemonnee",
   "wallet_list_edit_group_name": "Groepsnaam bewerken",
@@ -1078,11 +989,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Portefeuilles",
   "warning": "Waarschuwing",
-  "welcome": "Welkom",
+  "welcome": "Welkom bij",
   "welcome_subtitle_new_wallet": "Als u opnieuw wilt beginnen, tikt u op de nieuwe portemonnee hieronder en u bent op weg naar de races.",
   "welcome_subtitle_restore_wallet": "Als je een bestaande portemonnee hebt die je in cake wilt brengen, kies dan gewoon om de bestaande portemonnee te herstellen en we zullen je door het proces leiden.",
   "welcome_to_cakepay": "Welkom bij Cake Pay!",
-  "what_is_payjoin": "Wat is Payjoin ?",
   "what_is_silent_payments": "Wat zijn stille betalingen?",
   "widgets_address": "Adres",
   "widgets_or": "of",
@@ -1112,6 +1022,5 @@
   "you_will_get": "Converteren naar",
   "you_will_receive_estimated_amount": "U ontvangt(geschat )",
   "you_will_send": "Converteren van",
-  "youCanGoBackToYourDapp": "U kunt nu terug naar uw DApp gaan",
   "yy": "JJ"
 }
\ No newline at end of file
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 4b39a949b..cb4f09982 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -1,5 +1,5 @@
 {
-  "about_cake_pay": "Cake Pay umożliwia łatwe kupowanie kart podarunkowych z wirtualnymi saldami, które można natychmiast wydać u ponad 150 000 sprzedawców.",
+  "about_cake_pay": "Cake Pay umożliwia łatwe kupowanie kart podarunkowych z wirtualnymi aktywami, które można natychmiast wydać u ponad 150 000 sprzedawców w Stanach Zjednoczonych.",
   "account": "Konto",
   "accounts": "Konta",
   "accounts_subaddresses": "Konta i podadresy",
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Dodaj przedpłacone środki do kart (do ${value})",
   "add_new_node": "Dodaj nowy węzeł",
   "add_new_word": "Dodaj nowe słowo",
-  "add_passphrase": "Dodaj hasło",
-  "add_passphrase_warning_text": "Wprowadź hasło tylko wtedy, gdy w przeszłości używałeś jednego do tego portfela. Jeśli wejdziesz do niewłaściwej hasła lub nie użyjesz wcześniejszego pensjonatu na tym portfelu, nie zobaczysz żadnego z istniejących funduszy ani historii.",
   "add_receiver": "Dodaj kolejnego odbiorcę (opcjonalnie)",
   "add_secret_code": "Możesz też dodać ten tajny kod do aplikacji uwierzytelniającej",
   "add_tip": "Dodaj wskazówkę",
   "add_token_disclaimer_check": "Potwierdziłem adres kontraktu tokena i informacje, korzystając z renomowanego źródła. Dodanie złośliwych lub niepoprawnych informacji może spowodować utratę środków.",
   "add_token_warning": "Nie edytuj ani nie dodawaj tokenów zgodnie z instrukcjami oszustów.\nZawsze potwierdzaj adresy tokenów z renomowanymi źródłami!",
   "add_value": "Dodaj wartość",
-  "added_message_for_ata_error": "Upewnij się, że masz wystarczającą saldo SOL, aby ukończyć transakcję.",
   "address": "Adres",
   "address_book": "Kontakty",
   "address_book_menu": "Kontakty",
@@ -35,7 +32,7 @@
   "address_remove_content": "Czy na pewno chcesz usunąć wybrany kontakt?",
   "addresses": "Adresy",
   "advanced_settings": "Zaawansowane ustawienia",
-  "aggressive": "Agresywny",
+  "aggressive": "Nadgorliwy",
   "agree": "Zgadzam się",
   "agree_and_continue": "Zgadzam się i kontynuuj",
   "agree_to": "Tworząc konto wyrażasz zgodę na ",
@@ -55,18 +52,16 @@
   "anonpay_description": "Wygeneruj ${type}. Odbiorca może ${method} z dowolną obsługiwaną kryptowalutą, a Ty otrzymasz środki w tym portfelu.",
   "apk_update": "Aktualizacja APK",
   "approve": "Zatwierdzić",
-  "approve_request": "Zatwierdzić żądanie",
-  "approve_tokens": "Zatwierdzić tokeny",
   "arrive_in_this_address": "${currency} ${tag}dotrze na ten adres",
   "ascending": "Wznoszący się",
   "ask_each_time": "Zapytaj za każdym razem",
   "auth_store_ban_timeout": "przekroczenie limitu czasu",
-  "auth_store_banned_for": "Zablokowany na ",
+  "auth_store_banned_for": "Zablokowany za ",
   "auth_store_banned_minutes": " minuty",
   "auth_store_incorrect_password": "Niepoprawny PIN",
   "authenticated": "Uwierzytelniony",
   "authentication": "Uwierzytelnianie",
-  "auto_generate_addresses": "Automatycznie generuj adresy",
+  "auto_generate_addresses": "Auto generują adresy",
   "auto_generate_subaddresses": "Automatycznie generuj podadresy",
   "automatic": "Automatyczny",
   "available_balance": "Dostępne środki",
@@ -74,39 +69,34 @@
   "avg_savings": "Śr. oszczędności",
   "awaitDAppProcessing": "Poczekaj, aż dApp zakończy przetwarzanie.",
   "awaiting_payment_confirmation": "Oczekiwanie na potwierdzenie płatności",
-  "background_sync": "Synchronizacja w tle",
+  "background_sync": "Synchronizacja tła",
   "background_sync_mode": "Tryb synchronizacji w tle",
-  "background_sync_on_battery_low": "Synchronizować na niskiej baterii",
-  "background_sync_on_charging": "Synchronizować tylko podczas ładowania",
-  "background_sync_on_device_idle": "Synchronizować tylko wtedy, gdy urządzenie nie jest używane",
-  "background_sync_on_unmetered_network": "Wymagaj niezametrowanej sieci",
   "backup": "Kopia zapasowa",
   "backup_file": "Plik kopii zapasowej",
   "backup_password": "Hasło kpoii zapasowej",
-  "balance": "Saldo",
+  "balance": "Balansować",
   "balance_page": "Strona salda",
   "bill_amount": "Kwota rachunku",
   "billing_address_info": "Jeśli zostaniesz poproszony o podanie adresu rozliczeniowego, podaj swój adres wysyłki",
   "biometric_auth_reason": "Zeskanuj swój odcisk palca, aby uwierzytelnić",
   "bitcoin_dark_theme": "Ciemny motyw Bitcoina",
-  "bitcoin_light_theme": "Jasny motyw Bitcoin",
+  "bitcoin_light_theme": "Lekki motyw Bitcoin",
   "bitcoin_payments_require_1_confirmation": "Płatności Bitcoin wymagają 1 potwierdzenia, co może zająć 20 minut lub dłużej. Dziękuję za cierpliwość! Otrzymasz wiadomość e-mail, gdy płatność zostanie potwierdzona.",
   "block_height": "Wysokość bloku",
-  "block_remaining": "pozostał 1 blok",
+  "block_remaining": "1 blok pozostałym",
   "Blocks_remaining": "Pozostało ${status} bloków",
   "bluetooth": "Bluetooth",
-  "bright_theme": "Jasny",
-  "bump_fee": "Opłata za transakcje",
+  "bright_theme": "Biały",
+  "bump_fee": "Opłata za nierówność",
   "buy": "Kup",
   "buy_alert_content": "Obecnie obsługujemy tylko zakup Bitcoin, Ethereum, Litecoin i Monero. Utwórz lub przełącz się na swój portfel Bitcoin, Ethereum, Litecoin lub Monero.",
   "buy_bitcoin": "Kup Bitcoin",
   "buy_now": "Kup Teraz",
   "buy_provider_unavailable": "Dostawca obecnie niedostępny.",
-  "buy_sell_pair_is_not_supported_warning": "Ta para walut nie jest obsługiwana przez żadnego dostawcy dla wybranej metody płatności. Wybierz inną parę lub spróbuj zmienić metodę płatności.",
   "buy_with": "Kup za pomocą",
   "by_cake_pay": "przez Cake Pay",
-  "cake_2fa_preset": "Cake 2FA Preset",
-  "cake_dark_theme": "Cake Dark",
+  "cake_2fa_preset": "Ciasto 2FA Preset",
+  "cake_dark_theme": "Cake Dark Temat",
   "cake_pay_account_note": "Zarejestruj się, używając tylko adresu e-mail, aby przeglądać i kupować karty. Niektóre są nawet dostępne ze zniżką!",
   "cake_pay_learn_more": "Kupuj i wykorzystuj karty podarunkowe od razu w aplikacji!\nPrzesuń od lewej do prawej, aby dowiedzieć się więcej.",
   "cake_pay_save_order": "Karta powinna zostać wysłana na adres e-mail w ciągu 1 dnia roboczego \n Zapisz identyfikator zamówienia:",
@@ -118,33 +108,29 @@
   "cakepay_confirm_no_vpn": "Potwierdzam, że nie używam proxy ani VPN",
   "cakepay_confirm_purchase": "Potwierdź zakup",
   "cakepay_confirm_terms_agreed": "Zgadzam się na przedstawione tutaj warunki:",
-  "cakepay_confirm_voided_refund": "Rozumiem, że próby zwrotu z kraju niedozwolnego nie zostaną uznane",
-  "cakepay_ios_not_available": "Przepraszamy, ta karta podarunkowa nie jest dostępna na iOS. Możesz ją kupić na Androidzie lub za pośrednictwem naszej strony internetowej.",
+  "cakepay_confirm_voided_refund": "Rozumiem, że próby odkupienia z ograniczonego kraju nie unieważają wszelkich",
+  "cakepay_ios_not_available": "Przepraszam, ta karta podarunkowa nie jest dostępna na iOS. Zamiast tego możesz go kupić na Android lub za pośrednictwem naszej strony internetowej.",
   "cakepay_prepaid_card": "Przedpłacona karta debetowa CakePay",
   "camera_consent": "Twój aparat zostanie użyty do przechwycenia obrazu w celach identyfikacyjnych przez ${provider}. Aby uzyskać szczegółowe informacje, sprawdź ich Politykę prywatności.",
   "camera_permission_is_required": "Wymagane jest pozwolenie na korzystanie z aparatu.\nWłącz tę funkcję w ustawieniach aplikacji.",
   "cancel": "Anuluj",
-  "cannot_verify": "Nie można zweryfikować",
-  "cannot_verify_description": "Tę domeny nie można zweryfikować. Przed zatwierdzeniem sprawdź prośbę.",
   "card_address": "Adres:",
   "cardholder_agreement": "Umowa posiadacza karty",
   "cards": "Karty",
-  "chain_id": "Identyfikator łańcucha",
-  "chains": "Łańcuchy",
+  "chains": "Więzy",
   "change": "Zmień",
   "change_backup_password_alert": "Twoje poprzednie pliki kopii zapasowej nie będą dostępne do zaimportowania z nowym hasłem kopii zapasowej. Nowe hasło kopii zapasowej będzie używane tylko dla nowych plików kopii zapasowych. Czy na pewno chcesz zmienić hasło zapasowe?",
   "change_currency": "Zmień walutę",
   "change_current_node": "Czy na pewno chcesz wybrać ten węzeł? ${node}?",
   "change_current_node_title": "Zmień bieżący węzeł",
-  "change_exchange_provider": "Zmień dostawce wymiany",
+  "change_exchange_provider": "Zmień dostawca zamiany",
   "change_language": "Zmień język",
   "change_language_to": "Zmień język na ${language}?",
   "change_password": "Zmień hasło",
   "change_rep": "Zmień przedstawiciela",
   "change_rep_message": "Czy na pewno chcesz zmienić przedstawiciela?",
-  "change_rep_successful": "Pomyślnie zmieniono przedstawiciela",
+  "change_rep_successful": "Pomyślnie zmienił przedstawiciela",
   "change_selected_exchanges": "Zmień wybrane wymiany",
-  "change_selected_pair": "Zmień wybraną parę",
   "change_wallet_alert_content": "Czy chcesz zmienić obecny portfel na ${wallet_name}?",
   "change_wallet_alert_title": "Zmień obecny portfel",
   "choose_a_payment_method": "Wybierz metodę płatności",
@@ -152,44 +138,39 @@
   "choose_account": "Wybierz konto",
   "choose_address": "\n\nWybierz adres:",
   "choose_card_value": "Wybierz wartość karty",
-  "choose_derivation": "Wybierz wyprowadzenie frazy",
+  "choose_derivation": "Wybierz wyprowadzenie portfela",
   "choose_from_available_options": "Wybierz z dostępnych opcji:",
   "choose_one": "Wybierz jeden",
-  "choose_relay": "Wybierz przekaźnik, który chcesz użyć",
+  "choose_relay": "Wybierz przekaźnik, którego chcesz użyć",
   "choose_wallet_currency": "Wybierz walutę portfela:",
   "choose_wallet_group": "Wybierz grupę portfela",
   "clear": "Wyczyść",
   "clearnet_link": "łącze Clearnet",
-  "close": "Zamknij",
-  "coin_control": "Kontrola monet (opcjonalne)",
-  "cold_or_recover_wallet": "Dodaj portfel tylko do odczytu od Cupcake, innego zimnego portfela lub odzyskaj papierowy portfel",
+  "close": "Zamknąć",
+  "coin_control": "Kontrola monet (opcjonalnie)",
+  "cold_or_recover_wallet": "Dodaj portfel tylko do odczytu od Cupcake lub zimnego portfela lub odzyskaj papierowy portfel",
   "collection_address": "Adres kolekcji",
   "collection_description": "Opis kolekcji",
   "collection_name": "Nazwa kolekcji",
   "color_theme": "Motyw kolorystyczny",
   "commit_transaction_amount_fee": "Zatwierdź transakcję\nIlość: ${amount}\nOpłata: ${fee}",
-  "confirm": "Potwierdź",
+  "confirm": "Potwierdzać",
   "confirm_delete_template": "Ta czynność usunie ten szablon. Czy chcesz kontynuować?",
   "confirm_delete_wallet": "Ta czynność usunie ten portfel. Czy chcesz kontynuować?",
   "confirm_fee_deduction": "Potwierdź odliczenie opłaty",
-  "confirm_fee_deduction_content": "Czy zgadzasz się odliczyć opłatę z wysyłanej kwoty?",
+  "confirm_fee_deduction_content": "Czy zgadzasz się odliczyć opłatę od wyników?",
   "confirm_passphrase": "Potwierdź hasło",
-  "confirm_sending": "Potwierdź transakcje wychodzącą",
-  "confirm_silent_payments_switch_node": "Twój obecny węzeł nie obsługuje cichych płatności \\ Cake Wallet przełączy się na kompatybilny węzeł, tylko do skanowania",
+  "confirm_sending": "Potwierdź wysłanie",
+  "confirm_silent_payments_switch_node": "Twój obecny węzeł nie obsługuje cichych płatności \\ NCAKE Portfel przełączy się na kompatybilny węzeł, tylko do skanowania",
   "confirm_transaction": "Potwierdź transakcję",
   "confirmations": "Potwierdzenia",
   "confirmed": "Potwierdzone saldo",
   "confirmed_tx": "Potwierdzony",
   "congratulations": "gratulacje!",
   "connect_an_existing_yat": "Podłącz istniejący Yat",
-  "connect_hw_info_step_1": "Upewnij się, że urządzenie jest włączone.",
-  "connect_hw_info_step_2": "Włącz Bluetooth dla obu urządzeń i sparuj je z telefonu lub podłącz urządzenia razem za pomocą kabla USB.",
-  "connect_hw_info_step_3": "Odblokuj urządzenie i przejdź do żądanej aplikacji Crypto.",
-  "connect_hw_info_step_4": "Wybierz urządzenie w portfelu ciasta i kontynuuj konfigurację.",
   "connect_yats": "Połącz Yats",
   "connect_your_hardware_wallet": "Podłącz portfel sprzętowy za pomocą Bluetooth lub USB",
   "connect_your_hardware_wallet_ios": "Podłącz portfel sprzętowy za pomocą Bluetooth",
-  "connected": "Połączony",
   "connection_sync": "Połączenie i synchronizacja",
   "connectWalletPrompt": "Połącz swój portfel z WalletConnect, aby dokonywać transakcji",
   "contact": "Kontakt",
@@ -207,10 +188,8 @@
   "copy": "Kopiuj",
   "copy_address": "Skopiuj adress",
   "copy_id": "skopiuj ID",
-  "copy_payjoin_address": "Kopiuj adres PAYJOIN",
-  "copy_payjoin_url": "Skopiuj Payjoin url",
   "copyWalletConnectLink": "Skopiuj link do WalletConnect z dApp i wklej tutaj",
-  "corrupted_seed_notice": "Pliki dla tego portfela są uszkodzone i nie można ich otworzyć. Zobacz frazę seed, zapisz je i przywróć portfel.\n\nJeśli wartość jest pusta, frazy seed nie można było poprawnie odzyskać.",
+  "corrupted_seed_notice": "Pliki dla tego portfela są uszkodzone i nie można ich otworzyć. Zobacz wyrażenie nasion, zapisz je i przywróć portfel.\n\nJeśli wartość jest pusta, ziarno nie można było poprawnie odzyskać.",
   "countries": "Kraje",
   "create_account": "Utwórz konto",
   "create_backup": "Utwórz kopię zapasową",
@@ -226,67 +205,51 @@
   "custom_drag": "Niestandardowe (trzymaj i przeciągnij)",
   "custom_redeem_amount": "Niestandardowa kwota wykorzystania",
   "custom_value": "Wartość niestandardowa",
-  "dark_theme": "Ciemny motyw",
+  "dark_theme": "Ciemny",
   "debit_card": "Karta debetowa",
-  "debit_card_terms": "Przechowywanie i używanie numeru karty płatniczej (oraz danych uwierzytelniających odpowiadających numerowi karty płatniczej) w tym portfelu cyfrowym podlega Warunkom odpowiedniej umowy posiadacza karty z wydawcą karty płatniczej, zgodnie z obowiązującym od time do time.",
+  "debit_card_terms": "Przechowywanie i używanie numeru karty płatniczej (oraz danych uwierzytelniających odpowiadających numerowi karty płatniczej) w tym portfelu cyfrowym podlega Warunkom odpowiedniej umowy posiadacza karty z wydawcą karty płatniczej, zgodnie z obowiązującym od od czasu do czasu.",
   "decimal_places_error": "Za dużo miejsc dziesiętnych",
-  "decimals_cannot_be_zero": "Liczba dziesiętna nie może być zerowa.",
-  "decred_info_card_details": "Decred używa zdecentralizowanej i zachowującej prywatność metody synchronizacji znanej jako „SPV”, która trwa dłużej niż synchronizacja portfela bitcoin. Aby dowiedzieć się więcej, kliknij poniżej.",
-  "decred_info_title": "Synchronizacja w decred",
+  "decimals_cannot_be_zero": "Token dziesiętny nie może być zerowy.",
+  "decred_info_card_details": "Decred używa zdecentralizowanej i zachowującej prywatność metodę synchronizacji znanej jako „SPV”, która trwa dłużej niż normalny portfel bitcoin. Aby dowiedzieć się więcej, dotknij poniżej.",
+  "decred_info_title": "Synchronizacja w dekred",
   "default_buy_provider": "Domyślny dostawca zakupu",
   "default_sell_provider": "Domyślny dostawca sprzedaży",
-  "delete": "Usuń",
+  "delete": "Skasuj",
   "delete_account": "Usuń konto",
   "delete_wallet": "Usuń portfel",
   "delete_wallet_confirm_message": "Czy na pewno chcesz usunąć portfel ${wallet_name}?",
   "deleteConnectionConfirmationPrompt": "Czy na pewno chcesz usunąć połączenie z",
   "denominations": "Wyznaczenia",
   "derivationpath": "Ścieżka pochodna",
-  "descending": "Malejąco",
+  "descending": "Schodzenie",
   "description": "Opis",
   "destination_tag": "Tag docelowy:",
-  "deuro_collect_interest": "Zbierać",
-  "deuro_savings": "dEuro oszczędności",
-  "deuro_savings_add": "Depozyt",
-  "deuro_savings_balance": "Równowaga oszczędności",
-  "deuro_savings_collect_interest": "Zbieraj zainteresowanie",
-  "deuro_savings_remove": "Wycofać",
-  "deuro_savings_set_approval": "Ustaw zatwierdzenie",
-  "deuro_savings_subtitle": "Zarabiaj do 10% odsetek od Deuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Potwierdzenie i odbicie na ekranie może potrwać kilka sekund",
-  "device_is_signing": "Urządzenie podpisuje",
-  "dfx_option_description": "Kup krypto za EUR & CHF. Dla klientów prywatnych i korporacyjnych w Europie",
+  "dfx_option_description": "Kup krypto z EUR & CHF. Dla klientów detalicznych i korporacyjnych w Europie",
   "didnt_get_code": "Nie dostałeś kodu?",
   "digit_pin": "-znakowy PIN",
   "digital_and_physical_card": " cyfrowa i fizyczna przedpłacona karta debetowa",
-  "disable": "Wyłącz",
-  "disable_automatic_exchange_status_updates": "Wyłącz automatyczne aktualizacje statusu wymiany",
-  "disable_bulletin": "Wyłącz biuletyn",
+  "disable": "Wyłączyć",
+  "disable_bulletin": "Wyłącz biuletyn statusu usługi",
   "disable_buy": "Wyłącz akcję kupna",
   "disable_cake_2fa": "Wyłącz Cake 2FA",
   "disable_exchange": "Wyłącz wymianę",
   "disable_exchange_option": "Wyłącz opcję wymiany",
-  "disable_fee_api_warning": "Wyłączając tą opcję, stawki opłaty mogą być w niektórych przypadkach niedokładne, więc możesz przepłacić opłatę za transakcje",
+  "disable_fee_api_warning": "Wyłączając to, stawki opłaty mogą być w niektórych przypadkach niedokładne, więc możesz skończyć się przepłaceniem lub wynagrodzeniem opłat za transakcje",
   "disable_fiat": "Wyłącz waluty FIAT",
   "disable_sell": "Wyłącz akcję sprzedaży",
-  "disable_tor": "Wyłącz Tor",
   "disable_trade_option": "Wyłącz opcję handlu",
   "disableBatteryOptimization": "Wyłącz optymalizację baterii",
   "disableBatteryOptimizationDescription": "Czy chcesz wyłączyć optymalizację baterii, aby synchronizacja tła działała swobodniej i płynnie?",
   "disabled": "Wyłączone",
-  "disconnect_session": "Odłącz sesję",
   "discount": "Zaoszczędź ${value}%",
   "display_settings": "Ustawienia wyświetlania",
   "displayable": "Wyświetlane",
   "do_not_have_enough_gas_asset": "Nie masz wystarczającej ilości ${currency}, aby dokonać transakcji przy bieżących warunkach sieci blockchain. Potrzebujesz więcej ${currency}, aby uiścić opłaty za sieć blockchain, nawet jeśli wysyłasz inny zasób.",
   "do_not_send": "Nie wysyłaj",
-  "do_not_share_warning_text": "NIE udostępniaj ich nikomu innemu, w tym pomocy technicznej.\n\nJeśli to zrobisz twoje środki prawdopodobnie zostaną skradzione!",
+  "do_not_share_warning_text": "NIE udostępniaj ich nikomu innemu, w tym pomocy technicznej.\n\nTwoje środki wtedy prawdopodobnie zostaną skradzione!",
   "do_not_show_me": "Nie pokazuj mi tego ponownie",
   "domain_looks_up": "Wyszukiwanie domen",
-  "domain_mismatch": "Niedopasowanie domeny",
-  "domain_mismatch_description": "Ta strona ma domenę, która nie pasuje do nadawcy tego żądania. Zatwierdzenie może prowadzić do utraty funduszy.",
   "donation_link_details": "Szczegóły linku darowizny",
-  "done": "Zrobione",
   "e_sign_consent": "Zgoda na podpis elektroniczny",
   "edit": "Edytuj",
   "edit_backup_password": "Edytuj hasło kopii zapasowej",
@@ -294,11 +257,10 @@
   "edit_token": "Edytuj token",
   "electrum_address_disclaimer": "Za każdym razem, gdy wykorzystasz adres, dla wiekszej prywatności generujemy nowy, ale poprzednie adresy nadal działają, i moga odbierać środki",
   "email_address": "Adres e-mail",
-  "enable": "Włącz",
-  "enable_builtin_tor": "Włącz wbudowany tor",
+  "enable": "Włączać",
   "enable_mempool_api": "Mempool API dla dokładnych opłat i dat",
   "enable_replace_by_fee": "Włącz wymianę po lewej",
-  "enable_silent_payments_scanning": "Zacznij skanować Silent Payments",
+  "enable_silent_payments_scanning": "Zacznij skanować ciche płatności, aż do osiągnięcia wskazówki",
   "enabled": "Włączone",
   "enter_amount": "Wprowadź kwotę",
   "enter_backup_password": "Wprowadź tutaj hasło kopii zapasowej",
@@ -312,31 +274,29 @@
   "enterTokenID": "Wprowadź identyfikator tokena",
   "enterWalletConnectURI": "Wprowadź identyfikator URI WalletConnect",
   "error": "Błąd",
-  "error_dialog_content": "Ups, mamy błąd.\n\nProszę o przesłanie raportu o błędach do naszego zespołu wsparcia, aby nasz zespół mógł go poprawić.",
+  "error_dialog_content": "Ups, mamy trochę błędu.\n\nProszę o przesłanie raportu o błędach do naszego zespołu wsparcia, aby aplikacja była lepsza.",
   "error_text_account_name": "Nazwa konta może zawierać tylko litery, cyfry\ni musi mieć od 1 do 15 znaków",
   "error_text_address": "Adres musi odpowiadać typowi kryptowaluty",
   "error_text_amount": "Kwota może zawierać tylko liczby",
   "error_text_contact_name": "Nazwa kontaktu nie może zawierać symboli ` , ' \"\ni musi mieć od 1 do 32 znaków ",
-  "error_text_crypto_currency": "Liczba cyfr dziesiętnych\nmusi być mniejsza lub równa 12",
-  "error_text_fiat": "Wartość kwoty nie może przekroczyć dostępnego salda.\nLiczba cyfr dziesiętnych musi być mniejsza lub równa 2",
+  "error_text_crypto_currency": "Liczba cyfr ułamkowych\nmusi być mniejsza lub równa 12",
+  "error_text_fiat": "Wartość kwoty nie może przekroczyć dostępnego salda.\nLiczba cyfr ułamkowych musi być mniejsza lub równa 2",
   "error_text_input_above_maximum_limit": "Kwota jest większa niż maksymalna",
   "error_text_input_below_minimum_limit": "Kwota jest mniejsza niż minimalna",
   "error_text_keys": "Klucze portfela mogą zawierać tylko 64 znaki w systemie szesnastkowym",
   "error_text_limits_loading_failed": "Wymiana dla ${provider} nie została utworzona. Ładowanie limitów nie powiodło się",
   "error_text_maximum_limit": "Wymiana dla ${provider} nie została utworzona. Kwota jest większa niż maksymalna: ${max} ${currency}",
   "error_text_minimal_limit": "Wymiana dla ${provider} nie została utworzona. Kwota jest mniejsza niż minimalna: ${min} ${currency}",
-  "error_text_node_address": "Wpisz adres IPv4",
+  "error_text_node_address": "Wpisz adres iPv4",
   "error_text_node_port": "Port węzła może zawierać tylko liczby od 0 do 65535",
   "error_text_node_proxy_address": "Wprowadź <adres IPv4>:<port>, na przykład 127.0.0.1:9050",
   "error_text_payment_id": "ID może zawierać od 16 do 64 znaków w formacie szesnastkowym",
   "error_text_subaddress_name": "Nazwa podadresu nie może zawierać symboli ` , ' \"\ni musi mieć od 1 do 20 znaków",
   "error_text_template": "Nazwa i adres szablonu nie mogą zawierać ` , ' \" symbolika\ni musi mieć od 1 do 106 znaków",
   "error_text_wallet_name": "Nazwa portfela może zawierać tylko litery, cyfry lub symbole _ - \ni musi mieć od 1 do 33 znaków",
-  "error_text_xmr": "Wartość XMR nie może przekraczać dostępnego salda.\nLiczba cyfr dziesiętnych musi być mniejsza lub równa 12",
-  "error_while_processing": "Wystąpił błąd podczas przeróbki",
+  "error_text_xmr": "Wartość XMR nie może przekraczać dostępnego salda.\nLiczba cyfr ułamkowych musi być mniejsza lub równa 12",
   "errorGettingCredentials": "Niepowodzenie: Błąd podczas uzyskiwania poświadczeń",
   "errorSigningTransaction": "Wystąpił błąd podczas podpisywania transakcji",
-  "establishing_tor_connection": "Ustalenie połączenia TOR",
   "estimated": "Oszacowano",
   "estimated_new_fee": "Szacowana nowa opłata",
   "estimated_receive_amount": "Szacowana kwota otrzymania",
@@ -344,7 +304,7 @@
   "event": "Wydarzenie",
   "events": "Wydarzenia",
   "exchange": "Giełda",
-  "exchange_incorrect_current_wallet_for_xmr": "Jeśli chcesz zamienić XMR z salda Monero, najpierw przejdź na portfel Monero.",
+  "exchange_incorrect_current_wallet_for_xmr": "Jeśli chcesz zamienić XMR z salda Monero Portfer, najpierw przejdź na portfel Monero.",
   "exchange_new_template": "Nowy szablon wymiany",
   "exchange_provider_unsupported": "${providerName} nie jest już obsługiwany!",
   "exchange_result_confirm": "Naciskając Potwierdź, wyślesz ${fetchingLabel} ${from} z twojego portfela ${walletName} na adres podany poniżej. Lub możesz wysłać z zewnętrznego portfela na poniższy adres / kod QR.\n\nNaciśnij Potwierdź, aby kontynuować lub wróć, aby zmienić kwoty.",
@@ -352,15 +312,14 @@
   "exchange_result_write_down_ID": "*Skopiuj lub zanotuj identyfikator transakcji pokazany powyżej.",
   "exchange_result_write_down_trade_id": "Skopiuj lub zanotuj identyfikator transakcji (ID), aby kontynuować.",
   "exchange_sync_alert_content": "Poczekaj, aż portfel zostanie zsynchronizowany",
-  "exchange_trade_result_confirm": "Naciskając wyślij z Cake Wallet, wyślesz ${fetchingLabel} ${from} z portfela o nazwie ${walletName} na adres pokazany poniżej. Lub możesz wysłać z portfela zewnętrznego na adres / qr kod na stronie Wyślij ze strony szczegółów portfela zewnętrznego. \n\n naciśnij którykolwiek z przycisków, aby kontynuować lub wróć, aby zmienić kwoty.",
+  "exchange_trade_result_confirm": "Naciskając wyślij z portfela ciasta, wyślesz ${fetchingLabel} ${from} z portfela o nazwie ${walletName} na adres pokazany poniżej. Lub możesz wysłać z portfela zewnętrznego na adres / qr kod na stronie Wyślij ze strony szczegółów portfela zewnętrznego. \n\n naciśnij którykolwiek z przycisków, aby kontynuować lub wróć, aby zmienić kwoty.",
   "expired": "Przedawniony",
   "expires": "Wygasa",
-  "expiresOn": "Wygasa w dniu",
+  "expiresOn": "Upływa w dniu",
   "expiry_and_validity": "Wygaśnięcie i ważność",
   "export_backup": "Eksportuj kopię zapasową",
-  "export_logs": "Eksportuj dzienniki",
-  "export_outputs": "Eksportuj wyjscia",
-  "extend_session": "Rozszerzyć sesję",
+  "export_logs": "Dzienniki eksportu",
+  "export_outputs": "Wyjścia eksportowe",
   "extra_id": "Dodatkowy ID:",
   "extracted_address_content": "Wysyłasz środki na\n${recipient_name}",
   "failed_authentication": "Nieudane uwierzytelnienie. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "API Walut FIAT",
   "fiat_balance": "Bilans Fiata",
   "field_required": "To pole jest wymagane",
-  "file_saved": "Zapisano plik",
   "fill_code": "Proszę wpisać kod weryfikacyjny który otrzymałeś w wiadomości e-mail",
   "filter_by": "Filtruj według",
   "first_wallet_text": "Świetny portfel na Monero, Bitcoin, Ethereum, Litecoin, i Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Zapomniałem hasła",
   "freeze": "Zamróź",
   "frequently_asked_questions": "Często zadawane pytania",
-  "from": "Z",
   "frozen": "Zamrożone",
   "frozen_balance": "Mrożona równowaga",
   "full_balance": "Pełne saldo",
   "gas_exceeds_allowance": "Gaz wymagany przez transakcję przekracza dodatek.",
-  "gas_price": "Cena gazu",
   "generate_name": "Wygeneruj nazwę",
   "generating_gift_card": "Generowanie karty podarunkowej",
   "generating_transaction": "Generowanie transakcji",
@@ -413,53 +369,51 @@
   "hide_details": "Ukryj szczegóły",
   "high_contrast_theme": "Motyw o wysokim kontraście",
   "home_screen_settings": "Ustawienia ekranu głównego",
-  "how_to_connect": "Jak połączyć się",
   "how_to_use": "Jak używać",
   "how_to_use_card": "Jak korzystać z tej karty?",
   "id": "ID: ",
   "if_you_dont_see_your_device": "Jeśli nie widzisz swojego urządzenia powyżej, upewnij się, że Twoja księga nie śpi i odblokowana!",
-  "ignor": "Ignoruj",
+  "ignor": "Ignorować",
   "import": "Import",
   "importNFTs": "Importuj NFT",
   "in_store": "W Sklepie",
   "incoming": "Przychodzące",
   "incorrect_seed": "Wprowadzony seed jest nieprawidłowy.",
-  "incorrect_seed_option": "Błędna fraza seed. Spróbuj ponownie",
-  "incorrect_seed_option_back": "Błędna fraza seed. Upewnij się, że wraza, którą wprowadzasz jest prawidłowo zapisana i spróbuj ponownie.",
+  "incorrect_seed_option": "Błędny. Spróbuj ponownie",
+  "incorrect_seed_option_back": "Błędny. Upewnij się, że twoje ziarno jest prawidłowo zapisane i spróbuj ponownie.",
   "inputs": "Wejścia",
   "insufficient_funds_for_tx": "Niewystarczające fundusze na skuteczne wykonanie transakcji.",
-  "insufficient_lamport_for_tx": "Nie masz wystarczającej ilości SOL, aby pokryć transakcję i opłatę za transakcję. Dodaj więcej SOL do portfela lub zmniejsz wysyłaną kwotę SOL.",
-  "insufficient_lamports": "Nie masz wystarczającej ilości SOL, aby pokryć transakcję i opłatę za transakcję. Potrzebujesz przynajmniej ${solValueNeeded} SOL. Uprzejmie dodaj więcej SOL do portfela lub zmniejsz wysyłaną kwotę SOL, którą wysyłasz",
-  "insufficientFundsForRentError": "Nie masz wystarczającej ilości SOL, aby pokryć opłatę za transakcję i czynsz za konto. Dodaj więcej SOL do portfela lub zmniejsz kwotę, którą wysyłasz",
-  "insufficientFundsForRentErrorReceiver": "Konto odbiorcy nie ma wystarczającej ilości SOL, aby pokryć czynsz. Poproś odbiorcę o dodanie więcej SOL do ich konta.",
+  "insufficient_lamport_for_tx": "Nie masz wystarczającej ilości SOL, aby pokryć transakcję i opłatę za transakcję. Uprzejmie dodaj więcej sol do portfela lub zmniejsz wysyłaną kwotę SOL.",
+  "insufficient_lamports": "Nie masz wystarczającej ilości SOL, aby pokryć transakcję i opłatę za transakcję. Potrzebujesz przynajmniej ${solValueNeeded} sol. Uprzejmie dodaj więcej sol do portfela lub zmniejsz wysyłaną kwotę SOL, którą wysyłasz",
+  "insufficientFundsForRentError": "Nie masz wystarczającej ilości SOL, aby pokryć opłatę za transakcję i czynsz za konto. Uprzejmie dodaj więcej sol do portfela lub zmniejsz solę, którą wysyłasz",
   "introducing_cake_pay": "Przedstawiamy Cake Pay!",
   "invalid_input": "Nieprawidłowe dane wejściowe",
   "invalid_password": "Nieprawidłowe hasło",
   "invoice_details": "Dane do faktury",
   "is_percentage": "jest",
-  "keys": "Klucze",
+  "keys": "Klawiatura",
   "last_30_days": "Ostatnie 30 dni",
   "learn_more": "Dowiedz się więcej",
-  "ledger_connection_error": "Nie udało się połączyć z twoim portfelem. Proszę spróbuj ponownie.",
-  "ledger_error_device_locked": "Portfel jest zablokowany",
+  "ledger_connection_error": "Nie udało się połączyć z twoją księgą. Proszę spróbuj ponownie.",
+  "ledger_error_device_locked": "Księga jest zamknięta",
   "ledger_error_tx_rejected_by_user": "Transakcja odrzucona na urządzeniu",
-  "ledger_error_wrong_app": "Upewnij się, że uruchamiasz odpowiednią aplikację na swoim portfelu",
-  "ledger_please_enable_bluetooth": "Włącz Bluetooth aby wykryć twój portfel",
-  "legacy": "Legacy",
+  "ledger_error_wrong_app": "Upewnij się, że opisz odpowiednią aplikację na swojej księdze",
+  "ledger_please_enable_bluetooth": "Włącz Bluetooth wykrywanie księgi",
+  "legacy": "Dziedzictwo",
   "light_theme": "Jasny",
   "litecoin_enable_mweb_sync": "Włącz skanowanie MWEB",
   "litecoin_mweb": "MWEB",
   "litecoin_mweb_allow_coins": "Zezwalaj na monety MWEB",
-  "litecoin_mweb_always_scan": "Ustaw MWEB na ciągłe skanowanie",
-  "litecoin_mweb_description": "MWEB to nowy protokół, który oferuje szybsze, tańsze i bardziej prywatne transakcje dla kryptowaluty Litecoin",
-  "litecoin_mweb_dismiss": "Odrzuć",
+  "litecoin_mweb_always_scan": "Ustaw MWEB zawsze skanowanie",
+  "litecoin_mweb_description": "MWEB to nowy protokół, który przynosi szybciej, tańsze i bardziej prywatne transakcje do Litecoin",
+  "litecoin_mweb_dismiss": "Odrzucać",
   "litecoin_mweb_display_card": "Pokaż kartę MWEB",
   "litecoin_mweb_enable": "Włącz MWEB",
   "litecoin_mweb_enable_later": "Możesz ponownie włączyć MWEB w ustawieniach wyświetlania.",
   "litecoin_mweb_logs": "Dzienniki MWEB",
   "litecoin_mweb_node": "Węzeł MWEB",
-  "litecoin_mweb_pegin": "Peg in",
-  "litecoin_mweb_pegout": "Peg out",
+  "litecoin_mweb_pegin": "Kołek",
+  "litecoin_mweb_pegout": "Palikować",
   "litecoin_mweb_scanning": "Skanowanie MWEB",
   "litecoin_mweb_settings": "Ustawienia MWEB",
   "litecoin_mweb_warning": "Korzystanie z MWEB początkowo pobiera ~ 600 MB danych i może potrwać do 30 minut w zależności od prędkości sieci. Te początkowe dane pobierają tylko raz i będą dostępne dla wszystkich portfeli Litecoin",
@@ -471,24 +425,21 @@
   "logout": "Wyloguj",
   "low_fee": "Niska opłata",
   "low_fee_alert": "Obecnie korzystasz z niskiego priorytetu opłaty sieciowej. Może to spowodować długie oczekiwanie, różne stawki lub anulowane transakcje. Zalecamy ustawienie wyższej opłaty, aby zapewnić lepsze wrażenia.",
-  "made_easy": "łatwe",
   "manage_nodes": "Zarządzaj węzłami",
   "manage_pow_nodes": "Zarządzaj węzłami PoW",
   "manage_yats": "Zarządzaj Yats",
   "mark_as_redeemed": "Oznacz jako wykorzystany",
   "market_place": "Rynek",
-  "matrix_green_dark_theme": "Matrix zielony ciemny motyw",
+  "matrix_green_dark_theme": "Matrix Zielony ciemny motyw",
   "max_amount": "Max: ${value}",
   "max_value": "Max: ${value} ${currency}",
   "memo": "Notatka:",
   "message": "Wiadomość",
   "message_verified": "Wiadomość została pomyślnie zweryfikowana",
-  "messages": "Wiadomości",
-  "method": "Metoda",
   "methods": "Metody",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
-  "mint_address": "Adres mintowania",
+  "mint_address": "Adres mięty",
   "minutes_to_pin_code": "${minute} minut",
   "mm": "MM",
   "modify_2fa": "Zmodyfikuj ciasto 2FA",
@@ -497,10 +448,9 @@
   "monero_dark_theme": "Ciemny motyw Monero",
   "monero_light_theme": "Lekki motyw Monero",
   "moonpay_alert_text": "Wartość kwoty musi być większa lub równa ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Wystąpił błąd podczas pobierania NFT. Uprzejmie sprawdź swoje połączenie internetowe i spróbuj ponownie.",
   "more_options": "Więcej opcji",
   "multiple_addresses_detected": "Wykryto wiele adresów",
-  "mweb_confirmed": "Potwierdzone MWEB",
+  "mweb_confirmed": "Potwierdził MWEB",
   "mweb_unconfirmed": "Niepotwierdzone MWEB",
   "name": "Nazwa",
   "nano_current_rep": "Obecny przedstawiciel",
@@ -514,13 +464,12 @@
   "new_subaddress_label_name": "Etykieta nazwy adresu",
   "new_subaddress_title": "Nowy adres",
   "new_template": "Nowy szablon",
-  "new_transactions_notifications": "Wyślij powiadomienia o nowych transakcjach",
   "new_wallet": "Nowy portfel",
   "newConnection": "Nowe połączenie",
   "no_cards_found": "Nie znaleziono żadnych kart",
   "no_extra_detail": "Brak dodatkowych szczegółów",
-  "no_id_needed": "Nie potrzeba dowodu!",
-  "no_id_required": "Nie wymagamy dowodu. Doładuj i wydawaj gdziekolwiek",
+  "no_id_needed": "Nie potrzeba Dowodu!",
+  "no_id_required": "Nie wymagamy Dowodu. Doładuj i wydawaj gdziekolwiek",
   "no_providers_available": "Brak dostępnych dostawców",
   "no_relay_on_domain": "Brak przekaźnika dla domeny użytkownika lub przekaźnik jest niedostępny. Wybierz przekaźnik, którego chcesz użyć.",
   "no_relays": "Żadnych przekaźników",
@@ -539,15 +488,14 @@
   "normal": "Normalna",
   "note_optional": "Notatka (opcjonalnie)",
   "note_tap_to_change": "Notatka (dotknij, aby zmienić)",
-  "notification_permission_denied": "Zezwolenie na powiadomienie zostało odrzucone, prosimy ręcznie włączyć go w ustawieniach",
   "nullURIError": "URI ma wartość zerową",
   "offer_expires_in": "Oferta wygasa za ",
   "offline": "Offline",
   "ok": "Ok",
   "old_fee": "Stara opłata",
-  "onion_link": "Link .onion",
+  "onion_link": "Łącznik cebulowy",
   "online": "online",
-  "onramper_option_description": "Szybko kup kryptowaluty z wieloma metodami płatności. Dostępne w większości krajów. Ceny i opłaty różnią się.",
+  "onramper_option_description": "Szybko kup kryptowaluty z wieloma metodami płatności. Dostępne w większości krajów. Spready i opłaty różnią się.",
   "open_gift_card": "Otwórz kartę podarunkową",
   "open_wallet": "Otwarty portfel",
   "optional_description": "Opcjonalny opis",
@@ -566,25 +514,13 @@
   "overshot": "Przesadzanie",
   "overwrite_amount": "Nadpisz ilość",
   "pairingInvalidEvent": "Nieprawidłowe zdarzenie parowania",
-  "passphrase": "Hasło frazy seed (opcjonalnie)",
-  "passphrases_doesnt_match": "Hasła frazy seed nie pasują, spróbuj ponownie",
+  "passphrase": "PassPhraza (opcjonalnie)",
+  "passphrases_doesnt_match": "Passfrazy nie pasują, spróbuj ponownie",
   "password": "Hasło",
   "paste": "Wklej",
   "pause_wallet_creation": "Możliwość utworzenia Portfela Haven jest obecnie wstrzymana.",
-  "payjoin_card_content": "Payjoin to nowa funkcja wymagająca prywatności i oszczędzania opłat w Bitcoin.",
-  "payjoin_details": "Szczegóły Payjoin",
-  "payjoin_enabled": "Payjoin włączony",
-  "payjoin_enabling_popup_content": "Możesz przełączać Payjoin w menu → Prywatność → Użyj Payjoin, aby włączyć lub wyłączyć później.",
-  "payjoin_enabling_popup_title": "Włączanie Payjoin",
-  "payjoin_request_awaiting_tx": "Oczekiwanie na transakcję",
-  "payjoin_request_in_progress": "W toku",
-  "payjoin_unavailable": "Payjoin niedostępny",
-  "payjoin_unavailable_sheet_content": "Otrzymanie transakcji Payjoin wymaga przygotowania Bitcoin do użycia. \\ N \\ NAS, ponieważ portfel ma fundusze, Payjoin zostanie automatycznie włączony.",
-  "payjoin_unavailable_sheet_title": "Dlaczego Payjoin jest niedostępny?",
   "payment_id": "ID Płatności: ",
-  "payment_made_easy": "Płatności są łatwe",
   "payment_was_received": "Twoja płatność została otrzymana.",
-  "payments": "Płatności",
   "pending": " (w oczekiwaniu)",
   "percentageOf": "z ${amount}",
   "pin_at_top": "przypnij ${token} na górze",
@@ -594,21 +530,20 @@
   "placeholder_transactions": "Twoje transakcje zostaną wyświetlone tutaj",
   "please_choose_one": "Wybierz jeden",
   "please_fill_totp": "Wpisz 8-cyfrowy kod znajdujący się na drugim urządzeniu",
-  "please_make_selection": "Wybierz opcję, aby utworzyć lub przywrócić swój portfel.",
+  "please_make_selection": "Wybierz poniżej, aby utworzyć lub przywrócić swój portfel.",
   "please_reference_document": "Proszę odwołać się do poniższych dokumentów, aby uzyskać więcej informacji.",
   "please_select": "Proszę wybrać:",
   "please_select_backup_file": "Wybierz plik kopii zapasowej i wprowadź hasło.",
   "please_try_to_connect_to_another_node": "Spróbuj połączyć się z innym węzłem",
   "please_wait": "Proszę czekać",
   "polygonscan_history": "Historia PolygonScan",
-  "potential_scam": "Potencjalne oszustwo",
   "powered_by": "Obsługiwane przez ${title}",
   "pre_seed_button_text": "Rozumiem. Pokaż mi moją fraze seed",
-  "pre_seed_description": "Na następnej stronie zobaczysz serię słów. To jest twoje wyjątkowe i prywatne ziarno i jest to jedyny sposób na odzyskanie portfela w przypadku utraty lub awarii. Twoim obowiązkiem jest zapisanie go i przechowywanie w bezpiecznym miejscu poza aplikacją do portfela ciasta.",
-  "pre_seed_title": "WAŻNE",
+  "pre_seed_description": "Na następnej stronie zobaczysz serię ${words} słów. To jest Twoja unikalna i prywatna fraza seed i jest to JEDYNY sposób na odzyskanie portfela w przypadku utraty lub awarii telefonu. Twoim obowiązkiem jest zapisanie go i przechowywanie w bezpiecznym miejscu (np. na kartce w SEJFIE).",
+  "pre_seed_title": "WAŻNY",
   "prepaid_cards": "Karty przedpłacone",
   "prevent_screenshots": "Zapobiegaj zrzutom ekranu i nagrywaniu ekranu",
-  "primary_address": "Adres główny",
+  "primary_address": "Adres podstawowy",
   "privacy": "Prywatność",
   "privacy_policy": "Polityka prywatności",
   "privacy_settings": "Ustawienia prywatności",
@@ -617,12 +552,11 @@
   "proceed_on_device": "Kontynuuj swoje urządzenie",
   "proceed_on_device_description": "Postępuj zgodnie z instrukcjami wyświetlonymi w portfelu sprzętowym",
   "processing": "Przetwarzanie",
-  "processing_signed_tx": "Przetwarzanie podpisanej transakcji",
   "profile": "Profil",
-  "provider_error": "${provider} błąd",
+  "provider_error": "${provider} pomyłka",
   "public_key": "Klucz publiczny",
   "purchase_gift_card": "Kup kartę podarunkową",
-  "purple_dark_theme": "Ciemy Fiolet",
+  "purple_dark_theme": "Purple Dark Temat",
   "qr_fullscreen": "Dotknij, aby otworzyć pełnoekranowy kod QR",
   "qr_payment_amount": "Ten kod QR zawiera kwotę do zapłaty. Czy chcesz nadpisać obecną wartość?",
   "quantity": "Ilość",
@@ -633,14 +567,14 @@
   "received": "Odebrane",
   "recipient_address": "Adres odbiorcy",
   "reconnect": "Połącz ponownie",
-  "reconnect_alert_text": "Czy na pewno chcesz się ponownie połączyć?",
+  "reconnect_alert_text": "Czy na pewno ponownie się ponownie połączysz?",
   "reconnect_your_hardware_wallet": "Ponownie podłącz portfel sprzętowy",
   "reconnection": "Ponowne łączenie",
   "red_dark_theme": "Czerwony Mroczny motyw",
-  "red_light_theme": "Cezrwony Jasny motyw",
-  "redeemed": "wydane",
+  "red_light_theme": "Motyw czerwony światło",
+  "redeemed": "wykupione",
   "refund_address": "Adres do zwrotu",
-  "reject": "Odrzuć",
+  "reject": "Odrzucić",
   "remaining": "pozostałe",
   "remove": "Usuń",
   "remove_node": "Usuń węzeł",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Twój przedstawiciel nie wydaje się mieć dobrej opinii. Stuknij tutaj, aby wybrać nowy",
   "repeat_wallet_password": "Powtórz hasło portfela",
   "repeated_password_is_incorrect": "Powtarzane hasło jest nieprawidłowe. Powtórz ponownie hasło portfela.",
-  "requested": "Wymagany",
   "require_for_adding_contacts": "Wymagane do dodania kontaktów",
   "require_for_all_security_and_backup_settings": "Wymagaj dla wszystkich ustawień zabezpieczeń i kopii zapasowych",
   "require_for_assessing_wallet": "Wymagaj dostępu do portfela",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Wymagaj wysyłania do portfeli wewnętrznych",
   "require_for_sends_to_non_contacts": "Wymagaj wysyłania do osób niekontaktowych",
   "require_pin_after": "Wymagaj kodu PIN po",
-  "required_passphrase": "Fraza",
   "rescan": "Skanuj ponownie",
   "resend_code": "Wyślij go ponownie",
   "reset": "Wyczyść",
   "reset_password": "Zresetuj hasło",
-  "restore": "Przywrócić",
   "restore_active_seed": "Aktywne seedy",
   "restore_address": "Adres",
   "restore_bitcoin_description_from_keys": "Przywróć swój portfel z klucza prywatnego",
@@ -676,21 +607,21 @@
   "restore_description_from_hardware_wallet": "Przywróć z portfela sprzętowego księgi",
   "restore_description_from_keys": "Przywróć swój portfel z kluczy prywatnych",
   "restore_description_from_seed": "Przywróć swój portfel z 25 lub 13-słownej frazy seed",
-  "restore_description_from_seed_keys": "Odzyskaj swój portfel z frazy seed / kluczy, które zapisałeś w bezpiecznym miejscu",
+  "restore_description_from_seed_keys": "Odzyskaj swój portfel z seedów / kluczy, które zapisałeś w bezpiecznym miejscu",
   "restore_existing_wallet": "Przywróć istniejący portfel",
   "restore_from_date_or_blockheight": "Wprowadź datę na kilka dni przed utworzeniem tego portfela, lub jeśli znasz wysokość bloku, wprowadź go zamiast daty",
   "restore_from_seed_placeholder": "Wpisz lub wklej tutaj swoją frazę seed",
   "restore_new_seed": "Nowy seed",
-  "restore_next": "Następny",
+  "restore_next": "Kolejny",
   "restore_recover": "Przywróć",
   "restore_restore_wallet": "Przywróć portfel",
-  "restore_seed_keys_restore": "Przywracanie z frazy seed / kluczy",
+  "restore_seed_keys_restore": "Przywracanie seedów / kluczy",
   "restore_spend_key_private": "Podaj prywatny klucz wglądu (view key)",
   "restore_title_from_backup": "Przywróć z pliku kopii zapasowej",
   "restore_title_from_hardware_wallet": "Przywróć z portfela sprzętowego",
   "restore_title_from_keys": "Przywróć z kluczy",
-  "restore_title_from_seed": "Przywróć z frazy seed",
-  "restore_title_from_seed_keys": "Przywróć z frazy seed / kluczy",
+  "restore_title_from_seed": "Przywróć z seedów",
+  "restore_title_from_seed_keys": "Przywróć z seedów / kluczy",
   "restore_view_key_private": "Podaj klucz prywatny",
   "restore_wallet": "Przywróć portfel",
   "restore_wallet_name": "Nazwa portfela",
@@ -713,10 +644,7 @@
   "search_language": "Wyszukaj język",
   "second_intro_content": "Twój Yat to jeden unikalny adres emoji, który zastępuje wszystkie Twoje długie adresy szesnastkowe dla wszystkich Twoich walut.",
   "second_intro_title": "Jeden adres emoji, aby zarzadzać wszystkimi walutami",
-  "security": "Bezpieczeństwo",
   "security_and_backup": "Bezpieczeństwo i kopia zapasowa",
-  "security_risk": "Ryzyko bezpieczeństwa",
-  "security_risk_description": "Ta domena jest oznaczona jako niebezpieczna przez wielu dostawców bezpieczeństwa. Odejdź natychmiast, aby chronić swoje aktywa.",
   "seed_alert_back": "Wróć",
   "seed_alert_content": "Fraza Seed to jedyny sposób na odzyskanie portfela. Zapisałeś ją?",
   "seed_alert_title": "Uwaga",
@@ -751,6 +679,9 @@
   "seedtype": "Sedtype",
   "seedtype_alert_content": "Dzielenie się nasionami z innymi portfelami jest możliwe tylko z BIP39 sededType.",
   "seedtype_alert_title": "Ustanowienie typu sedype",
+  "seedtype_legacy": "Dziedzictwo (25 słów)",
+  "seedtype_polyseed": "Poliqueed (16 słów)",
+  "seedtype_wownero": "Wowero (14 słów)",
   "select_backup_file": "Wybierz plik kopii zapasowej",
   "select_buy_provider_notice": "Wybierz powyższe dostawcę zakupu. Możesz pominąć ten ekran, ustawiając domyślnego dostawcę zakupu w ustawieniach aplikacji.",
   "select_destination": "Wybierz miejsce docelowe dla pliku kopii zapasowej.",
@@ -770,11 +701,10 @@
   "send_error_minimum_value": "Minimalna wartość to 0,01",
   "send_estimated_fee": "Szacowana opłata:",
   "send_fee": "Opłata:",
-  "send_from_cake_wallet": "Wyślij z Cake Wallet",
+  "send_from_cake_wallet": "Wyślij z portfela ciasta",
   "send_from_external_wallet": "Wyślij z portfela zewnętrznego",
   "send_name": "Imię",
   "send_new": "Nowy",
-  "send_payjoin": "Wyślij Payjoin",
   "send_payment_id": "Identyfikator płatności (opcjonalny)",
   "send_priority": "Obecnie opłata ustalona jest na ${transactionPriority} priorytet.\nPriorytet transakcji można zmienić w ustawieniach",
   "send_sending": "Wysyłanie...",
@@ -814,27 +744,25 @@
   "settings_trades": "Transakcje",
   "settings_transactions": "Transakcje",
   "settings_wallets": "Portfele",
-  "setup_2fa": "Skonfiguruj Cake 2FA",
+  "setup_2fa": "Skonfiguruj ciasto 2FA",
   "setup_2fa_text": "Cake 2FA działa przy użyciu TOTP jako drugiego czynnika uwierzytelniającego.\n\nTOTP Cake 2FA wymaga obsługi SHA-512 i 8 cyfr; zapewnia to większe bezpieczeństwo. Więcej informacji i obsługiwane aplikacje znajdziesz w przewodniku.",
   "setup_pin": "Ustaw PIN",
   "setup_successful": "Twój kod PIN został pomyślnie skonfigurowany!",
   "setup_totp_recommended": "Skonfiguruj TOTP",
-  "setup_warning_2fa_text": "Będziesz musiał przywrócić swój portfel z frazy seed.\n\nWsparcie Cake nie będzie w stanie Ci pomóc, jeśli utracisz dostęp do swoich kluczy 2FA lub frazy seed.\nCake 2FA to drugie uwierzytelnienie niektórych działań w portfelu. Przed użyciem Cake 2FA zalecamy zapoznanie się z instrukcją. Cake 2FA nie jest tak bezpieczne jak przechowywanie w zimnym lub sprzętowym portfelu.\n\nJeśli utracisz dostęp do aplikacji 2FA lub kluczy TOTP, Utracisz dostęp do tego portfela.",
+  "setup_warning_2fa_text": "Będziesz musiał przywrócić swój portfel z nasion mnemonicznych.\n\nWsparcie Cake nie będzie w stanie Ci pomóc, jeśli utracisz dostęp do swoich nasion 2FA lub mnemoników.\nCake 2FA to drugie uwierzytelnienie niektórych działań w portfelu. Przed użyciem Cake 2FA zalecamy zapoznanie się z instrukcją.NIE jest tak bezpieczne jak przechowywanie w chłodni.\n\nJeśli utracisz dostęp do aplikacji 2FA lub kluczy TOTP, UTRAcisz dostęp do tego portfela. ",
   "setup_your_debit_card": "Skonfiguruj swoją kartę debetową",
   "share": "Udział",
   "share_address": "Udostępnij adres",
-  "shared_seed_wallet_groups": "Grupy portfeli",
+  "shared_seed_wallet_groups": "Wspólne grupy portfeli nasion",
   "show": "Pokazywać",
   "show_address_book_popup": "Pokaż okienko książki adresowej",
-  "show_balance": "Przytrzymaj, aby pokazać saldo",
-  "show_balance_toast": "Przytrzymaj i puść, aby ukryć lub pokazać saldo",
+  "show_balance": "Długa prasa, aby pokazać równowagę",
+  "show_balance_toast": "Długa naciśnij, aby ukryć lub pokazać równowagę",
   "show_details": "Pokaż szczegóły",
   "show_keys": "Pokaż seed/klucze",
   "show_market_place": "Pokaż rynek",
-  "show_seed": "Pokaż frazę seed",
-  "sign_all": "Podpisz wszystkie",
+  "show_seed": "Pokaż frazy seed",
   "sign_message": "Podpisuj wiadomość",
-  "sign_one": "Podpisz jeden",
   "sign_up": "Zarejestruj się",
   "sign_verify_message": "Podpisz lub zweryfikuj wiadomość",
   "sign_verify_message_sub": "Podpisz lub zweryfikuj wiadomość za pomocą klucza prywatnego",
@@ -843,9 +771,9 @@
   "signature_invalid_error": "Podpis nie jest ważny dla podanej wiadomości",
   "signTransaction": "Podpisz transakcję",
   "signup_for_card_accept_terms": "Zarejestruj się, aby otrzymać kartę i zaakceptuj warunki.",
-  "silent_payment": "Silent Payment",
-  "silent_payments": "Silent Payments",
-  "silent_payments_always_scan": "Włącz ciągłe skanowanie Silent Payments",
+  "silent_payment": "Cicha płatność",
+  "silent_payments": "Ciche płatności",
+  "silent_payments_always_scan": "Ustaw ciche płatności zawsze skanowanie",
   "silent_payments_disclaimer": "Nowe adresy nie są nową tożsamością. Jest to ponowne wykorzystanie istniejącej tożsamości z inną etykietą.",
   "silent_payments_display_card": "Pokaż kartę Silent Payments",
   "silent_payments_scan_from_date": "Skanuj z daty",
@@ -854,7 +782,7 @@
   "silent_payments_scanned_tip": "Zeskanowany do napiwku! (${tip})",
   "silent_payments_scanning": "Skanowanie cichych płatności",
   "silent_payments_settings": "Ustawienia o cichej płatności",
-  "single_seed_wallets_group": "Pojedyncze portfele",
+  "single_seed_wallets_group": "Pojedyncze portfele nasion",
   "slidable": "Przesuwne",
   "solana_create_associated_token_account_exception": "Błąd tworzenia powiązanego konta tokena dla adresu wpływającego.",
   "solana_no_associated_token_account_exception": "Nie ma powiązanego konta tokena dla tego adresu.",
@@ -863,23 +791,19 @@
   "sort_by": "Sortuj według",
   "spend_key_private": "Klucz prywatny",
   "spend_key_public": "Klucz publiczny",
-  "starting_tor_proxy": "Rozpoczęcie proxy TOR",
   "status": "Status: ",
-  "step": "Krok",
   "string_default": "Domyślny",
   "subaddress_title": "Lista podadresów",
   "subaddresses": "Podadresy",
   "submit_request": "Złóż wniosek",
-  "success": "Sukces",
   "successful": "Udany",
   "support_description_guides": "Dokumentacja i wsparcie dla typowych problemów",
   "support_description_live_chat": "Darmowe i szybkie! Do pomocy są dostępni przeszkoleni przedstawiciele wsparcia",
   "support_description_other_links": "Dołącz do naszych społeczności lub skontaktuj się z nami naszymi partnerami za pomocą innych metod",
-  "support_title_guides": "Dokumenty Cake Wallet",
+  "support_title_guides": "Dokumenty portfela ciasta",
   "support_title_live_chat": "Wsparcie na żywo",
   "support_title_other_links": "Inne linki wsparcia",
-  "supported": "Utrzymany",
-  "swap": "Wymiana",
+  "swap": "Zamieniać",
   "sweeping_wallet": "Zamiatanie portfela",
   "sweeping_wallet_alert": "To nie powinno zająć dużo czasu. NIE WYCHODŹ Z TEGO EKRANU, W PRZECIWNYM WYPADKU MOŻE ZOSTAĆ UTRACONA ŚRODKI",
   "switchToETHWallet": "Przejdź na portfel Ethereum i spróbuj ponownie",
@@ -898,30 +822,25 @@
   "sync_status_syncronizing": "SYNCHRONIZACJA",
   "sync_status_timed_out": "PRZEKROCZONO LIMIT CZASU",
   "sync_status_unsupported": "Nieobsługiwany węzeł",
-  "synchronizing": "Synchronizacja",
-  "syncing_wallet_alert_content": "Twoje saldo i lista transakcji mogą nie być kompletne, dopóki u góry nie pojawi się napis „ZSYNCHRONIZOWANY”. Kliknij/stuknij, aby dowiedzieć się więcej.",
+  "syncing_wallet_alert_content": "Twoje saldo i lista transakcji mogą nie być kompletne, dopóki u góry nie pojawi się napis „SYNCHRONIZOWANY”. Kliknij/stuknij, aby dowiedzieć się więcej.",
   "syncing_wallet_alert_title": "Twój portfel się synchronizuje",
   "template": "Szablon",
   "template_name": "Nazwa szablonu",
   "testnet_coins_no_value": "Monety testowe nie mają wartości",
-  "third_intro_content": "Yats działają również poza Cake Wallet. Każdy adres portfela na ziemi można zamienić na Yat!",
+  "third_intro_content": "Yats mieszkają również poza Cake Wallet. Każdy adres portfela na ziemi można zastąpić Yat!",
   "third_intro_title": "Yat ładnie bawi się z innymi",
   "this_pair_is_not_supported_warning": "Ta para nie jest obsługiwana z aktualnie wybraną wymianą. Wybierz kolejną wymianę.",
   "thorchain_contract_address_not_supported": "Thorchain nie wspiera wysyłania na adres umowy",
   "thorchain_taproot_address_not_supported": "Dostawca Thorchain nie obsługuje adresów TAPROOT. Zmień adres lub wybierz innego dostawcę.",
   "time": "${minutes}m ${seconds}s",
-  "tip": "tip:",
-  "to": "Do",
+  "tip": "wskazówka:",
   "today": "Dzisiaj",
-  "token_already_exists": "Token już istnieje",
   "token_contract_address": "Adres kontraktu tokena",
   "token_decimal": "Token dziesiętny",
   "token_name": "Nazwa tokena, np.: Tether",
   "token_symbol": "Symbol tokena np.: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Nie zapomnij określić identyfikatora notatki podczas wysyłania transakcji TON dla wymiany",
-  "tor_connection": "Połączenie przez Tor",
-  "tor_connection_timeout": "Tor Connection Timeout",
+  "tor_connection": "Połączenie Torem",
   "tor_only": "Tylko sieć Tor",
   "total": "Całkowity",
   "total_saving": "Całkowite oszczędności",
@@ -947,19 +866,19 @@
   "trade_is_powered_by": "Ta wymiana jest obsługiwana przez ${provider}",
   "trade_not_created": "Wymiana nie została utworzona",
   "trade_not_found": "Nie znaleziono transakcji.",
-  "trade_state_btc_sent": "Wysłano",
-  "trade_state_complete": "Ukończono",
+  "trade_state_btc_sent": "Wysłanie",
+  "trade_state_complete": "Ukończona",
   "trade_state_confirming": "Potwierdzanie",
-  "trade_state_created": "Stworzono",
-  "trade_state_finished": "Zakończono",
-  "trade_state_paid": "Opłacono",
+  "trade_state_created": "Stworzona",
+  "trade_state_finished": "Zakończona",
+  "trade_state_paid": "Opłacona",
   "trade_state_paid_unconfirmed": "Transakcja niepotwierdzona",
   "trade_state_pending": "Oczekująca",
   "trade_state_timeout": "Koniec czasu",
   "trade_state_to_be_created": "Została stworzona",
   "trade_state_traded": "Wymienione",
   "trade_state_trading": "Wymiana",
-  "trade_state_underpaid": "Niedopłacona",
+  "trade_state_underpaid": "Niedopłacone",
   "trade_state_unpaid": "Nie opłacona",
   "trades": "Transakcje",
   "transaction_cost": "Koszt transakcji",
@@ -977,23 +896,21 @@
   "transaction_priority_fastest": "Najszybsza",
   "transaction_priority_medium": "Średnia",
   "transaction_priority_regular": "Regularna",
-  "transaction_priority_slow": "Wolna (Zalecane)",
+  "transaction_priority_slow": "Wolna(Zalecane)",
   "transaction_sent": "Transakcja wysłana!",
   "transaction_sent_notice": "Jeśli ekran nie zmieni się po 1 minucie, sprawdź eksplorator bloków i swój e-mail.",
   "transactions": "Transakcje",
   "transactions_by_date": "Transakcje według daty",
-  "transport_type": "Typ transportu",
   "trongrid_history": "Historia Trongrida",
   "trusted": "Zaufany",
-  "try_again": "Spróbuj ponownie",
-  "tx_commit_exception_no_dust_on_change": "Transakcja została odrzucana z tą kwotą. Za pomocą tych monet możesz wysłać ${min} bez reszty lub ${max}, które zwrócą resztę.",
+  "tx_commit_exception_no_dust_on_change": "Transakcja jest odrzucana z tą kwotą. Za pomocą tych monet możesz wysłać ${min} bez zmiany lub ${max}, które zwraca zmianę.",
   "tx_commit_failed": "Zatwierdzenie transakcji nie powiodło się. Skontaktuj się z obsługą.",
   "tx_commit_failed_no_peers": "Transakcja nie była transmitowana, spróbuj ponownie za około sekundę",
   "tx_invalid_input": "Używasz niewłaściwego typu wejściowego dla tego rodzaju płatności",
   "tx_no_dust_exception": "Transakcja jest odrzucana przez wysyłanie zbyt małej ilości. Spróbuj zwiększyć kwotę.",
   "tx_not_enough_inputs_exception": "Za mało dostępnych danych wejściowych. Wybierz więcej pod kontrolą monet",
   "tx_rejected_bip68_final": "Transakcja niepotwierdza wejściów i nie zastąpiła opłaty.",
-  "tx_rejected_dust_change": "Transakcja odrzucona według reguł sieciowych, niska ilość zmiany (pył). Spróbuj wysłać całość lub zmniejszyć kwotę.",
+  "tx_rejected_dust_change": "Transakcja odrzucona według reguł sieciowych, niska ilość zmiany (kurz). Spróbuj wysłać całość lub zmniejszyć kwotę.",
   "tx_rejected_dust_output": "Transakcja odrzucona według reguł sieciowych, niskiej ilości wyjściowej (pyłu). Zwiększ kwotę.",
   "tx_rejected_dust_output_send_all": "Transakcja odrzucona według reguł sieciowych, niskiej ilości wyjściowej (pyłu). Sprawdź saldo monet wybranych pod kontrolą monet.",
   "tx_rejected_vout_negative": "Za mało salda, aby zapłacić za opłaty tej transakcji. Sprawdź saldo monet pod kontrolą monet.",
@@ -1004,27 +921,23 @@
   "unavailable_balance_description": "Niedostępne saldo: Suma ta obejmuje środki zablokowane w transakcjach oczekujących oraz te, które aktywnie zamroziłeś w ustawieniach kontroli monet. Zablokowane salda staną się dostępne po zakończeniu odpowiednich transakcji, natomiast zamrożone salda pozostaną niedostępne dla transakcji, dopóki nie zdecydujesz się ich odblokować.",
   "unconfirmed": "Niepotwierdzone saldo",
   "understand": "Rozumiem",
-  "unlock": "Odblokuj",
-  "unmatched_currencies": "Waluta Twojego obecnego portfela nie zgadza się z walutą zeskanowanego kodu QR",
+  "unlock": "Odblokować",
+  "unmatched_currencies": "Waluta Twojego obecnego portfela nie zgadza się z waluctą zeskanowanego kodu QR",
   "unrestricted_background_service": "Nieograniczona usługa w tle",
   "unrestricted_background_service_notice": "Aby włączyć synchronizację tła, musisz włączyć nieograniczoną usługę w tle",
   "unspent_change": "Zmiana",
   "unspent_coins_details_title": "Szczegóły niewydanych monet",
   "unspent_coins_title": "Niewydane monety",
   "unsupported_asset": "Nie obsługujemy tego działania w przypadku tego zasobu. Utwórz lub przełącz się na portfel obsługiwanego typu aktywów.",
-  "update_session": "Aktualizacja sesji",
-  "uptime": "Czas online",
+  "uptime": "Czas aktu",
   "upto": "do ${value}",
   "usb": "USB",
   "use": "Użyj ",
   "use_card_info_three": "Użyj cyfrowej karty online lub za pomocą zbliżeniowych metod płatności.",
   "use_card_info_two": "Środki są przeliczane na USD, gdy są przechowywane na koncie przedpłaconym, a nie w walutach cyfrowych.",
-  "use_device_theme": "Użyj motywu urządzenia",
-  "use_payjoin": "Używać Payjoin",
   "use_ssl": "Użyj SSL",
   "use_suggested": "Użyj sugerowane",
   "use_testnet": "Użyj testne",
-  "user_rejected_method": "Metoda odrzucona użytkownika",
   "value": "Wartość",
   "value_type": "Typ wartości",
   "variable_pair_not_supported": "Ta para zmiennych nie jest obsługiwana na wybranych giełdach",
@@ -1051,7 +964,6 @@
   "wallet_group_description_view_seed": "Zawsze możesz ponownie zobaczyć to ziarno pod",
   "wallet_group_empty_state_text_one": "Wygląda na to, że nie masz żadnych kompatybilnych grup portfeli !\n\n Tap",
   "wallet_group_empty_state_text_two": "poniżej, aby zrobić nowy.",
-  "wallet_has_passphrase": "Ten portfel ma panie",
   "wallet_keys": "Klucze portfela",
   "wallet_list_create_new_wallet": "Utwórz nowy portfel",
   "wallet_list_edit_group_name": "Edytuj nazwę grupy",
@@ -1068,20 +980,19 @@
   "wallet_name": "Nazwa portfela",
   "wallet_name_exists": "Portfel o tej nazwie już istnieje",
   "wallet_password_is_empty": "Hasło portfela jest puste. Hasło portfela nie powinno być puste",
-  "wallet_recovery_height": "Wysokość odzyskiwania",
+  "wallet_recovery_height": "Wysokość odzysku",
   "wallet_restoration_store_incorrect_seed_length": "Nieprawidłowa długość frazy seed",
   "wallet_seed": "Seed portfela",
   "wallet_seed_legacy": "Dziedziczne ziarno portfela",
   "wallet_store_monero_wallet": "Portfel Monero",
-  "walletConnect": "WalletConnect",
+  "walletConnect": "PortfelPołącz",
   "wallets": "Portfele",
   "warning": "Ostrzeżenie",
-  "welcome": "Powitanie",
-  "welcome_subtitle_new_wallet": "Jeśli chcesz zacząć od nowa, dotknij Utwórz nowy portfel poniżej.",
+  "welcome": "Witamy w",
+  "welcome_subtitle_new_wallet": "Jeśli chcesz zacząć od nowa, dotknij Utwórz nowy portfel poniżej, a będziesz na wyścigach.",
   "welcome_subtitle_restore_wallet": "Jeśli masz istniejący portfel, który chcesz wnieść do ciasta, po prostu wybierz przywróć istniejący portfel, a my przeprowadzimy Cię przez proces.",
   "welcome_to_cakepay": "Witamy w Cake Pay!",
-  "what_is_payjoin": "Co to jest PayJoin ?",
-  "what_is_silent_payments": "Co to Silent Payments?",
+  "what_is_silent_payments": "Co to są ciche płatności?",
   "widgets_address": "Adres",
   "widgets_or": "lub",
   "widgets_restore_from_blockheight": "Przywróć z wysokości bloku",
@@ -1092,7 +1003,7 @@
   "xlm_extra_info": "Nie zapomnij podać dodatkowego identyfikatora (memo) podczas wysyłania transakcji XLM do wymiany",
   "xmr_available_balance": "Dostępne środki",
   "xmr_full_balance": "Pełne saldo",
-  "xmr_hidden": "Ukryte",
+  "xmr_hidden": "Ukryty",
   "xmr_to_error": "Błąd XMR.TO",
   "xmr_to_error_description": "Nieprawidłowa kwota. Maksymalny limit to 8 cyfr po przecinku",
   "xrp_extra_info": "Nie zapomnij podać tagu docelowego podczas wysyłania transakcji XRP do wymiany",
@@ -1110,7 +1021,5 @@
   "you_will_get": "Konwertuj na",
   "you_will_receive_estimated_amount": "Otrzymasz(oszacowane )",
   "you_will_send": "Konwertuj z",
-  "youCanGoBackToYourDapp": "Możesz teraz wrócić do swojego dapp",
-  "yy": "RR",
-  "tor_experimental": "Jest to funkcja eksperymentalna. Nie wszystkie połączenia wykonane z Cake Wallet korzystają z Tor, niektóre połączenia mogą korzystać z Clearnet, aby w pełni przekierować ruch skorzystaj z Tor w trybie VPN."
+  "yy": "RR"
 }
\ No newline at end of file
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index c2f0f209c..2fb3bac5f 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Adicionar fundos pré-pagos aos cartões (até ${value})",
   "add_new_node": "Adicionar novo nó",
   "add_new_word": "Adicionar nova palavra",
-  "add_passphrase": "Adicione a senha",
-  "add_passphrase_warning_text": "Digite apenas uma senha se você usou uma para esta carteira no passado. Se você inserir a senha errada ou não já usou uma senha antes nesta carteira, não verá nenhum dos fundos ou histórico existentes.",
   "add_receiver": "Adicione outro receptor (opcional)",
   "add_secret_code": "Ou adicione este código secreto a um aplicativo autenticador",
   "add_tip": "Adicionar Dica",
   "add_token_disclaimer_check": "Confirmei o endereço e as informações do contrato de token usando uma fonte confiável. Adicionar informações maliciosas ou incorretas pode resultar em perda de fundos.",
   "add_token_warning": "Não edite ou adicione tokens de acordo com as instruções dos golpistas.\nSempre confirme os endereços de token com fontes confiáveis!",
   "add_value": "Adicionar valor",
-  "added_message_for_ata_error": "Por favor, certifique -se de ter um equilíbrio SOL suficiente para concluir sua transação.",
   "address": "Endereço",
   "address_book": "Livro de endereços",
   "address_book_menu": "Livro de endereços",
@@ -55,8 +52,6 @@
   "anonpay_description": "Gere ${type}. O destinatário pode ${method} com qualquer criptomoeda suportada e você receberá fundos nesta carteira.",
   "apk_update": "Atualização de APK",
   "approve": "Aprovar",
-  "approve_request": "Aprovar solicitação",
-  "approve_tokens": "Aprovar tokens",
   "arrive_in_this_address": "${currency} ${tag}chegará neste endereço",
   "ascending": "Ascendente",
   "ask_each_time": "Pergunte cada vez",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Aguardando confirmação de pagamento",
   "background_sync": "Sincronização de fundo",
   "background_sync_mode": "Modo de sincronização em segundo plano",
-  "background_sync_on_battery_low": "Sincronizar com bateria baixa",
-  "background_sync_on_charging": "Sincronize apenas ao carregar",
-  "background_sync_on_device_idle": "Sincronize apenas quando o dispositivo não está sendo usado",
-  "background_sync_on_unmetered_network": "Requer rede não meta",
   "backup": "Cópia de segurança",
   "backup_file": "Arquivo de backup",
   "backup_password": "Senha de backup",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Compre Bitcoin",
   "buy_now": "Comprar agora",
   "buy_provider_unavailable": "Provedor atualmente indisponível.",
-  "buy_sell_pair_is_not_supported_warning": "Este par de moeda não é suportado por nenhum provedor para o método de pagamento selecionado. Escolha um par diferente ou tente alterar o método de pagamento.",
   "buy_with": "Compre com",
   "by_cake_pay": "por Cake Pay",
   "cake_2fa_preset": "Predefinição de bolo 2FA",
@@ -124,12 +114,9 @@
   "camera_consent": "Sua câmera será usada para capturar uma imagem para fins de identificação por ${provider}. Por favor, verifique a Política de Privacidade para obter detalhes.",
   "camera_permission_is_required": "É necessária permissão da câmera.\nAtive-o nas configurações do aplicativo.",
   "cancel": "Cancelar",
-  "cannot_verify": "Não pode verificar",
-  "cannot_verify_description": "Este domínio não pode ser verificado. Verifique a solicitação com cuidado antes de aprovar.",
   "card_address": "Endereço:",
   "cardholder_agreement": "Acordo do titular do cartão",
   "cards": "Cartões",
-  "chain_id": "ID da cadeia",
   "chains": "Correntes",
   "change": "Mudar",
   "change_backup_password_alert": "Seus arquivos de backup anteriores não estarão disponíveis para importação com a nova senha de backup. A nova senha de backup será usada apenas para novos arquivos de backup. Tem certeza que deseja alterar a senha de backup?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Tem certeza de que deseja alterar os representantes?",
   "change_rep_successful": "Mudou com sucesso o representante",
   "change_selected_exchanges": "Altere as trocas selecionadas",
-  "change_selected_pair": "Altere o par selecionado",
   "change_wallet_alert_content": "Quer mudar a carteira atual para ${wallet_name}?",
   "change_wallet_alert_title": "Alterar carteira atual",
   "choose_a_payment_method": "Escolha um método de pagamento",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Confirmado",
   "congratulations": "Parabéns!",
   "connect_an_existing_yat": "Conecte um Yat existente",
-  "connect_hw_info_step_1": "Verifique se o seu dispositivo está ligado.",
-  "connect_hw_info_step_2": "Ligue o Bluetooth para os dois dispositivos e emparelhe -os do telefone ou conecte seus dispositivos usando um cabo USB.",
-  "connect_hw_info_step_3": "Desbloqueie seu dispositivo e navegue até o aplicativo Crypto desejado.",
-  "connect_hw_info_step_4": "Selecione seu dispositivo na carteira de bolo e continue com a configuração.",
   "connect_yats": "Connect Yats",
   "connect_your_hardware_wallet": "Conecte sua carteira de hardware usando Bluetooth ou USB",
   "connect_your_hardware_wallet_ios": "Conecte sua carteira de hardware usando o Bluetooth",
-  "connected": "Conectado",
   "connection_sync": "Conexão e sincronização",
   "connectWalletPrompt": "Conecte sua carteira ao WalletConnect para fazer transações",
   "contact": "Contato",
@@ -207,8 +188,6 @@
   "copy": "Copiar",
   "copy_address": "Copiar endereço",
   "copy_id": "Copiar ID",
-  "copy_payjoin_address": "Copie o endereço PayJoin",
-  "copy_payjoin_url": "Copie Payjoin url",
   "copyWalletConnectLink": "Copie o link WalletConnect do dApp e cole aqui",
   "corrupted_seed_notice": "Os arquivos para esta carteira estão corrompidos e não podem ser abertos. Veja a frase das sementes, salve -a e restaure a carteira.\n\nSe o valor estiver vazio, a semente não pôde ser recuperada corretamente.",
   "countries": "Países",
@@ -245,22 +224,11 @@
   "descending": "descendente",
   "description": "Descrição",
   "destination_tag": "Tag de destino:",
-  "deuro_collect_interest": "Coletar",
-  "deuro_savings": "dEuro Savings",
-  "deuro_savings_add": "Depósito",
-  "deuro_savings_balance": "Balanço de poupança",
-  "deuro_savings_collect_interest": "Coletar juros",
-  "deuro_savings_remove": "Retirar",
-  "deuro_savings_set_approval": "Defina aprovação",
-  "deuro_savings_subtitle": "Ganhe até 10% de juros em sua Deuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Pode levar alguns segundos para a transação confirmar e se refletir na tela",
-  "device_is_signing": "O dispositivo está assinando",
   "dfx_option_description": "Compre criptografia com EUR & CHF. Para clientes de varejo e corporativo na Europa",
   "didnt_get_code": "Não recebeu o código?",
   "digit_pin": "dígitos",
   "digital_and_physical_card": "cartão de débito pré-pago digital e físico",
   "disable": "Desativar",
-  "disable_automatic_exchange_status_updates": "Desativar atualizações automáticas de status de troca",
   "disable_bulletin": "Desativar boletim de status de serviço",
   "disable_buy": "Desativar ação de compra",
   "disable_cake_2fa": "Desabilitar o Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Ao desativar isso, as taxas de taxas podem ser imprecisas em alguns casos, para que você possa acabar pagando demais ou pagando as taxas por suas transações",
   "disable_fiat": "Desativar fiat",
   "disable_sell": "Desativar ação de venda",
-  "disable_tor": "Desativar tor",
   "disable_trade_option": "Desativar a opção comercial",
   "disableBatteryOptimization": "Desative a otimização da bateria",
   "disableBatteryOptimizationDescription": "Deseja desativar a otimização da bateria para fazer a sincronização de fundo funcionar de forma mais livre e suave?",
   "disabled": "Desabilitado",
-  "disconnect_session": "Desconecte a sessão",
   "discount": "Economize ${value}%",
   "display_settings": "Configurações de exibição",
   "displayable": "Exibível",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Não os compartilhe com mais ninguém, incluindo suporte.\n\nSeus fundos podem e serão roubados!",
   "do_not_show_me": "não me mostre isso novamente",
   "domain_looks_up": "Pesquisas de domínio",
-  "domain_mismatch": "Incompatibilidade de domínio",
-  "domain_mismatch_description": "Este site possui um domínio que não corresponde ao remetente desta solicitação. A aprovação pode levar à perda de fundos.",
   "donation_link_details": "Detalhes do link de doação",
-  "done": "Feito",
   "e_sign_consent": "Consentimento de assinatura eletrônica",
   "edit": "Editar",
   "edit_backup_password": "Editar senha de backup",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Geramos novos endereços cada vez que você usa um, mas os endereços anteriores continuam funcionando",
   "email_address": "Endereço de e-mail",
   "enable": "Habilitar",
-  "enable_builtin_tor": "Ative o Buildi-in Tor",
   "enable_mempool_api": "Mempool API para taxas e datas precisas",
   "enable_replace_by_fee": "Habilite substituir por taxa",
   "enable_silent_payments_scanning": "Comece a escanear pagamentos silenciosos, até que o topo seja alcançada",
@@ -333,10 +295,8 @@
   "error_text_template": "O nome e o endereço do modelo não podem conter os símbolos ` , ' \" \ne deve ter entre 1 e 106 caracteres",
   "error_text_wallet_name": "O nome da carteira só pode conter letras, números, _ - símbolos\ne deve ter entre 1 e 33 caracteres",
   "error_text_xmr": "A quantia em XMR não pode exceder o saldo disponível.\nTO número de dígitos decimais deve ser menor ou igual a 12",
-  "error_while_processing": "Ocorreu um erro ao procurar",
   "errorGettingCredentials": "Falha: Erro ao obter credenciais",
   "errorSigningTransaction": "Ocorreu um erro ao assinar a transação",
-  "establishing_tor_connection": "Estabilizar a conexão com",
   "estimated": "Estimado",
   "estimated_new_fee": "Nova taxa estimada",
   "estimated_receive_amount": "Valor estimado de recebimento",
@@ -360,7 +320,6 @@
   "export_backup": "Backup de exportação",
   "export_logs": "Exportar logs",
   "export_outputs": "Saídas de exportação",
-  "extend_session": "Estender sessão",
   "extra_id": "ID extra:",
   "extracted_address_content": "Você enviará fundos para\n${recipient_name}",
   "failed_authentication": "Falha na autenticação. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "API da Fiat",
   "fiat_balance": "Equilíbrio Fiat",
   "field_required": "Este campo é obrigatório",
-  "file_saved": "Arquivo salvo",
   "fill_code": "Por favor, preencha o código de verificação fornecido ao seu e-mail",
   "filter_by": "Filtrar por",
   "first_wallet_text": "Carteira incrível para Monero, Bitcoin, Ethereum, Litecoin, e Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Esqueci a senha",
   "freeze": "Congelar",
   "frequently_asked_questions": "Perguntas frequentes",
-  "from": "De",
   "frozen": "Congeladas",
   "frozen_balance": "Equilíbrio congelado",
   "full_balance": "Saldo total",
   "gas_exceeds_allowance": "O gás exigido pela transação excede o subsídio.",
-  "gas_price": "Preço do gás",
   "generate_name": "Gerar nome",
   "generating_gift_card": "Gerando Cartão Presente",
   "generating_transaction": "Gerando transação",
@@ -413,7 +369,6 @@
   "hide_details": "Ocultar detalhes",
   "high_contrast_theme": "Tema de alto contraste",
   "home_screen_settings": "Configurações da tela inicial",
-  "how_to_connect": "Como conectar",
   "how_to_use": "Como usar",
   "how_to_use_card": "Como usar este cartão",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Você não tem Sol suficiente para cobrir a transação e sua taxa de transação. Por favor, adicione mais sol à sua carteira ou reduza a quantidade de sol que você envia.",
   "insufficient_lamports": "Você não tem Sol suficiente para cobrir a transação e sua taxa de transação. Você precisa de pelo menos ${solValueNeeded} sol. Por favor, adicione mais sol à sua carteira ou reduza a quantidade de sol que você está enviando",
   "insufficientFundsForRentError": "Você não tem Sol suficiente para cobrir a taxa de transação e o aluguel da conta. Por favor, adicione mais sol à sua carteira ou reduza a quantidade de sol que você envia",
-  "insufficientFundsForRentErrorReceiver": "A conta do receptor não possui SOL suficiente para cobrir o aluguel. Por favor, peça ao destinatário que adicione mais sol à sua conta.",
   "introducing_cake_pay": "Apresentando o Cake Pay!",
   "invalid_input": "Entrada inválida",
   "invalid_password": "Senha inválida",
@@ -471,7 +425,6 @@
   "logout": "Logout",
   "low_fee": "Taxa baixa",
   "low_fee_alert": "No momento, você está usando uma prioridade de taxa de rede baixa. Isso pode causar longas esperas, taxas diferentes ou negociações canceladas. Recomendamos definir uma taxa mais alta para uma melhor experiência.",
-  "made_easy": "facilitado",
   "manage_nodes": "Gerenciar nós",
   "manage_pow_nodes": "Gerenciar nós PoW",
   "manage_yats": "Gerenciar Yats",
@@ -484,8 +437,6 @@
   "memo": "Memorando:",
   "message": "Mensagem",
   "message_verified": "A mensagem foi verificada com sucesso",
-  "messages": "Mensagens",
-  "method": "Método",
   "methods": "Métodos",
   "min_amount": "Mínimo: ${valor}",
   "min_value": "Mín: ${value} ${currency}",
@@ -498,7 +449,6 @@
   "monero_dark_theme": "Monero Tema Escuro",
   "monero_light_theme": "Monero Light Theme",
   "moonpay_alert_text": "O valor do montante deve ser maior ou igual a ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Ocorreu um erro ao buscar NFTs. Por favor, verifique sua conexão com a Internet e tente novamente.",
   "more_options": "Mais opções",
   "multiple_addresses_detected": "Vários endereços detectados",
   "mweb_confirmed": "MWEB confirmado",
@@ -515,7 +465,6 @@
   "new_subaddress_label_name": "Nome",
   "new_subaddress_title": "Novo endereço",
   "new_template": "Novo modelo",
-  "new_transactions_notifications": "Envie notificações sobre novas transações",
   "new_wallet": "Nova carteira",
   "newConnection": "Nova conexão",
   "no_cards_found": "Nenhum cartão encontrado",
@@ -540,7 +489,6 @@
   "normal": "Normal",
   "note_optional": "Nota (opcional)",
   "note_tap_to_change": "Nota (toque para alterar)",
-  "notification_permission_denied": "A permissão de notificação foi negada com permamer, por favor, ativá -la manualmente em configurações",
   "nullURIError": "URI é nulo",
   "offer_expires_in": "A oferta expira em: ",
   "offline": "offline",
@@ -573,20 +521,8 @@
   "password": "Senha",
   "paste": "Colar",
   "pause_wallet_creation": "A capacidade de criar a Haven Wallet está atualmente pausada.",
-  "payjoin_card_content": "Payjoin é um novo recurso de preservação de privacidade e economia de taxas no Bitcoin.",
-  "payjoin_details": "Payjoin detalhes",
-  "payjoin_enabled": "Payjoin habilitado",
-  "payjoin_enabling_popup_content": "Você pode alternar Payjoin em Menu → Privacidade → Use Payjoin para habilitá -lo ou desativá -lo posteriormente.",
-  "payjoin_enabling_popup_title": "Habilitando Payjoin",
-  "payjoin_request_awaiting_tx": "Aguardando transação",
-  "payjoin_request_in_progress": "Em andamento",
-  "payjoin_unavailable": "Payjoin indisponível",
-  "payjoin_unavailable_sheet_content": "O recebimento de uma transação Payjoin exige que você tenha o Bitcoin pronto para uso. \\ N \\ nas assim que sua carteira tiver fundos, Payjoin será ativado automaticamente.",
-  "payjoin_unavailable_sheet_title": "Por que Payjoin não está disponível?",
   "payment_id": "ID de pagamento: ",
-  "payment_made_easy": "Pagamentos facilitados",
   "payment_was_received": "Seu pagamento foi recebido.",
-  "payments": "Pagamentos",
   "pending": " (pendente)",
   "percentageOf": "de ${amount}",
   "pin_at_top": "fixe ${token} no topo",
@@ -603,10 +539,9 @@
   "please_try_to_connect_to_another_node": "Por favor, tente conectar-se a outro nó",
   "please_wait": "Por favor, aguarde",
   "polygonscan_history": "História do PolygonScan",
-  "potential_scam": "Golpe potencial",
   "powered_by": "Troca realizada por ${title}",
   "pre_seed_button_text": "Compreendo. Me mostre minha semente",
-  "pre_seed_description": "Na próxima página, você verá uma série de palavras. Esta é a sua semente única e privada e é a única maneira de recuperar sua carteira em caso de perda ou mau funcionamento. É sua responsabilidade anotar e armazená -lo em um local seguro fora do aplicativo de carteira de bolo.",
+  "pre_seed_description": "Na próxima página, você verá uma série de ${words} palavras. Esta é a sua semente única e privada e é a ÚNICA maneira de recuperar sua carteira em caso de perda ou mau funcionamento. É SUA responsabilidade anotá-lo e armazená-lo em um local seguro fora do aplicativo Cake Wallet.",
   "pre_seed_title": "IMPORTANTE",
   "prepaid_cards": "Cartões pré-pagos",
   "prevent_screenshots": "Evite capturas de tela e gravação de tela",
@@ -619,7 +554,6 @@
   "proceed_on_device": "Prossiga no seu dispositivo",
   "proceed_on_device_description": "Siga as instruções solicitadas em sua carteira de hardware",
   "processing": "Processamento",
-  "processing_signed_tx": "Processando transação assinada",
   "profile": "Perfil",
   "provider_error": "${provider} erro",
   "public_key": "Chave pública",
@@ -652,7 +586,6 @@
   "rep_warning_sub": "Seu representante não parece estar em boa posição. Toque aqui para selecionar um novo",
   "repeat_wallet_password": "Repita a senha da carteira",
   "repeated_password_is_incorrect": "A senha repetida está incorreta. Repita a senha da carteira novamente.",
-  "requested": "Solicitado",
   "require_for_adding_contacts": "Requer para adicionar contatos",
   "require_for_all_security_and_backup_settings": "Exigir todas as configurações de segurança e backup",
   "require_for_assessing_wallet": "Requer para acessar a carteira",
@@ -663,12 +596,10 @@
   "require_for_sends_to_internal_wallets": "Exigir envios para carteiras internas",
   "require_for_sends_to_non_contacts": "Exigir para envios para não-contatos",
   "require_pin_after": "Exigir PIN após",
-  "required_passphrase": "Senha",
   "rescan": "Reescanear",
   "resend_code": "Por favor, reenvie",
   "reset": "Limpar",
   "reset_password": "Redefinir senha",
-  "restore": "Restaurar",
   "restore_active_seed": "Semente ativa",
   "restore_address": "Endereço",
   "restore_bitcoin_description_from_keys": "Restaure sua carteira a partir da string WIF gerada de suas chaves privadas",
@@ -715,10 +646,7 @@
   "search_language": "Idioma de pesquisa",
   "second_intro_content": "Seu Yat é um endereço de emoji único e exclusivo que substitui todos os seus endereços hexadecimais longos para todas as suas moedas.",
   "second_intro_title": "Um endereço de emoji para governar todos eles",
-  "security": "Segurança",
   "security_and_backup": "Segurança e backup",
-  "security_risk": "Risco de segurança",
-  "security_risk_description": "Esse domínio é sinalizado como inseguro por vários provedores de segurança. Saia imediatamente para proteger seus ativos.",
   "seed_alert_back": "Volte",
   "seed_alert_content": "A semente é a única forma de recuperar sua carteira. Você escreveu isso?",
   "seed_alert_title": "Atenção",
@@ -753,6 +681,9 @@
   "seedtype": "SeedType",
   "seedtype_alert_content": "Compartilhar sementes com outras carteiras só é possível com o BIP39 SeedType.",
   "seedtype_alert_title": "Alerta de SeedType",
+  "seedtype_legacy": "Legado (25 palavras)",
+  "seedtype_polyseed": "Polyseed (16 palavras)",
+  "seedtype_wownero": "Wowrone (14 palavras)",
   "select_backup_file": "Selecione o arquivo de backup",
   "select_buy_provider_notice": "Selecione um provedor de compra acima. Você pode pular esta tela definindo seu provedor de compra padrão nas configurações de aplicativos.",
   "select_destination": "Selecione o destino para o arquivo de backup.",
@@ -776,7 +707,6 @@
   "send_from_external_wallet": "Enviar da carteira externa",
   "send_name": "Nome",
   "send_new": "Novo",
-  "send_payjoin": "Enviar Payjoin",
   "send_payment_id": "ID de pagamento (opcional)",
   "send_priority": "Atualmente, a taxa está definida para a prioridade: ${transactionPriority}.\nA prioridade da transação pode ser ajustada nas configurações",
   "send_sending": "Enviando...",
@@ -834,9 +764,7 @@
   "show_keys": "Mostrar semente/chaves",
   "show_market_place": "Mostrar mercado",
   "show_seed": "Mostrar semente",
-  "sign_all": "Assine tudo",
   "sign_message": "Mensagem de assinar",
-  "sign_one": "Assine um",
   "sign_up": "Inscrever-se",
   "sign_verify_message": "Assinar ou verificar mensagem",
   "sign_verify_message_sub": "Assine ou verifique uma mensagem usando sua chave privada",
@@ -865,14 +793,11 @@
   "sort_by": "Ordenar por",
   "spend_key_private": "Chave de gastos (privada)",
   "spend_key_public": "Chave de gastos (pública)",
-  "starting_tor_proxy": "Começando por proxy",
   "status": "Status: ",
-  "step": "Etapa",
   "string_default": "Padrão",
   "subaddress_title": "Sub-endereços",
   "subaddresses": "Sub-endereços",
   "submit_request": "enviar um pedido",
-  "success": "Sucesso",
   "successful": "Bem-sucedido",
   "support_description_guides": "Documentação e suporte para problemas comuns",
   "support_description_live_chat": "Livre e rápido! Representantes de suporte treinado estão disponíveis para ajudar",
@@ -880,7 +805,6 @@
   "support_title_guides": "Documentos da carteira de bolo",
   "support_title_live_chat": "Apoio ao vivo",
   "support_title_other_links": "Outros links de suporte",
-  "supported": "Suportado",
   "swap": "Trocar",
   "sweeping_wallet": "Carteira varrendo",
   "sweeping_wallet_alert": "To nie powinno zająć dużo czasu. NIE WYCHODŹ Z TEGO EKRANU, W PRZECIWNYM WYPADKU MOŻE ZOSTAĆ UTRACONA ŚRODKI",
@@ -900,7 +824,6 @@
   "sync_status_syncronizing": "SINCRONIZANDO",
   "sync_status_timed_out": "TEMPO ESGOTADO",
   "sync_status_unsupported": "Nó não suportado",
-  "synchronizing": "Sincronizando",
   "syncing_wallet_alert_content": "Seu saldo e lista de transações podem não estar completos até que diga “SYNCHRONIZED” no topo. Clique/toque para saber mais.",
   "syncing_wallet_alert_title": "Sua carteira está sincronizando",
   "template": "Modelo",
@@ -913,18 +836,13 @@
   "thorchain_taproot_address_not_supported": "O provedor de Thorchain não suporta endereços de raiz de Tap. Altere o endereço ou selecione um provedor diferente.",
   "time": "${minutes}m ${seconds}s",
   "tip": "Dica:",
-  "to": "Para",
   "today": "Hoje",
-  "token_already_exists": "Token já existe",
   "token_contract_address": "Endereço do contrato de token",
   "token_decimal": "Token decimal",
   "token_name": "Nome do token, por exemplo: Tether",
   "token_symbol": "Símbolo de token, por exemplo: USDT",
   "tokenID": "EU IA",
-  "ton_extra_info": "Não se esqueça de especificar o ID do memorando ao enviar a transação TON para a troca",
   "tor_connection": "Conexão Tor",
-  "tor_connection_timeout": "Tor de tempo limite da conexão",
-  "tor_experimental": "Esse é um recurso experimental, nem todas as conexões feitas com o suporte para o suporte para a carteira de bolo - algumas conexões podem usar o ClearNet, a fim de rotear totalmente o tráfego de aplicativos TOR com o modo VPN.",
   "tor_only": "Tor apenas",
   "total": "Total",
   "total_saving": "Economia total",
@@ -985,10 +903,8 @@
   "transaction_sent_notice": "Se a tela não prosseguir após 1 minuto, verifique um explorador de blocos e seu e-mail.",
   "transactions": "Transações",
   "transactions_by_date": "Transações por data",
-  "transport_type": "Tipo de transporte",
   "trongrid_history": "História de Trongrid",
   "trusted": "confiável",
-  "try_again": "Tente novamente",
   "tx_commit_exception_no_dust_on_change": "A transação é rejeitada com esse valor. Com essas moedas, você pode enviar ${min} sem alteração ou ${max} que retorna alterações.",
   "tx_commit_failed": "A confirmação da transação falhou. Entre em contato com o suporte.",
   "tx_commit_failed_no_peers": "A transação não foi transmitida, tente novamente em um segundo",
@@ -1015,19 +931,15 @@
   "unspent_coins_details_title": "Detalhes de moedas não gastas",
   "unspent_coins_title": "Moedas não gastas",
   "unsupported_asset": "Não oferecemos suporte a esta ação para este recurso. Crie ou mude para uma carteira de um tipo de ativo compatível.",
-  "update_session": "Sessão de atualização",
   "uptime": "Tempo de atividade",
   "upto": "até ${value}",
   "usb": "USB",
   "use": "Use PIN de ",
   "use_card_info_three": "Use o cartão digital online ou com métodos de pagamento sem contato.",
   "use_card_info_two": "Os fundos são convertidos para USD quando mantidos na conta pré-paga, não em moedas digitais.",
-  "use_device_theme": "Use o tema do dispositivo",
-  "use_payjoin": "Usar Payjoin",
   "use_ssl": "Use SSL",
   "use_suggested": "Uso sugerido",
   "use_testnet": "Use testNet",
-  "user_rejected_method": "Método rejeitado pelo usuário",
   "value": "Valor",
   "value_type": "Tipo de valor",
   "variable_pair_not_supported": "Este par de variáveis não é compatível com as trocas selecionadas",
@@ -1055,7 +967,6 @@
   "wallet_group_description_view_seed": "Você sempre pode ver esta semente novamente em",
   "wallet_group_empty_state_text_one": "Parece que você não tem nenhum grupo de carteira compatível !\n\n Toque",
   "wallet_group_empty_state_text_two": "abaixo para fazer um novo.",
-  "wallet_has_passphrase": "Esta carteira tem uma senha",
   "wallet_keys": "Semente/chaves da carteira",
   "wallet_list_create_new_wallet": "Criar nova carteira",
   "wallet_list_edit_group_name": "Editar o nome do grupo",
@@ -1080,11 +991,10 @@
   "walletConnect": "CarteiraConectada",
   "wallets": "Carteiras",
   "warning": "Aviso",
-  "welcome": "Bem-vindo",
+  "welcome": "Bem-vindo ao",
   "welcome_subtitle_new_wallet": "Se você quiser começar de novo, toque em criar uma nova carteira abaixo e você estará nas corridas.",
   "welcome_subtitle_restore_wallet": "Se você tem uma carteira existente que deseja trazer para o bolo, basta escolher a carteira existente e nós o guiaremos pelo processo.",
   "welcome_to_cakepay": "Bem-vindo ao Cake Pay!",
-  "what_is_payjoin": "O que é Payjoin ?",
   "what_is_silent_payments": "O que são pagamentos silenciosos?",
   "widgets_address": "Endereço",
   "widgets_or": "ou",
@@ -1114,6 +1024,5 @@
   "you_will_get": "Converter para",
   "you_will_receive_estimated_amount": "Você receberá(estimado )",
   "you_will_send": "Converter de",
-  "youCanGoBackToYourDapp": "Você pode voltar para o seu dapp agora",
   "yy": "aa"
 }
\ No newline at end of file
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 1b59e84ab..4173ad6d5 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Добавить предоплаченные средства на карты (до ${value})",
   "add_new_node": "Добавить новую ноду",
   "add_new_word": "Добавить новое слово",
-  "add_passphrase": "Добавить пасфраз",
-  "add_passphrase_warning_text": "Введите фразу только в том случае, если вы использовали один для этого кошелька в прошлом. Если вы введете неверную пассисную фразу или не использовали пасфразу до этого кошелька, вы не увидите ни одного существующего фонда или истории.",
   "add_receiver": "Добавить получателя (необязательно)",
   "add_secret_code": "Или добавьте этот секретный код в приложение для аутентификации.",
   "add_tip": "Добавить подсказку",
   "add_token_disclaimer_check": "Я подтвердил адрес контракта токена и информацию, используя авторитетный источник. Добавление вредоносной или неверной информации может привести к потере средств.",
   "add_token_warning": "Не редактируйте и не добавляйте токены по указанию мошенников.\nВсегда подтверждайте адреса токенов из авторитетных источников!",
   "add_value": "Добавить значение",
-  "added_message_for_ata_error": "Пожалуйста, убедитесь, что у вас достаточно баланса Sol, чтобы завершить вашу транзакцию.",
   "address": "Адрес",
   "address_book": "Адресная книга",
   "address_book_menu": "Адресная книга",
@@ -55,8 +52,6 @@
   "anonpay_description": "Создайте ${type}. Получатель может использовать ${method} с любой поддерживаемой криптовалютой, и вы получите средства на этот кошелек.",
   "apk_update": "Обновление APK",
   "approve": "Утвердить",
-  "approve_request": "Утвердить запрос",
-  "approve_tokens": "Одобрить токены",
   "arrive_in_this_address": "${currency} ${tag}придет на этот адрес",
   "ascending": "Восходящий",
   "ask_each_time": "Спросите каждый раз",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Ожидается подтверждения платежа",
   "background_sync": "Фоновая синхронизация",
   "background_sync_mode": "Режим фоновой синхронизации",
-  "background_sync_on_battery_low": "Синхронизировать на низкой батареи",
-  "background_sync_on_charging": "Синхронизировать только при зарядке",
-  "background_sync_on_device_idle": "Синхронизировать только тогда, когда устройство не используется",
-  "background_sync_on_unmetered_network": "Требуется незамеченная сеть",
   "backup": "Резервная копия",
   "backup_file": "Файл резервной копии",
   "backup_password": "Пароль резервной копии",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Купить Bitcoin",
   "buy_now": "Купить сейчас",
   "buy_provider_unavailable": "Поставщик в настоящее время недоступен.",
-  "buy_sell_pair_is_not_supported_warning": "Эта валютная пара не поддерживается каким -либо поставщиком для выбранного способа оплаты. Пожалуйста, выберите другую пару или попробуйте изменить метод оплаты.",
   "buy_with": "Купить с помощью",
   "by_cake_pay": "от Cake Pay",
   "cake_2fa_preset": "Торт 2FA Preset",
@@ -124,12 +114,9 @@
   "camera_consent": "Ваша камера будет использоваться для захвата изображения в целях идентификации ${provider}. Пожалуйста, ознакомьтесь с их Политикой конфиденциальности для получения подробной информации.",
   "camera_permission_is_required": "Требуется разрешение камеры.\nПожалуйста, включите его в настройках приложения.",
   "cancel": "Отменить",
-  "cannot_verify": "Не может проверить",
-  "cannot_verify_description": "Этот домен не может быть проверен. Тщательно проверьте запрос, прежде чем утверждать.",
   "card_address": "Адрес:",
   "cardholder_agreement": "Соглашение с держателем карты",
   "cards": "Карты",
-  "chain_id": "Цепочка",
   "chains": "Цепи",
   "change": "Изменить",
   "change_backup_password_alert": "Ваши предыдущие файлы резервных копий будут недоступны для импорта с новым паролем резервной копии. Новый пароль резервной копии будет использоваться только для новых файлов резервных копий. Вы уверены, что хотите изменить пароль резервной копии?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Вы уверены, что хотите сменить представителя?",
   "change_rep_successful": "Успешно изменил представитель",
   "change_selected_exchanges": "Изменить выбранные обмены",
-  "change_selected_pair": "Изменить выбранную пару",
   "change_wallet_alert_content": "Вы хотите изменить текущий кошелек на ${wallet_name}?",
   "change_wallet_alert_title": "Изменить текущий кошелек",
   "choose_a_payment_method": "Выберите способ оплаты",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Подтвержденный",
   "congratulations": "Поздравляем!",
   "connect_an_existing_yat": "Подключить существующий Yat",
-  "connect_hw_info_step_1": "Убедитесь, что ваше устройство включено.",
-  "connect_hw_info_step_2": "Включите Bluetooth для обоих устройств и соедините их с телефона или соедините свои устройства вместе с помощью USB -кабеля.",
-  "connect_hw_info_step_3": "Разблокируйте свое устройство и перейдите к желаемому крипто -приложению.",
-  "connect_hw_info_step_4": "Выберите свое устройство в кошельке для торта и продолжайте с настройкой.",
   "connect_yats": "Подключить Yats",
   "connect_your_hardware_wallet": "Подключите свой аппаратный кошелек с помощью Bluetooth или USB",
   "connect_your_hardware_wallet_ios": "Подключите свой аппаратный кошелек с помощью Bluetooth",
-  "connected": "Подключенный",
   "connection_sync": "Подключение и синхронизация",
   "connectWalletPrompt": "Подключите свой кошелек к WalletConnect для совершения транзакций.",
   "contact": "Контакт",
@@ -207,8 +188,6 @@
   "copy": "Скопировать",
   "copy_address": "Cкопировать адрес",
   "copy_id": "Скопировать ID",
-  "copy_payjoin_address": "Скопируйте адрес оплатывания",
-  "copy_payjoin_url": "Копировать Payjoin url",
   "copyWalletConnectLink": "Скопируйте ссылку WalletConnect из dApp и вставьте сюда.",
   "corrupted_seed_notice": "Файлы для этого кошелька повреждены и не могут быть открыты. Пожалуйста, просмотрите семенную фразу, сохраните ее и восстановите кошелек.\n\nЕсли значение пустое, то семя не смог правильно восстановить.",
   "countries": "Страны",
@@ -245,22 +224,11 @@
   "descending": "Нисходящий",
   "description": "Описание",
   "destination_tag": "Целевой тег:",
-  "deuro_collect_interest": "Собирать",
-  "deuro_savings": "dEuro Savings",
-  "deuro_savings_add": "Депозитный",
-  "deuro_savings_balance": "Сберегательный баланс",
-  "deuro_savings_collect_interest": "Собирать интерес",
-  "deuro_savings_remove": "Отзывать",
-  "deuro_savings_set_approval": "Установить утверждение",
-  "deuro_savings_subtitle": "Заработайте до 10% процентов на ваших Deuro Stablecoin Holdings",
-  "deuro_tx_commited_content": "Чтобы подтвердить, может потребоваться пару секунд, чтобы подтвердить и быть отраженным на экране",
-  "device_is_signing": "Устройство подписывает",
   "dfx_option_description": "Купить крипто с Eur & CHF. Для розничных и корпоративных клиентов в Европе",
   "didnt_get_code": "Не получить код?",
   "digit_pin": "-значный PIN",
   "digital_and_physical_card": "цифровая и физическая предоплаченная дебетовая карта",
   "disable": "Запрещать",
-  "disable_automatic_exchange_status_updates": "Отключить обновления автоматического статуса обмена",
   "disable_bulletin": "Отключить бюллетень статуса обслуживания",
   "disable_buy": "Отключить действие покупки",
   "disable_cake_2fa": "Отключить торт 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Выключив это, в некоторых случаях ставки платы могут быть неточными, так что вы можете в конечном итоге переплачивать или недоплачивать сборы за ваши транзакции",
   "disable_fiat": "Отключить фиат",
   "disable_sell": "Отключить действие продажи",
-  "disable_tor": "Отключить Tor",
   "disable_trade_option": "Отключить возможность торговли",
   "disableBatteryOptimization": "Отключить оптимизацию батареи",
   "disableBatteryOptimizationDescription": "Вы хотите отключить оптимизацию батареи, чтобы сделать фона синхронизации более свободно и плавно?",
   "disabled": "Отключено",
-  "disconnect_session": "Отключить сеанс",
   "discount": "Сэкономьте ${value}%",
   "display_settings": "Настройки отображения",
   "displayable": "Отображаемый",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Не сообщайте их никому, включая техподдержку.\n\nВаши средства могут и будут украдены!",
   "do_not_show_me": "Не показывай мне это больше",
   "domain_looks_up": "Поиск доменов",
-  "domain_mismatch": "Несоответствие домена",
-  "domain_mismatch_description": "Этот веб -сайт имеет домен, который не соответствует отправителю этого запроса. Утверждение может привести к потере средств.",
   "donation_link_details": "Информация о ссылке для пожертвований",
-  "done": "Сделанный",
   "e_sign_consent": "Согласие электронной подписи",
   "edit": "Редактировать",
   "edit_backup_password": "Изменить пароль резервной копии",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Мы генерируем новые адреса каждый раз, когда вы их используете, но предыдущие адреса продолжают работать.",
   "email_address": "Адрес электронной почты",
   "enable": "Давать возможность",
-  "enable_builtin_tor": "Включить встроенный в Tor",
   "enable_mempool_api": "Mempool API за точные сборы и даты",
   "enable_replace_by_fee": "Включить замену за пикой",
   "enable_silent_payments_scanning": "Начните сканировать безмолвные платежи, пока не будет достигнут наконечник",
@@ -333,10 +295,8 @@
   "error_text_template": "Имя и адрес шаблона не может содержать ` , ' \" символы\nи должно быть от 1 до 106 символов в длину",
   "error_text_wallet_name": "Имя кошелька может содержать только буквы, цифры, _ - символы\nи должно быть от 1 до 33 символов в длину",
   "error_text_xmr": "Значение XMR не может превышать доступный баланс.\nКоличество цифр после запятой должно быть меньше или равно 12",
-  "error_while_processing": "Произошла ошибка во время выплаты",
   "errorGettingCredentials": "Не удалось: ошибка при получении учетных данных.",
   "errorSigningTransaction": "Произошла ошибка при подписании транзакции",
-  "establishing_tor_connection": "Остановка связи",
   "estimated": "Примерно",
   "estimated_new_fee": "Расчетная новая плата",
   "estimated_receive_amount": "Расчетная сумма получения",
@@ -360,7 +320,6 @@
   "export_backup": "Экспорт резервной копии",
   "export_logs": "Экспортные журналы",
   "export_outputs": "Экспортные выходы",
-  "extend_session": "Продлить сессию",
   "extra_id": "Дополнительный ID:",
   "extracted_address_content": "Вы будете отправлять средства\n${recipient_name}",
   "failed_authentication": "Ошибка аутентификации. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Фиат API",
   "fiat_balance": "Фиатный баланс",
   "field_required": "Это поле обязательно к заполнению",
-  "file_saved": "Файл сохранен",
   "fill_code": "Пожалуйста, введите код подтверждения, отправленный на вашу электронную почту",
   "filter_by": "Фильтровать по",
   "first_wallet_text": "В самом удобном кошельке для Monero, Bitcoin, Ethereum, Litecoin, и Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Забыли пароль",
   "freeze": "Заморозить",
   "frequently_asked_questions": "Часто задаваемые вопросы",
-  "from": "От",
   "frozen": "Заморожено",
   "frozen_balance": "Замороженный баланс",
   "full_balance": "Весь баланс",
   "gas_exceeds_allowance": "Газ, требуемый в результате транзакции, превышает пособие.",
-  "gas_price": "Цена газа",
   "generate_name": "Создать имя",
   "generating_gift_card": "Создание подарочной карты",
   "generating_transaction": "Генерирующая транзакция",
@@ -413,7 +369,6 @@
   "hide_details": "Скрыть детали",
   "high_contrast_theme": "Высококонтрастная тема",
   "home_screen_settings": "Настройки главного экрана",
-  "how_to_connect": "Как подключиться",
   "how_to_use": "Как использовать",
   "how_to_use_card": "Как использовать эту карту",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "У вас недостаточно Sol, чтобы покрыть транзакцию и плату за транзакцию. Пожалуйста, добавьте больше Sol в свой кошелек или уменьшите сумму Sol, которую вы отправляете.",
   "insufficient_lamports": "У вас недостаточно Sol, чтобы покрыть транзакцию и плату за транзакцию. Вам нужен как минимум ${solValueNeeded} sol. Пожалуйста, добавьте больше Sol в свой кошелек или уменьшите сумму Sol, которую вы отправляете",
   "insufficientFundsForRentError": "У вас недостаточно Sol, чтобы покрыть плату за транзакцию и аренду для счета. Пожалуйста, добавьте больше Sol в свой кошелек или уменьшите сумму Sol, которую вы отправляете",
-  "insufficientFundsForRentErrorReceiver": "У счета приемника не хватает Sol, чтобы покрыть арендную плату. Пожалуйста, попросите приемника добавить больше SOL в свою учетную запись.",
   "introducing_cake_pay": "Представляем Cake Pay!",
   "invalid_input": "Неверный Ввод",
   "invalid_password": "Неверный пароль",
@@ -471,7 +425,6 @@
   "logout": "Выйти",
   "low_fee": "Низкая комиссия",
   "low_fee_alert": "В настоящее время вы используете низкий приоритет платы за сеть. Это может привести к длительному ожиданию, изменению ставок или отмене сделок. Мы рекомендуем установить более высокую плату для лучшего опыта.",
-  "made_easy": "Сделано легко",
   "manage_nodes": "Управление узлами",
   "manage_pow_nodes": "Управление узлами PoW",
   "manage_yats": "Управлять Yat",
@@ -483,8 +436,6 @@
   "memo": "Памятка:",
   "message": "Сообщение",
   "message_verified": "Сообщение было успешно проверено",
-  "messages": "Сообщения",
-  "method": "Метод",
   "methods": "Методы",
   "min_amount": "Минимум: ${value}",
   "min_value": "Мин: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Темная тема Monero",
   "monero_light_theme": "Светлая тема Monero",
   "moonpay_alert_text": "Сумма должна быть больше или равна ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Произошла ошибка при получении NFT. Пожалуйста, проверьте подключение к Интернету и попробуйте еще раз.",
   "more_options": "Дополнительные параметры",
   "multiple_addresses_detected": "Обнаружено несколько адресов",
   "mweb_confirmed": "Подтверждено MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Имя",
   "new_subaddress_title": "Новый адрес",
   "new_template": "Новый шаблон",
-  "new_transactions_notifications": "Отправить уведомления о новых транзакциях",
   "new_wallet": "Новый кошелёк",
   "newConnection": "Новое соединение",
   "no_cards_found": "Карт не найдено",
@@ -539,7 +488,6 @@
   "normal": "Нормальный",
   "note_optional": "Примечание (необязательно)",
   "note_tap_to_change": "Примечание (нажмите для изменения)",
-  "notification_permission_denied": "Разрешение уведомления было отклонено, пожалуйста, вручную включить его в настройках",
   "nullURIError": "URI имеет значение null",
   "offer_expires_in": "Предложение истекает через: ",
   "offline": "Не в сети",
@@ -572,20 +520,8 @@
   "password": "Пароль",
   "paste": "Вставить",
   "pause_wallet_creation": "Возможность создания Haven Wallet в настоящее время приостановлена.",
-  "payjoin_card_content": "Payjoin-новая функция, поддерживающая конфиденциальность и сборы в биткойнах.",
-  "payjoin_details": "Payjoin подробности",
-  "payjoin_enabled": "Payjoin включено",
-  "payjoin_enabling_popup_content": "Вы можете переключить Payjoin в меню → конфиденциальность → использовать Payjoin, чтобы включить или отключить его позже.",
-  "payjoin_enabling_popup_title": "Включение Payjoin",
-  "payjoin_request_awaiting_tx": "В ожидании транзакции",
-  "payjoin_request_in_progress": "В ходе выполнения",
-  "payjoin_unavailable": "Payjoin недоступен",
-  "payjoin_unavailable_sheet_content": "Получение транзакции Payjoin требует, чтобы вы готовили биткойн для использования. \\ N \\ Nas, как только ваш кошелек получит средства, Payjoin будет автоматически включен.",
-  "payjoin_unavailable_sheet_title": "Почему Payjoin недоступен?",
   "payment_id": "ID платежа: ",
-  "payment_made_easy": "Платежи сделаны простыми",
   "payment_was_received": "Ваш платеж получен.",
-  "payments": "Платежи",
   "pending": " (в ожидании)",
   "percentageOf": "из ${amount}",
   "pin_at_top": "закрепить ${token} вверху",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "Пожалуйста, попробуйте подключиться к другой ноде",
   "please_wait": "Пожалуйста, подождите",
   "polygonscan_history": "История PolygonScan",
-  "potential_scam": "Потенциальная афера",
   "powered_by": "Используя ${title}",
   "pre_seed_button_text": "Понятно. Покажите мнемоническую фразу",
-  "pre_seed_description": "На следующей странице вы увидите серию слов. Это ваше уникальное и частное семя, и это единственный способ восстановить ваш кошелек в случае потери или неисправности. Вы несете ответственность за то, чтобы записать его и хранить в безопасном месте за пределами приложения кошелька для торта.",
+  "pre_seed_description": "На следующей странице вы увидите серию из ${words} слов. Это ваша уникальная и личная мнемоническая фраза, и это ЕДИНСТВЕННЫЙ способ восстановить свой кошелек в случае потери или неисправности. ВАМ необходимо записать ее и хранить в надежном месте вне приложения Cake Wallet.",
   "pre_seed_title": "ВАЖНО",
   "prepaid_cards": "Предоплаченные карты",
   "prevent_screenshots": "Предотвратить скриншоты и запись экрана",
@@ -618,7 +553,6 @@
   "proceed_on_device": "Пройдите на свое устройство",
   "proceed_on_device_description": "Пожалуйста, следуйте инструкциям, представленным на вашем аппаратном кошельке",
   "processing": "Обработка",
-  "processing_signed_tx": "Обработка подписанной транзакции",
   "profile": "Профиль",
   "provider_error": "${provider} ошибка",
   "public_key": "Публичный ключ",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "Ваш представитель, похоже, не в хорошей репутации. Нажмите здесь, чтобы выбрать новый",
   "repeat_wallet_password": "Повторите пароль кошелька",
   "repeated_password_is_incorrect": "Повторный пароль неверен. Пожалуйста, повторите пароль кошелька снова.",
-  "requested": "Запрошен",
   "require_for_adding_contacts": "Требовать добавления контактов",
   "require_for_all_security_and_backup_settings": "Требовать все настройки безопасности и резервного копирования",
   "require_for_assessing_wallet": "Требовать для доступа к кошельку",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "Требовать отправки на внутренние кошельки",
   "require_for_sends_to_non_contacts": "Требовать для отправки не контактам",
   "require_pin_after": "Требовать ПИН после",
-  "required_passphrase": "Пасфраза",
   "rescan": "Пересканировать",
   "resend_code": "Пожалуйста, отправьте еще раз",
   "reset": "Сброс",
   "reset_password": "Сбросить пароль",
-  "restore": "Восстановить",
   "restore_active_seed": "Активная мнемоническая фраза",
   "restore_address": "Адрес",
   "restore_bitcoin_description_from_keys": "Вы можете восстановить кошелёк с помощью WIF",
@@ -714,10 +645,7 @@
   "search_language": "Язык поиска",
   "second_intro_content": "Ваш Yat - это единственный уникальный адрес эмодзи, который заменяет длинные шестнадцатеричные адреса для всех ваших валют.",
   "second_intro_title": "Один адрес эмодзи для управления остальными адресами",
-  "security": "Безопасность",
   "security_and_backup": "Безопасность и резервное копирование",
-  "security_risk": "Риск безопасности",
-  "security_risk_description": "Этот домен помечен как небезопасен несколькими поставщиками безопасности. Оставьте немедленно, чтобы защитить ваши активы.",
   "seed_alert_back": "Назад",
   "seed_alert_content": "Мнемоническая фраза - единственный способ восстановить ваш кошелек. Вы записали ее?",
   "seed_alert_title": "Внимание",
@@ -752,6 +680,9 @@
   "seedtype": "SEEDTYPE",
   "seedtype_alert_content": "Обмен семенами с другими кошельками возможно только с BIP39 SeedType.",
   "seedtype_alert_title": "SEEDTYPE ALERT",
+  "seedtype_legacy": "Наследие (25 слов)",
+  "seedtype_polyseed": "Полиса (16 слов)",
+  "seedtype_wownero": "Wownero (14 слов)",
   "select_backup_file": "Выберите файл резервной копии",
   "select_buy_provider_notice": "Выберите поставщика покупки выше. Вы можете пропустить этот экран, установив поставщика покупки по умолчанию в настройках приложения.",
   "select_destination": "Пожалуйста, выберите место для файла резервной копии.",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "Отправить с внешнего кошелька",
   "send_name": "Имя",
   "send_new": "Новый",
-  "send_payjoin": "Отправлять Payjoin",
   "send_payment_id": "ID платежа (опционально)",
   "send_priority": "Комиссия установлена в зависимости от приоритета: ${transactionPriority}.\nПриоритет транзакции может быть изменён в настройках",
   "send_sending": "Отправка...",
@@ -833,9 +763,7 @@
   "show_keys": "Показать мнемоническую фразу/ключи",
   "show_market_place": "Показать торговую площадку",
   "show_seed": "Показать мнемоническую фразу",
-  "sign_all": "Подписать все",
   "sign_message": "Сообщение о знаке",
-  "sign_one": "Подписать один",
   "sign_up": "Зарегистрироваться",
   "sign_verify_message": "Подписать или проверить сообщение",
   "sign_verify_message_sub": "Подписать или проверить сообщение, используя свой закрытый ключ",
@@ -864,14 +792,11 @@
   "sort_by": "Сортировать по",
   "spend_key_private": "Приватный ключ траты",
   "spend_key_public": "Публичный ключ траты",
-  "starting_tor_proxy": "Запуск прокси",
   "status": "Статус: ",
-  "step": "Шаг",
   "string_default": "По умолчанию",
   "subaddress_title": "Список субадресов",
   "subaddresses": "Субадреса",
   "submit_request": "отправить запрос",
-  "success": "Успех",
   "successful": "Успешный",
   "support_description_guides": "Документация и поддержка общих вопросов",
   "support_description_live_chat": "Бесплатно и быстро! Обученные представители поддержки доступны для оказания помощи",
@@ -879,7 +804,6 @@
   "support_title_guides": "Корт кошелек документов",
   "support_title_live_chat": "Живая поддержка",
   "support_title_other_links": "Другие ссылки на поддержку",
-  "supported": "Поддерживается",
   "swap": "Менять",
   "sweeping_wallet": "Подметание кошелька",
   "sweeping_wallet_alert": "Это не должно занять много времени. НЕ ПОКИДАЙТЕ ЭТОТ ЭКРАН, ИНАЧЕ ВЫЧИСЛЕННЫЕ СРЕДСТВА МОГУТ БЫТЬ ПОТЕРЯНЫ",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "СИНХРОНИЗАЦИЯ",
   "sync_status_timed_out": "ВРЕМЯ ВЫШЛО",
   "sync_status_unsupported": "Неподдерживаемый узел",
-  "synchronizing": "Синхронизация",
   "syncing_wallet_alert_content": "Ваш баланс и список транзакций могут быть неполными, пока вверху не будет написано «СИНХРОНИЗИРОВАНО». Щелкните/коснитесь, чтобы узнать больше.",
   "syncing_wallet_alert_title": "Ваш кошелек синхронизируется",
   "template": "Шаблон",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "Поставщик Thorchain не поддерживает адреса taproot. Пожалуйста, измените адрес или выберите другого поставщика.",
   "time": "${minutes}мин ${seconds}сек",
   "tip": "Совет:",
-  "to": "К",
   "today": "Сегодня",
-  "token_already_exists": "Токен уже существует",
   "token_contract_address": "Адрес контракта токена",
   "token_decimal": "Десятичный токен",
   "token_name": "Имя токена, например: Tether",
   "token_symbol": "Символ токена, например: USDT",
   "tokenID": "ИДЕНТИФИКАТОР",
-  "ton_extra_info": "Пожалуйста, не забудьте указать идентификатор записки при отправке TON транзакции для обмена",
   "tor_connection": "Тор соединение",
-  "tor_connection_timeout": "TOR Timeout",
-  "tor_experimental": "Это экспериментальная функция, а не все соединения, сделанные из поддержки TOR для торта - некоторые подключения могут использовать ClearNet, чтобы полностью маршрутироваться с использованием трафика приложений в режиме VPN.",
   "tor_only": "Только Tor",
   "total": "Общий",
   "total_saving": "Общая экономия",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "Если экран не отображается через 1 минуту, проверьте обозреватель блоков и свою электронную почту.",
   "transactions": "Транзакции",
   "transactions_by_date": "Сортировать по дате",
-  "transport_type": "Транспортный тип",
   "trongrid_history": "История Тронгрида",
   "trusted": "доверенный",
-  "try_again": "Попробуйте еще раз",
   "tx_commit_exception_no_dust_on_change": "Транзакция отклоняется с этой суммой. С этими монетами вы можете отправлять ${min} без изменения или ${max}, которые возвращают изменение.",
   "tx_commit_failed": "Комплект транзакции не удался. Пожалуйста, свяжитесь с поддержкой.",
   "tx_commit_failed_no_peers": "Транзакция не смогла передать, попробуйте еще раз через секунду или около того",
@@ -1014,19 +930,15 @@
   "unspent_coins_details_title": "Сведения о неизрасходованных монетах",
   "unspent_coins_title": "Неизрасходованные монеты",
   "unsupported_asset": "Мы не поддерживаем это действие для этого объекта. Пожалуйста, создайте или переключитесь на кошелек поддерживаемого типа активов.",
-  "update_session": "Обновление сессии",
   "uptime": "Время безотказной работы",
   "upto": "до ${value}",
   "usb": "USB",
   "use": "Использовать ",
   "use_card_info_three": "Используйте цифровую карту онлайн или с помощью бесконтактных способов оплаты.",
   "use_card_info_two": "Средства конвертируются в доллары США, когда они хранятся на предоплаченном счете, а не в цифровых валютах.",
-  "use_device_theme": "Используйте тему устройства",
-  "use_payjoin": "Использовать Payjoin",
   "use_ssl": "Использовать SSL",
   "use_suggested": "Использовать предложенный",
   "use_testnet": "Используйте Testnet",
-  "user_rejected_method": "Пользователь отклонил метод",
   "value": "Ценить",
   "value_type": "Тип значения",
   "variable_pair_not_supported": "Эта пара переменных не поддерживается выбранными биржами.",
@@ -1053,7 +965,6 @@
   "wallet_group_description_view_seed": "Вы всегда можете просматривать это семя снова под",
   "wallet_group_empty_state_text_one": "Похоже, у вас нет никаких совместимых групп кошелька !\n\n tap",
   "wallet_group_empty_state_text_two": "ниже, чтобы сделать новый.",
-  "wallet_has_passphrase": "Этот кошелек имеет фразу",
   "wallet_keys": "Мнемоническая фраза/ключи кошелька",
   "wallet_list_create_new_wallet": "Создать новый кошелёк",
   "wallet_list_edit_group_name": "Редактировать название группы",
@@ -1078,11 +989,10 @@
   "walletConnect": "КошелекПодключиться",
   "wallets": "Кошельки",
   "warning": "Предупреждение",
-  "welcome": "Добро пожаловать",
+  "welcome": "Приветствуем в",
   "welcome_subtitle_new_wallet": "Если вы хотите начать Fresh, нажмите «Создать новый кошелек» ниже, и вы отправитесь на гонки.",
   "welcome_subtitle_restore_wallet": "Если у вас есть существующий кошелек, который вы хотите принести в торт, просто выберите «Восстановить существующий кошелек», и мы проведем вас через процесс.",
   "welcome_to_cakepay": "Добро пожаловать в Cake Pay!",
-  "what_is_payjoin": "Что такое Payjoin ?",
   "what_is_silent_payments": "Что такое молчаливые платежи?",
   "widgets_address": "Адрес",
   "widgets_or": "или",
@@ -1112,6 +1022,5 @@
   "you_will_get": "Конвертировать в",
   "you_will_receive_estimated_amount": "Вы получите(Оценку )",
   "you_will_send": "Конвертировать из",
-  "youCanGoBackToYourDapp": "Вы можете вернуться к своему даппу сейчас",
   "yy": "ГГ"
 }
\ No newline at end of file
diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb
index 1fc8d81d5..acd70c554 100644
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "เพิ่มเงินสำรองไว้บนบัตร (ถึง ${value})",
   "add_new_node": "เพิ่มโหนดใหม่",
   "add_new_word": "เพิ่มคำใหม่",
-  "add_passphrase": "เพิ่มวลีรหัสผ่าน",
-  "add_passphrase_warning_text": "ป้อนวลีรหัสผ่านเท่านั้นหากคุณเคยใช้สำหรับกระเป๋าเงินนี้ในอดีต หากคุณป้อนวลีรหัสผ่านที่ไม่ถูกต้องหรือไม่เคยใช้ข้อความรหัสผ่านมาก่อนในกระเป๋าเงินนี้คุณจะไม่เห็นเงินทุนหรือประวัติใด ๆ ที่มีอยู่",
   "add_receiver": "เพิ่มผู้รับอื่น ๆ (ตัวเลือก)",
   "add_secret_code": "หรือเพิ่มรหัสลับนี้ลงในแอปตรวจสอบความถูกต้อง",
   "add_tip": "เพิ่มคำแนะนำ",
   "add_token_disclaimer_check": "ฉันได้ยืนยันที่อยู่และข้อมูลของสัญญาโทเค็นโดยใช้แหล่งข้อมูลที่เชื่อถือได้ การเพิ่มข้อมูลที่เป็นอันตรายหรือไม่ถูกต้องอาจทำให้สูญเสียเงินได้",
   "add_token_warning": "ห้ามแก้ไขหรือเพิ่มโทเค็นตามคำแนะนำของนักต้มตุ๋น\nยืนยันที่อยู่โทเค็นกับแหล่งที่มาที่เชื่อถือได้เสมอ!",
   "add_value": "เพิ่มมูลค่า",
-  "added_message_for_ata_error": "กรุณาตรวจสอบให้แน่ใจว่าคุณมียอดคงเหลือโซลเพียงพอที่จะทำธุรกรรมให้เสร็จสมบูรณ์",
   "address": "ที่อยู่",
   "address_book": "สมุดที่อยู่",
   "address_book_menu": "สมุดที่อยู่",
@@ -55,8 +52,6 @@
   "anonpay_description": "สร้าง ${type} ผู้รับสามารถ ${method} ด้วยสกุลเงินดิจิทัลที่รองรับ และคุณจะได้รับเงินในกระเป๋าสตางค์นี้",
   "apk_update": "ปรับปรุง APK",
   "approve": "อนุมัติ",
-  "approve_request": "อนุมัติคำขอ",
-  "approve_tokens": "อนุมัติโทเค็น",
   "arrive_in_this_address": "${currency} ${tag}จะมาถึงที่อยู่นี้",
   "ascending": "จากน้อยไปมาก",
   "ask_each_time": "ถามทุกครั้ง",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "รอการยืนยันการชำระเงิน",
   "background_sync": "การซิงค์พื้นหลัง",
   "background_sync_mode": "โหมดซิงค์พื้นหลัง",
-  "background_sync_on_battery_low": "ซิงโครไนซ์กับแบตเตอรี่ต่ำ",
-  "background_sync_on_charging": "ซิงโครไนซ์เฉพาะเมื่อชาร์จ",
-  "background_sync_on_device_idle": "ซิงโครไนซ์เฉพาะเมื่อไม่ใช้อุปกรณ์",
-  "background_sync_on_unmetered_network": "ต้องการเครือข่ายที่ไม่ได้รับการแก้ไข",
   "backup": "สำรองข้อมูล",
   "backup_file": "ไฟล์สำรองข้อมูล",
   "backup_password": "รหัสผ่านสำรองข้อมูล",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "ซื้อ Bitcoin",
   "buy_now": "ซื้อตอนนี้",
   "buy_provider_unavailable": "ผู้ให้บริการไม่สามารถใช้งานได้ในปัจจุบัน",
-  "buy_sell_pair_is_not_supported_warning": "คู่สกุลเงินนี้ไม่ได้รับการสนับสนุนจากผู้ให้บริการรายใดสำหรับวิธีการชำระเงินที่เลือก โปรดเลือกคู่อื่นหรือลองเปลี่ยนวิธีการชำระเงิน",
   "buy_with": "ซื้อด้วย",
   "by_cake_pay": "โดย Cake Pay",
   "cake_2fa_preset": "เค้ก 2FA ที่ตั้งไว้ล่วงหน้า",
@@ -124,12 +114,9 @@
   "camera_consent": "กล้องของคุณจะถูกนำมาใช้เพื่อจับภาพเพื่อวัตถุประสงค์ในการระบุตัวตนภายใน ${provider} โปรดตรวจสอบนโยบายความเป็นส่วนตัวเพื่อดูรายละเอียด",
   "camera_permission_is_required": "ต้องได้รับอนุญาตจากกล้อง\nโปรดเปิดใช้งานจากการตั้งค่าแอป",
   "cancel": "ยกเลิก",
-  "cannot_verify": "ไม่สามารถตรวจสอบได้",
-  "cannot_verify_description": "โดเมนนี้ไม่สามารถตรวจสอบได้ ตรวจสอบคำขออย่างละเอียดก่อนอนุมัติ",
   "card_address": "ที่อยู่:",
   "cardholder_agreement": "ข้อตกลงผู้ใช้บัตร",
   "cards": "บัตร",
-  "chain_id": "รหัสโซ่",
   "chains": "ห่วงโซ่",
   "change": "เปลี่ยน",
   "change_backup_password_alert": "ไฟล์สำรองที่ผ่านมาจะไม่สามารถนำเข้าด้วยรหัสผ่านสำรองใหม่ได้ รหัสผ่านสำรองใหม่จะถูกใช้เฉพาะสำหรับไฟล์สำรองใหม่ คุณแน่ใจหรือว่าต้องการเปลี่ยนรหัสผ่านสำรอง?",
@@ -144,7 +131,6 @@
   "change_rep_message": "คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนตัวแทน",
   "change_rep_successful": "เปลี่ยนตัวแทนสำเร็จ",
   "change_selected_exchanges": "เปลี่ยนการแลกเปลี่ยนที่เลือก",
-  "change_selected_pair": "เปลี่ยนคู่ที่เลือก",
   "change_wallet_alert_content": "คุณต้องการเปลี่ยนกระเป๋าปัจจุบันเป็น ${wallet_name} หรือไม่?",
   "change_wallet_alert_title": "เปลี่ยนกระเป๋าปัจจุบัน",
   "choose_a_payment_method": "เลือกวิธีการชำระเงิน",
@@ -182,14 +168,9 @@
   "confirmed_tx": "ซึ่งยืนยันแล้ว",
   "congratulations": "ขอแสดงความยินดี!",
   "connect_an_existing_yat": "เชื่อมต่อ Yat ที่มีอยู่",
-  "connect_hw_info_step_1": "ตรวจสอบให้แน่ใจว่าอุปกรณ์ของคุณเปิดใช้งาน",
-  "connect_hw_info_step_2": "เปิดบลูทู ธ สำหรับอุปกรณ์ทั้งสองและจับคู่จากโทรศัพท์หรือเชื่อมต่ออุปกรณ์ของคุณเข้าด้วยกันโดยใช้สายเคเบิล USB",
-  "connect_hw_info_step_3": "ปลดล็อกอุปกรณ์ของคุณและนำทางไปยังแอพ crypto ที่ต้องการ",
-  "connect_hw_info_step_4": "เลือกอุปกรณ์ของคุณในกระเป๋าเงินเค้กและดำเนินการติดตั้งต่อไป",
   "connect_yats": "เชื่อมต่อ Yats",
   "connect_your_hardware_wallet": "เชื่อมต่อกระเป๋าเงินฮาร์ดแวร์ของคุณโดยใช้บลูทู ธ หรือ USB",
   "connect_your_hardware_wallet_ios": "เชื่อมต่อกระเป๋าเงินฮาร์ดแวร์ของคุณโดยใช้บลูทู ธ",
-  "connected": "ซึ่งเชื่อมต่อกัน",
   "connection_sync": "การเชื่อมต่อและการซิงค์",
   "connectWalletPrompt": "เชื่อมต่อกระเป๋าเงินของคุณด้วย WalletConnect เพื่อทำธุรกรรม",
   "contact": "ผู้ติดต่อ",
@@ -207,8 +188,6 @@
   "copy": "คัดลอก",
   "copy_address": "คัดลอกที่อยู่",
   "copy_id": "คัดลอก ID",
-  "copy_payjoin_address": "คัดลอกที่อยู่ PayJoin",
-  "copy_payjoin_url": "คัดลอก Payjoin url",
   "copyWalletConnectLink": "คัดลอกลิงก์ WalletConnect จาก dApp แล้ววางที่นี่",
   "corrupted_seed_notice": "ไฟล์สำหรับกระเป๋าเงินนี้เสียหายและไม่สามารถเปิดได้ โปรดดูวลีเมล็ดบันทึกและกู้คืนกระเป๋าเงิน\n\nหากค่าว่างเปล่าเมล็ดก็ไม่สามารถกู้คืนได้อย่างถูกต้อง",
   "countries": "ประเทศ",
@@ -245,22 +224,11 @@
   "descending": "ลงมา",
   "description": "คำอธิบาย",
   "destination_tag": "แท็กปลายทาง:",
-  "deuro_collect_interest": "เก็บรวบรวม",
-  "deuro_savings": "การออมของ dEuro",
-  "deuro_savings_add": "เงินฝาก",
-  "deuro_savings_balance": "ยอดเงินออม",
-  "deuro_savings_collect_interest": "เก็บดอกเบี้ย",
-  "deuro_savings_remove": "ถอน",
-  "deuro_savings_set_approval": "ตั้งค่าการอนุมัติ",
-  "deuro_savings_subtitle": "รับดอกเบี้ยมากถึง 10% สำหรับ Deuro Stablecoin Holdings ของคุณ",
-  "deuro_tx_commited_content": "อาจใช้เวลาสองสามวินาทีในการทำธุรกรรมเพื่อยืนยันและสะท้อนบนหน้าจอ",
-  "device_is_signing": "อุปกรณ์กำลังลงนาม",
   "dfx_option_description": "ซื้อ crypto ด้วย Eur & CHF สำหรับลูกค้ารายย่อยและลูกค้าในยุโรป",
   "didnt_get_code": "ไม่ได้รับรหัส?",
   "digit_pin": "-หลัก PIN",
   "digital_and_physical_card": "บัตรเดบิตดิจิตอลและบัตรพื้นฐาน",
   "disable": "ปิดการใช้งาน",
-  "disable_automatic_exchange_status_updates": "ปิดใช้งานการอัปเดตสถานะการแลกเปลี่ยนอัตโนมัติ",
   "disable_bulletin": "ปิดการใช้งาน Bulletin สถานะบริการ",
   "disable_buy": "ปิดการใช้งานการซื้อ",
   "disable_cake_2fa": "ปิดการใช้งานเค้ก 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "โดยการปิดสิ่งนี้อัตราค่าธรรมเนียมอาจไม่ถูกต้องในบางกรณีดังนั้นคุณอาจจบลงด้วยการจ่ายเงินมากเกินไปหรือจ่ายค่าธรรมเนียมสำหรับการทำธุรกรรมของคุณมากเกินไป",
   "disable_fiat": "ปิดใช้งานสกุลเงินตรา",
   "disable_sell": "ปิดการใช้งานการขาย",
-  "disable_tor": "ปิดการใช้งาน TOR",
   "disable_trade_option": "ปิดใช้งานตัวเลือกการค้า",
   "disableBatteryOptimization": "ปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่",
   "disableBatteryOptimizationDescription": "คุณต้องการปิดใช้งานการเพิ่มประสิทธิภาพแบตเตอรี่เพื่อให้การซิงค์พื้นหลังทำงานได้อย่างอิสระและราบรื่นมากขึ้นหรือไม่?",
   "disabled": "ปิดใช้งาน",
-  "disconnect_session": "ตัดการเชื่อมต่อ",
   "discount": "ประหยัด ${value}%",
   "display_settings": "การตั้งค่าการแสดงผล",
   "displayable": "สามารถแสดงได้",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "อย่าแชร์ข้อมูลนี้กับใครอื่น รวมถึงฝ่ายสนับสนุนด้วย\n\nการเงินของคุณอาจถูกขโมยโดยไม่หวังดี!",
   "do_not_show_me": "อย่าแสดงข้อความนี้อีก",
   "domain_looks_up": "การค้นหาโดเมน",
-  "domain_mismatch": "โดเมนไม่ตรงกัน",
-  "domain_mismatch_description": "เว็บไซต์นี้มีโดเมนที่ไม่ตรงกับผู้ส่งคำขอนี้ การอนุมัติอาจนำไปสู่การสูญเสียเงินทุน",
   "donation_link_details": "รายละเอียดลิงค์บริจาค",
-  "done": "เสร็จแล้ว",
   "e_sign_consent": "การยอมรับ E-Sign",
   "edit": "แก้ไข",
   "edit_backup_password": "แก้ไขรหัสผ่านสำรอง",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "เราสร้างที่อยู่ใหม่ทุกครั้งที่คุณใช้หนึ่งอย่าง แต่ที่อยู่เก่ายังสามารถใช้ได้ต่อไป",
   "email_address": "ที่อยู่อีเมล",
   "enable": "เปิดใช้งาน",
-  "enable_builtin_tor": "เปิดใช้งาน Tor ในตัว",
   "enable_mempool_api": "Mempool API สำหรับค่าธรรมเนียมและวันที่ที่ถูกต้อง",
   "enable_replace_by_fee": "เปิดใช้งานการเปลี่ยนโดยค่าธรรมเนียม",
   "enable_silent_payments_scanning": "เริ่มสแกนการชำระเงินแบบเงียบจนกว่าจะถึงปลาย",
@@ -333,10 +295,8 @@
   "error_text_template": "ชื่อแม่แบบและที่อยู่ไม่สามารถมีสัญลักษณ์ ` , '\" และต้องมีความยาวระหว่าง 1 ถึง 106 ตัวอักษร",
   "error_text_wallet_name": "ชื่อกระเป๋าสตางค์จะต้องประกอบด้วยตัวอักษร ตัวเลข และสัญลักษณ์ _ - และมีความยาวระหว่าง 1 ถึง 33 ตัวอักษร",
   "error_text_xmr": "มูลค่า XMR ไม่สามารถเกินยอดคงเหลือได้\nจำนวนสตริงทศนิยมต้องน้อยกว่าหรือเท่ากับ 12",
-  "error_while_processing": "เกิดข้อผิดพลาดในขณะที่ proceessing",
   "errorGettingCredentials": "ล้มเหลว: เกิดข้อผิดพลาดขณะรับข้อมูลรับรอง",
   "errorSigningTransaction": "เกิดข้อผิดพลาดขณะลงนามธุรกรรม",
-  "establishing_tor_connection": "การเชื่อมต่อ Tor",
   "estimated": "ประมาณการ",
   "estimated_new_fee": "ค่าธรรมเนียมใหม่โดยประมาณ",
   "estimated_receive_amount": "โดยประมาณว่าจำนวนเงินที่ได้รับ",
@@ -360,7 +320,6 @@
   "export_backup": "ส่งออกข้อมูลสำรอง",
   "export_logs": "บันทึกการส่งออก",
   "export_outputs": "เอาต์พุตส่งออก",
-  "extend_session": "ขยายเซสชัน",
   "extra_id": "ไอดีเพิ่มเติม:",
   "extracted_address_content": "คุณกำลังจะส่งเงินไปยัง\n${recipient_name}",
   "failed_authentication": "การยืนยันสิทธิ์ล้มเหลว ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "API สกุลเงินตรา",
   "fiat_balance": "เฟียต บาลานซ์",
   "field_required": "ช่องนี้จำเป็น",
-  "file_saved": "บันทึกไฟล์",
   "fill_code": "โปรดกรอกรหัสยืนยันที่ส่งไปยังอีเมลของคุณ",
   "filter_by": "กรองตาม",
   "first_wallet_text": "กระเป๋าสตางค์ที่สวยงามสำหรับ Monero, Bitcoin, Ethereum, Litecoin และ Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "ลืมรหัสผ่าน",
   "freeze": "ดักจับ",
   "frequently_asked_questions": "คำถามที่พบบ่อย",
-  "from": "จาก",
   "frozen": "ถูกดักจับ",
   "frozen_balance": "สมดุลแช่แข็ง",
   "full_balance": "ยอดคงเหลือทั้งหมด",
   "gas_exceeds_allowance": "ก๊าซที่ต้องการโดยการทำธุรกรรมเกินค่าเผื่อ",
-  "gas_price": "ราคาก๊าซ",
   "generate_name": "สร้างชื่อ",
   "generating_gift_card": "กำลังสร้างบัตรของขวัญ",
   "generating_transaction": "การสร้างธุรกรรม",
@@ -413,7 +369,6 @@
   "hide_details": "ซ่อนรายละเอียด",
   "high_contrast_theme": "ธีมความคมชัดสูง",
   "home_screen_settings": "การตั้งค่าหน้าจอหลัก",
-  "how_to_connect": "วิธีการเชื่อมต่อ",
   "how_to_use": "วิธีใช้",
   "how_to_use_card": "วิธีใช้บัตรนี้",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "คุณไม่มีโซลเพียงพอที่จะครอบคลุมการทำธุรกรรมและค่าธรรมเนียมการทำธุรกรรม กรุณาเพิ่มโซลให้มากขึ้นลงในกระเป๋าเงินของคุณหรือลดจำนวนโซลที่คุณส่งมา",
   "insufficient_lamports": "คุณไม่มีโซลเพียงพอที่จะครอบคลุมการทำธุรกรรมและค่าธรรมเนียมการทำธุรกรรม คุณต้องการอย่างน้อย ${solValueNeeded} SOL กรุณาเพิ่มโซลให้มากขึ้นลงในกระเป๋าเงินของคุณหรือลดจำนวนโซลที่คุณกำลังส่ง",
   "insufficientFundsForRentError": "คุณไม่มีโซลเพียงพอที่จะครอบคลุมค่าธรรมเนียมการทำธุรกรรมและค่าเช่าสำหรับบัญชี กรุณาเพิ่มโซลให้มากขึ้นลงในกระเป๋าเงินของคุณหรือลดจำนวนโซลที่คุณส่งมา",
-  "insufficientFundsForRentErrorReceiver": "บัญชีของผู้รับไม่เพียงพอที่จะครอบคลุมค่าเช่า โปรดขอให้ผู้รับเพิ่ม SOL เพิ่มเติมในบัญชีของพวกเขา",
   "introducing_cake_pay": "ยินดีต้อนรับสู่ Cake Pay!",
   "invalid_input": "อินพุตไม่ถูกต้อง",
   "invalid_password": "รหัสผ่านไม่ถูกต้อง",
@@ -471,7 +425,6 @@
   "logout": "ออกจากระบบ",
   "low_fee": "ค่าธรรมเนียมต่ำ",
   "low_fee_alert": "ขณะนี้คุณกำลังใช้ค่าธรรมเนียมของเครือข่ายที่มีความสำคัญต่ำ ซึ่งอาจทำให้เกิดการรอนาน ราคาที่แตกต่างกัน หรือยกเลิกการซื้อขาย เราแนะนำให้กำหนดค่าธรรมเนียมที่สูงขึ้นเพื่อประสบการณ์ที่ดีขึ้น",
-  "made_easy": "ทำง่าย",
   "manage_nodes": "จัดการโหนด",
   "manage_pow_nodes": "จัดการโหนด PoW",
   "manage_yats": "จัดการ Yats",
@@ -483,8 +436,6 @@
   "memo": "หมายเหตุ:",
   "message": "ข้อความ",
   "message_verified": "ข้อความได้รับการตรวจสอบอย่างประสบความสำเร็จ",
-  "messages": "ข้อความ",
-  "method": "วิธี",
   "methods": "วิธีการ",
   "min_amount": "จำนวนขั้นต่ำ: ${value}",
   "min_value": "ขั้นต่ำ: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "ธีมมืด Monero",
   "monero_light_theme": "ธีมแสง Monero",
   "moonpay_alert_text": "มูลค่าของจำนวนต้องมากกว่าหรือเท่ากับ ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "เกิดข้อผิดพลาดในขณะที่ดึง NFTs กรุณาตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณและลองอีกครั้ง",
   "more_options": "ตัวเลือกเพิ่มเติม",
   "multiple_addresses_detected": "ตรวจพบหลายที่อยู่",
   "mweb_confirmed": "MWEB ยืนยันแล้ว",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "ชื่อป้ายกำกับ",
   "new_subaddress_title": "ที่อยู่ใหม่",
   "new_template": "แม่แบบใหม่",
-  "new_transactions_notifications": "ส่งการแจ้งเตือนเกี่ยวกับธุรกรรมใหม่",
   "new_wallet": "กระเป๋าใหม่",
   "newConnection": "การเชื่อมต่อใหม่",
   "no_cards_found": "ไม่พบการ์ด",
@@ -539,7 +488,6 @@
   "normal": "ปกติ",
   "note_optional": "บันทึก (ไม่จำเป็น)",
   "note_tap_to_change": "หมายเหตุ (กดเพื่อเปลี่ยน)",
-  "notification_permission_denied": "การอนุญาตการแจ้งเตือนได้รับการปฏิเสธอย่างอนุญาตโปรดเปิดใช้งานด้วยตนเองในการตั้งค่า",
   "nullURIError": "URI เป็นโมฆะ",
   "offer_expires_in": "ข้อเสนอจะหมดอายุใน: ",
   "offline": "ออฟไลน์",
@@ -571,20 +519,8 @@
   "password": "รหัสผ่าน",
   "paste": "วาง",
   "pause_wallet_creation": "ขณะนี้ความสามารถในการสร้าง Haven Wallet ถูกหยุดชั่วคราว",
-  "payjoin_card_content": "Payjoin เป็นฟีเจอร์การประหยัดความเป็นส่วนตัวและการประหยัดค่าธรรมเนียมใหม่ใน Bitcoin",
-  "payjoin_details": "Payjoin รายละเอียด",
-  "payjoin_enabled": "Payjoin เปิดใช้งาน",
-  "payjoin_enabling_popup_content": "คุณสามารถสลับ Payjoin ภายใต้เมนู→ความเป็นส่วนตัว→ใช้ Payjoin เพื่อเปิดใช้งานหรือปิดการใช้งานในภายหลัง",
-  "payjoin_enabling_popup_title": "เปิดใช้งาน Payjoin",
-  "payjoin_request_awaiting_tx": "รอธุรกรรม",
-  "payjoin_request_in_progress": "การดำเนินการ",
-  "payjoin_unavailable": "Payjoin ไม่พร้อมใช้งาน",
-  "payjoin_unavailable_sheet_content": "การรับธุรกรรม Payjoin จะต้องให้คุณมี Bitcoin พร้อมใช้งาน \\ n \\ nas เร็ว ๆ นี้เนื่องจากกระเป๋าเงินของคุณมีเงินทุน Payjoin จะเปิดใช้งานโดยอัตโนมัติ",
-  "payjoin_unavailable_sheet_title": "ทำไม Payjoin ไม่พร้อมใช้งาน?",
   "payment_id": "ID การชำระเงิน: ",
-  "payment_made_easy": "การชำระเงินทำให้ง่าย",
   "payment_was_received": "การชำระเงินของคุณได้รับการรับทราบแล้ว",
-  "payments": "การชำระเงิน",
   "pending": " (อยู่ระหว่างดำเนินการ)",
   "percentageOf": "${amount} ของ",
   "pin_at_top": "ปักหมุด ${token} ที่ด้านบน",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "โปรดลองเชื่อมต่อกับโหนดอื่น",
   "please_wait": "โปรดรอ",
   "polygonscan_history": "ประวัติ PolygonScan",
-  "potential_scam": "การหลอกลวงที่มีศักยภาพ",
   "powered_by": "พัฒนาขึ้นโดย ${title}",
   "pre_seed_button_text": "ฉันเข้าใจ แสดง seed ของฉัน",
-  "pre_seed_description": "ในหน้าถัดไปคุณจะเห็นชุดคำ นี่คือเมล็ดพันธุ์ที่ไม่เหมือนใครและเป็นส่วนตัวของคุณและเป็นวิธีเดียวที่จะกู้คืนกระเป๋าเงินของคุณในกรณีที่สูญเสียหรือทำงานผิดปกติ มันเป็นความรับผิดชอบของคุณที่จะเขียนลงและเก็บไว้ในที่ปลอดภัยนอกแอพเค้กกระเป๋าเงิน",
+  "pre_seed_description": "บนหน้าถัดไปคุณจะเห็นชุดของคำ ${words} คำ นี่คือ seed ของคุณที่ไม่ซ้ำใดๆ และเป็นความลับเพียงของคุณ และนี่คือเพียงวิธีเดียวที่จะกู้กระเป๋าของคุณในกรณีที่สูญหายหรือมีปัญหา มันเป็นความรับผิดชอบของคุณเพื่อเขียนมันลงบนกระดาษและจัดเก็บไว้ในที่ปลอดภัยนอกแอป Cake Wallet",
   "pre_seed_title": "สำคัญ",
   "prepaid_cards": "บัตรเติมเงิน",
   "prevent_screenshots": "ป้องกันภาพหน้าจอและการบันทึกหน้าจอ",
@@ -617,7 +552,6 @@
   "proceed_on_device": "ดำเนินการบนอุปกรณ์ของคุณ",
   "proceed_on_device_description": "โปรดทำตามคำแนะนำที่ได้รับแจ้งไว้ในกระเป๋าเงินฮาร์ดแวร์ของคุณ",
   "processing": "กำลังประมวลผล",
-  "processing_signed_tx": "การประมวลผลธุรกรรมที่ลงนาม",
   "profile": "ประวัติโดยย่อ",
   "provider_error": "ข้อผิดพลาด ${provider}",
   "public_key": "คีย์สาธารณะ",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "ตัวแทนของคุณดูเหมือนจะไม่อยู่ในสถานะที่ดี แตะที่นี่เพื่อเลือกอันใหม่",
   "repeat_wallet_password": "ทำซ้ำรหัสผ่านกระเป๋าเงิน",
   "repeated_password_is_incorrect": "รหัสผ่านซ้ำไม่ถูกต้อง โปรดทำซ้ำรหัสผ่านกระเป๋าเงินอีกครั้ง",
-  "requested": "ได้รับการร้องขอ",
   "require_for_adding_contacts": "ต้องการสำหรับการเพิ่มผู้ติดต่อ",
   "require_for_all_security_and_backup_settings": "จำเป็นสำหรับการตั้งค่าความปลอดภัยและการสำรองข้อมูลทั้งหมด",
   "require_for_assessing_wallet": "จำเป็นสำหรับการเข้าถึงกระเป๋าเงิน",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "จำเป็นต้องส่งไปยังกระเป๋าเงินภายใน",
   "require_for_sends_to_non_contacts": "จำเป็นต้องส่งไปยังผู้ที่ไม่ได้ติดต่อ",
   "require_pin_after": "ต้องการ PIN หลังจาก",
-  "required_passphrase": "วรรณะ",
   "rescan": "สแกนใหม่",
   "resend_code": "โปรดส่งอีกครั้ง",
   "reset": "รีเซ็ต",
   "reset_password": "รีเซ็ตรหัสผ่าน",
-  "restore": "คืนค่า",
   "restore_active_seed": "ซีดที่ใช้งานอยู่",
   "restore_address": "ที่อยู่",
   "restore_bitcoin_description_from_keys": "กู้กระเป๋าของคุณจากสตริง WIF ที่สร้างขึ้นจากคีย์ส่วนตัวของคุณ",
@@ -713,10 +644,7 @@
   "search_language": "ค้นหาภาษา",
   "second_intro_content": "Yat ของคุณเป็นอิโมจิที่อยู่เดียวที่จะแทนที่ทุกที่อยู่และเลขฐานสิบหกของคุณสำหรับเหรียญคริปโตทุกชนิด",
   "second_intro_title": "อิโมจิที่อยู่เดียวที่จะควบคุมพวกเขาทั้งหมด",
-  "security": "ความปลอดภัย",
   "security_and_backup": "ความปลอดภัยและการสำรองข้อมูล",
-  "security_risk": "ความเสี่ยงด้านความปลอดภัย",
-  "security_risk_description": "โดเมนนี้ถูกตั้งค่าสถานะว่าไม่ปลอดภัยโดยผู้ให้บริการความปลอดภัยหลายราย ออกทันทีเพื่อปกป้องทรัพย์สินของคุณ",
   "seed_alert_back": "กลับ",
   "seed_alert_content": "Seed เป็นเพียงวิธีเดียวที่จะกู้กระเป๋าของคุณ คุณได้เขียนมันขึ้นลงกระดาษหรือไม่?",
   "seed_alert_title": "ความสนใจ",
@@ -751,6 +679,9 @@
   "seedtype": "เมล็ดพันธุ์",
   "seedtype_alert_content": "การแบ่งปันเมล็ดกับกระเป๋าเงินอื่น ๆ เป็นไปได้เฉพาะกับ bip39 seedtype",
   "seedtype_alert_title": "การแจ้งเตือน seedtype",
+  "seedtype_legacy": "มรดก (25 คำ)",
+  "seedtype_polyseed": "โพลีส (16 คำ)",
+  "seedtype_wownero": "wownero (14 คำ)",
   "select_backup_file": "เลือกไฟล์สำรอง",
   "select_buy_provider_notice": "เลือกผู้ให้บริการซื้อด้านบน คุณสามารถข้ามหน้าจอนี้ได้โดยการตั้งค่าผู้ให้บริการซื้อเริ่มต้นในการตั้งค่าแอป",
   "select_destination": "โปรดเลือกปลายทางสำหรับไฟล์สำรอง",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "ส่งจากกระเป๋าเงินภายนอก",
   "send_name": "ชื่อ",
   "send_new": "ใหม่",
-  "send_payjoin": "ส่ง Payjoin",
   "send_payment_id": "ID การชำระเงิน (ไม่จำเป็น)",
   "send_priority": "ในขณะนี้ค่าธรรมเนียมถูกตั้งค่าเป็นความสำคัญ ${transactionPriority} \nความสำคัญของธุรกรรมสามารถปรับได้ในการตั้งค่า",
   "send_sending": "กำลังส่ง...",
@@ -832,9 +762,7 @@
   "show_keys": "แสดงซีด/คีย์",
   "show_market_place": "แสดงตลาดกลาง",
   "show_seed": "แสดงซีด",
-  "sign_all": "ลงนามทั้งหมด",
   "sign_message": "ลงนามข้อความ",
-  "sign_one": "ลงชื่อเข้าใช้",
   "sign_up": "สมัครสมาชิก",
   "sign_verify_message": "ลงชื่อเข้าใช้หรือตรวจสอบข้อความ",
   "sign_verify_message_sub": "ลงชื่อเข้าใช้หรือตรวจสอบข้อความโดยใช้คีย์ส่วนตัวของคุณ",
@@ -863,14 +791,11 @@
   "sort_by": "เรียงตาม",
   "spend_key_private": "คีย์จ่าย (ส่วนตัว)",
   "spend_key_public": "คีย์จ่าย (สาธารณะ)",
-  "starting_tor_proxy": "เริ่มพร็อกซี TOR",
   "status": "สถานะ: ",
-  "step": "ขั้นตอน",
   "string_default": "ค่าเริ่มต้น",
   "subaddress_title": "รายการที่อยู่ย่อย",
   "subaddresses": "ที่อยู่ย่อย",
   "submit_request": "ส่งคำขอ",
-  "success": "ความสำเร็จ",
   "successful": "ประสบความสำเร็จ",
   "support_description_guides": "เอกสารและการสนับสนุนสำหรับปัญหาทั่วไป",
   "support_description_live_chat": "ฟรีและรวดเร็ว! ตัวแทนฝ่ายสนับสนุนที่ผ่านการฝึกอบรมพร้อมให้ความช่วยเหลือ",
@@ -878,7 +803,6 @@
   "support_title_guides": "เอกสารกระเป๋าเงินเค้ก",
   "support_title_live_chat": "การสนับสนุนสด",
   "support_title_other_links": "ลิงค์สนับสนุนอื่น ๆ",
-  "supported": "ที่ได้รับการสนับสนุน",
   "swap": "แลกเปลี่ยน",
   "sweeping_wallet": "กวาดกระเป๋าสตางค์",
   "sweeping_wallet_alert": "การดำเนินการนี้ใช้เวลาไม่นาน อย่าออกจากหน้าจอนี้ มิฉะนั้นเงินที่กวาดไปอาจสูญหาย",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "กำลังซิงโครไนซ์",
   "sync_status_timed_out": "หมดเวลา",
   "sync_status_unsupported": "โหนดที่ไม่ได้รับการสนับสนุน",
-  "synchronizing": "การซิงโครไนซ์",
   "syncing_wallet_alert_content": "รายการยอดเงินและธุรกรรมของคุณอาจไม่สมบูรณ์จนกว่าจะมีข้อความว่า “ซิงโครไนซ์” ที่ด้านบน คลิก/แตะเพื่อเรียนรู้เพิ่มเติม่",
   "syncing_wallet_alert_title": "กระเป๋าสตางค์ของคุณกำลังซิงค์",
   "template": "แบบฟอร์ม",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "ผู้ให้บริการ Thorchain ไม่รองรับที่อยู่ taproot โปรดเปลี่ยนที่อยู่หรือเลือกผู้ให้บริการอื่น",
   "time": "${minutes}m ${seconds}s",
   "tip": "เพิ่มค่าตอบแทน:",
-  "to": "ถึง",
   "today": "วันนี้",
-  "token_already_exists": "โทเค็นมีอยู่แล้ว",
   "token_contract_address": "ที่อยู่สัญญาโทเค็น",
   "token_decimal": "โทเค็นทศนิยม",
   "token_name": "ชื่อโทเค็น เช่น Tether",
   "token_symbol": "สัญลักษณ์โทเค็น เช่น USDT",
   "tokenID": "บัตรประจำตัวประชาชน",
-  "ton_extra_info": "โปรดอย่าลืมระบุรหัสบันทึกในขณะที่ส่งธุรกรรม TON สำหรับการแลกเปลี่ยน",
   "tor_connection": "การเชื่อมต่อทอร์",
-  "tor_connection_timeout": "หมดเวลาเชื่อมต่อ tor",
-  "tor_experimental": "นี่เป็นคุณสมบัติการทดลองไม่ใช่การเชื่อมต่อทั้งหมดที่ทำจากการรองรับเค้กกระเป๋าเงิน TOR การกำหนดเส้นทาง - การเชื่อมต่อบางอย่างอาจใช้ Clearnet เพื่อกำหนดเส้นทางการจราจรแอพใช้ TOR ด้วยโหมด VPN",
   "tor_only": "Tor เท่านั้น",
   "total": "ทั้งหมด",
   "total_saving": "ประหยัดรวม",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "ถ้าหน้าจอไม่ขึ้นหลังจาก 1 นาทีแล้ว ให้ตรวจสอบ block explorer และอีเมลของคุณ",
   "transactions": "ธุรกรรม",
   "transactions_by_date": "ธุรกรรมตามวันที่",
-  "transport_type": "ประเภทการขนส่ง",
   "trongrid_history": "ประวัติศาสตร์ Trongrid",
   "trusted": "มั่นคง",
-  "try_again": "ลองอีกครั้ง",
   "tx_commit_exception_no_dust_on_change": "ธุรกรรมถูกปฏิเสธด้วยจำนวนเงินนี้ ด้วยเหรียญเหล่านี้คุณสามารถส่ง ${min} โดยไม่ต้องเปลี่ยนแปลงหรือ ${max} ที่ส่งคืนการเปลี่ยนแปลง",
   "tx_commit_failed": "การทำธุรกรรมล้มเหลว กรุณาติดต่อฝ่ายสนับสนุน",
   "tx_commit_failed_no_peers": "การทำธุรกรรมล้มเหลวในการออกอากาศโปรดลองอีกครั้งในวินาทีหรือมากกว่านั้น",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "รายละเอียดเหรียญที่ไม่ได้ใช้",
   "unspent_coins_title": "เหรียญที่ไม่ได้ใช้",
   "unsupported_asset": "เราไม่สนับสนุนการกระทำนี้สำหรับเนื้อหานี้ โปรดสร้างหรือเปลี่ยนเป็นกระเป๋าเงินประเภทสินทรัพย์ที่รองรับ",
-  "update_session": "อัปเดตเซสชัน",
   "uptime": "เวลาทำงาน",
   "upto": "สูงสุด ${value}",
   "usb": "ยูเอสบี",
   "use": "สลับไปที่ ",
   "use_card_info_three": "ใช้บัตรดิจิตอลออนไลน์หรือผ่านวิธีการชำระเงินแบบไม่ต้องใช้บัตรกระดาษ",
   "use_card_info_two": "เงินจะถูกแปลงค่าเป็นดอลลาร์สหรัฐเมื่อถือไว้ในบัญชีสำรองเงิน ไม่ใช่สกุลเงินดิจิตอล",
-  "use_device_theme": "ใช้ธีมอุปกรณ์",
-  "use_payjoin": "ใช้ Payjoin",
   "use_ssl": "ใช้ SSL",
   "use_suggested": "ใช้ที่แนะนำ",
   "use_testnet": "ใช้ testnet",
-  "user_rejected_method": "วิธีการปฏิเสธของผู้ใช้",
   "value": "ค่า",
   "value_type": "ประเภทค่า",
   "variable_pair_not_supported": "คู่ความสัมพันธ์ที่เปลี่ยนแปลงได้นี้ไม่สนับสนุนกับหุ้นที่เลือก",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "คุณสามารถดูเมล็ดพันธุ์นี้ได้อีกครั้งภายใต้",
   "wallet_group_empty_state_text_one": "ดูเหมือนว่าคุณจะไม่มีกลุ่มกระเป๋าเงินที่เข้ากันได้ !\n\n แตะ",
   "wallet_group_empty_state_text_two": "ด้านล่างเพื่อสร้างใหม่",
-  "wallet_has_passphrase": "กระเป๋าเงินนี้มีข้อความรหัสผ่าน",
   "wallet_keys": "ซีดของกระเป๋า/คีย์",
   "wallet_list_create_new_wallet": "สร้างกระเป๋าใหม่",
   "wallet_list_edit_group_name": "แก้ไขชื่อกลุ่ม",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "กระเป๋า",
   "warning": "คำเตือน",
-  "welcome": "ยินดีต้อนรับ",
+  "welcome": "ยินดีต้อนรับสู่",
   "welcome_subtitle_new_wallet": "หากคุณต้องการเริ่มต้นใหม่ให้แตะสร้างกระเป๋าเงินใหม่ด้านล่างและคุณจะออกจากการแข่งขัน",
   "welcome_subtitle_restore_wallet": "หากคุณมีกระเป๋าเงินที่มีอยู่ที่คุณต้องการนำเข้าเค้กให้เลือกคืนกระเป๋าเงินที่มีอยู่แล้วเราจะพาคุณผ่านกระบวนการ",
   "welcome_to_cakepay": "ยินดีต้อนรับสู่ Cake Pay!",
-  "what_is_payjoin": "PayJoin ? คืออะไร",
   "what_is_silent_payments": "การชำระเงินเงียบคืออะไร?",
   "widgets_address": "ที่อยู่",
   "widgets_or": "หรือ",
@@ -1111,6 +1021,5 @@
   "you_will_get": "แปลงเป็น",
   "you_will_receive_estimated_amount": "คุณจะได้รับ(โดยประมาณ )",
   "you_will_send": "แปลงจาก",
-  "youCanGoBackToYourDapp": "คุณสามารถกลับไปที่ dapp ของคุณได้ทันที",
   "yy": "ปี"
 }
\ No newline at end of file
diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb
index 2ca3b02e4..a378ff3ea 100644
--- a/res/values/strings_tl.arb
+++ b/res/values/strings_tl.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Magdagdag ng mga prepaid na pondo sa card (hanggang sa ${value})",
   "add_new_node": "Magdagdag ng bagong node",
   "add_new_word": "Magdagdag ng bagong salita",
-  "add_passphrase": "Magdagdag ng passphrase",
-  "add_passphrase_warning_text": "Magpasok lamang ng isang passphrase kung ginamit mo ang isa para sa pitaka na ito sa nakaraan. Kung nagpasok ka ng maling passphrase o hindi pa gumamit ng isang passphrase bago sa pitaka na ito, hindi mo makikita ang alinman sa umiiral na pondo o kasaysayan.",
   "add_receiver": "Magdagdag ng isa pang tatanggap (opsyonal)",
   "add_secret_code": "O, idagdag ang sikretong code na ito sa isang authenticator app",
   "add_tip": "Magdagdag ng Tip",
   "add_token_disclaimer_check": "Kinumpirma ko ang address ng kontrata ng token at impormasyon gamit ang isang kagalang-galang na mapagkukunan. Ang pagdaragdag ng nakakahamak o hindi tamang impormasyon ay maaaring magresulta sa pagkawala ng mga pondo.",
   "add_token_warning": "Huwag i-edit o magdagdag ng mga token tulad ng itinuro ng mga scammers.\nLaging kumpirmahin ang mga token address na may mga kagalang-galang na mapagkukunan!",
   "add_value": "Magdagdag ng halaga",
-  "added_message_for_ata_error": "Mabuting tiyakin na mayroon kang sapat na balanse ng sol upang makumpleto ang iyong transaksyon.",
   "address": "Address",
   "address_book": "Address Book",
   "address_book_menu": "Address book",
@@ -55,8 +52,6 @@
   "anonpay_description": "Bumuo ng ${type}. Ang tatanggap ay maaaring ${method} na may anumang suportadong cryptocurrency, at makakatanggap ka ng mga pondo sa wallet na ito.",
   "apk_update": "APK update",
   "approve": "Aprubahan",
-  "approve_request": "Aprubahan ang kahilingan",
-  "approve_tokens": "Aprubahan ang mga token",
   "arrive_in_this_address": "Ang ${currency} ${tag} ay darating sa address na ito",
   "ascending": "Umakyat",
   "ask_each_time": "Magtanong sa tuwing",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Nanghihintay ng Kumpirmasyon sa Pagbabayad",
   "background_sync": "Pag -sync ng background",
   "background_sync_mode": "Background sync mode",
-  "background_sync_on_battery_low": "Mag -synchronize sa mababang baterya",
-  "background_sync_on_charging": "Mag -synchronize lamang kapag singilin",
-  "background_sync_on_device_idle": "Mag -synchronize lamang kapag hindi ginagamit ang aparato",
-  "background_sync_on_unmetered_network": "Nangangailangan ng hindi natukoy na network",
   "backup": "Backup",
   "backup_file": "Backup na file",
   "backup_password": "Backup na password",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Bumili ng Bitcoin",
   "buy_now": "Bumili Ngayon",
   "buy_provider_unavailable": "Kasalukuyang hindi available ang provider.",
-  "buy_sell_pair_is_not_supported_warning": "Ang pares ng pera na ito ay hindi suportado ng anumang tagapagbigay ng serbisyo para sa napiling paraan ng pagbabayad. Mangyaring pumili ng ibang pares o subukang baguhin ang paraan ng pagbabayad.",
   "buy_with": "Bumili ng",
   "by_cake_pay": "by Cake Pay",
   "cake_2fa_preset": "Cake 2FA Preset",
@@ -124,12 +114,9 @@
   "camera_consent": "Gagamitin ang iyong camera upang kumuha ng larawan para sa mga layunin ng pagkakakilanlan sa pamamagitan ng ${provider}. Pakisuri ang kanilang Patakaran sa Privacy para sa mga detalye.",
   "camera_permission_is_required": "Kinakailangan ang pahintulot sa camera.\nMangyaring paganahin ito mula sa mga setting ng app.",
   "cancel": "Kanselahin",
-  "cannot_verify": "Hindi ma -verify",
-  "cannot_verify_description": "Ang domain na ito ay hindi ma -verify. Suriin nang mabuti ang kahilingan bago aprubahan.",
   "card_address": "Address:",
   "cardholder_agreement": "Kasunduan sa Cardholder",
   "cards": "Mga Card",
-  "chain_id": "Chain ID",
   "chains": "Mga Chain",
   "change": "Sukli",
   "change_backup_password_alert": "Ang iyong mga nakaraang backup na file ay hindi magagamit upang i-import gamit ang bagong backup na password. Ang bagong backup na password ay gagamitin lamang para sa mga bagong backup na file. Sigurado ka bang gusto mong baguhin ang backup na password?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Sigurado ka bang nais mong baguhin ang mga representative?",
   "change_rep_successful": "Matagumpay na nagbago ng representative",
   "change_selected_exchanges": "Baguhin ang mga napiling palitan",
-  "change_selected_pair": "Baguhin ang napiling pares",
   "change_wallet_alert_content": "Gusto mo bang palitan ang kasalukuyang wallet sa ${wallet_name}?",
   "change_wallet_alert_title": "Baguhin ang kasalukuyang wallet",
   "choose_a_payment_method": "Pumili ng isang paraan ng pagbabayad",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Nakumpirma",
   "congratulations": "Congratulations!",
   "connect_an_existing_yat": "Ikonekta ang isang umiiral na Yat",
-  "connect_hw_info_step_1": "Siguraduhin na ang iyong aparato ay pinapagana.",
-  "connect_hw_info_step_2": "Lumiko ang Bluetooth para sa parehong mga aparato at ipares ang mga ito mula sa telepono, o ikonekta ang iyong mga aparato nang magkasama gamit ang isang USB cable.",
-  "connect_hw_info_step_3": "I -unlock ang iyong aparato at mag -navigate sa nais na crypto app.",
-  "connect_hw_info_step_4": "Piliin ang iyong aparato sa cake wallet at magpatuloy sa pag -setup.",
   "connect_yats": "Ikonekta sa Yats",
   "connect_your_hardware_wallet": "Ikonekta ang iyong hardware wallet gamit ang Bluetooth o USB",
   "connect_your_hardware_wallet_ios": "Ikonekta ang iyong wallet gamit ang Bluetooth",
-  "connected": "Konektado",
   "connection_sync": "Koneksyon at pag-sync",
   "connectWalletPrompt": "Ikonekta ang iyong wallet sa WalletConnect upang gumawa ng mga transaksyon",
   "contact": "Contact",
@@ -207,8 +188,6 @@
   "copy": "Kopyahin",
   "copy_address": "Kopyahin ang Address",
   "copy_id": "Kopyahin ang ID",
-  "copy_payjoin_address": "Kopyahin ang address ng PayJoin",
-  "copy_payjoin_url": "Kopyahin ang Payjoin url",
   "copyWalletConnectLink": "Kopyahin ang link ng WalletConnect mula sa dApp at i-paste dito",
   "corrupted_seed_notice": "Ang mga file para sa pitaka na ito ay nasira at hindi mabubuksan. Mangyaring tingnan ang parirala ng binhi, i -save ito, at ibalik ang pitaka.\n\nKung ang halaga ay walang laman, kung gayon ang binhi ay hindi ma -recover nang tama.",
   "countries": "Mga bansa",
@@ -245,22 +224,11 @@
   "descending": "Pababang",
   "description": "Paglalarawan",
   "destination_tag": "Tag ng patutunguhan:",
-  "deuro_collect_interest": "Mangolekta",
-  "deuro_savings": "Pagtipid ni dEuro",
-  "deuro_savings_add": "Deposito",
-  "deuro_savings_balance": "Balanse sa pagtitipid",
-  "deuro_savings_collect_interest": "Mangolekta ng interes",
-  "deuro_savings_remove": "Umatras",
-  "deuro_savings_set_approval": "Itakda ang pag -apruba",
-  "deuro_savings_subtitle": "Kumita ng hanggang sa 10% na interes sa iyong mga hawak na Deuro StableCoin",
-  "deuro_tx_commited_content": "Maaaring tumagal ng ilang segundo para sa transaksyon upang kumpirmahin at maipakita sa screen",
-  "device_is_signing": "Nag -sign ang aparato",
   "dfx_option_description": "Bumili ng crypto kasama ang EUR & CHF. Para sa mga retail customer at corporate customer sa Europe",
   "didnt_get_code": "Hindi nakuha ang code?",
   "digit_pin": "-digit PIN",
   "digital_and_physical_card": " digital at pisikal na prepaid debit card",
   "disable": "Huwag paganahin",
-  "disable_automatic_exchange_status_updates": "Huwag paganahin ang mga awtomatikong pag -update ng katayuan ng palitan",
   "disable_bulletin": "Huwag paganahin ang bulletin ng katayuan ng serbisyo",
   "disable_buy": "Huwag paganahin ang pagkilos ng pagbili",
   "disable_cake_2fa": "Huwag paganahin ang Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Sa pamamagitan ng pag -off nito, ang mga rate ng bayad ay maaaring hindi tumpak sa ilang mga kaso, kaya maaari mong tapusin ang labis na bayad o pagsuporta sa mga bayarin para sa iyong mga transaksyon",
   "disable_fiat": "Huwag paganahin ang fiat",
   "disable_sell": "Huwag paganahin ang pagkilos ng pagbebenta",
-  "disable_tor": "Huwag paganahin ang tor",
   "disable_trade_option": "Huwag paganahin ang pagpipilian sa kalakalan",
   "disableBatteryOptimization": "Huwag Paganahin ang Pag-optimize ng Baterya",
   "disableBatteryOptimizationDescription": "Nais mo bang huwag paganahin ang pag-optimize ng baterya upang gawing mas malaya at maayos ang background sync?",
   "disabled": "Hindi pinagana",
-  "disconnect_session": "Idiskonekta ang sesyon",
   "discount": "Makatipid ng ${value}%",
   "display_settings": "Mga setting ng pagpapakita",
   "displayable": "Maipapakita",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Huwag ibahagi ang mga ito sa sinuman kasama ang tagatustos.\n\nMaaaring manakaw ang iyong mga pondo!",
   "do_not_show_me": "Huwag mo itong ipakita muli",
   "domain_looks_up": "Mga paghahanap ng domain",
-  "domain_mismatch": "Domain mismatch",
-  "domain_mismatch_description": "Ang website na ito ay may isang domain na hindi tumutugma sa nagpadala ng kahilingan na ito. Ang pag -apruba ay maaaring humantong sa pagkawala ng mga pondo.",
   "donation_link_details": "Mga detalye ng link ng donasyon",
-  "done": "Tapos na",
   "e_sign_consent": "E-Sign Consent",
   "edit": "I-edit",
   "edit_backup_password": "I-edit ang backup na password",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Bumubuo kami ng mga bagong address sa tuwing gagamit ka ng isa, ngunit ang mga nakaraang address ay patuloy na gumagana",
   "email_address": "Email Address",
   "enable": "Paganahin",
-  "enable_builtin_tor": "Paganahin ang built-in tor",
   "enable_mempool_api": "Mempool API para sa tumpak na bayad at mga petsa",
   "enable_replace_by_fee": "Paganahin ang  Replace-By-Fee",
   "enable_silent_payments_scanning": "Simulan ang pag -scan ng tahimik na pagbabayad, hanggang sa maabot ang tip",
@@ -333,10 +295,8 @@
   "error_text_template": "Ang pangalan ng template at address ay hindi maaaring maglaman ng mga simbolo ng ',' \"\nat dapat sa pagitan ng 1 at 106 na character ang haba",
   "error_text_wallet_name": "Ang pangalan ng wallet ay maaari lamang maglaman ng mga titik, numero, _ - mga simbolo\nat dapat sa pagitan ng 1 at 33 character ang haba",
   "error_text_xmr": "Ang halaga ng XMR ay hindi maaaring lumampas sa magagamit na balanse.\nAng bilang ng mga numero ng fraction ay dapat na mas mababa o katumbas ng 12",
-  "error_while_processing": "May naganap na error habang nagpapatuloy",
   "errorGettingCredentials": "Nabigo: Error habang kumukuha ng mga kredensyal",
   "errorSigningTransaction": "Error habang pinipirmahan ang transaksyon",
-  "establishing_tor_connection": "Koneksyon ng Tor",
   "estimated": "Tinatayang",
   "estimated_new_fee": "Tinatayang bagong fee",
   "estimated_receive_amount": "Tinatayang natanggap na halaga",
@@ -360,7 +320,6 @@
   "export_backup": "I-export ang backup",
   "export_logs": "Mga log ng pag -export",
   "export_outputs": "Mga output ng pag -export",
-  "extend_session": "Palawakin ang session",
   "extra_id": "Dagdag na ID:",
   "extracted_address_content": "Magpapadala ka ng pondo sa\n${recipient_name}",
   "failed_authentication": "Nabigo ang pagpapatunay. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "Balanse ng fiat",
   "field_required": "Kinakailangan ang patlang na ito",
-  "file_saved": "Nai -save ang file",
   "fill_code": "Mangyaring ilagay ang verfification code na ibinigay sa iyong email",
   "filter_by": "Filter ni",
   "first_wallet_text": "Kahanga-hangang wallet para sa Monero, Bitcoin, Litecoin, Ethereum, at Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Nakalimutan ang Password",
   "freeze": "I-freeze",
   "frequently_asked_questions": "Mga madalas itanong",
-  "from": "Mula sa",
   "frozen": "Frozen",
   "frozen_balance": "Frozen na balanse",
   "full_balance": "Buong Balanse",
   "gas_exceeds_allowance": "Ang gas na kinakailangan ng transaksyon ay lumampas sa allowance.",
-  "gas_price": "Presyo ng Gas",
   "generate_name": "Bumuo ng pangalan",
   "generating_gift_card": "Bumubuo ng Gift Card",
   "generating_transaction": "Bumubuo ng transaksyon",
@@ -413,7 +369,6 @@
   "hide_details": "Itago ang mga detalye",
   "high_contrast_theme": "High Contrast Theme",
   "home_screen_settings": "Mga setting ng home screen",
-  "how_to_connect": "Paano kumonekta",
   "how_to_use": "Paano gamitin",
   "how_to_use_card": "Paano gamitin ang card na ito",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "Wala kang sapat na SOL upang masakop ang transaksyon at ang bayad sa transaksyon nito. Mabuting magdagdag ng higit pa sa iyong pitaka o bawasan ang sol na halaga na iyong ipinapadala.",
   "insufficient_lamports": "Wala kang sapat na SOL upang masakop ang transaksyon at ang bayad sa transaksyon nito. Kailangan mo ng hindi bababa sa ${solValueNeeded} sol. Mabait na magdagdag ng higit pang sol sa iyong pitaka o bawasan ang dami ng iyong ipinapadala",
   "insufficientFundsForRentError": "Wala kang sapat na SOL upang masakop ang fee sa transaksyon at upa para sa account. Mabait na magdagdag ng higit pa sa iyong wallet o bawasan ang halaga ng SOL na iyong ipinapadala",
-  "insufficientFundsForRentErrorReceiver": "Ang account ng tatanggap ay walang sapat na sol upang masakop ang upa. Mangyaring hilingin sa tatanggap na magdagdag ng higit pang SOL sa kanilang account.",
   "introducing_cake_pay": "Pagpapakilala ng Cake Pay!",
   "invalid_input": "Di-wastong input",
   "invalid_password": "Di-wastong password",
@@ -471,7 +425,6 @@
   "logout": "Mag-logout",
   "low_fee": "Mababang fee",
   "low_fee_alert": "Kasalukuyan kang gumagamit ng isang mababang priyoridad sa network fee. Maaari itong maging sanhi ng mahabang paghihintay, iba't ibang mga rate, o kanselahin ang mga trading. Inirerekumenda namin ang pagtatakda ng isang mas mataas na fee para sa isang mas mahusay na karanasan.",
-  "made_easy": "Ginawa madali",
   "manage_nodes": "Pamahalaan ang mga node",
   "manage_pow_nodes": "Pamahalaan ang mga PoW node",
   "manage_yats": "Pamahalaan ang mga Yat",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "Mensahe",
   "message_verified": "Ang mensahe ay matagumpay na na -verify",
-  "messages": "Mga mensahe",
-  "method": "Paraan",
   "methods": "Mga Paraan",
   "min_amount": "Min: ${value}",
   "min_value": "Min: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero Dark Theme",
   "monero_light_theme": "Monero Light Theme",
   "moonpay_alert_text": "Ang halaga ay dapat na higit pa o katumbas ng ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "May naganap na error habang kinukuha ang mga NFT. Mabuting suriin ang iyong koneksyon sa internet at subukang muli.",
   "more_options": "Higit pang mga Pagpipilian",
   "multiple_addresses_detected": "Maramihang mga address na napansin",
   "mweb_confirmed": "Nakumpirma na MWeb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Pangalan ng label",
   "new_subaddress_title": "Bagong address",
   "new_template": "Bagong Template",
-  "new_transactions_notifications": "Magpadala ng mga abiso tungkol sa mga bagong transaksyon",
   "new_wallet": "Bagong Wallet",
   "newConnection": "Bagong Koneksyon",
   "no_cards_found": "Walang nahanap na mga card",
@@ -539,7 +488,6 @@
   "normal": "Normal",
   "note_optional": "Tala (opsyonal)",
   "note_tap_to_change": "Tala (i-tap para baguhin)",
-  "notification_permission_denied": "Ang pahintulot ng abiso ay pinahihintulutan na tumanggi, mangyaring manu -manong paganahin ito sa mga setting",
   "nullURIError": "Ang URI ay null",
   "offer_expires_in": "Mag-expire ang alok sa: ",
   "offline": "Offline",
@@ -571,20 +519,8 @@
   "password": "Password",
   "paste": "I-paste",
   "pause_wallet_creation": "Kasalukuyang naka-pause ang kakayahang gumawa ng Haven Wallet.",
-  "payjoin_card_content": "Payjoin ay isang bagong tampok na privacy-pag-iingat at pag-save ng bayad sa Bitcoin.",
-  "payjoin_details": "Mga detalye ng Payjoin",
-  "payjoin_enabled": "Payjoin pinagana",
-  "payjoin_enabling_popup_content": "Maaari mong i -toggle Payjoin sa ilalim ng menu → privacy → gumamit ng Payjoin upang paganahin o huwag paganahin ito sa ibang pagkakataon.",
-  "payjoin_enabling_popup_title": "Pagpapagana Payjoin",
-  "payjoin_request_awaiting_tx": "Naghihintay ng transaksyon",
-  "payjoin_request_in_progress": "Sa pag -unlad",
-  "payjoin_unavailable": "Payjoin hindi magagamit",
-  "payjoin_unavailable_sheet_content": "Ang pagtanggap ng isang Payjoin transaksyon ay nangangailangan sa iyo na handa nang gamitin ang bitcoin.",
-  "payjoin_unavailable_sheet_title": "Bakit hindi magagamit ang Payjoin?",
   "payment_id": "Payment ID: ",
-  "payment_made_easy": "Madali ang mga pagbabayad",
   "payment_was_received": "Natanggap ang iyong bayad.",
-  "payments": "Pagbabayad",
   "pending": "(hindi pa tapos)",
   "percentageOf": "ng ${amount}",
   "pin_at_top": "I-pin ${token} sa tuktok",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Pakisubukang kumonekta sa iba pang node",
   "please_wait": "Mangyaring maghintay",
   "polygonscan_history": "Kasaysayan ng PolygonScan",
-  "potential_scam": "Potensyal na scam",
   "powered_by": "Pinapagana ng ${title}",
   "pre_seed_button_text": "Naiintindihan ko. Ipakita sa akin ang aking binhi",
-  "pre_seed_description": "Sa susunod na pahina makikita mo ang isang serye ng mga salita. Ito ang iyong natatangi at pribadong binhi at ito ang tanging paraan upang mabawi ang iyong pitaka kung sakaling mawala o madepektong paggawa. Responsibilidad mong isulat ito at itago ito sa isang ligtas na lugar sa labas ng cake wallet app.",
+  "pre_seed_description": "Sa susunod na pahina makikita mo ang isang serye ng mga ${words} na mga salita. Ito ang iyong natatangi at pribadong binhi at ito ang tanging paraan upang mabawi ang iyong pitaka kung sakaling mawala o madepektong paggawa. Responsibilidad mong isulat ito at itago ito sa isang ligtas na lugar sa labas ng cake wallet app.",
   "pre_seed_title": "Mahalaga",
   "prepaid_cards": "Mga Prepaid Card",
   "prevent_screenshots": "Maiwasan ang mga screenshot at pag -record ng screen",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Magpatuloy sa iyong hardware wallet",
   "proceed_on_device_description": "Mangyaring sundin ang mga tagubilin na sinenyasan sa iyong hardware wallet",
   "processing": "Pagproseso",
-  "processing_signed_tx": "Pagproseso ng naka -sign transaksyon",
   "profile": "Profile",
   "provider_error": "${provider} error",
   "public_key": "Public key",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Ang iyong representative ay hindi lilitaw na nasa mabuting kalagayan. Tapikin dito upang pumili ng bago",
   "repeat_wallet_password": "Ulitin ang password ng wallet",
   "repeated_password_is_incorrect": "Ang paulit-ulit na password ay hindi tama. Mangyaring ulitin muli ang password ng wallet.",
-  "requested": "Hiniling",
   "require_for_adding_contacts": "Nangangailangan para sa pagdaragdag ng mga contact",
   "require_for_all_security_and_backup_settings": "Nangangailangan para sa lahat ng mga setting ng seguridad at backup",
   "require_for_assessing_wallet": "Nangangailangan para sa pag-access ng wallet",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Nangangailangan para sa pagpapadala sa mga panloob na wallet",
   "require_for_sends_to_non_contacts": "Nangangailangan para sa pagpapadala sa mga hindi contact",
   "require_pin_after": "Nangangailangan ng PIN pagkatapos",
-  "required_passphrase": "Passphrase",
   "rescan": "Muling i-scan",
   "resend_code": "Mangyaring ipadala ito muli",
   "reset": "I-reset",
   "reset_password": "I-reset ang password",
-  "restore": "Ibalik",
   "restore_active_seed": "Aktibong seed",
   "restore_address": "Address",
   "restore_bitcoin_description_from_keys": "Ibalik ang iyong wallet mula sa nabuong WIF string mula sa iyong mga private key",
@@ -713,10 +644,7 @@
   "search_language": "Maghanap ng wika",
   "second_intro_content": "Ang iyong Yat ay isang natatanging emoji address na pumapalit sa lahat ng iyong mahabang hexadecimal address para sa lahat ng iyong pera.",
   "second_intro_title": "Isang emoji address para pamunuan silang lahat",
-  "security": "Seguridad",
   "security_and_backup": "Seguridad at backup",
-  "security_risk": "Panganib sa seguridad",
-  "security_risk_description": "Ang domain na ito ay na -flag bilang hindi ligtas ng maraming mga nagbibigay ng seguridad. Mag -iwan kaagad upang maprotektahan ang iyong mga pag -aari.",
   "seed_alert_back": "Bumalik",
   "seed_alert_content": "Ang seed ay ang tanging paraan upang mabawi ang iyong wallet. Naisulat mo na ba?",
   "seed_alert_title": "Attention",
@@ -751,6 +679,9 @@
   "seedtype": "Seed type",
   "seedtype_alert_content": "Ang pagbabahagi ng mga buto sa iba pang mga pitaka ay posible lamang sa bip39 seedtype.",
   "seedtype_alert_title": "Alerto ng Seedtype",
+  "seedtype_legacy": "Legacy (25 na salita)",
+  "seedtype_polyseed": "Polyseed (16 na salita)",
+  "seedtype_wownero": "Wownero (14 na salita)",
   "select_backup_file": "Piliin ang backup na file",
   "select_buy_provider_notice": "Pumili ng provider ng pagbili sa itaas. Maaari mong laktawan ang screen na ito sa pamamagitan ng pagtatakda ng iyong default na provider ng pagbili sa mga setting ng app.",
   "select_destination": "Mangyaring piliin ang patutunguhan para sa backup na file.",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "Magpadala mula sa panlabas na pitaka",
   "send_name": "Pangalan",
   "send_new": "Bago",
-  "send_payjoin": "Magpadala ng Payjoin",
   "send_payment_id": "Payment ID (opsyonal)",
   "send_priority": "Kasalukuyang nakatakda ang fee sa ${transactionPriority} priyoridad.\n Ang priyoridad ng transaksyon ay maaaring isaayos sa mga setting",
   "send_sending": "Nagpapadala...",
@@ -832,9 +762,7 @@
   "show_keys": "Ipakita ang mga seed/key",
   "show_market_place": "Ipakita ang Marketplace",
   "show_seed": "Ipakita ang seed",
-  "sign_all": "Mag -sign lahat",
   "sign_message": "Mag -sign Message",
-  "sign_one": "Mag -sign ng isa",
   "sign_up": "Mag-sign Up",
   "sign_verify_message": "Mag -sign o i -verify ang mensahe",
   "sign_verify_message_sub": "Mag -sign o i -verify ang isang mensahe gamit ang iyong pribadong key",
@@ -863,14 +791,11 @@
   "sort_by": "Pag-uri-uriin sa pamamagitan ng",
   "spend_key_private": "Spend key (private)",
   "spend_key_public": "Spend key (public)",
-  "starting_tor_proxy": "Simula sa Tor Proxy",
   "status": "Katayuan: ",
-  "step": "Hakbang",
   "string_default": "Default",
   "subaddress_title": "Listahan ng Subaddress",
   "subaddresses": "Mga Subaddress",
   "submit_request": "magsumite ng isang kahilingan",
-  "success": "Tagumpay",
   "successful": "Matagumpay",
   "support_description_guides": "Dokumentasyon at suporta para sa mga karaniwang isyu",
   "support_description_live_chat": "Libre at mabilis! Ang mga bihasang kinatawan ng suporta ay magagamit upang tulungan",
@@ -878,7 +803,6 @@
   "support_title_guides": "Cake wallet doc",
   "support_title_live_chat": "Live na suporta",
   "support_title_other_links": "Iba pang mga link sa suporta",
-  "supported": "Suportado",
   "swap": "Palitan",
   "sweeping_wallet": "Sweeping wallet",
   "sweeping_wallet_alert": "Hindi ito dapat magtagal. HUWAG iwanan ang screen na ito o maaaring mawala ang mga pondo.",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "PAG-SYNCHRONIZE",
   "sync_status_timed_out": "NAG-TIME OUT",
   "sync_status_unsupported": "HINDI SUPORTADONG NODE",
-  "synchronizing": "Pag -synchronize",
   "syncing_wallet_alert_content": "Ang iyong balanse at listahan ng transaksyon ay maaaring hindi kumpleto hanggang sa sabihin nito na \"NAKA-SYNCHRONIZE\" sa tuktok. Mag-click/tap upang malaman ang higit pa.",
   "syncing_wallet_alert_title": "Ang iyong wallet ay nag-sync",
   "template": "Template",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Ang provider ng THORChain ay hindi sumusuporta sa mga address ng Taproot. Mangyaring baguhin ang address o pumili ng ibang provider.",
   "time": "${minutes} m ${seconds} s",
   "tip": "Tip:",
-  "to": "Sa",
   "today": "Ngayon",
-  "token_already_exists": "Mayroon nang token",
   "token_contract_address": "Address ng token contract",
   "token_decimal": "Token decimal",
   "token_name": "Pangalan ng token, halimbawa: Tether",
   "token_symbol": "Simbolo ng token, halimbawa: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Mangyaring huwag kalimutan na tukuyin ang memo ID habang nagpapadala ng toneladang transaksyon para sa palitan",
   "tor_connection": "Koneksyon ng Tor",
-  "tor_connection_timeout": "Oras ng koneksyon sa tor",
-  "tor_experimental": "Ito ay isang pang -eksperimentong tampok, hindi lahat ng mga koneksyon na ginawa mula sa cake ng suporta sa wallet ng tor ruta - ang ilang mga koneksyon ay maaaring gumamit ng clearnet, upang ganap na ruta ang paggamit ng trapiko ng trapiko na may mode na VPN.",
   "tor_only": "Tor lamang",
   "total": "Kabuuan",
   "total_saving": "Kabuuang ipon",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "Kung hindi magpapatuloy ang screen pagkatapos ng 1 minuto, tingnan ang block explorer at ang iyong email.",
   "transactions": "Mga Transaksyon",
   "transactions_by_date": "Mga transaksyon ayon sa petsa",
-  "transport_type": "Uri ng transportasyon",
   "trongrid_history": "Kasaysayan ng TronGrid",
   "trusted": "Pinagkakatiwalaan",
-  "try_again": "Subukang muli",
   "tx_commit_exception_no_dust_on_change": "Ang transaksyon ay tinanggihan sa halagang ito. Sa mga barya na ito maaari kang magpadala ng ${min} nang walang sukli o ${max} na nagbabalik ng sukli.",
   "tx_commit_failed": "Nabigo ang transaksyon. Mangyaring makipag-ugnay sa suporta.",
   "tx_commit_failed_no_peers": "Nabigo ang transaksyon na mag -broadcast, mangyaring subukang muli sa isang segundo o higit pa",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "Mga detalye ng mga hindi nagastos na barya",
   "unspent_coins_title": "Mga hindi nagamit na barya",
   "unsupported_asset": "Hindi namin sinusuportahan ang pagkilos na ito para sa asset na ito. Mangyaring lumikha o lumipat sa isang wallet ng isang suportadong uri ng asset.",
-  "update_session": "I -update ang Session",
   "uptime": "Uptime",
   "upto": "hanggang sa ${value}",
   "usb": "USB",
   "use": "Lumipat sa ",
   "use_card_info_three": "Gamitin ang digital card online o sa mga paraan ng pagbabayad na walang contact.",
   "use_card_info_two": "Ang mga pondo ay na-convert sa USD kapag hawak sa prepaid account, hindi sa mga digital na pera.",
-  "use_device_theme": "Gumamit ng tema ng aparato",
-  "use_payjoin": "Gumamit ng Payjoin",
   "use_ssl": "Gumamit ng SSL",
   "use_suggested": "Gumamit ng iminungkahing",
   "use_testnet": "Gumamit ng testnet",
-  "user_rejected_method": "Tinanggihan ng gumagamit ang pamamaraan",
   "value": "Halaga",
   "value_type": "Uri ng halaga",
   "variable_pair_not_supported": "Ang variable na pares na ito ay hindi suportado sa mga napiling exchange",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "Maaari mong palaging tingnan ang binhi na ito sa ilalim",
   "wallet_group_empty_state_text_one": "Mukhang wala kang anumang mga katugmang pangkat ng pitaka!\n\ntap",
   "wallet_group_empty_state_text_two": "sa ibaba upang gumawa ng bago.",
-  "wallet_has_passphrase": "Ang pitaka na ito ay may isang passphrase",
   "wallet_keys": "Wallet seed/keys",
   "wallet_list_create_new_wallet": "Lumikha ng bagong wallet",
   "wallet_list_edit_group_name": "I -edit ang Pangalan ng Grupo",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Mga Wallet",
   "warning": "Babala",
-  "welcome": "Maligayang pagdating",
+  "welcome": "Maligayang pagdating sa",
   "welcome_subtitle_new_wallet": "Kung nais mong simulan ang sariwa, tapikin ang Lumikha ng Bagong Wallet sa ibaba at pupunta ka sa mga karera.",
   "welcome_subtitle_restore_wallet": "Kung mayroon kang isang umiiral na pitaka na nais mong dalhin sa cake, piliin lamang ang ibalik ang umiiral na pitaka at lalakad ka namin sa proseso.",
   "welcome_to_cakepay": "Maligayang pagdating sa Cake Pay!",
-  "what_is_payjoin": "Ano ang Payjoin ?",
   "what_is_silent_payments": "Ano ang tahimik na pagbabayad?",
   "widgets_address": "Address",
   "widgets_or": "o",
@@ -1111,6 +1021,5 @@
   "you_will_get": "I-convert sa",
   "you_will_receive_estimated_amount": "Makakatanggap ka ng(tinantyang)",
   "you_will_send": "I-convert mula sa",
-  "youCanGoBackToYourDapp": "Maaari kang bumalik sa iyong dapp ngayon",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb
index c5582b4ef..8011401dc 100644
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Ön ödemeli kartlara para ekle (En fazla yüklenebilir tutar: ${value})",
   "add_new_node": "Yeni düğüm ekle",
   "add_new_word": "Yeni kelime ekle",
-  "add_passphrase": "Parola ekle",
-  "add_passphrase_warning_text": "Sadece geçmişte bu cüzdan için bir tane kullandıysanız bir parola girin. Yanlış parola girerseniz veya daha önce bu cüzdanda bir parola kullanmadıysanız, mevcut fonlardan veya geçmişi görmezsiniz.",
   "add_receiver": "Başka bir alıcı ekle (isteğe bağlı)",
   "add_secret_code": "Veya bu gizli kodu bir kimlik doğrulama uygulamasına ekleyin",
   "add_tip": "Bahşiş Ekle",
   "add_token_disclaimer_check": "Belirteç sözleşmesi adresini ve bilgilerini saygın bir kaynak kullanarak onayladım. Kötü amaçlı veya yanlış bilgilerin eklenmesi para kaybına neden olabilir.",
   "add_token_warning": "Dolandırıcıların talimatına göre jetonları düzenlemeyin veya eklemeyin.\nBelirteç adreslerini her zaman saygın kaynaklarla onaylayın!",
   "add_value": "Değer ekle",
-  "added_message_for_ata_error": "Lütfen işleminizi tamamlamak için yeterli SOL bakiyesine sahip olduğunuzdan emin olun.",
   "address": "Adres",
   "address_book": "Adres Defteri",
   "address_book_menu": "Adres defteri",
@@ -55,8 +52,6 @@
   "anonpay_description": "${type} oluşturun. Alıcı, desteklenen herhangi bir kripto para birimi ile ${method} yapabilir ve bu cüzdanda para alırsınız.",
   "apk_update": "APK güncellemesi",
   "approve": "Onaylamak",
-  "approve_request": "Talebi Onaylama",
-  "approve_tokens": "Jetonları onaylayın",
   "arrive_in_this_address": "${currency} ${tag}bu adrese ulaşacak",
   "ascending": "Yükselen",
   "ask_each_time": "Her seferinde sor",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Ödemenin onaylanması bekleniyor",
   "background_sync": "Arka plan senkronizasyonu",
   "background_sync_mode": "Arka Plan Senkronizasyon Modu",
-  "background_sync_on_battery_low": "Düşük pille senkronize edin",
-  "background_sync_on_charging": "Yalnızca şarj ederken senkronize edin",
-  "background_sync_on_device_idle": "Yalnızca cihaz kullanılmadığında senkronize edin",
-  "background_sync_on_unmetered_network": "Karşıdamlanmamış ağ gerektirir",
   "backup": "Yedek",
   "backup_file": "Yedek dosyası",
   "backup_password": "Yedek parolası",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Bitcoin Satın Al",
   "buy_now": "Şimdi al",
   "buy_provider_unavailable": "Sağlayıcı şu anda kullanılamıyor.",
-  "buy_sell_pair_is_not_supported_warning": "Bu para birimi çifti, seçilen ödeme yöntemi için herhangi bir sağlayıcı tarafından desteklenmez. Lütfen farklı bir çift seçin veya ödeme yöntemini değiştirmeyi deneyin.",
   "buy_with": "Şunun ile al: ",
   "by_cake_pay": "Cake Pay tarafından",
   "cake_2fa_preset": "Kek 2FA Ön Ayarı",
@@ -124,12 +114,9 @@
   "camera_consent": "Kameranız ${provider} tarihine kadar tanımlama amacıyla bir görüntü yakalamak için kullanılacaktır. Ayrıntılar için lütfen Gizlilik Politikalarını kontrol edin.",
   "camera_permission_is_required": "Kamera izni gereklidir.\nLütfen uygulama ayarlarından etkinleştirin.",
   "cancel": "İptal",
-  "cannot_verify": "Doğrulamaz",
-  "cannot_verify_description": "Bu alan doğrulanamaz. Onaylamadan önce isteği dikkatlice kontrol edin.",
   "card_address": "Adres:",
   "cardholder_agreement": "Kart Sahibi Sözleşmesi",
   "cards": "Kartlar",
-  "chain_id": "Zincir kimliği",
   "chains": "Zincirler",
   "change": "Değiştir",
   "change_backup_password_alert": "Önceki yedekleme dosyaların yeni yedek parolası ile içe aktarılamayacaktır. Yeni yedekleme parolası yalnızca yeni yedekleme dosyaları için kullanılabilir olacak. Yedekleme parolasını değiştirmek istediğinden emin misin?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Temsilcileri değiştirmek istediğinizden emin misiniz?",
   "change_rep_successful": "Temsilciyi başarıyla değiştirdi",
   "change_selected_exchanges": "Seçilen borsaları değiştirin",
-  "change_selected_pair": "Seçilen çifti değiştir",
   "change_wallet_alert_content": "Şimdiki cüzdanı ${wallet_name} cüzdanı ile değiştirmek istediğinden emin misin?",
   "change_wallet_alert_title": "Şimdiki cüzdanı değiştir",
   "choose_a_payment_method": "Bir Ödeme Yöntemi Seçin",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Onaylanmış",
   "congratulations": "Tebrikler!",
   "connect_an_existing_yat": "Mevcut bir Yat'ı bağla",
-  "connect_hw_info_step_1": "Cihazınızın açıldığından emin olun.",
-  "connect_hw_info_step_2": "Bluetooth'u her iki cihaz için açın ve telefondan eşleştirin veya bir USB kablosu kullanarak cihazlarınızı birbirine bağlayın.",
-  "connect_hw_info_step_3": "Cihazınızın kilidini açın ve istenen kripto uygulamasına gidin.",
-  "connect_hw_info_step_4": "Cihazınızı kek cüzdanında seçin ve kuruluma devam edin.",
   "connect_yats": "Yat'lara bağlan",
   "connect_your_hardware_wallet": "Bluetooth veya USB kullanarak donanım cüzdanınızı bağlayın",
   "connect_your_hardware_wallet_ios": "Bluetooth kullanarak donanım cüzdanınızı bağlayın",
-  "connected": "Bağlı",
   "connection_sync": "Bağlantı ve senkronizasyon",
   "connectWalletPrompt": "İşlem yapmak için cüzdanınızı WalletConnect'e bağlayın",
   "contact": "Rehber",
@@ -207,8 +188,6 @@
   "copy": "Kopyala",
   "copy_address": "Adresi kopyala",
   "copy_id": "ID'yi kopyala",
-  "copy_payjoin_address": "PayJoin adresini kopyala",
-  "copy_payjoin_url": "Payjoin url kopyala",
   "copyWalletConnectLink": "WalletConnect bağlantısını dApp'ten kopyalayıp buraya yapıştırın",
   "corrupted_seed_notice": "Bu cüzdanın dosyaları bozuk ve açılamıyor. Lütfen tohum ifadesini görüntüleyin, kaydedin ve cüzdanı geri yükleyin.\n\nDeğer boşsa, tohum doğru bir şekilde geri kazanılamadı.",
   "countries": "Ülkeler",
@@ -245,22 +224,11 @@
   "descending": "Azalan",
   "description": "Tanım",
   "destination_tag": "Hedef Etiketi:",
-  "deuro_collect_interest": "TOPLAMAK",
-  "deuro_savings": "dEuro Tasarruf",
-  "deuro_savings_add": "Yatırmak",
-  "deuro_savings_balance": "Tasarruf Bakiyesi",
-  "deuro_savings_collect_interest": "İlgi toplamak",
-  "deuro_savings_remove": "Geri çekilmek",
-  "deuro_savings_set_approval": "Onay ayarlamak",
-  "deuro_savings_subtitle": "Deuro StableCoin Holdings'e% 10'a kadar faiz kazanın",
-  "deuro_tx_commited_content": "İşlemin onaylaması ve ekrana yansıtılması birkaç saniye sürebilir",
-  "device_is_signing": "Cihaz imzalıyor",
   "dfx_option_description": "Eur & chf ile kripto satın alın. Avrupa'daki perakende ve kurumsal müşteriler için",
   "didnt_get_code": "Kod gelmedi mi?",
   "digit_pin": " haneli PIN",
   "digital_and_physical_card": " Dijital para birimleri ile para yükleyebileceğiniz ve ek bilgiye gerek olmayan",
   "disable": "Devre dışı bırakmak",
-  "disable_automatic_exchange_status_updates": "Otomatik Değişim Durum Güncellemelerini Devre Dışı Bırak",
   "disable_bulletin": "Hizmet Durumu Bültenini Devre Dışı Bırak",
   "disable_buy": "Satın alma işlemini devre dışı bırak",
   "disable_cake_2fa": "Cake 2FA'yı Devre Dışı Bırak",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Bunu kapatarak, ücret oranları bazı durumlarda yanlış olabilir, bu nedenle işlemleriniz için ücretleri fazla ödeyebilir veya az ödeyebilirsiniz.",
   "disable_fiat": "İtibari paraları devre dışı bırak",
   "disable_sell": "Satış işlemini devre dışı bırak",
-  "disable_tor": "Tor'u devre dışı bırak",
   "disable_trade_option": "Ticaret seçeneğini devre dışı bırakın",
   "disableBatteryOptimization": "Pil optimizasyonunu devre dışı bırakın",
   "disableBatteryOptimizationDescription": "Arka plan senkronizasyonunu daha özgür ve sorunsuz bir şekilde çalıştırmak için pil optimizasyonunu devre dışı bırakmak istiyor musunuz?",
   "disabled": "Devre dışı",
-  "disconnect_session": "SONRA KONSİYORUM",
   "discount": "%${value} tasarruf et",
   "display_settings": "Görüntü ayarları",
   "displayable": "Gösterilebilir",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Bunları destek de dahil olmak üzere başka kimseyle paylaşma.\n\nParan çalınabilir ve çalınacaktır!",
   "do_not_show_me": "Bana bunu bir daha gösterme",
   "domain_looks_up": "Etki alanı aramaları",
-  "domain_mismatch": "Alan uyuşmazlığı",
-  "domain_mismatch_description": "Bu web sitesinde, bu isteğin göndereniyle eşleşmeyen bir etki alanı vardır. Onaylama fon kaybına yol açabilir.",
   "donation_link_details": "Bağış bağlantısı ayrıntıları",
-  "done": "Tamamlamak",
   "e_sign_consent": "E-İmza Onayı",
   "edit": "Düzenle",
   "edit_backup_password": "Yedek parolasını değiştir",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Adresini her kullandığında yeni adres oluşturuyoruz, ancak önceki adresler de çalışmaya devam eder",
   "email_address": "E-posta Adresi",
   "enable": "Olanak vermek",
-  "enable_builtin_tor": "Yerleşik Tor'u etkinleştirin",
   "enable_mempool_api": "Doğru ücretler ve tarihler için Mempool API'si",
   "enable_replace_by_fee": "Farklı Değiştir'i Etkinleştir",
   "enable_silent_payments_scanning": "Bahşiş ulaşılıncaya kadar sessiz ödemeleri taramaya başlayın",
@@ -333,10 +295,8 @@
   "error_text_template": "Şablon adı ve adresi ` , ' \" sembolleri içeremez\nve 1 ila 106 karakter uzunluğunda olmalı",
   "error_text_wallet_name": "Cüzdan ismi yalnızca harf, rakam \nve 1 ile 33 uzunluğunda karakter içermelidir.",
   "error_text_xmr": "XMR miktarı kullanılabilir bakiyeyi aşamaz.\nKesir basamaklarının sayısı 12'ye eşit veya daha az olmalıdır",
-  "error_while_processing": "ProceSting sırasında bir hata oluştu",
   "errorGettingCredentials": "Başarısız: Kimlik bilgileri alınırken hata oluştu",
   "errorSigningTransaction": "İşlem imzalanırken bir hata oluştu",
-  "establishing_tor_connection": "Fazla Tor Bağlantısı",
   "estimated": "Tahmini",
   "estimated_new_fee": "Tahmini yeni ücret",
   "estimated_receive_amount": "Tahmini alma miktarı",
@@ -360,7 +320,6 @@
   "export_backup": "Yedeği dışa aktar",
   "export_logs": "Dışa aktarma günlükleri",
   "export_outputs": "İhracat çıktıları",
-  "extend_session": "Oturumu Genişlet",
   "extra_id": "Ekstra ID:",
   "extracted_address_content": "Parayı buraya gönderceksin:\n${recipient_name}",
   "failed_authentication": "Doğrulama başarısız oldu. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "İtibari Para API",
   "fiat_balance": "Fiat Bakiyesi",
   "field_required": "Bu alan gereklidir",
-  "file_saved": "Dosya kaydedildi",
   "fill_code": "Lütfen e-postanıza gelen doğrulama kodunu girin",
   "filter_by": "Şuna göre filtrele",
   "first_wallet_text": "Monero, Bitcoin, Ethereum, Litecoin ve Haven için harika cüzdan",
@@ -382,12 +340,10 @@
   "forgot_password": "Parolamı unuttum",
   "freeze": "Dondur",
   "frequently_asked_questions": "Sıkça sorulan sorular",
-  "from": "İtibaren",
   "frozen": "Dondurulmuş",
   "frozen_balance": "Dondurulmuş denge",
   "full_balance": "Tüm bakiye",
   "gas_exceeds_allowance": "İşlemin gerektirdiği gaz ödeneği aşar.",
-  "gas_price": "Gaz fiyatı",
   "generate_name": "İsim Oluştur",
   "generating_gift_card": "Hediye Kartı Oluşturuluyor",
   "generating_transaction": "İşlem Oluşturma",
@@ -413,7 +369,6 @@
   "hide_details": "Detayları Gizle",
   "high_contrast_theme": "Yüksek Kontrastlı Tema",
   "home_screen_settings": "Ana ekran ayarları",
-  "how_to_connect": "Nasıl bağlanır",
   "how_to_use": "Nasıl kullanılır",
   "how_to_use_card": "Bu kart nasıl kullanılır",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "İşlemi ve işlem ücretini karşılamak için yeterli SOL'unuz yok. Lütfen cüzdanınıza daha fazla SOL ekleyin veya gönderdiğiniz sol miktarını azaltın.",
   "insufficient_lamports": "İşlemi ve işlem ücretini karşılamak için yeterli SOL'unuz yok. En az ${solValueNeeded} Sol'a ihtiyacınız var. Lütfen cüzdanınıza daha fazla sol ekleyin veya gönderdiğiniz sol miktarını azaltın",
   "insufficientFundsForRentError": "İşlem ücretini karşılamak ve hesap için kiralamak için yeterli SOL'nuz yok. Lütfen cüzdanınıza daha fazla sol ekleyin veya gönderdiğiniz sol miktarını azaltın",
-  "insufficientFundsForRentErrorReceiver": "Alıcının hesabının kirayı karşılamak için yeterli SOL yoktur. Lütfen alıcıdan hesaplarına daha fazla SOL eklemesini isteyin.",
   "introducing_cake_pay": "Cake Pay ile tanışın!",
   "invalid_input": "Geçersiz Giriş",
   "invalid_password": "Geçersiz şifre",
@@ -471,7 +425,6 @@
   "logout": "Çıkış yap",
   "low_fee": "Düşük komisyon",
   "low_fee_alert": "Şu anda düşük bir ağ ücreti önceliği kullanıyorsunuz. Bu durum uzun beklemeler, farklı oranlar veya iptal edilen işlemlere neden olabilir. Daha iyi bir deneyim için daha yüksek bir ücret belirlemenizi öneririz.",
-  "made_easy": "kolaylaştırılmış",
   "manage_nodes": "Düğümleri yönet",
   "manage_pow_nodes": "PoW Düğümlerini Yönet",
   "manage_yats": "Yats'ları yönet",
@@ -483,8 +436,6 @@
   "memo": "Memo:",
   "message": "İleti",
   "message_verified": "Mesaj başarıyla doğrulandı",
-  "messages": "Mesaj",
-  "method": "Yöntem",
   "methods": "Yöntemler",
   "min_amount": "Min: ${value}",
   "min_value": "En az: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Monero Koyu Tema",
   "monero_light_theme": "Monero Hafif Tema",
   "moonpay_alert_text": "Tutar ${minAmount} ${fiatCurrency} miktarına eşit veya daha fazla olmalıdır",
-  "moralis_nft_error": "NFT'ler getirilirken bir hata oluştu. Lütfen internet bağlantınızı kontrol edin ve tekrar deneyin.",
   "more_options": "Daha Fazla Seçenek",
   "multiple_addresses_detected": "Birden çok adres tespit edildi",
   "mweb_confirmed": "Onaylanmış mweb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Etiket ismi",
   "new_subaddress_title": "Yeni adres",
   "new_template": "Yeni Şablon",
-  "new_transactions_notifications": "Yeni işlemler hakkında bildirimler gönderin",
   "new_wallet": "Yeni Cüzdan",
   "newConnection": "Yeni bağlantı",
   "no_cards_found": "Kart bulunamadı",
@@ -539,7 +488,6 @@
   "normal": "Normal",
   "note_optional": "Not (isteğe bağlı)",
   "note_tap_to_change": "Not (değiştirmek için dokunun)",
-  "notification_permission_denied": "Bildirim izni perdence reddedildi, lütfen ayarlarda manuel olarak etkinleştirin",
   "nullURIError": "URI boş",
   "offer_expires_in": "Teklifin bitmesine kalan: ",
   "offline": "Çevrimdışı",
@@ -571,20 +519,8 @@
   "password": "Parola",
   "paste": "Yapıştır",
   "pause_wallet_creation": "Haven Cüzdanı oluşturma yeteneği şu anda duraklatıldı.",
-  "payjoin_card_content": "Payjoin, Bitcoin'de yeni bir gizliliği koruyan ve ücret tasarrufu sağlayan bir özelliktir.",
-  "payjoin_details": "Payjoin detaylar",
-  "payjoin_enabled": "Payjoin etkinleştirilmiş",
-  "payjoin_enabling_popup_content": "Daha sonra etkinleştirmek veya devre dışı bırakmak için Menü → Gizlilik → Kullanın Payjoin kullanabilirsiniz.",
-  "payjoin_enabling_popup_title": "Etkinleştirme Payjoin",
-  "payjoin_request_awaiting_tx": "İşlem bekliyor",
-  "payjoin_request_in_progress": "Devam etmekte",
-  "payjoin_unavailable": "Payjoin mevcut değil",
-  "payjoin_unavailable_sheet_content": "Bir Payjoin işlem almak, Bitcoin kullanıma hazır olmanızı gerektirir. \\ N \\ nas Cüzdanınızın fonları olduğu anda Payjoin otomatik olarak etkinleştirilir.",
-  "payjoin_unavailable_sheet_title": "Payjoin Neden mevcut değil?",
   "payment_id": "Ödeme ID'si: ",
-  "payment_made_easy": "Ödemeler kolaylaştırıldı",
   "payment_was_received": "Ödemeniz alındı.",
-  "payments": "Ödemeler",
   "pending": " (bekleyen)",
   "percentageOf": "of ${amount}",
   "pin_at_top": "${token} üstte sabitle",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Lütfen farklı düğüme bağlanmayı dene",
   "please_wait": "Lütfen bekleyin",
   "polygonscan_history": "PolygonScan geçmişi",
-  "potential_scam": "Potansiyel aldatmaca",
   "powered_by": "${title} tarafından desteklenmektedir",
   "pre_seed_button_text": "Anladım. Bana tohumumu göster.",
-  "pre_seed_description": "Bir sonraki sayfada bir dizi kelime göreceksiniz. Bu sizin eşsiz ve özel tohumunuzdur ve kayıp veya arıza durumunda cüzdanınızı kurtarmanın tek yolu budur. Yazmak ve kek cüzdan uygulamasının dışında güvenli bir yerde saklamak sizin sorumluluğunuzdadır.",
+  "pre_seed_description": "Bir sonraki sayfada ${words} kelime göreceksin. Bu senin benzersiz ve özel tohumundur, kaybetmen veya silinmesi durumunda cüzdanını kurtarmanın TEK YOLUDUR. Bunu yazmak ve Cake Wallet uygulaması dışında güvenli bir yerde saklamak tamamen SENİN sorumluluğunda.",
   "pre_seed_title": "UYARI",
   "prepaid_cards": "Ön ödemeli kartlar",
   "prevent_screenshots": "Ekran görüntülerini ve ekran kaydını önleyin",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Cihazınıza devam edin",
   "proceed_on_device_description": "Lütfen donanım cüzdanınızda istenen talimatları izleyin",
   "processing": "İşleme",
-  "processing_signed_tx": "İmzalı işlemin işlenmesi",
   "profile": "Profil",
   "provider_error": "${provider} hatası",
   "public_key": "Genel Anahtar",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "Temsilciniz iyi durumda görünmüyor. Yeni bir tane seçmek için buraya dokunun",
   "repeat_wallet_password": "Cüzdan şifresini tekrarlayın",
   "repeated_password_is_incorrect": "Tekrarlanan şifre yanlış. Lütfen cüzdan şifresini tekrarlayın.",
-  "requested": "İstenmiş",
   "require_for_adding_contacts": "Kişi eklemek için gerekli",
   "require_for_all_security_and_backup_settings": "Tüm güvenlik ve yedekleme ayarları için iste",
   "require_for_assessing_wallet": "Cüzdana erişmek için gerekli",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "Dahili cüzdanlara yapılan gönderimler için gereklilik",
   "require_for_sends_to_non_contacts": "Kişi olmayan kişilere göndermeler için gerekli kıl",
   "require_pin_after": "Şu kadar süre sonra PIN iste",
-  "required_passphrase": "Parola",
   "rescan": "Yeniden Tara",
   "resend_code": "Lütfen tekrar gönder",
   "reset": "Sıfırla",
   "reset_password": "Parolamı sıfırla",
-  "restore": "Eski haline getirmek",
   "restore_active_seed": "Tohumu aktifleştir",
   "restore_address": "Adres",
   "restore_bitcoin_description_from_keys": "Cüzdanını, oluşturulan WIF dizesinden veya özel anahtarlarından geri yükle",
@@ -713,10 +644,7 @@
   "search_language": "Dil arat",
   "second_intro_content": "Yat'ınız, tüm para birimleriniz için uzun onaltılık adreslerinizin yerini alan benzersiz emoji adresidir.",
   "second_intro_title": "Hepsini yönetebilen tek bir emoji adresi",
-  "security": "Güvenlik",
   "security_and_backup": "Güvenlik ve yedekleme",
-  "security_risk": "Güvenlik riski",
-  "security_risk_description": "Bu alan, birden fazla güvenlik sağlayıcısı tarafından güvensiz olarak işaretlenir. Varlıklarınızı korumak için hemen ayrılın.",
   "seed_alert_back": "Geriye dön",
   "seed_alert_content": "Cüzdanını kurtarmanın tek yolu tohumdur. Tohumunu yazdın mı?",
   "seed_alert_title": "Dikkat",
@@ -751,6 +679,9 @@
   "seedtype": "Tohum",
   "seedtype_alert_content": "Tohumları diğer cüzdanlarla paylaşmak sadece BIP39 tohumu ile mümkündür.",
   "seedtype_alert_title": "SeedType uyarısı",
+  "seedtype_legacy": "Miras (25 kelime)",
+  "seedtype_polyseed": "Polyseed (16 kelime)",
+  "seedtype_wownero": "Wownero (14 kelime)",
   "select_backup_file": "Yedek dosyası seç",
   "select_buy_provider_notice": "Yukarıda bir satın alma sağlayıcısı seçin. App ayarlarında varsayılan satın alma sağlayıcınızı ayarlayarak bu ekranı atlayabilirsiniz.",
   "select_destination": "Lütfen yedekleme dosyası için hedef seçin.",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "Harici cüzdandan gönder",
   "send_name": "İsim",
   "send_new": "Yeni",
-  "send_payjoin": "Göndermek Payjoin",
   "send_payment_id": "Ödeme ID'si (isteğe bağlı)",
   "send_priority": "Şu anda ücret ${transactionPriority} önceliğine ayarlanmıştır.\nİşlem önceliği ayarlardan değiştirilebilir",
   "send_sending": "Gönderiliyor...",
@@ -832,9 +762,7 @@
   "show_keys": "Tohumları/anahtarları göster",
   "show_market_place": "Pazar Yerini Göster",
   "show_seed": "Tohumları göster",
-  "sign_all": "Hepsini imzalamak",
   "sign_message": "İşaret mesajı",
-  "sign_one": "Bir İmza",
   "sign_up": "Kaydol",
   "sign_verify_message": "Mesajı işaretleyin veya doğrulayın",
   "sign_verify_message_sub": "Özel anahtarınızı kullanarak bir mesajı imzalayın veya doğrulayın",
@@ -863,14 +791,11 @@
   "sort_by": "Göre sırala",
   "spend_key_private": "Harcama anahtarı (özel)",
   "spend_key_public": "Harcama anahtarı (genel)",
-  "starting_tor_proxy": "Tor Proxy'yi Başlatma",
   "status": "Durum: ",
-  "step": "Adım",
   "string_default": "Varsayılan",
   "subaddress_title": "Alt adres listesi",
   "subaddresses": "Alt adresler",
   "submit_request": "talep gönder",
-  "success": "Başarı",
   "successful": "Başarılı",
   "support_description_guides": "Ortak sorunlara belge ve destek",
   "support_description_live_chat": "Ücretsiz ve hızlı! Eğitimli destek temsilcileri yardımcı olmak için mevcuttur",
@@ -878,7 +803,6 @@
   "support_title_guides": "Kek Cüzdan Dokümanlar",
   "support_title_live_chat": "Canlı destek",
   "support_title_other_links": "Diğer destek bağlantıları",
-  "supported": "Desteklenen",
   "swap": "Takas",
   "sweeping_wallet": "Süpürme cüzdanı",
   "sweeping_wallet_alert": "Bu uzun sürmemeli. BU EKRANDAN BIRAKMAYIN YOKSA SÜPÜRÜLEN FONLAR KAYBOLABİLİR",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "SENKRONİZE EDİLİYOR",
   "sync_status_timed_out": "ZAMAN AŞIMINA UĞRADI",
   "sync_status_unsupported": "Desteklenmeyen düğüm",
-  "synchronizing": "Senkronize etme",
   "syncing_wallet_alert_content": "Bakiyeniz ve işlem listeniz, en üstte \"SENKRONİZE EDİLDİ\" yazana kadar tamamlanmamış olabilir. Daha fazla bilgi edinmek için tıklayın/dokunun.",
   "syncing_wallet_alert_title": "Cüzdanınız senkronize ediliyor",
   "template": "Şablon",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Thorchain sağlayıcısı Taproot adreslerini desteklemiyor. Lütfen adresi değiştirin veya farklı bir sağlayıcı seçin.",
   "time": "${minutes}d ${seconds}s",
   "tip": "Bahşiş:",
-  "to": "İle",
   "today": "Bugün",
-  "token_already_exists": "Token zaten var",
   "token_contract_address": "Token sözleşme adresi",
   "token_decimal": "Belirteç ondalık",
   "token_name": "Belirteç adı, örneğin: Tether",
   "token_symbol": "Jeton sembolü, örneğin: USDT",
   "tokenID": "İD",
-  "ton_extra_info": "Lütfen değişim için ton işlemini gönderirken not kimliğini belirtmeyi unutmayın",
   "tor_connection": "Tor bağlantısı",
-  "tor_connection_timeout": "Tor bağlantı zaman aşımı",
-  "tor_experimental": "Bu deneysel bir özelliktir, kek cüzdanı desteğinden yapılan tüm bağlantılar değil, TOR yönlendirmesinden yapılmıştır - bazı bağlantılar, VPN moduyla uygulama trafik kullanımını tam olarak yönlendirmek için ClearNet kullanabilir.",
   "tor_only": "Yalnızca Tor",
   "total": "Toplam",
   "total_saving": "Toplam Tasarruf",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "Ekran 1 dakika sonra ilerlemezse, blok gezgininden ve e-postanızdan kontrol edin.",
   "transactions": "İşlemler",
   "transactions_by_date": "Tarihe göre transferler",
-  "transport_type": "Taşıma tipi",
   "trongrid_history": "Trongrid tarihi",
   "trusted": "Güvenilir",
-  "try_again": "Tekrar deneyin",
   "tx_commit_exception_no_dust_on_change": "İşlem bu miktarla reddedilir. Bu madeni paralarla değişiklik yapmadan ${min} veya değişikliği döndüren ${max} gönderebilirsiniz.",
   "tx_commit_failed": "İşlem taahhüdü başarısız oldu. Lütfen Destek ile iletişime geçin.",
   "tx_commit_failed_no_peers": "İşlem yayın yapamadı, lütfen bir saniye içinde tekrar deneyin",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "Harcanmamış koin detayları",
   "unspent_coins_title": "Harcanmamış koinler",
   "unsupported_asset": "Bu öğe için bu eylemi desteklemiyoruz. Lütfen desteklenen bir varlık türünde bir cüzdan oluşturun veya cüzdana geçiş yapın.",
-  "update_session": "Güncelleme Oturumu",
   "uptime": "Çalışma süresi",
   "upto": "Şu miktara kadar: ${value}",
   "usb": "USB",
   "use": "Şuna geç: ",
   "use_card_info_three": "Dijital kartı çevrimiçi olarak veya temassız ödeme yöntemleriyle kullanın.",
   "use_card_info_two": "Paralar, dijital para birimlerinde değil, ön ödemeli hesapta tutulduğunda USD'ye dönüştürülür.",
-  "use_device_theme": "Cihaz temasını kullanın",
-  "use_payjoin": "Kullanmak Payjoin",
   "use_ssl": "SSL kullan",
   "use_suggested": "Önerileni Kullan",
   "use_testnet": "TestNet kullanın",
-  "user_rejected_method": "Kullanıcı reddedilen yöntemi",
   "value": "Değer",
   "value_type": "Değer türü",
   "variable_pair_not_supported": "Bu değişken paritesi seçilen borsalarda desteklenmemekte",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "Bu tohumu her zaman tekrar görebilirsiniz",
   "wallet_group_empty_state_text_one": "Herhangi bir uyumlu cüzdan grubunuz yok gibi görünüyor !\n\n TAP",
   "wallet_group_empty_state_text_two": "Yeni bir tane yapmak için aşağıda.",
-  "wallet_has_passphrase": "Bu cüzdanın bir parola var",
   "wallet_keys": "Cüzdan tohumu/anahtarları",
   "wallet_list_create_new_wallet": "Yeni Cüzdan Oluştur",
   "wallet_list_edit_group_name": "Grup Adını Düzenle",
@@ -1077,11 +988,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Cüzdanlar",
   "warning": "Uyarı",
-  "welcome": "Hoş geldin",
+  "welcome": "Hoş Geldiniz",
   "welcome_subtitle_new_wallet": "Taze başlamak istiyorsanız, aşağıda yeni cüzdan oluşturun ve yarışlara gidersiniz.",
   "welcome_subtitle_restore_wallet": "Mevcut bir cüzdanınız varsa, kek içine getirmek istediğiniz, mevcut cüzdanı geri yüklemeyi seçin ve bu süreç boyunca size yol gösterelim.",
   "welcome_to_cakepay": "Cake Pay'e Hoş Geldiniz!",
-  "what_is_payjoin": "Payjoin nedir ?",
   "what_is_silent_payments": "Sessiz ödemeler nedir?",
   "widgets_address": "Adres",
   "widgets_or": "veya",
@@ -1111,6 +1021,5 @@
   "you_will_get": "Biçimine dönüştür:",
   "you_will_receive_estimated_amount": "(Tahmini ) alacaksınız",
   "you_will_send": "Biçiminden dönüştür:",
-  "youCanGoBackToYourDapp": "Şimdi Dapp'ınıza geri dönebilirsin",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index cdfc91433..8227d581f 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Додайте передплачені кошти на картки (до ${value})",
   "add_new_node": "Додати новий вузол",
   "add_new_word": "Добавити нове слово",
-  "add_passphrase": "Додати фразу",
-  "add_passphrase_warning_text": "Введіть парольну фразу, якщо ви використовували її для цього гаманця в минулому. Якщо ви вводите неправильну пасфразу або раніше не використовували парольну фразу на цьому гаманці, ви не побачите жодного з існуючих коштів чи історії.",
   "add_receiver": "Додати одержувача (необов'язково)",
   "add_secret_code": "Або додайте цей секретний код до програми автентифікації",
   "add_tip": "Додати підказку",
   "add_token_disclaimer_check": "Я підтвердив адресу та інформацію щодо договору маркера, використовуючи авторитетне джерело. Додавання зловмисної або невірної інформації може призвести до втрати коштів.",
   "add_token_warning": "Не редагуйте та не додавайте токени за вказівками шахраїв.\nЗавжди підтверджуйте адреси токенів у авторитетних джерелах!",
   "add_value": "Додати значення",
-  "added_message_for_ata_error": "Будь ласка, переконайтеся, що у вас є достатньо балансу SOL, щоб завершити свою транзакцію.",
   "address": "Адреса",
   "address_book": "Адресна книга",
   "address_book_menu": "Адресна книга",
@@ -55,8 +52,6 @@
   "anonpay_description": "Згенерувати ${type}. Одержувач може ${method} будь-якою підтримуваною криптовалютою, і ви отримаєте кошти на цей гаманець.",
   "apk_update": "Оновлення APK",
   "approve": "Затвердити",
-  "approve_request": "Запитайте запит",
-  "approve_tokens": "Затвердити токени",
   "arrive_in_this_address": "${currency} ${tag}надійде на цю адресу",
   "ascending": "Висхід",
   "ask_each_time": "Запитайте кожен раз",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Очікується підтвердження платежу",
   "background_sync": "Фонове синхронізація",
   "background_sync_mode": "Фоновий режим синхронізації",
-  "background_sync_on_battery_low": "Синхронізувати на низькому батареї",
-  "background_sync_on_charging": "Синхронізуватися лише при зарядці",
-  "background_sync_on_device_idle": "Синхронізувати лише тоді, коли пристрій не використовується",
-  "background_sync_on_unmetered_network": "Вимагати незадоволеної мережі",
   "backup": "Резервна копія",
   "backup_file": "Файл резервної копії",
   "backup_password": "Пароль резервної копії",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Купити Bitcoin",
   "buy_now": "Купити зараз",
   "buy_provider_unavailable": "В даний час постачальник недоступний.",
-  "buy_sell_pair_is_not_supported_warning": "Ця пара валюти не підтримується жодним постачальником для вибраного методу оплати. Виберіть іншу пару або спробуйте змінити метод оплати.",
   "buy_with": "Купити за допомогою",
   "by_cake_pay": "від Cake Pay",
   "cake_2fa_preset": "Торт 2FA Preset",
@@ -124,12 +114,9 @@
   "camera_consent": "Ваша камера використовуватиметься для зйомки зображення з метою ідентифікації ${provider}. Будь ласка, ознайомтеся з їхньою політикою конфіденційності, щоб дізнатися більше.",
   "camera_permission_is_required": "Потрібен дозвіл камери.\nУвімкніть його в налаштуваннях програми.",
   "cancel": "Відмінити",
-  "cannot_verify": "Не вдається перевірити",
-  "cannot_verify_description": "Цей домен неможливо перевірити. Ретельно перевірте запит перед затвердженням.",
   "card_address": "Адреса:",
   "cardholder_agreement": "Угода власника картки",
   "cards": "Картки",
-  "chain_id": "Ідентифікатор ланцюга",
   "chains": "Ланцюги",
   "change": "Змінити",
   "change_backup_password_alert": "Ваші попередні файли резервних копій будуть недоступні для імпорту з новим паролем резервної копії. Новий пароль резервної копії буде використовуватися тільки для нових файлів резервних копій. Ви впевнені, що хочете змінити пароль резервної копії?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Ви впевнені, що хочете змінити представника?",
   "change_rep_successful": "Успішно змінив представник",
   "change_selected_exchanges": "Змінити вибрані біржі",
-  "change_selected_pair": "Змінити вибрану пару",
   "change_wallet_alert_content": "Ви хочете змінити поточний гаманець на ${wallet_name}?",
   "change_wallet_alert_title": "Змінити поточний гаманець",
   "choose_a_payment_method": "Виберіть метод оплати",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Підтверджений",
   "congratulations": "Вітаємо!",
   "connect_an_existing_yat": "Підключити існуючий Yat",
-  "connect_hw_info_step_1": "Переконайтесь, що ваш пристрій працює.",
-  "connect_hw_info_step_2": "Увімкніть Bluetooth для обох пристроїв і з’єднайте їх з телефону або підключіть свої пристрої разом за допомогою USB -кабелю.",
-  "connect_hw_info_step_3": "Розблокуйте свій пристрій і перейдіть до потрібного програми Crypto.",
-  "connect_hw_info_step_4": "Виберіть свій пристрій у гаманці тортів і продовжуйте налаштування.",
   "connect_yats": "Підключіть Yats",
   "connect_your_hardware_wallet": "Підключіть апаратний гаманець за допомогою Bluetooth або USB",
   "connect_your_hardware_wallet_ios": "Підключіть апаратний гаманець за допомогою Bluetooth",
-  "connected": "З'єднаний",
   "connection_sync": "Підключення та синхронізація",
   "connectWalletPrompt": "Підключіть свій гаманець до WalletConnect, щоб здійснювати транзакції",
   "contact": "Контакт",
@@ -207,8 +188,6 @@
   "copy": "Скопіювати",
   "copy_address": "Cкопіювати адресу",
   "copy_id": "Скопіювати ID",
-  "copy_payjoin_address": "Копіювати адресу Payjoin",
-  "copy_payjoin_url": "Скопіюйте Payjoin url",
   "copyWalletConnectLink": "Скопіюйте посилання WalletConnect із dApp і вставте сюди",
   "corrupted_seed_notice": "Файли для цього гаманця пошкоджені і не можуть бути відкриті. Перегляньте насіннєву фразу, збережіть її та відновіть гаманець.\n\nЯкщо значення порожнє, то насіння не могло бути правильно відновленим.",
   "countries": "Країни",
@@ -245,22 +224,11 @@
   "descending": "Низхідний",
   "description": "опис",
   "destination_tag": "Тег призначення:",
-  "deuro_collect_interest": "Збирати",
-  "deuro_savings": "заощадження dEuro",
-  "deuro_savings_add": "Депозит",
-  "deuro_savings_balance": "Баланс заощаджень",
-  "deuro_savings_collect_interest": "Збирати інтерес",
-  "deuro_savings_remove": "Відступати",
-  "deuro_savings_set_approval": "Встановити схвалення",
-  "deuro_savings_subtitle": "Заробляйте до 10% відсотків на ваших Holdings Deuro StableCoin",
-  "deuro_tx_commited_content": "Це може знадобитися кілька секунд, щоб транзакція підтвердила та відображалася на екрані",
-  "device_is_signing": "Пристрій підписується",
   "dfx_option_description": "Купуйте криптовалюту з EUR & CHF. Для роздрібних та корпоративних клієнтів у Європі",
   "didnt_get_code": "Не отримали код?",
   "digit_pin": "-значний PIN",
   "digital_and_physical_card": " цифрова та фізична передплачена дебетова картка",
   "disable": "Вимкнути",
-  "disable_automatic_exchange_status_updates": "Вимкнути автоматичні оновлення стану обміну",
   "disable_bulletin": "Вимкнути статус послуги",
   "disable_buy": "Вимкнути дію покупки",
   "disable_cake_2fa": "Вимкнути Cake 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Вимкнувши це, ставки плати в деяких випадках можуть бути неточними, тому ви можете переплатити або недооплатити плату за свої транзакції",
   "disable_fiat": "Вимкнути фиат",
   "disable_sell": "Вимкнути дію продажу",
-  "disable_tor": "Вимкнути Тор",
   "disable_trade_option": "Вимкнути можливість торгівлі",
   "disableBatteryOptimization": "Вимкнути оптимізацію акумулятора",
   "disableBatteryOptimizationDescription": "Ви хочете відключити оптимізацію акумулятора, щоб зробити фонову синхронізацію більш вільно та плавно?",
   "disabled": "Вимкнено",
-  "disconnect_session": "Відключіть сеанс",
   "discount": "Зекономте ${value}%",
   "display_settings": "Налаштування дисплея",
   "displayable": "Відображуваний",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Не діліться цим нікому, включно зі службою підтримки.\n\nВаші кошти можуть і будуть вкрадені!",
   "do_not_show_me": "Не показувати це знову",
   "domain_looks_up": "Пошук доменів",
-  "domain_mismatch": "Невідповідність домену",
-  "domain_mismatch_description": "Цей веб -сайт має домен, який не відповідає відправнику цього запиту. Затвердження може призвести до втрати коштів.",
   "donation_link_details": "Деталі посилання для пожертв",
-  "done": "Виконаний",
   "e_sign_consent": "Згода електронного підпису",
   "edit": "Редагувати",
   "edit_backup_password": "Змінити пароль резервної копії",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "Ми створюємо нові адреси щоразу, коли ви використовуєте їх, але попередні адреси продовжують працювати",
   "email_address": "Адреса електронної пошти",
   "enable": "Ввімкнути",
-  "enable_builtin_tor": "Увімкнути вбудований tor",
   "enable_mempool_api": "API Mempool для точних зборів та дат",
   "enable_replace_by_fee": "Увімкнути заміну з комісією",
   "enable_silent_payments_scanning": "Почніть сканувати мовчазні платежі, поки не буде досягнуто наконечника",
@@ -333,10 +295,8 @@
   "error_text_template": "Ім'я та адреса шаблону не може містити ` , ' \" символи\nі може бути від 1 до 106 символів в довжину",
   "error_text_wallet_name": "Ім'я гаманця може містити тільки букви, цифри, символи _ -\nі повинно бути від 1 до 33 символів в довжину",
   "error_text_xmr": "Значення XMR не може перевищувати доступний баланс.\nКількість цифр після коми повинно бути меншим або дорівнювати 12",
-  "error_while_processing": "Помилка сталася під час проектування",
   "errorGettingCredentials": "Помилка: помилка під час отримання облікових даних",
   "errorSigningTransaction": "Під час підписання транзакції сталася помилка",
-  "establishing_tor_connection": "Закінчення підключення до TOR",
   "estimated": "Приблизно ",
   "estimated_new_fee": "Орієнтовна нова комісія",
   "estimated_receive_amount": "Орієнтовна сума отримує",
@@ -360,7 +320,6 @@
   "export_backup": "Експортувати резервну копію",
   "export_logs": "Експортні журнали",
   "export_outputs": "Експортні результати",
-  "extend_session": "Продовжити сеанс",
   "extra_id": "Додатковий ID:",
   "extracted_address_content": "Ви будете відправляти кошти\n${recipient_name}",
   "failed_authentication": "Помилка аутентифікації. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Фіат API",
   "fiat_balance": "Фіат Баланс",
   "field_required": "Це поле є обов'язковим",
-  "file_saved": "Збережено файл",
   "fill_code": "Будь ласка, введіть код підтвердження, надісланий на вашу електронну адресу",
   "filter_by": "Фільтрувати по",
   "first_wallet_text": "В самому зручному гаманці для Monero, Bitcoin, Ethereum, Litecoin, та Haven",
@@ -382,12 +340,10 @@
   "forgot_password": "Забули пароль",
   "freeze": "Заморозити",
   "frequently_asked_questions": "Часті запитання",
-  "from": "З",
   "frozen": "Заморожено",
   "frozen_balance": "Заморожений баланс",
   "full_balance": "Весь баланс",
   "gas_exceeds_allowance": "Газ, необхідний транзакціям, перевищує надбавку.",
-  "gas_price": "Ціна газу",
   "generate_name": "Згенерувати назву",
   "generating_gift_card": "Створення подарункової картки",
   "generating_transaction": "Генерування транзакції",
@@ -413,7 +369,6 @@
   "hide_details": "Приховати деталі",
   "high_contrast_theme": "Тема високої контрастності",
   "home_screen_settings": "Налаштування головного екрана",
-  "how_to_connect": "Як підключитися",
   "how_to_use": "Як використовувати",
   "how_to_use_card": "Як використовувати цю картку",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "У вас недостатньо SOL, щоб покрити транзакцію та її плату за трансакцію. Будь ласка, додайте до свого гаманця більше SOL або зменшіть суму, яку ви надсилаєте.",
   "insufficient_lamports": "У вас недостатньо SOL, щоб покрити транзакцію та її плату за трансакцію. Вам потрібно щонайменше ${solValueNeeded} sol. Будь ласка, додайте до свого гаманця більше SOL або зменшіть суму Sol, яку ви надсилаєте",
   "insufficientFundsForRentError": "У вас недостатньо SOL, щоб покрити плату за транзакцію та оренду на рахунок. Будь ласка, додайте до свого гаманця більше SOL або зменшіть суму, яку ви надсилаєте",
-  "insufficientFundsForRentErrorReceiver": "На рахунку одержувача не вистачає SOL, щоб покрити оренду. Будь ласка, попросіть одержувача додати більше SOL до свого рахунку.",
   "introducing_cake_pay": "Представляємо Cake Pay!",
   "invalid_input": "Неправильні дані",
   "invalid_password": "Недійсний пароль",
@@ -471,7 +425,6 @@
   "logout": "Вийти",
   "low_fee": "Низька плата",
   "low_fee_alert": "Зараз ви використовуєте низький пріоритет плати за мережу. Це може спричинити тривале очікування, інший курс або скасування угод. Ми рекомендуємо встановити вищу плату для кращого досвіду.",
-  "made_easy": "полегшив",
   "manage_nodes": "Керуйте вузлами",
   "manage_pow_nodes": "Керуйте вузлами PoW",
   "manage_yats": "Керувати Yat",
@@ -483,8 +436,6 @@
   "memo": "Пам’ятка:",
   "message": "повідомлення",
   "message_verified": "Повідомлення було успішно перевірено",
-  "messages": "Повідомлення",
-  "method": "Метод",
   "methods": "методи",
   "min_amount": "Мінімум: ${value}",
   "min_value": "Мін: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "Темна тема Monero",
   "monero_light_theme": "Легка тема Monero",
   "moonpay_alert_text": "Значення суми має бути більшим або дорівнювати ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Під час отримання NFTS сталася помилка. Будь ласка, перевірте підключення до Інтернету та повторіть спробу.",
   "more_options": "Більше параметрів",
   "multiple_addresses_detected": "Виявлено кілька адрес",
   "mweb_confirmed": "Підтвердив Mweb",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "Ім'я",
   "new_subaddress_title": "Нова адреса",
   "new_template": "Новий шаблон",
-  "new_transactions_notifications": "Надішліть сповіщення про нові транзакції",
   "new_wallet": "Новий гаманець",
   "newConnection": "Нове підключення",
   "no_cards_found": "Карт не знайдено",
@@ -539,7 +488,6 @@
   "normal": "нормальний",
   "note_optional": "Примітка (необов’язково)",
   "note_tap_to_change": "Примітка (натисніть для зміни)",
-  "notification_permission_denied": "Повідомлення дозволу отримали безперервно, будь ласка, вручну ввімкніть його в налаштуваннях",
   "nullURIError": "URI нульовий",
   "offer_expires_in": "Пропозиція закінчиться через: ",
   "offline": "Офлайн",
@@ -571,20 +519,8 @@
   "password": "Пароль",
   "paste": "Вставити",
   "pause_wallet_creation": "Можливість створення гаманця Haven зараз призупинено.",
-  "payjoin_card_content": "Payjoin-це нова функція збереження конфіденційності та економії плати в Bitcoin.",
-  "payjoin_details": "Payjoin деталей",
-  "payjoin_enabled": "Payjoin увімкнено",
-  "payjoin_enabling_popup_content": "Ви можете перемикатися Payjoin в меню → конфіденційність → використовувати Payjoin, щоб увімкнути або відключити його пізніше.",
-  "payjoin_enabling_popup_title": "Увімкнення Payjoin",
-  "payjoin_request_awaiting_tx": "Чекає транзакції",
-  "payjoin_request_in_progress": "Триває",
-  "payjoin_unavailable": "Payjoin недоступний",
-  "payjoin_unavailable_sheet_content": "Отримання транзакції Payjoin вимагає, щоб ви біткойн готували до використання.",
-  "payjoin_unavailable_sheet_title": "Чому Payjoin недоступний?",
   "payment_id": "ID платежу: ",
-  "payment_made_easy": "Платежі полегшені",
   "payment_was_received": "Ваш платіж отримано.",
-  "payments": "Виплати",
   "pending": " (в очікуванні)",
   "percentageOf": "${amount}",
   "pin_at_top": "закріпити ${token} зверху",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "Будь ласка, спробуйте підключитися до іншого вузлу",
   "please_wait": "Будь ласка, зачекайте",
   "polygonscan_history": "Історія PolygonScan",
-  "potential_scam": "Потенційна афера",
   "powered_by": "Використовуючи ${title}",
   "pre_seed_button_text": "Зрозуміло. Покажіть мнемонічну фразу",
-  "pre_seed_description": "На наступній сторінці ви побачите ряд слів. Це ваше унікальне та приватне насіння, і це єдиний спосіб відновити гаманець у разі втрати або несправності. Ви несете відповідальність записати його та зберігати в безпечному місці поза додатком для гаманця тортів.",
+  "pre_seed_description": "На наступній сторінці ви побачите серію з ${words} слів. Це ваша унікальна та приватна мнемонічна фраза, і це ЄДИНИЙ спосіб відновити ваш гаманець на випадок втрати або несправності. ВАМ необхідно записати її та зберігати в безпечному місці поза програмою Cake Wallet.",
   "pre_seed_title": "ВАЖЛИВО",
   "prepaid_cards": "Передплачені картки",
   "prevent_screenshots": "Запобігати знімкам екрана та запису екрана",
@@ -617,7 +552,6 @@
   "proceed_on_device": "Продовжуйте свій пристрій",
   "proceed_on_device_description": "Будь ласка, дотримуйтесь інструкцій, підказаних на вашому апаратному гаманці",
   "processing": "Обробка",
-  "processing_signed_tx": "Обробка підписана транзакція",
   "profile": "Профіль",
   "provider_error": "${provider} помилка",
   "public_key": "Публічний ключ",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "Ваш представник, схоже, не має доброго становища. Торкніться тут, щоб вибрати новий",
   "repeat_wallet_password": "Повторіть пароль гаманця",
   "repeated_password_is_incorrect": "Повторний пароль невірний. Будь ласка, повторіть пароль гаманця ще раз.",
-  "requested": "Запитуваний",
   "require_for_adding_contacts": "Потрібен для додавання контактів",
   "require_for_all_security_and_backup_settings": "Вимагати всіх налаштувань безпеки та резервного копіювання",
   "require_for_assessing_wallet": "Потрібен доступ до гаманця",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "Вимагати надсилання на внутрішні гаманці",
   "require_for_sends_to_non_contacts": "Вимагати для надсилання неконтактним особам",
   "require_pin_after": "Вимагати PIN після",
-  "required_passphrase": "Пропуск",
   "rescan": "Пересканувати",
   "resend_code": "Будь ласка, надішліть його повторно",
   "reset": "Скинути",
   "reset_password": "Скинути пароль",
-  "restore": "Відновити",
   "restore_active_seed": "Активна мнемонічна фраза",
   "restore_address": "Адреса",
   "restore_bitcoin_description_from_keys": "Ви можете відновити гаманець за допомогою WIF",
@@ -714,10 +645,7 @@
   "search_language": "Мова пошуку",
   "second_intro_content": "Ваш Yat - це єдина унікальна адреса емодзі, яка замінює довгі шістнадцятиричні адреси для всіх ваших валют.",
   "second_intro_title": "Одна адреса емодзі для управління іншими адресами",
-  "security": "Безпека",
   "security_and_backup": "Безпека та резервне копіювання",
-  "security_risk": "Ризик безпеки",
-  "security_risk_description": "Цей домен позначений як небезпечно численними постачальниками безпеки. Залиште негайно, щоб захистити свої активи.",
   "seed_alert_back": "Назад",
   "seed_alert_content": "Мнемонічна фраза - єдиний спосіб відновити ваш гаманець. Ви записали її?",
   "seed_alert_title": "Увага",
@@ -752,6 +680,9 @@
   "seedtype": "Насіннєвий тип",
   "seedtype_alert_content": "Спільний доступ до інших гаманців можливе лише за допомогою BIP39 Seedtype.",
   "seedtype_alert_title": "Попередження насінника",
+  "seedtype_legacy": "Спадщина (25 слів)",
+  "seedtype_polyseed": "Полісей (16 слів)",
+  "seedtype_wownero": "Влонеро (14 слів)",
   "select_backup_file": "Виберіть файл резервної копії",
   "select_buy_provider_notice": "Виберіть постачальника купівлі вище. Ви можете пропустити цей екран, встановивши свого постачальника купівлі за замовчуванням у налаштуваннях додатків.",
   "select_destination": "Виберіть місце призначення для файлу резервної копії.",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "Надіслати із зовнішнього гаманця",
   "send_name": "Ім'я",
   "send_new": "Новий",
-  "send_payjoin": "Надіслати Payjoin",
   "send_payment_id": "ID платежу (опційно)",
   "send_priority": "Комісія встановлена в залежності від пріоритету: ${transactionPriority}.\nПріоритет транзакції може бути змінений в налаштуваннях",
   "send_sending": "Відправлення...",
@@ -833,9 +763,7 @@
   "show_keys": "Показати мнемонічну фразу/ключі",
   "show_market_place": "Відображати маркетплейс",
   "show_seed": "Показати мнемонічну фразу",
-  "sign_all": "Підписати все",
   "sign_message": "Підпишіть повідомлення",
-  "sign_one": "Підписати один",
   "sign_up": "Зареєструватися",
   "sign_verify_message": "Підпишіть або перевірити повідомлення",
   "sign_verify_message_sub": "Підпишіть або перевірте повідомлення за допомогою вашого приватного ключа",
@@ -864,14 +792,11 @@
   "sort_by": "Сортувати за",
   "spend_key_private": "Приватний ключ витрати",
   "spend_key_public": "Публічний ключ витрати",
-  "starting_tor_proxy": "Початок Tor Proxy",
   "status": "Статус: ",
-  "step": "Крок",
   "string_default": "За замовчуванням",
   "subaddress_title": "Список Субадрес",
   "subaddresses": "Субадреси",
   "submit_request": "надіслати запит",
-  "success": "Успіх",
   "successful": "Успішний",
   "support_description_guides": "Документація та підтримка загальних питань",
   "support_description_live_chat": "Безкоштовно і швидко! Навчені представники підтримки доступні для надання допомоги",
@@ -879,7 +804,6 @@
   "support_title_guides": "Торт гаманці",
   "support_title_live_chat": "Жива підтримка",
   "support_title_other_links": "Інші посилання на підтримку",
-  "supported": "Підтримуваний",
   "swap": "Обміняти",
   "sweeping_wallet": "Підмітаня гаманця",
   "sweeping_wallet_alert": "Це не повинно зайняти багато часу. НЕ ЗАЛИШАЙТЕ ЦЬОГО ЕКРАНУ, АБО КОШТИ МОЖУТЬ БУТИ ВТРАЧЕНІ",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "СИНХРОНІЗАЦІЯ",
   "sync_status_timed_out": "ТАЙМ-АУТ",
   "sync_status_unsupported": "Непідтримуваний вузол",
-  "synchronizing": "Синхронізація",
   "syncing_wallet_alert_content": "Ваш баланс та список транзакцій може бути неповним, доки вгорі не буде написано «СИНХРОНІЗОВАНО». Натисніть/торкніться, щоб дізнатися більше.",
   "syncing_wallet_alert_title": "Ваш гаманець синхронізується",
   "template": "Шаблон",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "Постачальник Thorchain не підтримує адреси Taproot. Будь ласка, змініть адресу або виберіть іншого постачальника.",
   "time": "${minutes}хв ${seconds}сек",
   "tip": "Порада:",
-  "to": "До",
   "today": "Сьогодні",
-  "token_already_exists": "Маркер вже існує",
   "token_contract_address": "Адреса договору маркера",
   "token_decimal": "Токен десятковий",
   "token_name": "Назва токена, наприклад: Tether",
   "token_symbol": "Символ маркера, наприклад: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Не забудьте вказати ідентифікатор пам’яті під час надсилання транзакції TON для обміну",
   "tor_connection": "Підключення Tor",
-  "tor_connection_timeout": "Тайм -аут підключення TOR",
-  "tor_experimental": "Це експериментальна функція, не всі з'єднання, зроблені з підтримки тортів, що підтримують маршрутизацію - деякі з'єднання можуть використовувати Clearnet, щоб повністю маршрутизувати трафік додатків, використовуючи TOR з режимом VPN.",
   "tor_only": "Тільки Tor",
   "total": "Загальний",
   "total_saving": "Загальна економія",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "Якщо екран не відображається через 1 хвилину, перевірте провідник блоків і свою електронну пошту.",
   "transactions": "Транзакції",
   "transactions_by_date": "Сортувати по даті",
-  "transport_type": "Транспортний тип",
   "trongrid_history": "Тронгрідська історія",
   "trusted": "довіряють",
-  "try_again": "Спробуйте ще раз",
   "tx_commit_exception_no_dust_on_change": "Транзакція відхилена цією сумою. За допомогою цих монет ви можете надіслати ${min} без змін або ${max}, що повертає зміни.",
   "tx_commit_failed": "Транзакційна комісія не вдалося. Будь ласка, зв'яжіться з підтримкою.",
   "tx_commit_failed_no_peers": "Транзакція не вдалося транслювати, спробуйте ще раз за секунду або близько того",
@@ -1014,19 +930,15 @@
   "unspent_coins_details_title": "Відомості про невитрачені монети",
   "unspent_coins_title": "Невитрачені монети",
   "unsupported_asset": "Ми не підтримуємо цю дію для цього ресурсу. Створіть або перейдіть на гаманець підтримуваного типу активів.",
-  "update_session": "Оновити сеанс",
   "uptime": "Час роботи",
   "upto": "до ${value}",
   "usb": "USB",
   "use": "Використати ",
   "use_card_info_three": "Використовуйте цифрову картку онлайн або за допомогою безконтактних методів оплати.",
   "use_card_info_two": "Кошти конвертуються в долари США, якщо вони зберігаються на передплаченому рахунку, а не в цифрових валютах.",
-  "use_device_theme": "Використовуйте тему пристрою",
-  "use_payjoin": "Використовуйте Payjoin",
   "use_ssl": "Використати SSL",
   "use_suggested": "Використати запропоноване",
   "use_testnet": "Використовуйте тестову мережу",
-  "user_rejected_method": "КОМПЛЕКТИВНИЙ МЕТОД",
   "value": "Цінність",
   "value_type": "Тип значення",
   "variable_pair_not_supported": "Ця пара змінних не підтримується вибраними біржами",
@@ -1053,7 +965,6 @@
   "wallet_group_description_view_seed": "Ви завжди можете переглянути це насіння ще раз під",
   "wallet_group_empty_state_text_one": "Схоже, у вас немає сумісних груп гаманця !\n\n Торкніться",
   "wallet_group_empty_state_text_two": "нижче, щоб зробити новий.",
-  "wallet_has_passphrase": "Цей гаманець має фразу",
   "wallet_keys": "Мнемонічна фраза/ключі гаманця",
   "wallet_list_create_new_wallet": "Створити новий гаманець",
   "wallet_list_edit_group_name": "Назва групи редагування",
@@ -1078,11 +989,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Гаманці",
   "warning": "УВАГА",
-  "welcome": "Вітати",
+  "welcome": "Вітаємо в",
   "welcome_subtitle_new_wallet": "Якщо ви хочете почати спочатку, торкніться Створити новий гаманець нижче, і ви будете поза конкуренціею.",
   "welcome_subtitle_restore_wallet": "Якщо у вас є існуючий гаманець, який ви хочете ввести в торт, просто виберіть Відновити існуючий гаманець, і ми проведемо вас через процес.",
   "welcome_to_cakepay": "Ласкаво просимо до Cake Pay!",
-  "what_is_payjoin": "Що таке Payjoin ?",
   "what_is_silent_payments": "Що таке мовчазні платежі?",
   "widgets_address": "Адреса",
   "widgets_or": "або",
@@ -1112,6 +1022,5 @@
   "you_will_get": "Конвертувати в",
   "you_will_receive_estimated_amount": "Ви отримаєте(оцінюється )",
   "you_will_send": "Конвертувати з",
-  "youCanGoBackToYourDapp": "Ви можете повернутися до свого DAPP зараз",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb
index 42a2398c2..307340a21 100644
--- a/res/values/strings_ur.arb
+++ b/res/values/strings_ur.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "کارڈز میں پری پیڈ فنڈز شامل کریں (${value} تک)",
   "add_new_node": "نیا نوڈ شامل کریں۔",
   "add_new_word": "نیا لفظ شامل کریں۔",
-  "add_passphrase": "پاسفریز شامل کریں",
-  "add_passphrase_warning_text": "صرف ایک پاسفریز درج کریں اگر آپ نے ماضی میں اس پرس کے لئے ایک استعمال کیا ہو۔ اگر آپ غلط پاسفریس میں داخل ہوتے ہیں یا اس پرس سے پہلے پاس فیز کا استعمال نہیں کرتے ہیں تو ، آپ کو موجودہ فنڈز یا تاریخ میں سے کوئی بھی نظر نہیں آئے گا۔",
   "add_receiver": "دوسرا وصول کنندہ شامل کریں (اختیاری)",
   "add_secret_code": "                             ۔ﮟﯾﺮﮐ ﻞﻣﺎﺷ ﮟﯿﻣ ﭗﯾﺍ ﮦﺪﻨﻨﮐ ﻖﯾﺪﺼﺗ ﻮﮐ ﮈﻮﮐ ﮧﯿﻔﺧ ﺱﺍ ،ﺎﯾ",
   "add_tip": "ٹپ شامل کریں۔",
   "add_token_disclaimer_check": "میں نے ایک معتبر ذریعہ کا استعمال کرتے ہوئے ٹوکن کنٹریکٹ ایڈریس اور معلومات کی تصدیق کی ہے۔ بدنیتی پر مبنی یا غلط معلومات شامل کرنے کے نتیجے میں فنڈز ضائع ہو سکتے ہیں۔",
   "add_token_warning": "سکیمرز کی ہدایت کے مطابق ٹوکن میں ترمیم یا اضافہ نہ کریں۔\nہمیشہ معتبر ذرائع سے ٹوکن پتوں کی تصدیق کریں!",
   "add_value": "قدر شامل کریں۔",
-  "added_message_for_ata_error": "برائے مہربانی اس بات کو یقینی بنائیں کہ آپ کے لین دین کو مکمل کرنے کے ل enough آپ کے پاس کافی SOL توازن موجود ہے۔",
   "address": "ﮧﺘﭘ",
   "address_book": "ایڈریس بک",
   "address_book_menu": "ایڈریس بک",
@@ -55,8 +52,6 @@
   "anonpay_description": "${type} بنائیں۔ وصول کنندہ کسی بھی تعاون یافتہ کرپٹو کرنسی کے ساتھ ${method} کرسکتا ہے، اور آپ کو اس بٹوے میں فنڈز موصول ہوں گے۔",
   "apk_update": "APK اپ ڈیٹ",
   "approve": "ﻭﺮﮐ ﺭﻮﻈﻨﻣ",
-  "approve_request": "درخواست کو منظور کریں",
-  "approve_tokens": "ٹوکن کو منظور کریں",
   "arrive_in_this_address": "${currency} ${tag}اس پتے پر پہنچے گا۔",
   "ascending": "چڑھنے",
   "ask_each_time": "ہر بار پوچھیں",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "ادائیگی کی تصدیق کے منتظر",
   "background_sync": "پس منظر کی ہم آہنگی",
   "background_sync_mode": "پس منظر کی مطابقت پذیری کا موڈ",
-  "background_sync_on_battery_low": "کم بیٹری پر ہم وقت سازی کریں",
-  "background_sync_on_charging": "چارج کرتے وقت صرف ہم وقت سازی کریں",
-  "background_sync_on_device_idle": "صرف اس وقت مطابقت پذیر کریں جب آلہ استعمال نہ ہو",
-  "background_sync_on_unmetered_network": "بے ساختہ نیٹ ورک کی ضرورت ہے",
   "backup": "بیک اپ",
   "backup_file": "بیک اپ فائل",
   "backup_password": "بیک اپ پاس ورڈ",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Bitcoin خریدیں۔",
   "buy_now": "ابھی خریدئے",
   "buy_provider_unavailable": "فراہم کنندہ فی الحال دستیاب نہیں ہے۔",
-  "buy_sell_pair_is_not_supported_warning": "اس کرنسی کی جوڑی کو کسی بھی فراہم کنندہ کے ذریعہ منتخب کردہ ادائیگی کے طریقہ کار کے لئے تعاون نہیں کیا جاتا ہے۔ براہ کرم ایک مختلف جوڑی کا انتخاب کریں یا ادائیگی کے طریقہ کار کو تبدیل کرنے کی کوشش کریں۔",
   "buy_with": "کے ساتھ خریدیں۔",
   "by_cake_pay": "Cake پے کے ذریعے",
   "cake_2fa_preset": "کیک 2FA پیش سیٹ",
@@ -124,12 +114,9 @@
   "camera_consent": "۔ﮟﯿﮭﮑﯾﺩ ﯽﺴﯿﻟﺎﭘ ﯽﺴﯾﻮﯿﺋﺍﺮﭘ ﯽﮐ ﻥﺍ ﻡﺮﮐ ﮦﺍﺮﺑ ﮯﯿﻟ ﮯﮐ ﺕﻼ${provider}ﯿﺼﻔﺗ ۔ﺎﮔ ﮯﺋﺎﺟ ﺎﯿﮐ ﻝﺎﻤﻌﺘﺳﺍ ﮯﯿﻟ",
   "camera_permission_is_required": "۔ﮯﮨ ﺭﺎﮐﺭﺩ ﺕﺯﺎﺟﺍ ﯽﮐ ﮮﺮﻤﯿﮐ",
   "cancel": "منسوخ کریں۔",
-  "cannot_verify": "تصدیق نہیں کرسکتے ہیں",
-  "cannot_verify_description": "اس ڈومین کی تصدیق نہیں کی جاسکتی ہے۔ منظوری سے پہلے درخواست کو احتیاط سے چیک کریں۔",
   "card_address": "پتہ:",
   "cardholder_agreement": "کارڈ ہولڈر کا معاہدہ",
   "cards": "کارڈز",
-  "chain_id": "چین ID",
   "chains": "ﮟﯾﺮﯿﺠﻧﺯ",
   "change": "تبدیلی",
   "change_backup_password_alert": "آپ کی پچھلی بیک اپ فائلیں نئے بیک اپ پاس ورڈ کے ساتھ درآمد کرنے کے لیے دستیاب نہیں ہوں گی۔ نیا بیک اپ پاس ورڈ صرف نئی بیک اپ فائلوں کے لیے استعمال کیا جائے گا۔ کیا آپ واقعی بیک اپ پاس ورڈ تبدیل کرنا چاہتے ہیں؟",
@@ -144,7 +131,6 @@
   "change_rep_message": "؟ﮟﯿﮨ ﮯﺘﮨﺎﭼ ﺎﻧﺮﮐ ﻞﯾﺪﺒﺗ ﻮﮐ ﮞﻭﺪﻨﺋﺎﻤﻧ ﯽﻌﻗﺍﻭ ﭖﺁ ﺎﯿﮐ",
   "change_rep_successful": "نمائندہ کو کامیابی کے ساتھ تبدیل کیا",
   "change_selected_exchanges": "منتخب تبادلے کو تبدیل کریں",
-  "change_selected_pair": "منتخب کردہ جوڑی کو تبدیل کریں",
   "change_wallet_alert_content": "کیا آپ موجودہ والیٹ کو ${wallet_name} میں تبدیل کرنا چاہتے ہیں؟",
   "change_wallet_alert_title": "موجودہ پرس تبدیل کریں۔",
   "choose_a_payment_method": "ادائیگی کا طریقہ منتخب کریں",
@@ -182,14 +168,9 @@
   "confirmed_tx": "تصدیق",
   "congratulations": "مبارک ہو!",
   "connect_an_existing_yat": "ایک موجودہ Yat کو جوڑیں۔",
-  "connect_hw_info_step_1": "اس بات کو یقینی بنائیں کہ آپ کا آلہ چل رہا ہے۔",
-  "connect_hw_info_step_2": "دونوں آلات کے لئے بلوٹوتھ کو آن کریں اور فون سے ان کو جوڑیں ، یا USB کیبل کا استعمال کرکے اپنے آلات کو ایک ساتھ جوڑیں۔",
-  "connect_hw_info_step_3": "اپنے آلے کو انلاک کریں اور مطلوبہ کریپٹو ایپ پر جائیں۔",
-  "connect_hw_info_step_4": "اپنے آلے کو کیک پرس میں منتخب کریں اور سیٹ اپ کے ساتھ جاری رکھیں۔",
   "connect_yats": "Yats کو جوڑیں۔",
   "connect_your_hardware_wallet": "بلوٹوتھ یا USB کا استعمال کرتے ہوئے اپنے ہارڈ ویئر پرس کو مربوط کریں",
   "connect_your_hardware_wallet_ios": "بلوٹوتھ کا استعمال کرتے ہوئے اپنے ہارڈ ویئر پرس کو جوڑیں",
-  "connected": "منسلک",
   "connection_sync": "کنکشن اور مطابقت پذیری",
   "connectWalletPrompt": "۔ﮟﯾﮌﻮﺟ ﮫﺗﺎﺳ ﮯﮐ WalletConnect ﻮﮐ ﮮﻮﭩﺑ ﮯﻨﭘﺍ ﮯﯿﻟ ﮯﮐ ﮯﻧﺮﮐ ﻦﯾﺩ ﻦﯿﻟ",
   "contact": "رابطہ کریں۔",
@@ -207,8 +188,6 @@
   "copy": "کاپی",
   "copy_address": "ایڈریس کاپی کریں۔",
   "copy_id": "کاپی ID",
-  "copy_payjoin_address": "پے جوائن ایڈریس کاپی کریں",
-  "copy_payjoin_url": "کاپی کریں Payjoin url",
   "copyWalletConnectLink": "dApp ﮯﺳ WalletConnect ۔ﮟﯾﺮﮐ ﭧﺴﯿﭘ ﮞﺎﮩﯾ ﺭﻭﺍ ﮟﯾﺮﮐ ﯽﭘﺎﮐ ﻮﮐ ﮏﻨﻟ",
   "corrupted_seed_notice": "اس پرس کے لئے فائلیں خراب ہیں اور کھولنے سے قاصر ہیں۔ براہ کرم بیج کے فقرے کو دیکھیں ، اسے بچائیں ، اور بٹوے کو بحال کریں۔\n\nاگر قیمت خالی ہے ، تو بیج صحیح طور پر بازیافت کرنے سے قاصر تھا۔",
   "countries": "ممالک",
@@ -245,22 +224,11 @@
   "descending": "اترتے ہوئے",
   "description": "ﻞﯿﺼﻔﺗ",
   "destination_tag": "منزل کا ٹیگ:",
-  "deuro_collect_interest": "جمع کریں",
-  "deuro_savings": "ڈیورو کی بچت",
-  "deuro_savings_add": "جمع کروائیں",
-  "deuro_savings_balance": "بچت کا توازن",
-  "deuro_savings_collect_interest": "دلچسپی جمع کریں",
-  "deuro_savings_remove": "واپس لے لو",
-  "deuro_savings_set_approval": "منظوری طے کریں",
-  "deuro_savings_subtitle": "اپنے ڈیورو اسٹبل کوئن ہولڈنگز پر 10 ٪ سود حاصل کریں",
-  "deuro_tx_commited_content": "لین دین کی تصدیق اور اسکرین پر عکاسی کرنے میں اس میں کچھ سیکنڈ لگ سکتے ہیں",
-  "device_is_signing": "ڈیوائس پر دستخط کر رہے ہیں",
   "dfx_option_description": "یورو اور سی ایچ ایف کے ساتھ کرپٹو خریدیں۔ یورپ میں خوردہ اور کارپوریٹ صارفین کے لئے",
   "didnt_get_code": "کوڈ نہیں ملتا؟",
   "digit_pin": "-ہندسوں کا پن",
   "digital_and_physical_card": "  ڈیجیٹل اور فزیکل پری پیڈ ڈیبٹ کارڈ",
   "disable": "غیر فعال کریں۔",
-  "disable_automatic_exchange_status_updates": "خودکار تبادلہ کی حیثیت کی تازہ کاریوں کو غیر فعال کریں",
   "disable_bulletin": "خدمت کی حیثیت کا بلیٹن کو غیر فعال کریں",
   "disable_buy": "خرید ایکشن کو غیر فعال کریں۔",
   "disable_cake_2fa": "کیک 2FA کو غیر فعال کریں۔",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "اس کو بند کرنے سے ، کچھ معاملات میں فیس کی شرح غلط ہوسکتی ہے ، لہذا آپ اپنے لین دین کے لئے فیسوں کو زیادہ ادائیگی یا ادائیگی ختم کرسکتے ہیں۔",
   "disable_fiat": "فیاٹ کو غیر فعال کریں۔",
   "disable_sell": "فروخت کی کارروائی کو غیر فعال کریں۔",
-  "disable_tor": "ٹور کو غیر فعال کریں",
   "disable_trade_option": "تجارت کے آپشن کو غیر فعال کریں",
   "disableBatteryOptimization": "بیٹری کی اصلاح کو غیر فعال کریں",
   "disableBatteryOptimizationDescription": "کیا آپ پس منظر کی مطابقت پذیری کو زیادہ آزادانہ اور آسانی سے چلانے کے لئے بیٹری کی اصلاح کو غیر فعال کرنا چاہتے ہیں؟",
   "disabled": "معذور",
-  "disconnect_session": "منقطع سیشن",
   "discount": "${value}% بچائیں",
   "display_settings": "ڈسپلے کی ترتیبات",
   "displayable": "قابل نمائش",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "سپورٹ سمیت کسی اور کے ساتھ ان کا اشتراک نہ کریں۔\\n\\nآپ کے فنڈز چوری ہو سکتے ہیں اور ہو جائیں گے!",
   "do_not_show_me": "مجھے یہ دوبارہ مت دکھانا",
   "domain_looks_up": "ڈومین تلاش کرنا",
-  "domain_mismatch": "ڈومین مماثل",
-  "domain_mismatch_description": "اس ویب سائٹ میں ایک ڈومین ہے جو اس درخواست کے مرسل سے مماثل نہیں ہے۔ منظوری سے فنڈز کا نقصان ہوسکتا ہے۔",
   "donation_link_details": "عطیہ کے لنک کی تفصیلات",
-  "done": "کیا",
   "e_sign_consent": "ای سائن کنسنٹ",
   "edit": "ترمیم",
   "edit_backup_password": "بیک اپ پاس ورڈ میں ترمیم کریں۔",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "جب بھی آپ ایک کا استعمال کرتے ہیں تو ہم نئے پتے تیار کرتے ہیں، لیکن پچھلے پتے کام کرتے رہتے ہیں۔",
   "email_address": "ای میل اڈریس",
   "enable": "قابل بنائیں",
-  "enable_builtin_tor": "بلٹٹی ان ٹور کو فعال کریں",
   "enable_mempool_api": "درست فیسوں اور تاریخوں کے لئے میمپول API",
   "enable_replace_by_fee": "فی فیس کو تبدیل کریں",
   "enable_silent_payments_scanning": "خاموش ادائیگیوں کو اسکین کرنا شروع کریں ، جب تک کہ نوک نہ پہنچ جائے",
@@ -333,10 +295,8 @@
   "error_text_template": "ٹیمپلیٹ کا نام اور پتہ `` , \\' \" علامتوں پر مشتمل نہیں ہو سکتا ہے اور 1 اور 106 حروف کے درمیان ہونا چاہیے",
   "error_text_wallet_name": "والیٹ کے نام میں صرف حروف، اعداد، _ - علامتیں\\nاور 1 سے 33 حروف کے درمیان ہونی چاہئیں",
   "error_text_xmr": "XMR قدر دستیاب بیلنس سے زیادہ نہیں ہو سکتی۔\\nفرکشن ہندسوں کی تعداد 12 سے کم یا اس کے برابر ہونی چاہیے۔",
-  "error_while_processing": "ایک غلطی پیش کرتے وقت ہوئی",
   "errorGettingCredentials": "۔ﯽﺑﺍﺮﺧ ﮟﯿﻣ ﮯﻧﺮﮐ ﻞﺻﺎﺣ ﺩﺎﻨﺳﺍ :ﻡﺎﮐﺎﻧ",
   "errorSigningTransaction": "۔ﮯﮨ ﯽﺌﮔﺁ ﺶﯿﭘ ﯽﺑﺍﺮﺧ ﮏﯾﺍ ﺖﻗﻭ ﮯﺗﺮﮐ ﻂﺨﺘﺳﺩ ﺮﭘ ﻦﯾﺩ ﻦﯿﻟ",
-  "establishing_tor_connection": "ٹور کنکشن کو کھڑا کرنا",
   "estimated": "تخمینہ لگایا",
   "estimated_new_fee": "تخمینہ شدہ نئی فیس",
   "estimated_receive_amount": "تخمینہ وصول کی رقم",
@@ -360,7 +320,6 @@
   "export_backup": "بیک اپ برآمد کریں۔",
   "export_logs": "نوشتہ جات برآمد کریں",
   "export_outputs": "برآمد کے نتائج",
-  "extend_session": "سیشن میں توسیع",
   "extra_id": "اضافی ID:",
   "extracted_address_content": "آپ فنڈز بھیج رہے ہوں گے\n${recipient_name}",
   "failed_authentication": "ناکام تصدیق۔ ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "Fiat API",
   "fiat_balance": "فیاٹ بیلنس",
   "field_required": "اس کو پر کرنا ضروری ہے",
-  "file_saved": "فائل محفوظ ہوگئی",
   "fill_code": "براہ کرم اپنے ای میل پر فراہم کردہ تصدیقی کوڈ کو پُر کریں۔",
   "filter_by": "کی طرف سے فلٹر",
   "first_wallet_text": "Monero، Bitcoin، Ethereum، Litecoin، اور Haven کے لیے زبردست پرس",
@@ -382,12 +340,10 @@
   "forgot_password": "پاسورڈ بھول گے",
   "freeze": "منجمد",
   "frequently_asked_questions": "اکثر پوچھے گئے سوالات",
-  "from": "سے",
   "frozen": "منجمد",
   "frozen_balance": "منجمد توازن",
   "full_balance": "مکمل بیلنس",
   "gas_exceeds_allowance": "لین دین کے ذریعہ درکار گیس الاؤنس سے زیادہ ہے۔",
-  "gas_price": "گیس کی قیمت",
   "generate_name": "نام پیدا کریں۔",
   "generating_gift_card": "گفٹ کارڈ تیار کرنا",
   "generating_transaction": "ٹرانزیکشن پیدا کرنا",
@@ -413,7 +369,6 @@
   "hide_details": "تفصیلات چھپائیں۔",
   "high_contrast_theme": "ہائی کنٹراسٹ تھیم",
   "home_screen_settings": "ہوم اسکرین کی ترتیبات",
-  "how_to_connect": "کیسے مربوط ہوں",
   "how_to_use": "                                                         ﮧﻘﯾﺮﻃ ﺎﮐ ﮯﻧﺮﮐ ﻝﺎﻤﻌﺘﺳﺍ",
   "how_to_use_card": "اس کارڈ کو استعمال کرنے کا طریقہ",
   "id": "ID:",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "آپ کے پاس ٹرانزیکشن اور اس کے لین دین کی فیس کا احاطہ کرنے کے لئے کافی SOL نہیں ہے۔ برائے مہربانی اپنے بٹوے میں مزید سول شامل کریں یا آپ کو بھیجنے والی سول رقم کو کم کریں۔",
   "insufficient_lamports": "آپ کے پاس ٹرانزیکشن اور اس کے لین دین کی فیس کا احاطہ کرنے کے لئے کافی SOL نہیں ہے۔ آپ کو کم از کم ${solValueNeeded} sol کی ضرورت ہے۔ برائے مہربانی اپنے بٹوے میں مزید SOL شامل کریں یا آپ جس SOL رقم کو بھیج رہے ہو اسے کم کریں",
   "insufficientFundsForRentError": "آپ کے پاس ٹرانزیکشن فیس اور اکاؤنٹ کے لئے کرایہ لینے کے ل enough اتنا SOL نہیں ہے۔ برائے مہربانی اپنے بٹوے میں مزید سول شامل کریں یا آپ کو بھیجنے والی سول رقم کو کم کریں",
-  "insufficientFundsForRentErrorReceiver": "وصول کنندہ کے اکاؤنٹ میں کرایہ کا احاطہ کرنے کے لئے کافی SOL نہیں ہے۔ براہ کرم وصول کنندہ سے ان کے اکاؤنٹ میں مزید SOL شامل کرنے کو کہیں۔",
   "introducing_cake_pay": "Cake پے کا تعارف!",
   "invalid_input": "غلط ان پٹ",
   "invalid_password": "غلط پاسورڈ",
@@ -471,7 +425,6 @@
   "logout": "لاگ آوٹ",
   "low_fee": "کم فیس",
   "low_fee_alert": "آپ فی الحال کم نیٹ ورک فیس کی ترجیح استعمال کر رہے ہیں۔ یہ طویل انتظار، مختلف شرحوں، یا منسوخ شدہ تجارتوں کا سبب بن سکتا ہے۔ ہم بہتر تجربہ کے لیے زیادہ فیس مقرر کرنے کی تجویز کرتے ہیں۔",
-  "made_easy": "آسان بنا دیا",
   "manage_nodes": "۔ﮟﯾﺮﮐ ﻢﻈﻧ ﺎﮐ ﺱﮈﻮﻧ",
   "manage_pow_nodes": "PoW ۔ﮟﯾﺮﮐ ﻢﻈﻧ ﺎﮐ ﺱﮈﻮﻧ",
   "manage_yats": "یاٹس کا انتظام کریں۔",
@@ -483,8 +436,6 @@
   "memo": "میمو:",
   "message": "ﻡﺎﻐﯿﭘ",
   "message_verified": "پیغام کی کامیابی کے ساتھ تصدیق کی گئی",
-  "messages": "پیغامات",
-  "method": "طریقہ",
   "methods": "ﮯﻘﯾﺮﻃ",
   "min_amount": "کم سے کم: ${value}",
   "min_value": "کم سے کم: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "مونیرو ڈارک تھیم",
   "monero_light_theme": "مونیرو لائٹ تھیم",
   "moonpay_alert_text": "رقم کی قدر ${minAmount} ${fiatCurrency} کے برابر یا زیادہ ہونی چاہیے۔",
-  "moralis_nft_error": "این ایف ٹی ایس لانے کے دوران ایک خرابی پیش آگئی۔ برائے مہربانی اپنا انٹرنیٹ کنیکشن چیک کریں اور دوبارہ کوشش کریں۔",
   "more_options": "مزید زرائے",
   "multiple_addresses_detected": "متعدد پتے کا پتہ چلا",
   "mweb_confirmed": "تصدیق شدہ MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "لیبل کا نام",
   "new_subaddress_title": "نیا پتہ",
   "new_template": "نیا سانچہ",
-  "new_transactions_notifications": "نئے لین دین کے بارے میں اطلاعات بھیجیں",
   "new_wallet": "نیا پرس",
   "newConnection": "ﻦﺸﮑﻨﮐ ﺎﯿﻧ",
   "no_cards_found": "کوئی کارڈ نہیں ملا",
@@ -539,7 +488,6 @@
   "normal": "نارمل",
   "note_optional": "نوٹ (اختیاری)",
   "note_tap_to_change": "نوٹ (تبدیل کرنے کے لیے تھپتھپائیں)",
-  "notification_permission_denied": "نوٹیفکیشن کی اجازت کو یقینی طور پر انکار کردیا گیا ، براہ کرم اسے دستی طور پر ترتیبات میں اہل بنائیں",
   "nullURIError": "URI ۔ﮯﮨ ﻡﺪﻌﻟﺎﮐ",
   "offer_expires_in": "پیشکش کی میعاد اس وقت ختم ہو جاتی ہے:",
   "offline": "آف لائن",
@@ -573,20 +521,8 @@
   "password": "پاس ورڈ",
   "paste": "چسپاں کریں۔",
   "pause_wallet_creation": "Haven Wallet ۔ﮯﮨ ﻑﻮﻗﻮﻣ ﻝﺎﺤﻟﺍ ﯽﻓ ﺖﯿﻠﮨﺍ ﯽﮐ ﮯﻧﺎﻨﺑ",
-  "payjoin_card_content": "Payjoin بٹ کوائن میں پرائیویسی کو محفوظ رکھنے اور فیس بچانے کی ایک نئی خصوصیت ہے۔",
-  "payjoin_details": "Payjoin تفصیلات",
-  "payjoin_enabled": "Payjoin فعال",
-  "payjoin_enabling_popup_content": "آپ Payjoin مینو → پرائیویسی → Payjoin Payjoin Payjoin کو بعد میں فعال کرنے یا غیر فعال کرنے کے لئے Payjoin Payjoin کا استعمال کریں۔",
-  "payjoin_enabling_popup_title": "Payjoin کو چالو کرنا",
-  "payjoin_request_awaiting_tx": "لین دین کے منتظر",
-  "payjoin_request_in_progress": "پیشرفت میں",
-  "payjoin_unavailable": "Payjoin دستیاب نہیں",
-  "payjoin_unavailable_sheet_content": "Payjoin ٹرانزیکشن وصول کرنے کے ل you آپ کو بٹ کوائن کو استعمال کرنے کے لئے تیار کرنے کی ضرورت ہوتی ہے۔ \\ n \\ nas جیسے ہی آپ کے بٹوے میں فنڈز ہوں گے ، Payjoin خود بخود فعال ہوجائیں گے۔",
-  "payjoin_unavailable_sheet_title": "Payjoin دستیاب کیوں نہیں ہے؟",
   "payment_id": "ادائیگی کی شناخت:",
-  "payment_made_easy": "ادائیگی آسان کردی گئی",
   "payment_was_received": "آپ کی ادائیگی موصول ہو گئی۔",
-  "payments": "ادائیگی",
   "pending": "  (زیر التواء)",
   "percentageOf": "${amount} کا",
   "pin_at_top": "اوپر ${token} کو پن کریں۔",
@@ -603,10 +539,9 @@
   "please_try_to_connect_to_another_node": "براہ کرم کسی دوسرے نوڈ سے جڑنے کی کوشش کریں۔",
   "please_wait": "برائے مہربانی انتظار کریں",
   "polygonscan_history": "ﺦﯾﺭﺎﺗ ﯽﮐ ﻦﯿﮑﺳﺍ ﻥﻮﮔ ﯽﻟﻮﭘ",
-  "potential_scam": "ممکنہ گھوٹالہ",
   "powered_by": "${title} کے ذریعے تقویت یافتہ",
   "pre_seed_button_text": "میں سمجھتا ہوں۔ مجھے میرا بیج دکھاؤ",
-  "pre_seed_description": "اگلے صفحے پر آپ کو الفاظ کا ایک سلسلہ نظر آئے گا۔ یہ آپ کا انوکھا اور نجی بیج ہے اور نقصان یا خرابی کی صورت میں اپنے بٹوے کی بازیابی کا واحد راستہ ہے۔ آپ کی ذمہ داری ہے کہ وہ اسے لکھیں اور اسے کیک پرس ایپ کے باہر کسی محفوظ جگہ پر محفوظ کریں۔",
+  "pre_seed_description": "اگلے صفحے پر آپ کو ${words} الفاظ کا ایک سلسلہ نظر آئے گا۔ یہ آپ کا انوکھا اور نجی بیج ہے اور یہ آپ کے بٹوے کو ضائع یا خرابی کی صورت میں بازیافت کرنے کا واحد طریقہ ہے۔ اسے لکھنا اور اسے کیک والیٹ ایپ سے باہر کسی محفوظ جگہ پر اسٹور کرنا آپ کی ذمہ داری ہے۔",
   "pre_seed_title": "اہم",
   "prepaid_cards": "پری پیڈ کارڈز",
   "prevent_screenshots": "اسکرین شاٹس اور اسکرین ریکارڈنگ کو روکیں۔",
@@ -619,7 +554,6 @@
   "proceed_on_device": "اپنے آلے پر آگے بڑھیں",
   "proceed_on_device_description": "براہ کرم اپنے ہارڈ ویئر پرس پر آنے والی ہدایات پر عمل کریں",
   "processing": "پروسیسنگ",
-  "processing_signed_tx": "پروسیسنگ پر دستخط شدہ لین دین",
   "profile": "پروفائل",
   "provider_error": "${provider} خرابی۔",
   "public_key": "عوامی کلید",
@@ -652,7 +586,6 @@
   "rep_warning_sub": "آپ کا نمائندہ اچھ standing ے مقام پر نہیں دکھائی دیتا ہے۔ نیا منتخب کرنے کے لئے یہاں ٹیپ کریں",
   "repeat_wallet_password": "بٹوے کا پاس ورڈ دہرائیں",
   "repeated_password_is_incorrect": "بار بار پاس ورڈ غلط ہے۔ براہ کرم دوبارہ پرس کا پاس ورڈ دہرائیں۔",
-  "requested": "درخواست کی",
   "require_for_adding_contacts": "رابطوں کو شامل کرنے کی ضرورت ہے۔",
   "require_for_all_security_and_backup_settings": "تمام سیکورٹی اور بیک اپ کی ترتیبات کے لیے درکار ہے۔",
   "require_for_assessing_wallet": "بٹوے تک رسائی کے لیے درکار ہے۔",
@@ -663,12 +596,10 @@
   "require_for_sends_to_internal_wallets": "اندرونی بٹوے پر بھیجنے کے لیے درکار ہے۔",
   "require_for_sends_to_non_contacts": "غیر رابطوں کو بھیجنے کی ضرورت ہے۔",
   "require_pin_after": "اس کے بعد PIN کی ضرورت ہے۔",
-  "required_passphrase": "پاسفریز",
   "rescan": "دوبارہ اسکین کریں۔",
   "resend_code": "براہ کرم اسے دوبارہ بھیجیں۔",
   "reset": "دوبارہ ترتیب دیں۔",
   "reset_password": "پاس ورڈ ری سیٹ",
-  "restore": "بحال کریں",
   "restore_active_seed": "فعال بیج",
   "restore_address": "پتہ",
   "restore_bitcoin_description_from_keys": "اپنی نجی کلیدوں سے تیار کردہ WIF سٹرنگ سے اپنے بٹوے کو بحال کریں۔",
@@ -715,10 +646,7 @@
   "search_language": "زبان تلاش کریں۔",
   "second_intro_content": "آپ کا Yat ایک منفرد ایموجی ایڈریس ہے جو آپ کی تمام کرنسیوں کے لیے آپ کے تمام لمبے ہیکسا ڈیسیمل پتوں کی جگہ لے لیتا ہے۔",
   "second_intro_title": "ان سب پر حکمرانی کے لیے ایک ایموجی ایڈریس",
-  "security": "سلامتی",
   "security_and_backup": "سیکیورٹی اور بیک اپ",
-  "security_risk": "سیکیورٹی کا خطرہ",
-  "security_risk_description": "اس ڈومین کو متعدد سیکیورٹی فراہم کرنے والوں کے ذریعہ غیر محفوظ کے طور پر جھنڈا لگایا گیا ہے۔ اپنے اثاثوں کی حفاظت کے لئے فورا. چھوڑ دیں۔",
   "seed_alert_back": "واپس جاو",
   "seed_alert_content": "بیج آپ کے بٹوے کو بازیافت کرنے کا واحد طریقہ ہے۔ کیا آپ نے اسے لکھا ہے؟",
   "seed_alert_title": "توجہ",
@@ -753,6 +681,9 @@
   "seedtype": "سیڈ ٹائپ",
   "seedtype_alert_content": "دوسرے بٹوے کے ساتھ بیجوں کا اشتراک صرف BIP39 بیج ٹائپ کے ساتھ ہی ممکن ہے۔",
   "seedtype_alert_title": "سیڈ ٹائپ الرٹ",
+  "seedtype_legacy": "میراث (25 الفاظ)",
+  "seedtype_polyseed": "پالیسیڈ (16 الفاظ)",
+  "seedtype_wownero": "واونرو (14 الفاظ)",
   "select_backup_file": "بیک اپ فائل کو منتخب کریں۔",
   "select_buy_provider_notice": "اوپر خریدنے والا خریدنے والا منتخب کریں۔ آپ ایپ کی ترتیبات میں اپنے پہلے سے طے شدہ خریدنے والے کو ترتیب دے کر اس اسکرین کو چھوڑ سکتے ہیں۔",
   "select_destination": "۔ﮟﯾﺮﮐ ﺏﺎﺨﺘﻧﺍ ﺎﮐ ﻝﺰﻨﻣ ﮯﯿﻟ ﮯﮐ ﻞﺋﺎﻓ ﭖﺍ ﮏﯿﺑ ﻡﺮﮐ ﮦﺍﺮﺑ",
@@ -776,7 +707,6 @@
   "send_from_external_wallet": "بیرونی پرس سے بھیجیں",
   "send_name": "نام",
   "send_new": "نئی",
-  "send_payjoin": "بھیجیں",
   "send_payment_id": "ادائیگی کی شناخت (اختیاری)",
   "send_priority": "فی الحال فیس ${transactionPriority} کی ترجیح پر سیٹ ہے۔\\nٹرانزیکشن کی ترجیح سیٹنگز میں ایڈجسٹ کی جا سکتی ہے۔",
   "send_sending": "بھیج رہا ہے...",
@@ -834,9 +764,7 @@
   "show_keys": "بیج / چابیاں دکھائیں۔",
   "show_market_place": "بازار دکھائیں۔",
   "show_seed": "بیج دکھائیں۔",
-  "sign_all": "سب پر دستخط کریں",
   "sign_message": "سائن پیغام",
-  "sign_one": "ایک پر دستخط کریں",
   "sign_up": "سائن اپ",
   "sign_verify_message": "پیغام پر دستخط کریں یا تصدیق کریں",
   "sign_verify_message_sub": "اپنی نجی کلید کا استعمال کرتے ہوئے کسی پیغام پر دستخط کریں یا اس کی تصدیق کریں",
@@ -865,14 +793,11 @@
   "sort_by": "ترتیب دیں",
   "spend_key_private": "خرچ کی کلید (نجی)",
   "spend_key_public": "خرچ کی کلید (عوامی)",
-  "starting_tor_proxy": "ٹور پراکسی شروع کرنا",
   "status": "حالت:",
-  "step": "مرحلہ",
   "string_default": "پہلے سے طے شدہ",
   "subaddress_title": "ذیلی ایڈریس کی فہرست",
   "subaddresses": "ذیلی پتے",
   "submit_request": "درخواست بھیج دو",
-  "success": "کامیابی",
   "successful": "ﺏﺎﯿﻣﺎﮐ",
   "support_description_guides": "عام مسائل کے لئے دستاویزات اور مدد",
   "support_description_live_chat": "مفت اور تیز! تربیت یافتہ معاون نمائندے مدد کے لئے دستیاب ہیں",
@@ -880,7 +805,6 @@
   "support_title_guides": "کیک پرس کے دستاویزات",
   "support_title_live_chat": "براہ راست مدد",
   "support_title_other_links": "دوسرے سپورٹ لنکس",
-  "supported": "تائید",
   "swap": "تبادلہ",
   "sweeping_wallet": "جھاڑو دینے والا پرس",
   "sweeping_wallet_alert": "اس میں زیادہ وقت نہیں لینا چاہئے۔ اس اسکرین کو مت چھوڑیں یا بہہ جانے والے فنڈز ضائع ہوسکتے ہیں۔",
@@ -900,7 +824,6 @@
   "sync_status_syncronizing": "مطابقت پذیری",
   "sync_status_timed_out": "وقت ختم",
   "sync_status_unsupported": "غیر تعاون یافتہ نوڈ",
-  "synchronizing": "ہم آہنگی",
   "syncing_wallet_alert_content": "آپ کے بیلنس اور لین دین کی فہرست اس وقت تک مکمل نہیں ہو سکتی جب تک کہ یہ سب سے اوپر \"SYNCRONIZED\" نہ کہے۔ مزید جاننے کے لیے کلک/تھپتھپائیں۔",
   "syncing_wallet_alert_title": "آپ کا بٹوہ مطابقت پذیر ہو رہا ہے۔",
   "template": "سانچے",
@@ -913,18 +836,13 @@
   "thorchain_taproot_address_not_supported": "تھورچین فراہم کنندہ ٹیپروٹ پتے کی حمایت نہیں کرتا ہے۔ براہ کرم پتہ تبدیل کریں یا ایک مختلف فراہم کنندہ کو منتخب کریں۔",
   "time": "${minutes}m ${seconds}s",
   "tip": "ٹپ:",
-  "to": "to",
   "today": "آج",
-  "token_already_exists": "ٹوکن پہلے ہی موجود ہے",
   "token_contract_address": "ٹوکن کنٹریکٹ ایڈریس",
   "token_decimal": "ٹوکن اعشاریہ",
   "token_name": "ٹوکن کا نام جیسے: Tether",
   "token_symbol": "ٹوکن کی علامت جیسے: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "ایکسچینج کے لئے ٹن ٹرانزیکشن بھیجتے وقت براہ کرم میمو آئی ڈی کی وضاحت کرنا نہ بھولیں",
   "tor_connection": "ﻦﺸﮑﻨﮐ ﺭﻮﭨ",
-  "tor_connection_timeout": "ٹور کنکشن ٹائم آؤٹ",
-  "tor_experimental": "یہ ایک تجرباتی خصوصیت ہے ، کیک پرس پرس سپورٹ ٹور روٹنگ سے بنے تمام رابطے نہیں - کچھ رابطے کلینیٹ کا استعمال کرسکتے ہیں ، تاکہ مکمل طور پر ایپ ٹریفک کو VPN وضع کے ساتھ ٹور کا استعمال کریں۔",
   "tor_only": "صرف Tor",
   "total": "کل",
   "total_saving": "کل بچت",
@@ -985,10 +903,8 @@
   "transaction_sent_notice": "اگر اسکرین 1 منٹ کے بعد آگے نہیں بڑھتی ہے، تو بلاک ایکسپلورر اور اپنا ای میل چیک کریں۔",
   "transactions": "لین دین",
   "transactions_by_date": "تاریخ کے لحاظ سے لین دین",
-  "transport_type": "ٹرانسپورٹ کی قسم",
   "trongrid_history": "ٹرانگریڈ ہسٹری",
   "trusted": "قابل اعتماد",
-  "try_again": "دوبارہ کوشش کریں",
   "tx_commit_exception_no_dust_on_change": "اس رقم سے لین دین کو مسترد کردیا گیا ہے۔ ان سککوں کے ذریعہ آپ بغیر کسی تبدیلی کے ${min} یا ${max} بھیج سکتے ہیں جو لوٹتے ہیں۔",
   "tx_commit_failed": "ٹرانزیکشن کمٹ ناکام ہوگیا۔ براہ کرم سپورٹ سے رابطہ کریں۔",
   "tx_commit_failed_no_peers": "ٹرانزیکشن نشر کرنے میں ناکام ، براہ کرم ایک سیکنڈ یا اس میں دوبارہ کوشش کریں",
@@ -1015,19 +931,15 @@
   "unspent_coins_details_title": "غیر خرچ شدہ سککوں کی تفصیلات",
   "unspent_coins_title": "غیر خرچ شدہ سکے ۔",
   "unsupported_asset": "۔ﮟﯾﺮﮐ ﭻﺋﻮﺳ ﺮﭘ ﺱﺍ ﺎﯾ ﮟﯿﺋﺎﻨﺑ ﺱﺮﭘ ﺎﮐ ﻢﺴﻗ ﯽﮐ ﮧﺛﺎﺛﺍ ﮧﺘﻓﺎﯾ ﻥﻭﺎﻌﺗ ﻡﺮﮐ ﮦﺍﺮﺑ ۔ﮟﯿﮨ ﮯﺗﺮﮐ ﮟﯿﮩﻧ ﺖﯾﺎﻤﺣ ﯽﮐ ﯽﺋﺍﻭﺭﺭﺎﮐ ﺱﺍ ﮯﯿﻟ ﮯﮐ ﮧﺛﺎﺛﺍ ﺱﺍ ﻢﮨ",
-  "update_session": "سیشن کو اپ ڈیٹ کریں",
   "uptime": "اپ ٹائم",
   "upto": "${value} تک",
   "usb": "یو ایس بی",
   "use": "تبدیل کرنا",
   "use_card_info_three": "ڈیجیٹل کارڈ آن لائن یا کنٹیکٹ لیس ادائیگی کے طریقوں کے ساتھ استعمال کریں۔",
   "use_card_info_two": "رقوم کو امریکی ڈالر میں تبدیل کیا جاتا ہے جب پری پیڈ اکاؤنٹ میں رکھا جاتا ہے، ڈیجیٹل کرنسیوں میں نہیں۔",
-  "use_device_theme": "ڈیوائس تھیم استعمال کریں",
-  "use_payjoin": "Payjoin کا استعمال کریں",
   "use_ssl": "SSL استعمال کریں۔",
   "use_suggested": "تجویز کردہ استعمال کریں۔",
   "use_testnet": "ٹیسٹ نیٹ استعمال کریں",
-  "user_rejected_method": "صارف کو مسترد کرنے کا طریقہ",
   "value": "قدر",
   "value_type": "قدر کی قسم",
   "variable_pair_not_supported": "یہ متغیر جوڑا منتخب ایکسچینجز کے ساتھ تعاون یافتہ نہیں ہے۔",
@@ -1054,7 +966,6 @@
   "wallet_group_description_view_seed": "آپ ہمیشہ اس بیج کو دوبارہ دیکھ سکتے ہیں",
   "wallet_group_empty_state_text_one": "ایسا لگتا ہے کہ آپ کے پاس کوئی مطابقت پذیر والیٹ گروپس نہیں ہیں !\n\n نل",
   "wallet_group_empty_state_text_two": "ایک نیا بنانے کے لئے ذیل میں.",
-  "wallet_has_passphrase": "اس پرس میں پاسفریس ہے",
   "wallet_keys": "بٹوے کے بیج / چابیاں",
   "wallet_list_create_new_wallet": "نیا والیٹ بنائیں",
   "wallet_list_edit_group_name": "گروپ کے نام میں ترمیم کریں",
@@ -1079,11 +990,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "بٹوے",
   "warning": "وارننگ",
-  "welcome": "خوش آمدید",
+  "welcome": "میں خوش آمدید",
   "welcome_subtitle_new_wallet": "اگر آپ تازہ شروع کرنا چاہتے ہیں تو ، نیچے نیا پرس بنائیں پر تھپتھپائیں اور آپ ریسوں پر جائیں گے۔",
   "welcome_subtitle_restore_wallet": "اگر آپ کے پاس موجودہ پرس ہے تو آپ کیک میں لانا چاہتے ہیں تو ، موجودہ بٹوے کو بحال کریں کا انتخاب کریں اور ہم آپ کو اس عمل میں چلیں گے۔",
   "welcome_to_cakepay": "Cake پے میں خوش آمدید!",
-  "what_is_payjoin": "پے جوائن کیا ہے ?",
   "what_is_silent_payments": "خاموش ادائیگی کیا ہے؟",
   "widgets_address": "پتہ",
   "widgets_or": "یا",
@@ -1113,6 +1023,5 @@
   "you_will_get": "میں تبدیل کریں۔",
   "you_will_receive_estimated_amount": "آپ(تخمینہ ) وصول کریں گے",
   "you_will_send": "سے تبدیل کریں۔",
-  "youCanGoBackToYourDapp": "اب آپ اپنے ڈی اے پی پی پر واپس جاسکتے ہیں",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb
index 5f76e666a..c2935e9a0 100644
--- a/res/values/strings_vi.arb
+++ b/res/values/strings_vi.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Thêm tiền trả trước vào thẻ (tối đa ${value})",
   "add_new_node": "Thêm nút mới",
   "add_new_word": "Thêm từ mới",
-  "add_passphrase": "Thêm cụm mật khẩu",
-  "add_passphrase_warning_text": "Chỉ nhập một cụm mật khẩu nếu bạn đã sử dụng một cái cho ví này trong quá khứ. Nếu bạn nhập sai cụm từ hoặc chưa sử dụng cụm mật khẩu trước đây trên ví này, bạn sẽ không thấy bất kỳ quỹ hoặc lịch sử hiện có nào.",
   "add_receiver": "Thêm người nhận khác (tùy chọn)",
   "add_secret_code": "Hoặc, thêm mã bí mật này vào ứng dụng xác thực",
   "add_tip": "Thêm tiền boa",
   "add_token_disclaimer_check": "Tôi đã xác nhận địa chỉ hợp đồng token và thông tin bằng nguồn đáng tin cậy. Thêm thông tin sai hoặc độc hại có thể dẫn đến mất tiền.",
   "add_token_warning": "Không chỉnh sửa hoặc thêm token theo yêu cầu của kẻ lừa đảo.\nLuôn xác nhận địa chỉ token từ các nguồn đáng tin cậy!",
   "add_value": "Thêm giá trị",
-  "added_message_for_ata_error": "Vui lòng đảm bảo bạn có đủ số dư SOL để hoàn thành giao dịch của mình.",
   "address": "Địa chỉ",
   "address_book": "Sổ địa chỉ",
   "address_book_menu": "Sổ địa chỉ",
@@ -55,8 +52,6 @@
   "anonpay_description": "Tạo ${type}. Người nhận có thể ${method} với bất kỳ loại tiền điện tử nào được hỗ trợ, và bạn sẽ nhận được tiền trong ví này.",
   "apk_update": "Cập nhật APK",
   "approve": "Phê duyệt",
-  "approve_request": "Phê duyệt yêu cầu",
-  "approve_tokens": "Phê duyệt mã thông báo",
   "arrive_in_this_address": "${currency} ${tag} sẽ đến địa chỉ này",
   "ascending": "Tăng dần",
   "ask_each_time": "Hỏi mỗi lần",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "Đang chờ xác nhận thanh toán",
   "background_sync": "Đồng bộ nền",
   "background_sync_mode": "Chế độ đồng bộ nền",
-  "background_sync_on_battery_low": "Đồng bộ hóa trên pin thấp",
-  "background_sync_on_charging": "Chỉ đồng bộ hóa khi sạc",
-  "background_sync_on_device_idle": "Chỉ đồng bộ hóa khi thiết bị không được sử dụng",
-  "background_sync_on_unmetered_network": "Yêu cầu mạng không được thiết kế",
   "backup": "Sao lưu",
   "backup_file": "Tập tin sao lưu",
   "backup_password": "Mật khẩu sao lưu",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Mua Bitcoin",
   "buy_now": "Mua ngay",
   "buy_provider_unavailable": "Nhà cung cấp hiện không khả dụng.",
-  "buy_sell_pair_is_not_supported_warning": "Cặp tiền tệ này được hỗ trợ bởi bất kỳ nhà cung cấp nào cho phương thức thanh toán đã chọn. Vui lòng chọn một cặp khác hoặc thử thay đổi phương thức thanh toán.",
   "buy_with": "Mua bằng",
   "by_cake_pay": "bởi Cake Pay",
   "cake_2fa_preset": "Thiết lập sẵn Cake 2FA",
@@ -124,12 +114,9 @@
   "camera_consent": "Máy ảnh của bạn sẽ được sử dụng để chụp hình nhằm mục đích xác minh danh tính bởi ${provider}. Vui lòng kiểm tra Chính sách quyền riêng tư của họ để biết thêm chi tiết.",
   "camera_permission_is_required": "Cần có quyền truy cập máy ảnh. \nVui lòng bật nó từ cài đặt ứng dụng.",
   "cancel": "Hủy",
-  "cannot_verify": "Không thể xác minh",
-  "cannot_verify_description": "Miền này không thể được xác minh. Kiểm tra yêu cầu cẩn thận trước khi phê duyệt.",
   "card_address": "Địa chỉ:",
   "cardholder_agreement": "Thỏa thuận Chủ Thẻ",
   "cards": "Thẻ",
-  "chain_id": "ID chuỗi",
   "chains": "Chuỗi",
   "change": "Thay đổi",
   "change_backup_password_alert": "Các tệp sao lưu trước đây sẽ không còn khả dụng để nhập với mật khẩu sao lưu mới. Mật khẩu sao lưu mới chỉ được sử dụng cho các tệp sao lưu mới. Bạn có chắc chắn muốn thay đổi mật khẩu sao lưu không?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Bạn có chắc chắn muốn thay đổi đại diện không?",
   "change_rep_successful": "Thay đổi đại diện thành công",
   "change_selected_exchanges": "Thay đổi các trao đổi được chọn",
-  "change_selected_pair": "Thay đổi cặp đã chọn",
   "change_wallet_alert_content": "Bạn có muốn thay đổi ví hiện tại thành ${wallet_name} không?",
   "change_wallet_alert_title": "Thay đổi ví hiện tại",
   "choose_account": "Chọn tài khoản",
@@ -181,14 +167,9 @@
   "confirmed_tx": "Đã xác nhận",
   "congratulations": "Chúc mừng!",
   "connect_an_existing_yat": "Kết nối Yat hiện có",
-  "connect_hw_info_step_1": "Hãy chắc chắn rằng thiết bị của bạn được bật nguồn.",
-  "connect_hw_info_step_2": "Bật Bluetooth cho cả hai thiết bị và ghép chúng từ điện thoại hoặc kết nối các thiết bị của bạn với nhau bằng cáp USB.",
-  "connect_hw_info_step_3": "Mở khóa thiết bị của bạn và điều hướng đến ứng dụng tiền điện tử mong muốn.",
-  "connect_hw_info_step_4": "Chọn thiết bị của bạn trong ví bánh và tiếp tục với thiết lập.",
   "connect_yats": "Kết nối Yats",
   "connect_your_hardware_wallet": "Kết nối ví phần cứng của bạn bằng Bluetooth hoặc USB",
   "connect_your_hardware_wallet_ios": "Kết nối ví phần cứng của bạn bằng Bluetooth",
-  "connected": "Kết nối",
   "connection_sync": "Kết nối và đồng bộ hóa",
   "connectWalletPrompt": "Kết nối ví của bạn với WalletConnect để thực hiện giao dịch",
   "contact": "Liên hệ",
@@ -206,8 +187,6 @@
   "copy": "Sao chép",
   "copy_address": "Sao chép Địa chỉ",
   "copy_id": "Sao chép ID",
-  "copy_payjoin_address": "Sao chép địa chỉ payjoin",
-  "copy_payjoin_url": "Sao chép Payjoin url",
   "copyWalletConnectLink": "Sao chép liên kết WalletConnect từ dApp và dán vào đây",
   "corrupted_seed_notice": "Các tệp cho ví này bị hỏng và không thể mở. Vui lòng xem cụm từ hạt giống, lưu nó và khôi phục ví.\n\nNếu giá trị trống, thì hạt giống không thể được phục hồi chính xác.",
   "countries": "Quốc gia",
@@ -244,22 +223,11 @@
   "descending": "Giảm dần",
   "description": "Mô tả",
   "destination_tag": "Thẻ đích:",
-  "deuro_collect_interest": "Sưu tầm",
-  "deuro_savings": "Tiết kiệm dEuro",
-  "deuro_savings_add": "Tiền gửi",
-  "deuro_savings_balance": "Số dư tiết kiệm",
-  "deuro_savings_collect_interest": "Thu tiền lãi",
-  "deuro_savings_remove": "Rút",
-  "deuro_savings_set_approval": "Đặt phê duyệt",
-  "deuro_savings_subtitle": "Kiếm tới 10% tiền lãi cho Deuro Storcoin Holdings của bạn",
-  "deuro_tx_commited_content": "Có thể mất vài giây để giao dịch xác nhận và được phản ánh trên màn hình",
-  "device_is_signing": "Thiết bị đang ký",
   "dfx_option_description": "Mua tiền điện tử bằng EUR & CHF. Dành cho khách hàng bán lẻ và doanh nghiệp tại Châu Âu",
   "didnt_get_code": "Không nhận được mã?",
   "digit_pin": "Mã PIN - số",
   "digital_and_physical_card": "thẻ ghi nợ trả trước kỹ thuật số và vật lý",
   "disable": "Vô hiệu hóa",
-  "disable_automatic_exchange_status_updates": "Tắt các bản cập nhật trạng thái trao đổi tự động",
   "disable_bulletin": "Vô hiệu hóa bản tin tình trạng dịch vụ",
   "disable_buy": "Vô hiệu hóa chức năng mua",
   "disable_cake_2fa": "Vô hiệu hóa 2FA Cake",
@@ -268,12 +236,10 @@
   "disable_fee_api_warning": "Khi tắt chức năng này, tỉ lệ phí có thể không chính xác trong một số trường hợp, dẫn đến bạn trả quá hoặc không đủ phí cho giao dịch của mình.",
   "disable_fiat": "Vô hiệu hóa tiền tệ fiat",
   "disable_sell": "Vô hiệu hóa chức năng bán",
-  "disable_tor": "Tắt Tor",
   "disable_trade_option": "Tắt tùy chọn thương mại",
   "disableBatteryOptimization": "Vô hiệu hóa Tối ưu hóa Pin",
   "disableBatteryOptimizationDescription": "Bạn có muốn vô hiệu hóa tối ưu hóa pin để đồng bộ hóa nền hoạt động mượt mà hơn không?",
   "disabled": "Đã vô hiệu hóa",
-  "disconnect_session": "Ngắt kết nối phiên",
   "discount": "Tiết kiệm ${value}%",
   "display_settings": "Cài đặt hiển thị",
   "displayable": "Có thể hiển thị",
@@ -282,10 +248,7 @@
   "do_not_share_warning_text": "Không chia sẻ điều này với bất kỳ ai, bao gồm cả bộ phận hỗ trợ.\n\nTài sản của bạn có thể và sẽ bị đánh cắp!",
   "do_not_show_me": "Không hiển thị lại cho tôi",
   "domain_looks_up": "Tra cứu tên miền",
-  "domain_mismatch": "Không phù hợp miền",
-  "domain_mismatch_description": "Trang web này có một tên miền không khớp với người gửi yêu cầu này. Phê duyệt có thể dẫn đến mất tiền.",
   "donation_link_details": "Chi tiết liên kết quyên góp",
-  "done": "Xong",
   "e_sign_consent": "Đồng ý Ký Điện tử",
   "edit": "Chỉnh sửa",
   "edit_backup_password": "Chỉnh sửa mật khẩu sao lưu",
@@ -294,7 +257,6 @@
   "electrum_address_disclaimer": "Chúng tôi tạo địa chỉ mới mỗi khi bạn sử dụng, nhưng các địa chỉ cũ vẫn tiếp tục hoạt động",
   "email_address": "Địa chỉ Email",
   "enable": "Cho phép",
-  "enable_builtin_tor": "Bật Buildi-In Tor",
   "enable_mempool_api": "API Mempool cho các khoản phí và ngày chính xác",
   "enable_replace_by_fee": "Bật Thay thế Bằng Phí",
   "enable_silent_payments_scanning": "Bật quét thanh toán im lặng",
@@ -332,10 +294,8 @@
   "error_text_template": "Tên và địa chỉ mẫu không được chứa ký tự ` , ' \"\nvà phải từ 1 đến 106 ký tự",
   "error_text_wallet_name": "Tên ví chỉ được chứa chữ cái, số, ký hiệu _ -\nvà phải từ 1 đến 33 ký tự",
   "error_text_xmr": "Giá trị XMR không được vượt quá số dư khả dụng.\nSố chữ số thập phân phải ít hơn hoặc bằng 12",
-  "error_while_processing": "Xảy ra lỗi trong khi sử dụng",
   "errorGettingCredentials": "Không thành công: Lỗi khi nhận thông tin xác thực",
   "errorSigningTransaction": "Đã xảy ra lỗi khi ký giao dịch",
-  "establishing_tor_connection": "Kết nối tor",
   "estimated": "Ước tính",
   "estimated_new_fee": "Phí mới ước tính",
   "estimated_receive_amount": "Số tiền nhận ước tính",
@@ -359,7 +319,6 @@
   "export_backup": "Xuất sao lưu",
   "export_logs": "Nhật ký xuất khẩu",
   "export_outputs": "Đầu ra xuất khẩu",
-  "extend_session": "Mở rộng phiên",
   "extra_id": "ID bổ sung:",
   "extracted_address_content": "Bạn sẽ gửi tiền cho\n${recipient_name}",
   "failed_authentication": "Xác thực không thành công. ${state_error}",
@@ -371,7 +330,6 @@
   "fiat_api": "API Fiat",
   "fiat_balance": "Số dư Fiat",
   "field_required": "Trường này là bắt buộc",
-  "file_saved": "Tệp lưu",
   "fill_code": "Vui lòng điền mã xác minh được gửi đến email của bạn",
   "filter_by": "Lọc theo",
   "first_wallet_text": "Ví tuyệt vời cho Monero, Bitcoin, Ethereum, Litecoin, và Haven",
@@ -381,12 +339,10 @@
   "forgot_password": "Quên mật khẩu",
   "freeze": "Đóng băng",
   "frequently_asked_questions": "Các câu hỏi thường gặp",
-  "from": "Từ",
   "frozen": "Đã đóng băng",
   "frozen_balance": "Cân bằng đông lạnh",
   "full_balance": "Số dư đầy đủ",
   "gas_exceeds_allowance": "Gas theo yêu cầu của giao dịch vượt quá trợ cấp.",
-  "gas_price": "Giá xăng",
   "generate_name": "Tạo tên",
   "generating_gift_card": "Đang tạo thẻ quà tặng",
   "generating_transaction": "Tạo giao dịch",
@@ -412,7 +368,6 @@
   "hide_details": "Ẩn chi tiết",
   "high_contrast_theme": "Chủ đề độ tương phản cao",
   "home_screen_settings": "Cài đặt màn hình chính",
-  "how_to_connect": "Cách kết nối",
   "how_to_use": "Cách sử dụng",
   "how_to_use_card": "Cách sử dụng thẻ này",
   "id": "ID: ",
@@ -430,7 +385,6 @@
   "insufficient_lamport_for_tx": "Bạn không có đủ SOL để thanh toán giao dịch và phí giao dịch. Vui lòng thêm SOL vào ví của bạn hoặc giảm số lượng SOL bạn đang gửi.",
   "insufficient_lamports": "Bạn không có đủ SOL để thanh toán giao dịch và phí giao dịch. Bạn cần ít nhất ${solValueNeeded} SOL. Vui lòng thêm SOL vào ví của bạn hoặc giảm số lượng SOL bạn đang gửi",
   "insufficientFundsForRentError": "Bạn không có đủ SOL để thanh toán phí giao dịch và phí thuê cho tài khoản. Vui lòng thêm SOL vào ví của bạn hoặc giảm số lượng SOL bạn đang gửi",
-  "insufficientFundsForRentErrorReceiver": "Tài khoản của người nhận không có đủ SOL để trang trải tiền thuê nhà. Vui lòng yêu cầu người nhận thêm SOL vào tài khoản của họ.",
   "introducing_cake_pay": "Giới thiệu Cake Pay!",
   "invalid_input": "Nhập không hợp lệ",
   "invalid_password": "Mật khẩu không hợp lệ",
@@ -470,7 +424,6 @@
   "logout": "Đăng xuất",
   "low_fee": "Phí thấp",
   "low_fee_alert": "Bạn hiện đang sử dụng mức ưu tiên phí mạng thấp. Điều này có thể dẫn đến thời gian chờ lâu, tỷ giá khác nhau, hoặc giao dịch bị hủy bỏ. Chúng tôi khuyến nghị bạn đặt mức phí cao hơn để có trải nghiệm tốt hơn.",
-  "made_easy": "làm dễ dàng",
   "manage_nodes": "Quản lý các nút",
   "manage_pow_nodes": "Quản lý các nút PoW",
   "manage_yats": "Quản lý Yats",
@@ -482,8 +435,6 @@
   "memo": "Ghi chú:",
   "message": "Tin nhắn",
   "message_verified": "Tin nhắn đã được xác minh thành công",
-  "messages": "Tin nhắn",
-  "method": "Phương pháp",
   "methods": "Phương pháp",
   "min_amount": "Tối thiểu: ${value}",
   "min_value": "Tối thiểu: ${value} ${currency}",
@@ -496,7 +447,6 @@
   "monero_dark_theme": "Chủ đề tối Monero",
   "monero_light_theme": "Chủ đề sáng Monero",
   "moonpay_alert_text": "Giá trị số tiền phải lớn hơn hoặc bằng ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Một lỗi đã xảy ra trong khi tìm nạp NFT. Vui lòng kiểm tra kết nối Internet của bạn và thử lại.",
   "more_options": "Thêm tùy chọn",
   "multiple_addresses_detected": "Nhiều địa chỉ được phát hiện",
   "mweb_confirmed": "Xác nhận MWEB",
@@ -513,7 +463,6 @@
   "new_subaddress_label_name": "Tên nhãn",
   "new_subaddress_title": "Địa chỉ mới",
   "new_template": "Mẫu mới",
-  "new_transactions_notifications": "Gửi thông báo về các giao dịch mới",
   "new_wallet": "Ví mới",
   "newConnection": "Kết nối mới",
   "no_cards_found": "Không tìm thấy thẻ",
@@ -537,7 +486,6 @@
   "normal": "Bình thường",
   "note_optional": "Ghi chú (tùy chọn)",
   "note_tap_to_change": "Ghi chú (nhấn để thay đổi)",
-  "notification_permission_denied": "Giấy phép thông báo bị từ chối, vui lòng bật thủ công nó trong cài đặt",
   "nullURIError": "URI là null",
   "offer_expires_in": "Ưu đãi hết hạn trong: ",
   "offline": "Ngoại tuyến",
@@ -569,20 +517,8 @@
   "password": "Mật khẩu",
   "paste": "Dán",
   "pause_wallet_creation": "Khả năng tạo ví Haven hiện đang bị tạm dừng.",
-  "payjoin_card_content": "Payjoin là một tính năng bảo tồn quyền riêng tư mới và tiết kiệm phí trong Bitcoin.",
-  "payjoin_details": "Payjoin chi tiết",
-  "payjoin_enabled": "Payjoin Bật",
-  "payjoin_enabling_popup_content": "Bạn có thể chuyển đổi Payjoin trong Menu → Quyền riêng tư → Sử dụng Payjoin để bật hoặc tắt nó sau.",
-  "payjoin_enabling_popup_title": "Cho phép Payjoin",
-  "payjoin_request_awaiting_tx": "Đang chờ giao dịch",
-  "payjoin_request_in_progress": "Trong tiến trình",
-  "payjoin_unavailable": "Payjoin Không có sẵn",
-  "payjoin_unavailable_sheet_content": "Nhận một giao dịch Payjoin yêu cầu bạn sẵn sàng sử dụng bitcoin. \\ N \\ nas sớm khi ví của bạn có tiền, Payjoin sẽ được bật tự động.",
-  "payjoin_unavailable_sheet_title": "Tại sao Payjoin không có sẵn?",
   "payment_id": "ID thanh toán: ",
-  "payment_made_easy": "Thanh toán được thực hiện dễ dàng",
   "payment_was_received": "Thanh toán của bạn đã được nhận.",
-  "payments": "Thanh toán",
   "pending": " (đang chờ)",
   "percentageOf": "của ${amount}",
   "pin_at_top": "Ghim ${token} ở trên cùng",
@@ -599,10 +535,9 @@
   "please_try_to_connect_to_another_node": "Vui lòng thử kết nối với một nút khác",
   "please_wait": "Vui lòng chờ",
   "polygonscan_history": "Lịch sử PolygonScan",
-  "potential_scam": "Lừa đảo tiềm năng",
   "powered_by": "Được cung cấp bởi ${title}",
   "pre_seed_button_text": "Tôi hiểu. Hiển thị hạt giống của tôi",
-  "pre_seed_description": "Trên trang tiếp theo, bạn sẽ thấy một loạt các từ. Đây là hạt giống độc đáo và riêng tư của bạn và đó là cách duy nhất để phục hồi ví của bạn trong trường hợp mất hoặc trục trặc. Bạn có trách nhiệm viết nó ra và lưu trữ nó ở một nơi an toàn bên ngoài ứng dụng ví Cake.",
+  "pre_seed_description": "Trên trang tiếp theo, bạn sẽ thấy một chuỗi ${words} từ. Đây là hạt giống riêng tư và duy nhất của bạn và là CÁCH DUY NHẤT để khôi phục ví của bạn trong trường hợp mất hoặc hỏng hóc. Đây là TRÁCH NHIỆM của bạn để ghi lại và lưu trữ nó ở một nơi an toàn ngoài ứng dụng Cake Wallet.",
   "pre_seed_title": "QUAN TRỌNG",
   "prepaid_cards": "Thẻ trả trước",
   "prevent_screenshots": "Ngăn chặn ảnh chụp màn hình và ghi hình màn hình",
@@ -615,7 +550,6 @@
   "proceed_on_device": "Tiếp tục trên thiết bị của bạn",
   "proceed_on_device_description": "Vui lòng làm theo các hướng dẫn được nhắc trên ví phần cứng của bạn",
   "processing": "Xử lý",
-  "processing_signed_tx": "Xử lý giao dịch đã ký",
   "profile": "Hồ sơ",
   "provider_error": "Lỗi ${provider}",
   "public_key": "Khóa công khai",
@@ -648,7 +582,6 @@
   "rep_warning_sub": "Đại diện của bạn dường như không còn trong tình trạng tốt. Nhấn vào đây để chọn một cái mới",
   "repeat_wallet_password": "Nhập lại mật khẩu ví",
   "repeated_password_is_incorrect": "Mật khẩu nhập lại không chính xác. Vui lòng nhập lại mật khẩu ví.",
-  "requested": "Được yêu cầu",
   "require_for_adding_contacts": "Yêu cầu khi thêm danh bạ",
   "require_for_all_security_and_backup_settings": "Yêu cầu cho tất cả các cài đặt bảo mật và sao lưu",
   "require_for_assessing_wallet": "Yêu cầu khi truy cập ví",
@@ -659,12 +592,10 @@
   "require_for_sends_to_internal_wallets": "Yêu cầu khi gửi đến ví nội bộ",
   "require_for_sends_to_non_contacts": "Yêu cầu khi gửi đến người không phải danh bạ",
   "require_pin_after": "Yêu cầu PIN sau",
-  "required_passphrase": "Cụm cụm",
   "rescan": "Quét lại",
   "resend_code": "Vui lòng gửi lại",
   "reset": "Đặt lại",
   "reset_password": "Đặt lại mật khẩu",
-  "restore": "Khôi phục",
   "restore_active_seed": "Hạt giống hoạt động",
   "restore_address": "Địa chỉ",
   "restore_bitcoin_description_from_keys": "Khôi phục ví của bạn từ chuỗi WIF được tạo từ khóa riêng của bạn",
@@ -711,10 +642,7 @@
   "search_language": "Tìm kiếm ngôn ngữ",
   "second_intro_content": "Yat của bạn là một địa chỉ emoji duy nhất thay thế tất cả các địa chỉ hex dài của bạn cho tất cả các loại tiền tệ của bạn.",
   "second_intro_title": "Một địa chỉ emoji để cai trị tất cả",
-  "security": "Bảo vệ",
   "security_and_backup": "Bảo mật và sao lưu",
-  "security_risk": "Rủi ro bảo mật",
-  "security_risk_description": "Tên miền này được gắn cờ là không an toàn bởi nhiều nhà cung cấp bảo mật. Rời đi ngay lập tức để bảo vệ tài sản của bạn.",
   "seed_alert_back": "Quay lại",
   "seed_alert_content": "Hạt giống là cách duy nhất để khôi phục ví của bạn. Bạn đã ghi lại nó chưa?",
   "seed_alert_title": "Chú ý",
@@ -749,6 +677,9 @@
   "seedtype": "Loại hạt giống",
   "seedtype_alert_content": "Chia sẻ hạt giống với ví khác chỉ có thể với BIP39 SeedType.",
   "seedtype_alert_title": "Cảnh báo hạt giống",
+  "seedtype_legacy": "Di sản (25 từ)",
+  "seedtype_polyseed": "Polyseed (16 từ)",
+  "seedtype_wownero": "Wownero (14 từ)",
   "select_backup_file": "Chọn tệp sao lưu",
   "select_buy_provider_notice": "Chọn nhà cung cấp mua ở trên. Bạn có thể bỏ qua màn hình này bằng cách thiết lập nhà cung cấp mua mặc định trong cài đặt ứng dụng.",
   "select_destination": "Vui lòng chọn đích cho tệp sao lưu.",
@@ -771,7 +702,6 @@
   "send_from_external_wallet": "Gửi từ ví bên ngoài",
   "send_name": "Tên",
   "send_new": "Mới",
-  "send_payjoin": "Gửi Payjoin",
   "send_payment_id": "ID thanh toán (tùy chọn)",
   "send_priority": "Hiện tại phí được đặt ở mức ưu tiên ${transactionPriority}.\nƯu tiên giao dịch có thể được điều chỉnh trong cài đặt",
   "send_sending": "Đang gửi...",
@@ -829,9 +759,7 @@
   "show_keys": "Hiển thị hạt giống/khóa",
   "show_market_place": "Hiển thị Thị trường",
   "show_seed": "Hiển thị hạt giống",
-  "sign_all": "Ký tất cả",
   "sign_message": "Ký tin nhắn",
-  "sign_one": "Ký một",
   "sign_up": "Đăng ký",
   "sign_verify_message": "Ký hoặc xác minh tin nhắn",
   "sign_verify_message_sub": "Ký hoặc xác minh một tin nhắn bằng khóa riêng của bạn",
@@ -860,14 +788,11 @@
   "sort_by": "Sắp xếp theo",
   "spend_key_private": "Khóa chi tiêu (riêng tư)",
   "spend_key_public": "Khóa chi tiêu (công khai)",
-  "starting_tor_proxy": "Bắt đầu proxy tor",
   "status": "Trạng thái: ",
-  "step": "Bước chân",
   "string_default": "Mặc định",
   "subaddress_title": "Danh sách địa chỉ phụ",
   "subaddresses": "Địa chỉ phụ",
   "submit_request": "gửi yêu cầu",
-  "success": "Thành công",
   "successful": "Thành công",
   "support_description_guides": "Tài liệu và hỗ trợ cho các vấn đề phổ biến",
   "support_description_live_chat": "Miễn phí và nhanh chóng! Các đại diện hỗ trợ được đào tạo sẵn sàng hỗ trợ",
@@ -875,7 +800,6 @@
   "support_title_guides": "Cake Wallet Docs",
   "support_title_live_chat": "Hỗ trợ trực tiếp",
   "support_title_other_links": "Liên kết hỗ trợ khác",
-  "supported": "Được hỗ trợ",
   "swap": "Tráo đổi",
   "sweeping_wallet": "Quét ví",
   "sweeping_wallet_alert": "Việc này không nên mất nhiều thời gian. KHÔNG RỜI KHỎI MÀN HÌNH NÀY HOẶC CÁC KHOẢN TIỀN ĐƯỢC QUÉT CÓ THỂ BỊ MẤT.",
@@ -895,7 +819,6 @@
   "sync_status_syncronizing": "ĐANG ĐỒNG BỘ",
   "sync_status_timed_out": "HẾT THỜI GIAN",
   "sync_status_unsupported": "NÓT KHÔNG ĐƯỢC HỖ TRỢ",
-  "synchronizing": "Đồng bộ hóa",
   "syncing_wallet_alert_content": "Số dư và danh sách giao dịch của bạn có thể không đầy đủ cho đến khi nó hiển thị “ĐÃ ĐỒNG BỘ” ở trên cùng. Nhấn vào đây để tìm hiểu thêm.",
   "syncing_wallet_alert_title": "Ví của bạn đang đồng bộ",
   "template": "Mẫu",
@@ -908,18 +831,13 @@
   "thorchain_taproot_address_not_supported": "Nhà cung cấp ThorChain không hỗ trợ địa chỉ Taproot. Vui lòng thay đổi địa chỉ hoặc chọn nhà cung cấp khác.",
   "time": "${minutes} phút ${seconds} giây",
   "tip": "Mẹo:",
-  "to": "ĐẾN",
   "today": "Hôm nay",
-  "token_already_exists": "Mã thông báo đã tồn tại",
   "token_contract_address": "Địa chỉ hợp đồng token",
   "token_decimal": "Số thập phân của token",
   "token_name": "Tên token ví dụ: Tether",
   "token_symbol": "Ký hiệu token ví dụ: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Xin đừng quên chỉ định ID ghi nhớ trong khi gửi giao dịch tấn cho trao đổi",
   "tor_connection": "Kết nối Tor",
-  "tor_connection_timeout": "Thời gian chờ kết nối tor",
-  "tor_experimental": "Đây là một tính năng thử nghiệm, không phải tất cả các kết nối được làm từ Wake Wallet Hỗ trợ định tuyến TOR - một số kết nối có thể sử dụng ClearNet, để định tuyến đầy đủ về lưu lượng truy cập ứng dụng Tor với chế độ VPN.",
   "tor_only": "Chỉ Tor",
   "total": "Tổng cộng",
   "total_saving": "Tiết kiệm tổng cộng",
@@ -980,10 +898,8 @@
   "transaction_sent_notice": "Nếu màn hình không tiếp tục sau 1 phút, hãy kiểm tra trình khám phá khối và email của bạn.",
   "transactions": "Giao dịch",
   "transactions_by_date": "Giao dịch theo ngày",
-  "transport_type": "Loại vận chuyển",
   "trongrid_history": "Lịch sử TronGrid",
   "trusted": "Đã tin cậy",
-  "try_again": "Hãy thử lại",
   "tx_commit_exception_no_dust_on_change": "Giao dịch bị từ chối với số tiền này. Với số tiền này bạn có thể gửi ${min} mà không cần đổi tiền lẻ hoặc ${max} trả lại tiền lẻ.",
   "tx_commit_failed": "Giao dịch không thành công. Vui lòng liên hệ với hỗ trợ.",
   "tx_commit_failed_no_peers": "Giao dịch không phát sóng, vui lòng thử lại trong một giây hoặc lâu hơn",
@@ -1010,19 +926,15 @@
   "unspent_coins_details_title": "Chi tiết các đồng tiền chưa chi tiêu",
   "unspent_coins_title": "Các đồng tiền chưa chi tiêu",
   "unsupported_asset": "Chúng tôi không hỗ trợ hành động này cho tài sản này. Vui lòng tạo hoặc chuyển sang ví của loại tài sản được hỗ trợ.",
-  "update_session": "Cập nhật phiên",
   "uptime": "Thời gian hoạt động",
   "upto": "lên đến ${value}",
   "usb": "USB",
   "use": "Chuyển sang",
   "use_card_info_three": "Sử dụng thẻ kỹ thuật số trực tuyến hoặc với các phương thức thanh toán không tiếp xúc.",
   "use_card_info_two": "Các khoản tiền được chuyển đổi thành USD khi chúng được giữ trong tài khoản trả trước, không phải trong các loại tiền kỹ thuật số.",
-  "use_device_theme": "Sử dụng chủ đề thiết bị",
-  "use_payjoin": "Sử dụng Payjoin",
   "use_ssl": "Sử dụng SSL",
   "use_suggested": "Sử dụng đề xuất",
   "use_testnet": "Sử dụng Testnet",
-  "user_rejected_method": "Phương thức từ chối người dùng",
   "value": "Giá trị",
   "value_type": "Loại giá trị",
   "variable_pair_not_supported": "Cặp biến này không được hỗ trợ với các sàn giao dịch đã chọn",
@@ -1049,7 +961,6 @@
   "wallet_group_description_view_seed": "Bạn luôn có thể xem lại hạt giống này dưới",
   "wallet_group_empty_state_text_one": "Có vẻ như bạn không có bất kỳ nhóm ví tương thích nào !\n\n Tap",
   "wallet_group_empty_state_text_two": "Dưới đây để làm một cái mới.",
-  "wallet_has_passphrase": "Ví này có một cụm từ",
   "wallet_keys": "Hạt giống/khóa ví",
   "wallet_list_create_new_wallet": "Tạo ví mới",
   "wallet_list_edit_group_name": "Chỉnh sửa tên nhóm",
@@ -1074,11 +985,10 @@
   "walletConnect": "WalletConnect",
   "wallets": "Các ví",
   "warning": "Cảnh báo",
-  "welcome": "Chào mừng",
+  "welcome": "Chào mừng đến với",
   "welcome_subtitle_new_wallet": "Nếu bạn muốn bắt đầu mới, hãy nhấn Tạo ví mới bên dưới và bạn sẽ rời khỏi các cuộc đua.",
   "welcome_subtitle_restore_wallet": "Nếu bạn có một ví hiện có mà bạn muốn mang vào bánh, chỉ cần chọn khôi phục ví hiện có và chúng tôi sẽ hướng dẫn bạn qua quá trình này.",
   "welcome_to_cakepay": "Chào mừng đến với Cake Pay!",
-  "what_is_payjoin": "Payjoin là gì",
   "what_is_silent_payments": "Thanh toán im lặng là gì?",
   "widgets_address": "Địa chỉ",
   "widgets_or": "hoặc",
@@ -1108,6 +1018,5 @@
   "you_will_get": "Chuyển đổi thành",
   "you_will_receive_estimated_amount": "Bạn sẽ nhận được(ước tính )",
   "you_will_send": "Chuyển đổi từ",
-  "youCanGoBackToYourDapp": "Bạn có thể quay lại DAPP của mình ngay bây giờ",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb
index 360fcd6b6..b97fbb757 100644
--- a/res/values/strings_yo.arb
+++ b/res/values/strings_yo.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "Ẹ fikún owó sí àwọn káàdì (kò tóbi ju ${value})",
   "add_new_node": "Fi apẹka kún",
   "add_new_word": "Fikún ọ̀rọ̀ títun",
-  "add_passphrase": "Ṣafikun Kọwe",
-  "add_passphrase_warning_text": "Tẹ ni iwe ikawe nikan ti o ba ti lo ọkan fun apamọwọ yii ni igba atijọ. Ti o ba tẹ iwe ọrọ kukuru ti ko tọ tabi ko lo iwe kukuru ṣaaju lori apamọwọ yii, iwọ kii yoo wo eyikeyi awọn owo tabi itan-akọọlẹ.",
   "add_receiver": "Fikún àdírẹ́sì mìíràn (ìyàn nìyí)",
   "add_secret_code": "Tabi, ṣafikun koodu aṣiri yii si ohun elo onijeri kan",
   "add_tip": "Fún owó àfikún",
   "add_token_disclaimer_check": "Mo ti jẹrisi adirẹsi adehun ami ati alaye nipa lilo orisun olokiki kan. Fifi irira tabi alaye ti ko tọ le ja si isonu ti owo.",
   "add_token_warning": "Ma ṣe ṣatunkọ tabi ṣafikun awọn ami bi a ti fun ni aṣẹ nipasẹ awọn scammers.\nNigbagbogbo jẹrisi awọn adirẹsi ami pẹlu awọn orisun olokiki!",
   "add_value": "Fikún owó",
-  "added_message_for_ata_error": "Daradara rii daju pe o ni iwọntunwọnsi Sol Sol lati pari iṣowo rẹ.",
   "address": "Adirẹsi",
   "address_book": "Ìwé Àdírẹ́sì",
   "address_book_menu": "Ìwé Àdírẹ́sì",
@@ -55,8 +52,6 @@
   "anonpay_description": "Ṣe akọkọ ${type}. Awọn alabara le ${method} pẹlu eyikeyi iwo ise ati owo yoo wọle si iwe iwe yii.",
   "apk_update": "Àtúnse áàpù títun wà",
   "approve": "Fi ọwọ si",
-  "approve_request": "IKILỌ RẸ",
-  "approve_tokens": "Ṣe fọwọsi awọn àmi",
   "arrive_in_this_address": "${currency} ${tag} máa dé sí àdírẹ́sì yìí",
   "ascending": "Goke",
   "ask_each_time": "Beere lọwọ kọọkan",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "À ń dúró de ìjẹ́rìísí àránṣẹ́",
   "background_sync": "Imuṣiṣẹ Labẹ",
   "background_sync_mode": "Ipo amuṣiṣẹpọ abẹlẹ",
-  "background_sync_on_battery_low": "Muuṣiṣẹ lori batiri kekere",
-  "background_sync_on_charging": "Muṣiṣẹpọ nikan nigbati gbigba agbara",
-  "background_sync_on_device_idle": "Muṣiṣẹpọ nikan nigbati ẹrọ ko lo",
-  "background_sync_on_unmetered_network": "Nilo nẹtiwọki ti ko ni aabo",
   "backup": "Ṣẹ̀dà",
   "backup_file": "Ṣẹ̀dà akọsílẹ̀",
   "backup_password": "Ṣẹ̀dà ọ̀rọ̀ aṣínà",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "Ra Bitcoin",
   "buy_now": "Ra Bayibayi",
   "buy_provider_unavailable": "Olupese lọwọlọwọ ko si.",
-  "buy_sell_pair_is_not_supported_warning": "Apo owo yii ko ni atilẹyin nipasẹ eyikeyi olupese fun ọna isanwo ti o yan. Jọwọ yan bata ti o yatọ tabi gbiyanju yiyipada ọna isanwo.",
   "buy_with": "Rà pẹ̀lú",
   "by_cake_pay": "láti ọwọ́ Cake Pay",
   "cake_2fa_preset": "Cake 2FA Tito",
@@ -124,12 +114,9 @@
   "camera_consent": "Kamẹra rẹ yoo ṣee lo lati ya aworan kan fun awọn idi idanimọ nipasẹ ${provider}. Jọwọ ṣayẹwo Ilana Aṣiri wọn fun awọn alaye.",
   "camera_permission_is_required": "A nilo igbanilaaye kamẹra.\nJọwọ jeki o lati app eto.",
   "cancel": "Fagi lé e",
-  "cannot_verify": "Ko le mọ daju",
-  "cannot_verify_description": "A ko le jẹrisi ipo yii. Ṣayẹwo ibeere ni pẹkipẹki ṣaaju gbigba.",
   "card_address": "Àdírẹ́sì:",
   "cardholder_agreement": "Àjọrò olùṣe káàdì ìrajà",
   "cards": "Àwọn káàdì",
-  "chain_id": "ID ID",
   "chains": "Awọn ẹwọn",
   "change": "Pààrọ̀",
   "change_backup_password_alert": "Ẹ kò lè fi ọ̀rọ̀ aṣínà títun ti ẹ̀dà nípamọ́ ṣí àwọn àkọsílẹ̀ nípamọ́ tẹ́lẹ̀tẹ́lẹ̀ yín. Ẹ máa fi ọ̀rọ̀ aṣínà ti ẹ̀dà nípamọ́ títun ṣí àwọn àkọsílẹ̀ nípamọ́ títun nìkan. Ṣé ó dá ẹ lójú pé ẹ fẹ́ pààrọ̀  aṣínà ti ẹ̀dà nípamọ́?",
@@ -144,7 +131,6 @@
   "change_rep_message": "Ṣe o da ọ loju pe o fẹ yi awọn aṣoju pada?",
   "change_rep_successful": "Ni ifijišẹ yipada aṣoju",
   "change_selected_exchanges": "Yiyipada awọn paṣipaarọ ti o yan",
-  "change_selected_pair": "Yi bata ti a yan",
   "change_wallet_alert_content": "Ṣe ẹ fẹ́ pààrọ̀ àpamọ́wọ́ yìí sí ${wallet_name}?",
   "change_wallet_alert_title": "Ẹ pààrọ̀ àpamọ́wọ́ yìí",
   "choose_a_payment_method": "Yan ọna isanwo kan",
@@ -182,14 +168,9 @@
   "confirmed_tx": "Jẹrisi",
   "congratulations": "Ẹ kúuṣẹ́ ooo!",
   "connect_an_existing_yat": "So Yat wíwà",
-  "connect_hw_info_step_1": "Rii daju pe ẹrọ rẹ ni agbara lori.",
-  "connect_hw_info_step_2": "Tan Bluetooth lori fun awọn ẹrọ mejeeji ki o pa wọn kuro ninu foonu, tabi so awọn ẹrọ rẹ pọ pẹlu lilo okun USB.",
-  "connect_hw_info_step_3": "Ṣii ẹrọ rẹ ki o lọ kiri si ohun elo Crypto ti o fẹ.",
-  "connect_hw_info_step_4": "Yan ẹrọ rẹ ni apamọwọ akara oyinbo ki o tẹsiwaju pẹlu iṣeto.",
   "connect_yats": "So àwọn Yat",
   "connect_your_hardware_wallet": "So apamọwọ irinṣẹ rẹ nipa lilo Bluetooth tabi USB",
   "connect_your_hardware_wallet_ios": "So apamọwọ ẹrọ rẹ ni lilo Bluetooth",
-  "connected": "Sopọ",
   "connection_sync": "Ìkànpọ̀ àti ìbádọ́gba",
   "connectWalletPrompt": "So apamọwọ rẹ pọ pẹlu WalletConnect lati ṣe awọn iṣowo",
   "contact": "Olùbásọ̀rọ̀",
@@ -207,8 +188,6 @@
   "copy": "Ṣẹ̀dà",
   "copy_address": "Ṣẹ̀dà àdírẹ́sì",
   "copy_id": "Ṣẹ̀dà àmì ìdánimọ̀",
-  "copy_payjoin_address": "Daakọ Iwe Adirẹsi Payjoin",
-  "copy_payjoin_url": "Daakọ Payjoin url",
   "copyWalletConnectLink": "Daakọ ọna asopọ WalletConnect lati dApp ki o si lẹẹmọ nibi",
   "corrupted_seed_notice": "Awọn faili fun apamọwọ yii jẹ ibajẹ ati pe ko lagbara lati ṣii. Jọwọ wo ọrọ iseda, fipamọ rẹ, ki o mu apamọwọ naa pada.\n\nTi iye ba ṣofo, lẹhinna irugbin naa ko lagbara lati gba pada ni deede.",
   "countries": "Awọn orilẹ-ede",
@@ -245,22 +224,11 @@
   "descending": "Sọkalẹ",
   "description": "Apejuwe",
   "destination_tag": "Orúkọ tí ìbí tó a ránṣẹ́ sí:",
-  "deuro_collect_interest": "Kojọ",
-  "deuro_savings": "dEuro Awọn ifowopamọ",
-  "deuro_savings_add": "Owo ifipamọ",
-  "deuro_savings_balance": "Iwontunws.funfun ifowopamọ",
-  "deuro_savings_collect_interest": "Gba iwulo",
-  "deuro_savings_remove": "Yọkuro",
-  "deuro_savings_set_approval": "Ṣeto ifọwọsi",
-  "deuro_savings_subtitle": "Jo'gun to 10% iwulo lori awọn idaduro Duroblockoin rẹ",
-  "deuro_tx_commited_content": "O le gba tọkọtaya kan ti awọn aaya fun idunadura lati jẹrisi ati ṣe afihan loju iboju",
-  "device_is_signing": "Ẹrọ n forukọsilẹ",
   "dfx_option_description": "Ra Crypto pẹlu EUR & CHF. Fun soobu ati awọn alabara ile-iṣẹ ni Yuroopu",
   "didnt_get_code": "Ko gba koodu?",
   "digit_pin": "-díjíìtì òǹkà ìdánimọ̀ àdáni",
   "digital_and_physical_card": " káàdì ìrajà t'ara àti ti ayélujára",
   "disable": "Ko si",
-  "disable_automatic_exchange_status_updates": "Mu awọn imudojuiwọn ipo paṣipaarọ aifọwọyi",
   "disable_bulletin": "Mu blogti ipo ipo ṣiṣẹ",
   "disable_buy": "Ko iṣọrọ ọja",
   "disable_cake_2fa": "Ko 2FA Cake sii",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "Nipa yiyi eyi kuro, awọn oṣuwọn owo naa le jẹ aiṣe deede ni awọn ọrọ kan, nitorinaa o le pari apọju tabi awọn idiyele ti o ni agbara fun awọn iṣowo rẹ",
   "disable_fiat": "Pa owó tí ìjọba pàṣẹ wa lò",
   "disable_sell": "Ko iṣọrọ iṣọrọ",
-  "disable_tor": "Mu lile",
   "disable_trade_option": "Mu aṣayan iṣowo ṣiṣẹ",
   "disableBatteryOptimization": "Mu Ifasi batiri",
   "disableBatteryOptimizationDescription": "Ṣe o fẹ lati mu iṣapelo batiri si lati le ṣiṣe ayẹwo ẹhin ati laisiyonu?",
   "disabled": "Wọ́n tí a ti pa",
-  "disconnect_session": "Koro igba ipade",
   "discount": "Pamọ́ ${value}%",
   "display_settings": "Fihàn àwọn ààtò",
   "displayable": "A lè ṣàfihàn ẹ̀",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "Ẹ kò pín wọnyìí sí ẹnikẹ́ni. Ẹ sì kò pin wọnyìí sí ìranlọ́wọ́. Ẹnikẹ́ni lè jí owó yín! Wọ́n máa jí owó yín!",
   "do_not_show_me": "Kò fi eléyìí hàn mi mọ́",
   "domain_looks_up": "Awọn wiwa agbegbe",
-  "domain_mismatch": "Ìkápá",
-  "domain_mismatch_description": "Oju opo wẹẹbu yii ni ašẹ ti ko baamu olufiranṣẹ ti ibeere yii. Itẹwọgba le ja si ipadanu awọn owo.",
   "donation_link_details": "Iru awọn ẹya ọrọ ti o funni",
-  "done": "Ṣe",
   "dont_get_code": "Ṣé ẹ ti gba ọ̀rọ̀ ìdánimọ̀?",
   "e_sign_consent": "Jẹ́rìí sí lórí ayélujára",
   "edit": "Pààrọ̀",
@@ -296,7 +259,6 @@
   "electrum_address_disclaimer": "A dá àwọn àdírẹ́sì títun ní gbogbo àwọn ìgbà t'ẹ́ lo ó kan ṣùgbọ́n ẹ lè tẹ̀síwájú lo àwọn àdírẹ́sì tẹ́lẹ̀tẹ́lẹ̀.",
   "email_address": "Àdírẹ́sì ímeèlì",
   "enable": "Mu ṣiṣẹ",
-  "enable_builtin_tor": "Mu ṣiṣẹ",
   "enable_mempool_api": "Mempool API fun awọn owo deede ati awọn ọjọ",
   "enable_replace_by_fee": "Mu ki o rọpo",
   "enable_silent_payments_scanning": "Bẹrẹ awọn sisanwo ipalọlọ, titi ti o fi de opin",
@@ -334,10 +296,8 @@
   "error_text_template": "Orúkọ àwòṣe àti àdírẹ́sì kò lè ni nínú àwọn àmì ` , ' \"\nIye ẹyọ ọ̀rọ̀ náà gbọ́dọ̀ jẹ́ láàárín 1 àti 106",
   "error_text_wallet_name": "Orúkọ àpamọ́wọ́ lè ni nìkan nínú àwọn òǹkà àti ẹyọ ọ̀rọ̀ àti àmì _ -\nIye ẹyọ ọ̀rọ̀ gbọ́dọ̀ wà láàárín 1 àti 33",
   "error_text_xmr": "Iye XMR kò lè tóbi ju ìyókù.\nIye díjíìtì léyìn ẹsẹ kò gbọ́dọ̀ tóbi ju eéjìlá.",
-  "error_while_processing": "Aṣiṣe kan waye lakoko ti o duro",
   "errorGettingCredentials": "Kuna: Aṣiṣe lakoko gbigba awọn iwe-ẹri",
   "errorSigningTransaction": "Aṣiṣe kan ti waye lakoko ti o fowo si iṣowo",
-  "establishing_tor_connection": "Isopọ Stanishing",
   "estimated": "Ó tó a fojú díwọ̀n",
   "estimated_new_fee": "Ifoju tuntun owo tuntun",
   "estimated_receive_amount": "Ifoju gba iye",
@@ -361,7 +321,6 @@
   "export_backup": "Sún ẹ̀dà nípamọ́ síta",
   "export_logs": "Wọle si okeere",
   "export_outputs": "Agbohunlu okeere",
-  "extend_session": "Ifaagun igba",
   "extra_id": "Àmì ìdánimọ̀ tó fikún:",
   "extracted_address_content": "Ẹ máa máa fi owó ránṣẹ́ sí\n${recipient_name}",
   "failed_authentication": "Ìfẹ̀rílàdí pipòfo. ${state_error}",
@@ -373,7 +332,6 @@
   "fiat_api": "Ojú ètò áàpù owó tí ìjọba pàṣẹ wa lò",
   "fiat_balance": "Fiat Iwontunws.funfun",
   "field_required": "E ni lati se nkan si aye yi",
-  "file_saved": "Faili faili ti o ti fipamọ",
   "fill_code": "Ẹ jọ̀wọ́ tẹ̀ ọ̀rọ̀ ìjẹ́rìísí t'á ti ránṣẹ́ sí ímeèlì yín.",
   "filter_by": "Ṣẹ́ láti",
   "first_wallet_text": "Àpamọ́wọ́ t'á fi Monero, Bitcoin, Ethereum, Litecoin, àti Haven pamọ́ wà pa",
@@ -383,12 +341,10 @@
   "forgot_password": "Ẹ ti gbàgbé ọ̀rọ̀ aṣínà",
   "freeze": "Tì pa",
   "frequently_asked_questions": "Àwọn ìbéèrè la máa ń béèrè",
-  "from": "Lati",
   "frozen": "Ó l'a tì pa",
   "frozen_balance": "Iwontunwonsi ti o tutu",
   "full_balance": "Ìyókù owó kíkún",
   "gas_exceeds_allowance": "Gaasi ti a beere nipasẹ idunadura ju lọ.",
-  "gas_price": "Owo gaasi",
   "generate_name": "Ṣẹda Orukọ",
   "generating_gift_card": "À ń dá káàdì ìrajà t'á lò nínú irú kan ìtajà",
   "generating_transaction": "Ifọwọsi Iṣowo",
@@ -414,7 +370,6 @@
   "hide_details": "Dé ìsọfúnni kékeré",
   "high_contrast_theme": "Akori Iyatọ giga",
   "home_screen_settings": "Awọn eto iboju ile",
-  "how_to_connect": "Bi o ṣe le sopọ",
   "how_to_use": "Bawo ni lati lo",
   "how_to_use_card": "Báyìí ni wọ́n ṣe ń lo káàdì yìí.",
   "id": "Àmì Ìdánimọ̀: ",
@@ -432,7 +387,6 @@
   "insufficient_lamport_for_tx": "O ko ni sosi to lati bo idunadura ati idiyele iṣowo rẹ. Fi agbara kun Sol diẹ sii si apamọwọ rẹ tabi dinku sodo naa ti o \\ 'tun n firanṣẹ.",
   "insufficient_lamports": "O ko ni sosi to lati bo idunadura ati idiyele iṣowo rẹ. O nilo o kere ju ${solValueNeeded}. Fi agbara kun Sol diẹ sii si apamọwọ rẹ tabi dinku soso ti o n firanṣẹ",
   "insufficientFundsForRentError": "O ko ni Sol kan lati bo owo isanwo naa ki o yalo fun iroyin naa. Fi agbara kun Sol diẹ sii si apamọwọ rẹ tabi dinku soso naa ti o \\ 'tun n firanṣẹ",
-  "insufficientFundsForRentErrorReceiver": "Akọọlẹ olugba ko ni Sol lati bo iyalo naa. Jọwọ beere olugba lati ṣafikun Sol diẹ sii si akọọlẹ wọn.",
   "introducing_cake_pay": "Ẹ bá Cake Pay!",
   "invalid_input": "Iṣawọle ti ko tọ",
   "invalid_password": "Ọrọ igbaniwọle ti ko wulo",
@@ -472,7 +426,6 @@
   "logout": "Jáde",
   "low_fee": "Owó àfikún kékeré",
   "low_fee_alert": "Ẹ ń fi owó àfikún kékeré fún àwọn àránṣẹ́ yín lágbára. Eleyìí lè pẹ́ gba àránṣẹ́ yín. Ó sì lè dá àwọn iye mìíràn t'á ṣẹ́ owó sí. Ó sì lè pa àwọn pàṣípààrọ̀. A dábàá pé k'ẹ́ lo owó àfikún títobi láti ṣe àṣejèrè.",
-  "made_easy": "ṣe rọrun",
   "manage_nodes": "Ṣakoso awọn apa",
   "manage_pow_nodes": "Ṣakoso awọn Nodes PoW",
   "manage_yats": "Bójú Yats",
@@ -484,8 +437,6 @@
   "memo": "Àkọsílẹ̀:",
   "message": "Ifiranṣẹ",
   "message_verified": "Ifiranṣẹ naa ni aṣeyọri ni ifijišẹ",
-  "messages": "Awọn ifiranṣẹ",
-  "method": "Ọna",
   "methods": "Awọn ọna",
   "min_amount": "kò kéré ju: ${value}",
   "min_value": "kò gbọ́dọ̀ kéré ju ${value} ${currency}",
@@ -498,7 +449,6 @@
   "monero_dark_theme": "Monero Dudu Akori",
   "monero_light_theme": "Monero Light Akori",
   "moonpay_alert_text": "Iye owó kò gbọ́dọ̀ kéré ju ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "Aṣiṣe kan waye lakoko ti nfts. Fi inurere ṣayẹwo asopọ intanẹẹti rẹ ki o tun gbiyanju lẹẹkan si.",
   "more_options": "Ìyàn àfikún",
   "multiple_addresses_detected": "Awọn adirẹsi ọpọ rii",
   "mweb_confirmed": "Jẹrisi Mweb",
@@ -515,7 +465,6 @@
   "new_subaddress_label_name": "Orúkọ",
   "new_subaddress_title": "Àdírẹ́sì títun",
   "new_template": "Àwòṣe títun",
-  "new_transactions_notifications": "Firanṣẹ awọn iwifunni nipa awọn iṣowo tuntun",
   "new_wallet": "Àpamọ́wọ́ títun",
   "newConnection": "Tuntun Asopọ",
   "no_cards_found": "Ko si awọn kaadi ti a rii",
@@ -540,7 +489,6 @@
   "normal": "Deede",
   "note_optional": "Àkọsílẹ̀ (ìyàn nìyí)",
   "note_tap_to_change": "Àkọsílẹ̀  (ẹ tẹ̀ láti pààrọ̀)",
-  "notification_permission_denied": "Igbanilaaye iwifunni ni sẹsẹ sẹsẹ, jọwọ jẹ ki o mu ṣiṣẹ ni awọn eto",
   "nullURIError": "URI jẹ asan",
   "offer_expires_in": "Ìrònúdábàá máa gbẹ́mìí mì ní: ",
   "offline": "kò wà lórí ayélujára",
@@ -572,20 +520,8 @@
   "password": "Ọ̀rọ̀ aṣínà",
   "paste": "Fikún ẹ̀dà yín",
   "pause_wallet_creation": "Agbara lati ṣẹda Haven Wallet ti wa ni idaduro lọwọlọwọ.",
-  "payjoin_card_content": "Payjoin jẹ ẹya-itọju aṣiri tuntun ati ẹya fifipamọ owo sisan ni Bitcoin.",
-  "payjoin_details": "Payjoin awọn alaye",
-  "payjoin_enabled": "Payjoin ṣiṣẹ",
-  "payjoin_enabling_popup_content": "O le to Payjoin labẹ akojọ aṣayan → lo Payjoin lati ṣiṣẹ tabi mu kuro nigbamii.",
-  "payjoin_enabling_popup_title": "Mu ṣiṣẹ Payjoin",
-  "payjoin_request_awaiting_tx": "O duro de idunadura",
-  "payjoin_request_in_progress": "Ni ilọsiwaju",
-  "payjoin_unavailable": "Payjoin ko si",
-  "payjoin_unavailable_sheet_content": "Gbigba idunadura Payjoin iṣowo nbeere lati ni Bitcoin ṣetan lati lo. \\ N \\ NAS laipẹ bi apamọwọ rẹ ni owo, Payjoin yoo ṣiṣẹ laifọwọyi.",
-  "payjoin_unavailable_sheet_title": "Kini idi ti Payjoin ko si?",
   "payment_id": "Àmì ìdánimọ̀ àránṣẹ́: ",
-  "payment_made_easy": "Awọn sisanwo ti a ṣe rọrun",
   "payment_was_received": "Àránṣẹ́ yín ti dé.",
-  "payments": "Awọn sisanwo",
   "pending": " pípẹ́",
   "percentageOf": "láti ${amount}",
   "pin_at_top": "pin ${tokini} ni oke",
@@ -602,10 +538,9 @@
   "please_try_to_connect_to_another_node": "Ẹ jọ̀wọ́, gbìyànjú dárapọ̀ mọ́ apẹka mìíràn yí wọlé",
   "please_wait": "Jọwọ saa",
   "polygonscan_history": "PolygonScan itan",
-  "potential_scam": "Egan ti o ni agbara",
   "powered_by": "Láti ọwọ́ ${title}",
   "pre_seed_button_text": "Mo ti gbọ́. O fi hóró mi hàn mi",
-  "pre_seed_description": "Ni oju-iwe ti o tẹle iwọ yoo rii lẹsẹsẹ awọn ọrọ. Eyi jẹ irugbin alailẹgbẹ ati ti ikọkọ ati pe o jẹ ọna nikan lati bọsi apamọwọ rẹ ni ọran ti pipadanu tabi aisise. O jẹ ojuṣe rẹ lati kọ ọ silẹ ki o tọju rẹ ni aye ailewu ti ita ti app Fifun akara naa.",
+  "pre_seed_description": "Ẹ máa wo àwọn ọ̀rọ̀ ${words} lórí ojú tó ń bọ̀. Èyí ni hóró aládàáni yín tó kì í jọra. Ẹ lè fi í nìkan dá àpamọ́wọ́ yín padà sípò tí àṣìṣe tàbí ìbàjẹ́ bá ṣẹlẹ̀. Hóró yín ni ẹ gbọ́dọ̀ kọ sílẹ̀ àti pamọ́ síbí tó kò léwu níta Cake Wallet.",
   "pre_seed_title": "Ó TI ṢE PÀTÀKÌ",
   "prepaid_cards": "Awọn kaadi ti a ti sanwo",
   "prevent_screenshots": "Pese asapọ ti awọn ẹrọ eto aṣa",
@@ -618,7 +553,6 @@
   "proceed_on_device": "Tẹsiwaju lori ẹrọ rẹ",
   "proceed_on_device_description": "Jọwọ tẹle awọn ilana ti a ṣe lori apamọwọ ohun elo rẹ",
   "processing": "Iṣaayan",
-  "processing_signed_tx": "Sisọ idunadura fowo si",
   "profile": "profaili",
   "provider_error": "Àṣìṣe ${provider}",
   "public_key": "Kọ́kọ́rọ́ tó kò àdáni",
@@ -651,7 +585,6 @@
   "rep_warning_sub": "Aṣoju rẹ ko han lati wa ni iduro to dara. Fọwọ ba ibi lati yan ọkan titun kan",
   "repeat_wallet_password": "Tun ọrọ igbaniwọle apamọwọ naa",
   "repeated_password_is_incorrect": "Ọrọ igbaniwọle tun jẹ aṣiṣe. Jọwọ tun ọrọigbaniwọle apamọwọ lẹẹkansi.",
-  "requested": "Beere fun",
   "require_for_adding_contacts": "Beere fun fifi awọn olubasọrọ kun",
   "require_for_all_security_and_backup_settings": "Beere fun gbogbo aabo ati awọn eto afẹyinti",
   "require_for_assessing_wallet": "Beere fun wiwọle si apamọwọ",
@@ -662,12 +595,10 @@
   "require_for_sends_to_internal_wallets": "Beere fun fifiranṣẹ si awọn apamọwọ inu",
   "require_for_sends_to_non_contacts": "Beere fun fifiranṣẹ si awọn ti kii ṣe awọn olubasọrọ",
   "require_pin_after": "Ẹ nílò òǹkà ìdánimọ̀ àdáni láàárín",
-  "required_passphrase": "Kukurukọni",
   "rescan": "Tún Wá",
   "resend_code": "Ẹ jọ̀wọ́ tún un ránṣé",
   "reset": "Tún ṣe",
   "reset_password": "Tún ọ̀rọ̀ aṣínà ṣe",
-  "restore": "Mu pada",
   "restore_active_seed": "Hóró lọ́wọ́",
   "restore_address": "Àdírẹ́sì",
   "restore_bitcoin_description_from_keys": "Mú àpamọ́wọ́ yín padà láti ọ̀rọ̀ WIF t'á ti dá láti kọ́kọ́rọ́ àdáni yín",
@@ -714,10 +645,7 @@
   "search_language": "Wá èdè",
   "second_intro_content": "Àdírẹ́sì kan tó dá lórí emójì tó kì í jọra ni Yat yín. Ó rọ́pò gbogbo àwọn àdírẹ́sì gígùn yín tó dá lórí ìlà mẹ́rìndínlógún ti gbogbo àwọn iye owó yín.",
   "second_intro_title": "Àdírẹ́sì kan t'á dá láti emójì tó pàṣẹ gbogbo ohun wà",
-  "security": "Aabo",
   "security_and_backup": "Ìṣọ́ àti ẹ̀dà nípamọ́",
-  "security_risk": "Ewu aabo",
-  "security_risk_description": "Aaye yii jẹ aami bi aiṣe nipasẹ awọn olupese aabo pupọ. Lọ kuro lẹsẹkẹsẹ lati daabo bo awọn ohun-ini rẹ.",
   "seed_alert_back": "Padà sọ́dọ̀",
   "seed_alert_content": "Hóró ni ọ̀nà nìkan kí ṣẹ̀dà àpamọ́wọ́ yín. Ṣé ẹ ti kọ ọ́ sílẹ̀?",
   "seed_alert_title": "Ẹ wo",
@@ -752,6 +680,9 @@
   "seedtype": "Irugbin-seetypu",
   "seedtype_alert_content": "Pinpin awọn irugbin pẹlu awọn gedo miiran ṣee ṣe pẹlu Bip39 irugbin.",
   "seedtype_alert_title": "Ṣajọpọ Seeytype",
+  "seedtype_legacy": "Legacy (awọn ọrọ 25)",
+  "seedtype_polyseed": "Polyseed (awọn ọrọ 16)",
+  "seedtype_wownero": "Wowero (awọn ọrọ 14)",
   "select_backup_file": "Select backup file",
   "select_buy_provider_notice": "Yan olupese Ra loke. O le skii iboju yii nipa ṣiṣeto olupese rẹ ni awọn eto App.",
   "select_destination": "Jọwọ yan ibi ti o nlo fun faili afẹyinti.",
@@ -775,7 +706,6 @@
   "send_from_external_wallet": "Firanṣẹ lati apamọwọ ita",
   "send_name": "Orúkọ",
   "send_new": "Títun",
-  "send_payjoin": "Firanṣẹ PayjoinPayjoin",
   "send_payment_id": "Àmì ìdánimọ̀ àránṣẹ́ (ìyàn nìyí)",
   "send_priority": "${transactionPriority} agbára ni owó àfikún lọ́wọ́lọ́wọ́.\nẸ lè pààrọ̀ iye agbára t'ẹ fikún àránṣẹ́ lórí àwọn ààtò",
   "send_sending": "Ń Ránṣẹ́...",
@@ -833,9 +763,7 @@
   "show_keys": "Wo hóró / àwọn kọ́kọ́rọ́",
   "show_market_place": "Wa Sopọ Pataki",
   "show_seed": "Wo hóró",
-  "sign_all": "Wọlé gbogbo",
   "sign_message": "Ifiranṣẹ Ami",
-  "sign_one": "Mikọ",
   "sign_up": "Forúkọ sílẹ̀",
   "sign_verify_message": "Ami tabi ṣayẹwo ifiranṣẹ",
   "sign_verify_message_sub": "Wọle tabi ṣayẹwo ifiranṣẹ kan nipa lilo bọtini ikọkọ rẹ",
@@ -864,14 +792,11 @@
   "sort_by": "Sa pelu",
   "spend_key_private": "Kọ́kọ́rọ́ sísan (àdáni)",
   "spend_key_public": "Kọ́kọ́rọ́ sísan (kò àdáni)",
-  "starting_tor_proxy": "Bibẹrẹ Oluṣaaju Aṣoju",
   "status": "Tó ń ṣẹlẹ̀: ",
-  "step": "Igbesẹ",
   "string_default": "Aiyipada",
   "subaddress_title": "Àkọsílẹ̀ ni nínú àwọn àdírẹ́sì tíwọn rẹ̀lẹ̀",
   "subaddresses": "Àwọn àdírẹ́sì kékeré",
   "submit_request": "Ṣé ìbéèrè",
-  "success": "Aṣeyọri",
   "successful": "Aseyori",
   "support_description_guides": "Iwe ati atilẹyin fun awọn ọran ti o wọpọ",
   "support_description_live_chat": "Free ati sare! Ti oṣiṣẹ awọn aṣoju wa lati ṣe iranlọwọ",
@@ -879,7 +804,6 @@
   "support_title_guides": "Awọn iwe apamọwọ oyinbo akara oyinbo",
   "support_title_live_chat": "Atilẹyin ifiwe",
   "support_title_other_links": "Awọn ọna asopọ atilẹyin miiran",
-  "supported": "Ni atilẹyin",
   "swap": "Eepo",
   "sweeping_wallet": "Fi owo iwe iwe wofo",
   "sweeping_wallet_alert": "Yio kọja pada si ikan yii. Kì yoo daadaa leede yii tabi owo ti o ti fi se iwe iwe naa yoo gbe.",
@@ -899,7 +823,6 @@
   "sync_status_syncronizing": "Ń MÚDỌ́GBA",
   "sync_status_timed_out": "Ti akoko jade",
   "sync_status_unsupported": "Ile-igbimọ ti ko ni atilẹyin",
-  "synchronizing": "Mimuuṣiṣẹpọ",
   "syncing_wallet_alert_content": "Iwontunws.funfun rẹ ati atokọ idunadura le ma pari titi ti yoo fi sọ “SYNCHRONIZED” ni oke. Tẹ/tẹ ni kia kia lati ni imọ siwaju sii.",
   "syncing_wallet_alert_title": "Apamọwọ rẹ n muṣiṣẹpọ",
   "template": "Àwòṣe",
@@ -912,18 +835,13 @@
   "thorchain_taproot_address_not_supported": "Olupese Trockchain ko ṣe atilẹyin awọn adirẹsi Taproot. Jọwọ yi adirẹsi pada tabi yan olupese ti o yatọ.",
   "time": "${minutes}ìṣj ${seconds}ìṣs",
   "tip": "Owó àfikún:",
-  "to": "Si",
   "today": "Lénìí",
-  "token_already_exists": "Token tẹlẹ wa",
   "token_contract_address": "Àmi guide adirẹsi",
   "token_decimal": "Àmi eleemewa",
   "token_name": "Orukọ àmi fun apẹẹrẹ: Tether",
   "token_symbol": "Aami aami fun apẹẹrẹ: USDT",
   "tokenID": "ID",
-  "ton_extra_info": "Jọwọ maṣe gbagbe lati tokasi ID akọsilẹ lakoko fifiranṣẹ idunadura pupọ fun paṣipaarọ naa",
   "tor_connection": "Tor asopọ",
-  "tor_connection_timeout": "Akoko asopọ asopọ",
-  "tor_experimental": "Eyi jẹ ẹya ti esiperimenta ti a ṣe lati awọn Awoṣe Adwat atilẹyin ti o wa ni atilẹyin idiwọ - diẹ ninu awọn asopọ le lo imple, lati le ni ipa ọna App Prat pẹlu ipo VPN.",
   "tor_only": "Tor nìkan",
   "total": "Apapọ",
   "total_saving": "Owó t'ẹ́ ti pamọ́",
@@ -984,10 +902,8 @@
   "transaction_sent_notice": "Tí aṣàfihàn kò bá tẹ̀síwájú l'áàárín ìṣẹ́jú kan, ẹ tọ́ olùṣèwádìí àkójọpọ̀ àti ímeèlì yín wò.",
   "transactions": "Àwọn àránṣẹ́",
   "transactions_by_date": "Àwọn àránṣẹ́ t'á ti fi aago ṣa",
-  "transport_type": "Iru irinna",
   "trongrid_history": "Itan Trongrid",
   "trusted": "A ti fọkàn ẹ̀ tán",
-  "try_again": "Gbiyanju lẹẹkansi",
   "tx_commit_exception_no_dust_on_change": "Iṣowo naa ti kọ pẹlu iye yii. Pẹlu awọn owó wọnyi o le firanṣẹ ${min} laisi ayipada tabi ${max} ni iyipada iyipada.",
   "tx_commit_failed": "Idunadura iṣowo kuna. Jọwọ kan si atilẹyin.",
   "tx_commit_failed_no_peers": "Idunadura kuna lati wa igbohungbe, jọwọ gbiyanju lẹẹkansi ni iṣẹju keji tabi bẹẹ",
@@ -1014,19 +930,15 @@
   "unspent_coins_details_title": "Àwọn owó ẹyọ t'á kò tí ì san",
   "unspent_coins_title": "Àwọn owó ẹyọ t'á kò tí ì san",
   "unsupported_asset": "A ko ṣe atilẹyin iṣẹ yii fun dukia yii. Jọwọ ṣẹda tabi yipada si apamọwọ iru dukia atilẹyin.",
-  "update_session": "Apeere igba",
   "uptime": "Iduro",
   "upto": "kò tóbi ju ${value}",
   "usb": "USB",
   "use": "Lo",
   "use_card_info_three": "Ẹ lo káàdí ayélujára lórí wẹ́ẹ̀bù tàbí ẹ lò ó lórí àwọn ẹ̀rọ̀ ìrajà tíwọn kò kò.",
   "use_card_info_two": "A pààrọ̀ owó sí owó Amẹ́ríkà tó bá wà nínú àkanti t'á ti fikún tẹ́lẹ̀tẹ́lẹ̀. A kò kó owó náà nínú owó ayélujára.",
-  "use_device_theme": "Lo akori ẹrọ",
-  "use_payjoin": "Lo Payjoin",
   "use_ssl": "Lo SSL",
   "use_suggested": "Lo àbá",
   "use_testnet": "Lo tele",
-  "user_rejected_method": "Ọna ti o kọ olumulo",
   "value": "Iye",
   "value_type": "Iru iye",
   "variable_pair_not_supported": "A kì í ṣe k'á fi àwọn ilé pàṣípààrọ̀ yìí ṣe pàṣípààrọ̀ irú owó méji yìí",
@@ -1053,7 +965,6 @@
   "wallet_group_description_view_seed": "O le nigbagbogbo wo irugbin yii lẹẹkansi labẹ",
   "wallet_group_empty_state_text_one": "O dabi pe o ko ni eyikeyi awọn ẹgbẹ ti o ni ibamu!\n\ntẹ ni kia kia",
   "wallet_group_empty_state_text_two": "ni isalẹ lati ṣe ọkan titun.",
-  "wallet_has_passphrase": "Apamọwọ yii ni iwe kukuru kan",
   "wallet_keys": "Hóró/kọ́kọ́rọ́ àpamọ́wọ́",
   "wallet_list_create_new_wallet": "Ṣe àpamọ́wọ́ títun",
   "wallet_list_edit_group_name": "Ṣatunṣe Orukọ Ẹgbẹ",
@@ -1078,11 +989,10 @@
   "walletConnect": "Asopọmọra apamọwọ",
   "wallets": "Àwọn àpamọ́wọ́",
   "warning": "Ikilo",
-  "welcome": "Kaabọ",
+  "welcome": "Ẹ káàbọ sí",
   "welcome_subtitle_new_wallet": "Ti o ba fẹ bẹrẹ alabapade, tẹ Ṣẹda apamọwọ tuntun ni isalẹ iwọ yoo wa ni pipa si awọn ere-ije.",
   "welcome_subtitle_restore_wallet": "Ti o ba ni apamọwọ ti o wa tẹlẹ ti o fẹ lati mu wa sinu akara oyinbo, yan omi apamọwọ wa tẹlẹ ati pe a yoo rin ọ nipasẹ ilana naa.",
   "welcome_to_cakepay": "Ẹ káàbọ̀ sí Cake Pay!",
-  "what_is_payjoin": "Kini Payjoin?",
   "what_is_silent_payments": "Kini awọn sisanwo ipalọlọ?",
   "widgets_address": "Àdírẹ́sì",
   "widgets_or": "tàbí",
@@ -1112,6 +1022,5 @@
   "you_will_get": "Ṣe pàṣípààrọ̀ sí",
   "you_will_receive_estimated_amount": "Iwọ yoo gba ( excimated )",
   "you_will_send": "Ṣe pàṣípààrọ̀ láti",
-  "youCanGoBackToYourDapp": "O le pada si tapla rẹ bayi",
   "yy": "Ọd"
 }
\ No newline at end of file
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 3bf18677c..e1767a28f 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -15,15 +15,12 @@
   "add_fund_to_card": "向卡中添加预付资金（最多 ${value}）",
   "add_new_node": "添加新节点",
   "add_new_word": "添加新词",
-  "add_passphrase": "添加密码",
-  "add_passphrase_warning_text": "仅当您过去曾经为此钱包使用一个时，才输入密码。如果您在此钱包上输入错误的密码短语或在此钱包上之前没有使用过密码，则不会看到任何现有的资金或历史记录。",
   "add_receiver": "添加另一個接收器（可選）",
   "add_secret_code": "或者，将此密码添加到身份验证器应用程序中",
   "add_tip": "添加提示",
   "add_token_disclaimer_check": "我已使用信誉良好的来源确认了代币合约地址和信息。 添加恶意或不正确的信息可能会导致资金损失。",
   "add_token_warning": "请勿按照诈骗者的指示编辑或添加令牌。\n始终通过信誉良好的来源确认代币地址！",
   "add_value": "增加价值",
-  "added_message_for_ata_error": "请确保您有足够的SOL余额来完成交易。",
   "address": "地址",
   "address_book": "地址簿",
   "address_book_menu": "地址簿",
@@ -55,8 +52,6 @@
   "anonpay_description": "生成 ${type}。收款人可以使用任何受支持的加密货币 ${method}，您将在此钱包中收到资金。",
   "apk_update": "APK更新",
   "approve": "批准",
-  "approve_request": "批准请求",
-  "approve_tokens": "批准令牌",
   "arrive_in_this_address": "${currency} ${tag}将到达此地址",
   "ascending": "上升",
   "ask_each_time": "每次问",
@@ -76,10 +71,6 @@
   "awaiting_payment_confirmation": "等待付款确认",
   "background_sync": "背景同步",
   "background_sync_mode": "后台同步模式",
-  "background_sync_on_battery_low": "在低电池上同步",
-  "background_sync_on_charging": "仅在充电时同步",
-  "background_sync_on_device_idle": "仅在不使用设备时同步",
-  "background_sync_on_unmetered_network": "需要未经许可的网络",
   "backup": "备份",
   "backup_file": "备份文件",
   "backup_password": "备份密码",
@@ -102,7 +93,6 @@
   "buy_bitcoin": "购买比特币",
   "buy_now": "立即购买",
   "buy_provider_unavailable": "提供者目前不可用。",
-  "buy_sell_pair_is_not_supported_warning": "此货币对不受任何提供商的支持。请选择另一对或尝试更改付款方式。",
   "buy_with": "一起购买",
   "by_cake_pay": "通过 Cake Pay",
   "cake_2fa_preset": "蛋糕 2FA 预设",
@@ -124,12 +114,9 @@
   "camera_consent": "${provider} 将使用您的相机拍摄图像以供识别之用。请查看他们的隐私政策了解详情。",
   "camera_permission_is_required": "需要相机许可。\n请从应用程序设置中启用它。",
   "cancel": "取消",
-  "cannot_verify": "无法验证",
-  "cannot_verify_description": "该域无法验证。批准之前，请仔细检查请求。",
   "card_address": "地址:",
   "cardholder_agreement": "持卡人协议",
   "cards": "卡片",
-  "chain_id": "连锁ID",
   "chains": "链条",
   "change": "更改",
   "change_backup_password_alert": "您以前的备份文件将无法使用新的备份密码導入。 新的备份密码将仅用于新的备份文件。 您确定要更改备份密码吗？",
@@ -144,7 +131,6 @@
   "change_rep_message": "您确定要更换代表吗？",
   "change_rep_successful": "成功改变了代表",
   "change_selected_exchanges": "更改选定的交换",
-  "change_selected_pair": "更改选定对",
   "change_wallet_alert_content": "您是否想将当前钱包改为 ${wallet_name}?",
   "change_wallet_alert_title": "更换当前钱包",
   "choose_a_payment_method": "选择付款方式",
@@ -182,14 +168,9 @@
   "confirmed_tx": "确认的",
   "congratulations": "恭喜！",
   "connect_an_existing_yat": "連接現有 Yat",
-  "connect_hw_info_step_1": "确保您的设备已上电。",
-  "connect_hw_info_step_2": "为这两个设备打开蓝牙，然后将它们配对，或使用USB电缆将设备连接在一起。",
-  "connect_hw_info_step_3": "解锁设备并导航到所需的加密应用程序。",
-  "connect_hw_info_step_4": "在蛋糕钱包中选择您的设备，然后继续设置。",
   "connect_yats": "连接 Yats",
   "connect_your_hardware_wallet": "使用蓝牙或USB连接硬件钱包",
   "connect_your_hardware_wallet_ios": "使用蓝牙连接硬件钱包",
-  "connected": "连接",
   "connection_sync": "连接和同步",
   "connectWalletPrompt": "将您的钱包与 WalletConnect 连接以进行交易",
   "contact": "联系",
@@ -207,8 +188,6 @@
   "copy": "复制",
   "copy_address": "复制地址",
   "copy_id": "复制ID",
-  "copy_payjoin_address": "复制工资公司地址",
-  "copy_payjoin_url": "复制Payjoin url",
   "copyWalletConnectLink": "从 dApp 复制 WalletConnect 链接并粘贴到此处",
   "corrupted_seed_notice": "该钱包的文件被损坏，无法打开。请查看种子短语，保存并恢复钱包。\n\n如果该值为空，则种子无法正确恢复。",
   "countries": "国家",
@@ -245,22 +224,11 @@
   "descending": "下降",
   "description": "描述",
   "destination_tag": "目标Tag:",
-  "deuro_collect_interest": "收集",
-  "deuro_savings": "dEuro储蓄",
-  "deuro_savings_add": "订金",
-  "deuro_savings_balance": "储蓄平衡",
-  "deuro_savings_collect_interest": "收集兴趣",
-  "deuro_savings_remove": "提取",
-  "deuro_savings_set_approval": "设定批准",
-  "deuro_savings_subtitle": "您的Deuro Stablecoin Holdings最多可赚取10％的利息",
-  "deuro_tx_commited_content": "交易可能需要几秒钟才能确认并在屏幕上反射",
-  "device_is_signing": "设备正在签名",
   "dfx_option_description": "用Eur＆Chf购买加密货币。对于欧洲的零售和企业客户",
   "didnt_get_code": "没有获取代码？",
   "digit_pin": "位 PIN",
   "digital_and_physical_card": "数字和物理预付借记卡",
   "disable": "停用",
-  "disable_automatic_exchange_status_updates": "禁用自动交换状态更新",
   "disable_bulletin": "禁用服务状态公告",
   "disable_buy": "禁用购买操作",
   "disable_cake_2fa": "禁用蛋糕 2FA",
@@ -269,12 +237,10 @@
   "disable_fee_api_warning": "通过将其关闭，在某些情况下，收费率可能不准确，因此您最终可能会超额付款或支付交易费用",
   "disable_fiat": "禁用法令",
   "disable_sell": "禁用卖出操作",
-  "disable_tor": "禁用TOR",
   "disable_trade_option": "禁用贸易选项",
   "disableBatteryOptimization": "禁用电池优化",
   "disableBatteryOptimizationDescription": "您是否要禁用电池优化以使背景同步更加自由，平稳地运行？",
   "disabled": "禁用",
-  "disconnect_session": "断开会话",
   "discount": "节省 ${value}%",
   "display_settings": "显示设置",
   "displayable": "可显示",
@@ -283,10 +249,7 @@
   "do_not_share_warning_text": "请勿与其他任何人分享这些信息，包括支持人员。\n\n您的资金可能而且将会被盗！",
   "do_not_show_me": "不再提示",
   "domain_looks_up": "域名查找",
-  "domain_mismatch": "域不匹配",
-  "domain_mismatch_description": "该网站的域与此请求的发件人的发件人不匹配。批准可能导致资金损失。",
   "donation_link_details": "捐赠链接详情",
-  "done": "完毕",
   "e_sign_consent": "电子签名同意",
   "edit": "编辑",
   "edit_backup_password": "编辑备份密码",
@@ -295,7 +258,6 @@
   "electrum_address_disclaimer": "每次您使用一个地址时，我们都会生成新地址，但之前的地址仍然有效",
   "email_address": "电子邮件地址",
   "enable": "使能够",
-  "enable_builtin_tor": "启用内置的tor",
   "enable_mempool_api": "Mempool API获得准确的费用和日期",
   "enable_replace_by_fee": "启用by-Fee替换",
   "enable_silent_payments_scanning": "开始扫描无声付款，直到达到提示",
@@ -333,10 +295,8 @@
   "error_text_template": "模板名称和地址不能包含`，' \" 符号\n并且必须在1到106个字符之间",
   "error_text_wallet_name": "钱包名称只能包含字母、数字、_ - 符号\n并且长度必须在 1 到 33 个字符之间",
   "error_text_xmr": "XMR值不能超过可用余额.\n小数位数必须小于或等于12",
-  "error_while_processing": "发动机时发生错误",
   "errorGettingCredentials": "失败：获取凭据时出错",
   "errorSigningTransaction": "签署交易时发生错误",
-  "establishing_tor_connection": "tor连接",
   "estimated": "估计值",
   "estimated_new_fee": "估计新费用",
   "estimated_receive_amount": "估计接收金额",
@@ -360,7 +320,6 @@
   "export_backup": "导出备份",
   "export_logs": "导出日志",
   "export_outputs": "导出输出",
-  "extend_session": "扩展会话",
   "extra_id": "额外ID:",
   "extracted_address_content": "您将汇款至\n${recipient_name}",
   "failed_authentication": "身份验证失败. ${state_error}",
@@ -372,7 +331,6 @@
   "fiat_api": "法币API",
   "fiat_balance": "法币余额",
   "field_required": "此字段是必需的",
-  "file_saved": "保存的文件",
   "fill_code": "请填写提供给您邮箱的验证码",
   "filter_by": "过滤",
   "first_wallet_text": "适用于门罗币、比特币、以太坊、莱特币和避风港的超棒钱包",
@@ -382,12 +340,10 @@
   "forgot_password": "忘记密码",
   "freeze": "凍結",
   "frequently_asked_questions": "常见问题",
-  "from": "从",
   "frozen": "凍結的",
   "frozen_balance": "冷冻平衡",
   "full_balance": "全部余额",
   "gas_exceeds_allowance": "交易要求的气体超出了津贴。",
-  "gas_price": "汽油价格",
   "generate_name": "生成名称",
   "generating_gift_card": "生成礼品卡",
   "generating_transaction": "生成交易",
@@ -413,7 +369,6 @@
   "hide_details": "隐藏细节",
   "high_contrast_theme": "高对比度主题",
   "home_screen_settings": "主屏幕设置",
-  "how_to_connect": "如何连接",
   "how_to_use": "如何使用",
   "how_to_use_card": "如何使用这张卡",
   "id": "ID: ",
@@ -431,7 +386,6 @@
   "insufficient_lamport_for_tx": "您没有足够的溶胶来支付交易及其交易费用。请在您的钱包中添加更多溶胶或减少您发送的溶胶量。",
   "insufficient_lamports": "您没有足够的溶胶来支付交易及其交易费用。您至少需要${solValueNeeded} sol。请在您的钱包中添加更多溶胶或减少您发送的溶胶量",
   "insufficientFundsForRentError": "您没有足够的溶胶来支付该帐户的交易费和租金。请在钱包中添加更多溶胶或减少您发送的溶胶量",
-  "insufficientFundsForRentErrorReceiver": "接收器的帐户没有足够的溶胶来支付租金。请要求接收器向其帐户添加更多SOL。",
   "introducing_cake_pay": "介绍 Cake Pay!",
   "invalid_input": "输入无效",
   "invalid_password": "无效的密码",
@@ -471,7 +425,6 @@
   "logout": "注销",
   "low_fee": "费用低",
   "low_fee_alert": "您当前正在使用低网络费用优先级。这可能会导致长时间等待、不同的费率或取消交易。我们建议设置更高的费用以获得更好的体验。",
-  "made_easy": "变得容易",
   "manage_nodes": "管理节点",
   "manage_pow_nodes": "管理 PoW 节点",
   "manage_yats": "管理 Yats",
@@ -483,8 +436,6 @@
   "memo": "备忘录:",
   "message": "信息",
   "message_verified": "该消息已成功验证",
-  "messages": "消息",
-  "method": "方法",
   "methods": "方法",
   "min_amount": "最小值: ${value}",
   "min_value": "最小: ${value} ${currency}",
@@ -497,7 +448,6 @@
   "monero_dark_theme": "门罗币深色主题",
   "monero_light_theme": "门罗币浅色主题",
   "moonpay_alert_text": "金额的价值必须大于或等于 ${minAmount} ${fiatCurrency}",
-  "moralis_nft_error": "获取NFT时发生错误。请检查您的互联网连接，然后重试。",
   "more_options": "更多选项",
   "multiple_addresses_detected": "检测到的多个地址",
   "mweb_confirmed": "确认的MWEB",
@@ -514,7 +464,6 @@
   "new_subaddress_label_name": "标签名称",
   "new_subaddress_title": "新地址",
   "new_template": "新模板",
-  "new_transactions_notifications": "发送有关新交易的通知",
   "new_wallet": "新钱包",
   "newConnection": "新连接",
   "no_cards_found": "找不到卡",
@@ -539,7 +488,6 @@
   "normal": "普通的",
   "note_optional": "注释（可选）",
   "note_tap_to_change": "注释（轻按即可更改）",
-  "notification_permission_denied": "通知许可被e opply拒绝，请在设置中手动启用它",
   "nullURIError": "URI 为空",
   "offer_expires_in": "优惠有效期至 ",
   "offline": "离线",
@@ -571,20 +519,8 @@
   "password": "密码",
   "paste": "粘贴",
   "pause_wallet_creation": "创建 Haven 钱包的功能当前已暂停。",
-  "payjoin_card_content": "Payjoin是比特币中的新的隐私权和节省费用的功能。",
-  "payjoin_details": "Payjoin 细节",
-  "payjoin_enabled": "Payjoin启用",
-  "payjoin_enabling_popup_content": "您可以在菜单下切换 Payjoin隐私→使用 Payjoin以后启用或禁用它。",
-  "payjoin_enabling_popup_title": "启用 Payjoin",
-  "payjoin_request_awaiting_tx": "等待交易",
-  "payjoin_request_in_progress": "进行中",
-  "payjoin_unavailable": "Payjoin不可用",
-  "payjoin_unavailable_sheet_content": "接收 Payjoin Transaction需要您准备使用比特币。",
-  "payjoin_unavailable_sheet_title": "为什么 Payjoin不可用？",
   "payment_id": "付款 ID: ",
-  "payment_made_easy": "付款很容易",
   "payment_was_received": "您的付款已收到。",
-  "payments": "付款",
   "pending": " (待定)",
   "percentageOf": "${amount}",
   "pin_at_top": "将 ${token} 固定在顶部",
@@ -601,10 +537,9 @@
   "please_try_to_connect_to_another_node": "请尝试连接到其他节点",
   "please_wait": "请稍等",
   "polygonscan_history": "多边形扫描历史",
-  "potential_scam": "潜在骗局",
   "powered_by": "Powered by ${title}",
   "pre_seed_button_text": "我明白。 查看种子",
-  "pre_seed_description": "在下一页上，您将看到一系列单词。这是您独特的私人种子，这是在损失或故障时恢复钱包的唯一方法。将其写下来并将其存储在蛋糕钱包应用程序外的安全地方是您的责任。",
+  "pre_seed_description": "在下一页上，您将看到${words}个文字。 这是您独有的种子，是丟失或出现故障时恢复钱包的唯一方法。 您有必须将其写下并储存在Cake Wallet应用程序以外的安全地方。",
   "pre_seed_title": "重要",
   "prepaid_cards": "预付费卡",
   "prevent_screenshots": "防止截屏和录屏",
@@ -617,7 +552,6 @@
   "proceed_on_device": "在设备上继续",
   "proceed_on_device_description": "请按照您的硬件钱包上提示的说明进行操作",
   "processing": "加工",
-  "processing_signed_tx": "处理签名的交易",
   "profile": "轮廓",
   "provider_error": "${provider} 错误",
   "public_key": "公钥",
@@ -650,7 +584,6 @@
   "rep_warning_sub": "您的代表似乎并不信誉良好。点击这里选择一个新的",
   "repeat_wallet_password": "重复钱包密码",
   "repeated_password_is_incorrect": "重复密码不正确。请再次重复钱包密码。",
-  "requested": "要求",
   "require_for_adding_contacts": "需要添加联系人",
   "require_for_all_security_and_backup_settings": "需要所有安全和备份设置",
   "require_for_assessing_wallet": "需要访问钱包",
@@ -661,12 +594,10 @@
   "require_for_sends_to_internal_wallets": "需要发送到内部钱包",
   "require_for_sends_to_non_contacts": "需要发送给非联系人",
   "require_pin_after": "之后需要 PIN",
-  "required_passphrase": "密码",
   "rescan": "重新扫描",
   "resend_code": "请重新发送",
   "reset": "重置",
   "reset_password": "重置密码",
-  "restore": "恢复",
   "restore_active_seed": "活动种子",
   "restore_address": "地址",
   "restore_bitcoin_description_from_keys": "从私钥中生成的WIF字符串恢复您钱包",
@@ -713,10 +644,7 @@
   "search_language": "搜索语言",
   "second_intro_content": "您的 Yat 是一個唯一的表情符號地址，可替換您所有貨幣的所有長十六進制地址。",
   "second_intro_title": "一個表情符號地址來統治他們",
-  "security": "安全",
   "security_and_backup": "安全和备份",
-  "security_risk": "安全风险",
-  "security_risk_description": "该域被多个安全提供者标记为不安全。立即离开以保护您的资产。",
   "seed_alert_back": "返回",
   "seed_alert_content": "种子是恢复钱包的唯一方法。记住了吗？",
   "seed_alert_title": "注意",
@@ -751,6 +679,9 @@
   "seedtype": "籽粒",
   "seedtype_alert_content": "只有BIP39籽粒可以与其他钱包共享种子。",
   "seedtype_alert_title": "籽粒警报",
+  "seedtype_legacy": "遗产（25个单词）",
+  "seedtype_polyseed": "多种物品（16个单词）",
+  "seedtype_wownero": "沃恩罗（14个单词）",
   "select_backup_file": "选择备份文件",
   "select_buy_provider_notice": "在上面选择买入提供商。您可以通过在应用程序设置中设置默认的购买提供商来跳过此屏幕。",
   "select_destination": "请选择备份文件的目的地。",
@@ -774,7 +705,6 @@
   "send_from_external_wallet": "从外部钱包发送",
   "send_name": "名称",
   "send_new": "新建",
-  "send_payjoin": "发送 Payjoin",
   "send_payment_id": "付款编号 (可选的)",
   "send_priority": "目前，费用设置为 ${transactionPriority} 优先.\n交易优先级可以在设置中进行调整",
   "send_sending": "正在发送...",
@@ -832,9 +762,7 @@
   "show_keys": "显示种子/密钥",
   "show_market_place": "显示市场",
   "show_seed": "显示种子",
-  "sign_all": "签署全部",
   "sign_message": "标志消息",
-  "sign_one": "签一个",
   "sign_up": "注册",
   "sign_verify_message": "签名或验证消息",
   "sign_verify_message_sub": "使用您的私钥签名或验证消息",
@@ -863,14 +791,11 @@
   "sort_by": "排序方式",
   "spend_key_private": "Spend 密钥 (私钥)",
   "spend_key_public": "Spend 密钥 (公钥)",
-  "starting_tor_proxy": "启动Tor代理",
   "status": "状态: ",
-  "step": "步",
   "string_default": "默认",
   "subaddress_title": "子地址列表",
   "subaddresses": "子地址",
   "submit_request": "提交请求",
-  "success": "成功",
   "successful": "成功的",
   "support_description_guides": "对常见问题的文档和支持",
   "support_description_live_chat": "免费快速！训练有素的支持代表可以协助",
@@ -878,7 +803,6 @@
   "support_title_guides": "蛋糕钱包文档",
   "support_title_live_chat": "实时支持",
   "support_title_other_links": "其他支持链接",
-  "supported": "支持",
   "swap": "交换",
   "sweeping_wallet": "扫一扫钱包",
   "sweeping_wallet_alert": "\n这应该不会花很长时间。请勿离开此屏幕，否则可能会丢失所掠取的资金",
@@ -898,7 +822,6 @@
   "sync_status_syncronizing": "正在同步",
   "sync_status_timed_out": "时间到",
   "sync_status_unsupported": "不支持的节点",
-  "synchronizing": "同步",
   "syncing_wallet_alert_content": "您的余额和交易列表可能不完整，直到顶部显示“已同步”。单击/点击以了解更多信息。",
   "syncing_wallet_alert_title": "您的钱包正在同步",
   "template": "模板",
@@ -911,18 +834,13 @@
   "thorchain_taproot_address_not_supported": "Thorchain提供商不支持Taproot地址。请更改地址或选择其他提供商。",
   "time": "${minutes}m ${seconds}s",
   "tip": "提示:",
-  "to": "到",
   "today": "今天",
-  "token_already_exists": "令牌已经存在",
   "token_contract_address": "代币合约地址",
   "token_decimal": "令牌十进制",
   "token_name": "代币名称例如：Tether",
   "token_symbol": "代币符号例如：USDT",
   "tokenID": "ID",
-  "ton_extra_info": "请不要忘记在发送TON交易时指定备忘录",
   "tor_connection": "Tor连接",
-  "tor_connection_timeout": "TOR连接超时",
-  "tor_experimental": "这是一个实验功能，并非所有由Cake Wallet Support Tor路由组成的连接 - 某些连接可能会使用Clearnet，以便完全路由App App App Appl使用VPN模式。",
   "tor_only": "仅限 Tor",
   "total": "全部的",
   "total_saving": "总储蓄",
@@ -983,10 +901,8 @@
   "transaction_sent_notice": "如果屏幕在 1 分钟后没有继续，请检查区块浏览器和您的电子邮件。",
   "transactions": "交易情况",
   "transactions_by_date": "按日期交易",
-  "transport_type": "运输类型",
   "trongrid_history": "Trongrid历史",
   "trusted": "值得信赖",
-  "try_again": "再试一次",
   "tx_commit_exception_no_dust_on_change": "交易被此金额拒绝。使用这些硬币，您可以发送${min}无需更改或返回${max}的变化。",
   "tx_commit_failed": "交易承诺失败。请联系支持。",
   "tx_commit_failed_no_peers": "交易无法广播，请在一秒钟左右的时间内重试",
@@ -1013,19 +929,15 @@
   "unspent_coins_details_title": "未使用代幣詳情",
   "unspent_coins_title": "未使用的硬幣",
   "unsupported_asset": "我们不支持针对该资产采取此操作。请创建或切换到支持的资产类型的钱包。",
-  "update_session": "更新会话",
   "uptime": "正常运行时间",
   "upto": "最高 ${value}",
   "usb": "USB",
   "use": "切换使用",
   "use_card_info_three": "在线使用电子卡或使用非接触式支付方式。",
   "use_card_info_two": "预付账户中的资金转换为美元，不是数字货币。",
-  "use_device_theme": "使用设备主题",
-  "use_payjoin": "使用 Payjoin",
   "use_ssl": "使用SSL",
   "use_suggested": "使用建议",
   "use_testnet": "使用TestNet",
-  "user_rejected_method": "用户拒绝方法",
   "value": "价值",
   "value_type": "值类型",
   "variable_pair_not_supported": "所选交易所不支持此变量对",
@@ -1052,7 +964,6 @@
   "wallet_group_description_view_seed": "您可以随时再次在下面查看此种子",
   "wallet_group_empty_state_text_one": "看起来您没有任何兼容的钱包组!\n\n tap",
   "wallet_group_empty_state_text_two": "下面是一个新的。",
-  "wallet_has_passphrase": "这个钱包有一个密码",
   "wallet_keys": "钱包种子/密钥",
   "wallet_list_create_new_wallet": "创建新钱包",
   "wallet_list_edit_group_name": "编辑组名称",
@@ -1077,11 +988,10 @@
   "walletConnect": "钱包连接",
   "wallets": "钱包",
   "warning": "警告",
-  "welcome": "欢迎",
+  "welcome": "欢迎使用",
   "welcome_subtitle_new_wallet": "如果您想开始新鲜，请点击下面的创建新钱包，您将参加比赛。",
   "welcome_subtitle_restore_wallet": "如果您有一个现有的钱包要把蛋糕带入蛋糕，只需选择还原现有的钱包，我们将带您完成整个过程。",
   "welcome_to_cakepay": "欢迎来到 Cake Pay！",
-  "what_is_payjoin": "什么是工资join?",
   "what_is_silent_payments": "什么是无声付款？",
   "widgets_address": "地址",
   "widgets_or": "或者",
@@ -1111,6 +1021,5 @@
   "you_will_get": "转换到",
   "you_will_receive_estimated_amount": "您将收到(估计的)",
   "you_will_send": "转换自",
-  "youCanGoBackToYourDapp": "您现在可以回到DAPP",
   "yy": "YY"
 }
\ No newline at end of file
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index 740364dd1..597c0aa9a 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="5.1.0"
-MONERO_COM_BUILD_NUMBER=127
+MONERO_COM_VERSION="1.20.3"
+MONERO_COM_BUILD_NUMBER=115
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.1.0"
-CAKEWALLET_BUILD_NUMBER=267
+CAKEWALLET_VERSION="4.23.4"
+CAKEWALLET_BUILD_NUMBER=249
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"
diff --git a/scripts/android/build_decred.sh b/scripts/android/build_decred.sh
index ce37a7353..d7b2fdb6b 100755
--- a/scripts/android/build_decred.sh
+++ b/scripts/android/build_decred.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 cd "$(dirname "$0")"
@@ -7,10 +7,10 @@ cd "$(dirname "$0")"
 CW_DECRED_DIR=$(realpath ../..)/cw_decred
 LIBWALLET_PATH="${PWD}/decred/libwallet"
 LIBWALLET_URL="https://github.com/decred/libwallet.git"
-LIBWALLET_VERSION="05f8d7374999400fe4d525eb365c39b77d307b14"
+LIBWALLET_VERSION="87b2769538db3065b334d247b25774593fc6443d"
 
-if [[ -e $LIBWALLET_PATH ]]; then
-    rm -fr $LIBWALLET_PATH || true
+if [ -e $LIBWALLET_PATH ]; then
+       rm -fr $LIBWALLET_PATH/{*,.*} || true
 fi
 mkdir -p $LIBWALLET_PATH || true
 
@@ -32,7 +32,7 @@ then
     echo "You have these versions installed on your system currently:"
     ls ${ANDROID_HOME}/ndk/ | cat | awk '{ print "- " $1 }'
     echo "echo > ~/.zprofile"
-    echo "echo 'export ANDROID_NDK_VERSION=..... > ~/.zprofile"
+    echo "echo 'export ANDROID_NDK_CERSION=..... > ~/.zprofile"
     exit 1
 fi
 
@@ -65,7 +65,7 @@ do
     esac
 
     # PATH="${TOOLCHAIN_BASE_DIR}_${arch}/bin:${ORIGINAL_PATH}"
-    if [[ -e ./build ]]; then
+    if [ -e ./build ]; then
         rm -fr ./build
     fi
 
diff --git a/scripts/android/build_mwebd.sh b/scripts/android/build_mwebd.sh
index 3e9c5199d..cd4e2c1f4 100755
--- a/scripts/android/build_mwebd.sh
+++ b/scripts/android/build_mwebd.sh
@@ -1,9 +1,9 @@
 if [[ "$1" == "--dont-install" ]]; then
   echo "Skipping Go installation as per --dont-install flag"
 else
-  # install go > 1.24:
-  wget https://go.dev/dl/go1.24.1.linux-amd64.tar.gz
-  sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz
+  # install go > 1.23:
+  wget https://go.dev/dl/go1.23.1.linux-amd64.tar.gz
+  sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.1.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
@@ -13,7 +13,7 @@ fi
 # build mwebd:
 git clone https://github.com/ltcmweb/mwebd
 cd mwebd
-git reset --hard f75cb9edef07d03360ee2d33e6edae4243a890b1
+git reset --hard 555349415f76a42ec5c76152b64c4ab9aabc448f
 gomobile bind -target=android -androidapi 21 .
 mkdir -p ../../../cw_mweb/android/libs/
 cp ./mwebd.aar $_
\ No newline at end of file
diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh
index e1105d96d..1c1579830 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="5.1.0"
-MONERO_COM_BUILD_NUMBER=127
+MONERO_COM_VERSION="1.20.3"
+MONERO_COM_BUILD_NUMBER=113
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.1.0"
-CAKEWALLET_BUILD_NUMBER=324
+CAKEWALLET_VERSION="4.23.4"
+CAKEWALLET_BUILD_NUMBER=302
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 
diff --git a/scripts/ios/app_icon.sh b/scripts/ios/app_icon.sh
index dcb168888..3914c3756 100755
--- a/scripts/ios/app_icon.sh
+++ b/scripts/ios/app_icon.sh
@@ -1,101 +1,28 @@
 #!/bin/sh
 
-ICON_2x_PATH=""
-ICON_2x_ipad_PATH=""
-ICON_3x_PATH=""
-ICON_20_2x_PATH=""
-ICON_20_2x_ipad_PATH=""
-ICON_20_3x_PATH=""
-ICON_20_ipad_PATH=""
-ICON_29_PATH=""
-ICON_29_2x_PATH=""
-ICON_29_2x_ipad_PATH=""
-ICON_29_3x_PATH=""
-ICON_29_3x_ipad_PATH=""
-ICON_29_ipad_PATH=""
-ICON_40_2x_PATH=""
-ICON_40_2x_ipad_PATH=""
-ICON_40_3x_PATH=""
-ICON_40_ipad_PATH=""
-ICON_60_2x_PATH=""
-ICON_60_3x_PATH=""
-ICON_83_2x_ipad_PATH=""
-ICON_marketing_PATH=""
-ICON_ipad_PATH=""
-
-ICON_DIRECTORY=""
-
+ICON_120_PATH=""
+ICON_180_PATH=""
+ICON_1024_PATH=""
 DEST_DIR_PATH=`pwd`/../../ios/Runner/Assets.xcassets/AppIcon.appiconset
 
 case $APP_IOS_TYPE in
 	"monero.com")
-    ICON_DIRECTORY=monero_ios_icons;;
+	ICON_120_PATH=`pwd`/../../assets/images/monero.com_icon_120.png
+	ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png
+	ICON_1024_PATH=`pwd`/../../assets/images/monero.com_icon_1024.png;;
 	"cakewallet")
-    ICON_DIRECTORY=cakewallet_ios_icons;;
+	ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
+    ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
+    ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
+    "haven")
+	ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png
+    ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png
+    ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;;
 esac
 
-ICON_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@2x.png
-ICON_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@2x~ipad.png
-ICON_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon@3x.png
-ICON_20_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@2x.png
-ICON_20_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@2x~ipad.png
-ICON_20_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20@3x.png
-ICON_20_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-20~ipad.png
-ICON_29_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29.png
-ICON_29_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@2x.png
-ICON_29_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@2x~ipad.png
-ICON_29_3x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29@3x.png
-ICON_29_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-29~ipad.png
-ICON_40_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@2x.png
-ICON_40_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@2x~ipad.png
-ICON_40_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40@3x.png
-ICON_40_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-40~ipad.png
-ICON_60_2x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-60@2x~car.png
-ICON_60_3x_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-60@3x~car.png
-ICON_83_2x_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon-83.5@2x~ipad.png
-ICON_marketing_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon~ios-marketing.png
-ICON_ipad_PATH=`pwd`/../../assets/images/ios_icons/$ICON_DIRECTORY/AppIcon~ipad.png
-
-rm $DEST_DIR_PATH/AppIcon@2x.png
-rm $DEST_DIR_PATH/AppIcon@2x~ipad.png
-rm $DEST_DIR_PATH/AppIcon@3x.png
-rm $DEST_DIR_PATH/AppIcon-20@2x.png
-rm $DEST_DIR_PATH/AppIcon-20@2x~ipad.png
-rm $DEST_DIR_PATH/AppIcon-20@3x.png
-rm $DEST_DIR_PATH/AppIcon-20~ipad.png
-rm $DEST_DIR_PATH/AppIcon-29.png
-rm $DEST_DIR_PATH/AppIcon-29@2x.png
-rm $DEST_DIR_PATH/AppIcon-29@2x~ipad.png
-rm $DEST_DIR_PATH/AppIcon-29@3x.png
-rm $DEST_DIR_PATH/AppIcon-29~ipad.png
-rm $DEST_DIR_PATH/AppIcon-40@2x.png
-rm $DEST_DIR_PATH/AppIcon-40@2x~ipad.png
-rm $DEST_DIR_PATH/AppIcon-40@3x.png
-rm $DEST_DIR_PATH/AppIcon-40~ipad.png
-rm $DEST_DIR_PATH/AppIcon-60@2x~car.png
-rm $DEST_DIR_PATH/AppIcon-60@3x~car.png
-rm $DEST_DIR_PATH/AppIcon-83.5@2x~ipad.png
-rm $DEST_DIR_PATH/AppIcon~ios-marketing.png
-rm $DEST_DIR_PATH/AppIcon~ipad.png
-
-ln -s $ICON_2x_PATH $DEST_DIR_PATH/AppIcon@2x.png
-ln -s $ICON_2x_ipad_PATH $DEST_DIR_PATH/AppIcon@2x~ipad.png
-ln -s $ICON_3x_PATH $DEST_DIR_PATH/AppIcon@3x.png
-ln -s $ICON_20_2x_PATH $DEST_DIR_PATH/AppIcon-20@2x.png
-ln -s $ICON_20_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-20@2x~ipad.png
-ln -s $ICON_20_3x_PATH $DEST_DIR_PATH/AppIcon-20@3x.png
-ln -s $ICON_20_ipad_PATH $DEST_DIR_PATH/AppIcon-20~ipad.png
-ln -s $ICON_29_PATH $DEST_DIR_PATH/AppIcon-29.png
-ln -s $ICON_29_2x_PATH $DEST_DIR_PATH/AppIcon-29@2x.png
-ln -s $ICON_29_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-29@2x~ipad.png
-ln -s $ICON_29_3x_ipad_PATH $DEST_DIR_PATH/AppIcon-29@3x.png
-ln -s $ICON_29_ipad_PATH $DEST_DIR_PATH/AppIcon-29~ipad.png
-ln -s $ICON_40_2x_PATH $DEST_DIR_PATH/AppIcon-40@2x.png
-ln -s $ICON_40_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-40@2x~ipad.png
-ln -s $ICON_40_3x_PATH $DEST_DIR_PATH/AppIcon-40@3x.png
-ln -s $ICON_40_ipad_PATH $DEST_DIR_PATH/AppIcon-40~ipad.png
-ln -s $ICON_60_2x_PATH $DEST_DIR_PATH/AppIcon-60@2x~car.png
-ln -s $ICON_60_3x_PATH $DEST_DIR_PATH/AppIcon-60@3x~car.png
-ln -s $ICON_83_2x_ipad_PATH $DEST_DIR_PATH/AppIcon-83.5@2x~ipad.png
-ln -s $ICON_marketing_PATH $DEST_DIR_PATH/AppIcon~ios-marketing.png
-ln -s $ICON_ipad_PATH $DEST_DIR_PATH/AppIcon~ipad.png
+rm $DEST_DIR_PATH/app_icon_120.png
+rm $DEST_DIR_PATH/app_icon_180.png
+rm $DEST_DIR_PATH/app_icon_1024.png
+ln -s $ICON_120_PATH $DEST_DIR_PATH/app_icon_120.png
+ln -s $ICON_180_PATH $DEST_DIR_PATH/app_icon_180.png
+ln -s $ICON_1024_PATH $DEST_DIR_PATH/app_icon_1024.png
\ No newline at end of file
diff --git a/scripts/ios/build_decred.sh b/scripts/ios/build_decred.sh
index 37384f4e1..e6b13d0da 100755
--- a/scripts/ios/build_decred.sh
+++ b/scripts/ios/build_decred.sh
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 . ./config.sh
 LIBWALLET_PATH="${EXTERNAL_IOS_SOURCE_DIR}/libwallet"
 LIBWALLET_URL="https://github.com/decred/libwallet.git"
-LIBWALLET_VERSION="05f8d7374999400fe4d525eb365c39b77d307b14"
+LIBWALLET_VERSION="87b2769538db3065b334d247b25774593fc6443d"
 
-if [[ -e $LIBWALLET_PATH ]]; then
-    rm -fr $LIBWALLET_PATH
+if [ -e $LIBWALLET_PATH ]; then
+       rm -fr $LIBWALLET_PATH
 fi
 mkdir -p $LIBWALLET_PATH
 git clone $LIBWALLET_URL $LIBWALLET_PATH
@@ -17,8 +17,8 @@ SYSROOT=`xcrun --sdk iphoneos --show-sdk-path`
 CLANG="clang -target arm64-apple-ios -isysroot ${SYSROOT}"
 CLANGXX="clang++ -target arm64-apple-ios -isysroot ${SYSROOT}"
 
-if [[ -e ./build ]]; then
-    rm -fr ./build
+if [ -e ./build ]; then
+       rm -fr ./build
 fi
 CGO_ENABLED=1 GOOS=ios GOARCH=arm64 CC=$CLANG CXX=$CLANGXX \
 go build -v -buildmode=c-archive -o ./build/libdcrwallet.a ./cgo || exit 1
diff --git a/scripts/ios/build_mwebd.sh b/scripts/ios/build_mwebd.sh
index 456d43bb8..5bdd32e15 100755
--- a/scripts/ios/build_mwebd.sh
+++ b/scripts/ios/build_mwebd.sh
@@ -2,7 +2,7 @@
 if [[ "$1" == "--dont-install" ]]; then
   echo "Skipping Go installation as per --dont-install flag"
 else
-  # install go > 1.24:
+  # install go > 1.23:
   brew install go
   export PATH=$PATH:~/go/bin
   go install golang.org/x/mobile/cmd/gomobile@latest
@@ -12,7 +12,7 @@ fi
 # build mwebd:
 git clone https://github.com/ltcmweb/mwebd
 cd mwebd
-git reset --hard f75cb9edef07d03360ee2d33e6edae4243a890b1
+git reset --hard 555349415f76a42ec5c76152b64c4ab9aabc448f
 gomobile bind -target=ios .
 mv -fn ./Mwebd.xcframework ../../../cw_mweb/ios/
 # cleanup:
diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh
index e85cd8238..ef1747ba6 100755
--- a/scripts/linux/app_env.sh
+++ b/scripts/linux/app_env.sh
@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.1.0"
-CAKEWALLET_BUILD_NUMBER=58
+CAKEWALLET_VERSION="1.13.4"
+CAKEWALLET_BUILD_NUMBER=49
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
     echo "Wrong app type."
diff --git a/scripts/linux/build_cake_release.sh b/scripts/linux/build_cake_release.sh
deleted file mode 100755
index 16f228d2e..000000000
--- a/scripts/linux/build_cake_release.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# build_cake_release.sh - Script to build Cake Wallet for Linux
-# Usage: ./build_cake_release.sh --amd64 [--arm64] [--app=cakewallet|monero.com]
-
-set -e
-
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd "$SCRIPT_DIR"
-
-
-# Default values
-BUILD_AMD64=false
-BUILD_ARM64=false
-APP_TYPE="cakewallet"
-DOCKER_IMAGE="ghcr.io/cake-tech/cake_wallet:debian12-flutter3.27.0-go1.24.1-ruststablenightly"
-
-# Parse arguments
-for arg in "$@"
-do
-    case $arg in
-        --amd64)
-        BUILD_AMD64=true
-        shift
-        ;;
-        --arm64)
-        BUILD_ARM64=true
-        shift
-        ;;
-        --app=*)
-        APP_TYPE="${arg#*=}"
-        shift
-        ;;
-        *)
-        echo "Unknown argument: $arg"
-        echo "Usage: ./build_cake_release.sh --amd64 [--arm64] [--app=cakewallet|monero.com]"
-        exit 1
-        ;;
-    esac
-done
-
-cd ../..
-
-# Validate arguments
-if [[ "$BUILD_AMD64" == "false" && "$BUILD_ARM64" == "false" ]]; then
-    echo "Error: At least one architecture (--amd64 or --arm64) must be specified."
-    echo "Usage: ./build_cake_release.sh --amd64 [--arm64] [--app=cakewallet|monero.com]"
-    exit 1
-fi
-
-if [[ "$APP_TYPE" != "cakewallet" && "$APP_TYPE" != "monero.com" ]]; then
-    echo "Error: App type must be either 'cakewallet' or 'monero.com'"
-    echo "Usage: ./build_cake_release.sh --amd64 [--arm64] [--app=cakewallet|monero.com]"
-    exit 1
-fi
-
-# Function to build for a specific architecture
-build_for_arch() {
-    local arch=$1
-    local flutter_arch=$2
-    echo "Building $APP_TYPE for Linux ($arch)"
-    
-    docker run --privileged -v$(pwd):$(pwd) -w $(pwd) -i --rm --platform linux/$arch $DOCKER_IMAGE bash -x << EOF
-set -x -e
-pushd scripts
-    ./gen_android_manifest.sh
-popd
-pushd scripts/linux
-    source ./app_env.sh $APP_TYPE
-    ./app_config.sh
-    ./build_monero_all.sh
-popd
-flutter clean
-./model_generator.sh
-dart run tool/generate_localization.dart
-flutter build linux
-rm -rf build/linux/current
-cp -r build/linux/$flutter_arch build/linux/current
-rm -rf .flatpak-builder
-flatpak-builder --force-clean flatpak-build com.cakewallet.CakeWallet.yml
-flatpak build-export export flatpak-build
-flatpak build-bundle export build/linux/current/cake_wallet.flatpak com.cakewallet.CakeWallet
-cp build/linux/current/cake_wallet.flatpak build/linux/$flutter_arch/
-EOF
-}
-
-# Build for specified architectures
-echo "Building $APP_TYPE for Linux"
-if [[ "$BUILD_AMD64" == "true" ]]; then
-    build_for_arch "amd64" "x64"
-fi
-
-if [[ "$BUILD_ARM64" == "true" ]]; then
-    build_for_arch "arm64" "arm64"
-fi
-
-echo "Build process completed."
diff --git a/scripts/linux/build_monero_all.sh b/scripts/linux/build_monero_all.sh
index 6c901052f..7948d87a1 100755
--- a/scripts/linux/build_monero_all.sh
+++ b/scripts/linux/build_monero_all.sh
@@ -10,19 +10,15 @@ cd "$(dirname "$0")"
 for COIN in monero wownero;
 do
     pushd ../monero_c
-        # Determine target architecture based on system architecture
-        if [[ $(uname -m) == "arm64" || $(uname -m) == "aarch64" ]]; then
-            target="aarch64-linux-gnu"
-        else
-            target="x86_64-linux-gnu"
-        fi
-        
-        if [[ -f "release/${COIN}/${target}_libwallet2_api_c.so" ]];
-        then
-            echo "file exist, not building monero_c for ${COIN}/$target.";
-        else
-            ./build_single.sh ${COIN} $target -j$MAKE_JOB_COUNT
-            unxz -f ../monero_c/release/${COIN}/${target}_libwallet2_api_c.so.xz
-        fi
+        for target in x86_64-linux-gnu # aarch64-linux-gnu
+        do
+            if [[ -f "release/${COIN}/${target}_libwallet2_api_c.so" ]];
+            then
+                echo "file exist, not building monero_c for ${COIN}/$target.";
+            else
+                ./build_single.sh ${COIN} $target -j$MAKE_JOB_COUNT
+                unxz -f ../monero_c/release/${COIN}/${target}_libwallet2_api_c.so.xz
+            fi
+        done
     popd
 done
\ No newline at end of file
diff --git a/scripts/macos/app_config.sh b/scripts/macos/app_config.sh
index 641a7b46b..c10116136 100755
--- a/scripts/macos/app_config.sh
+++ b/scripts/macos/app_config.sh
@@ -36,7 +36,7 @@ case $APP_MACOS_TYPE in
         $MONERO_COM)
 		CONFIG_ARGS="--monero";;
         $CAKEWALLET)
-		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron --wownero";;
+		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron --wownero --decred";;
 esac
 
 cp -rf pubspec_description.yaml pubspec.yaml
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index 29c7f0291..7410ee3a3 100755
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
 fi
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="5.1.0"
-MONERO_COM_BUILD_NUMBER=56
+MONERO_COM_VERSION="1.10.3"
+MONERO_COM_BUILD_NUMBER=45
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="5.1.0"
-CAKEWALLET_BUILD_NUMBER=119
+CAKEWALLET_VERSION="1.16.4"
+CAKEWALLET_BUILD_NUMBER=107
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
diff --git a/scripts/macos/build_decred.sh b/scripts/macos/build_decred.sh
index b1bbfbc43..d4b7d4d65 100755
--- a/scripts/macos/build_decred.sh
+++ b/scripts/macos/build_decred.sh
@@ -4,7 +4,7 @@
 
 LIBWALLET_PATH="${EXTERNAL_MACOS_SOURCE_DIR}/libwallet"
 LIBWALLET_URL="https://github.com/decred/libwallet.git"
-LIBWALLET_VERSION="05f8d7374999400fe4d525eb365c39b77d307b14"
+LIBWALLET_VERSION="87b2769538db3065b334d247b25774593fc6443d"
 
 echo "======================= DECRED LIBWALLET ========================="
 
diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh
index ef29d360f..133c0ab2f 100755
--- a/scripts/prepare_moneroc.sh
+++ b/scripts/prepare_moneroc.sh
@@ -8,7 +8,7 @@ if [[ ! -d "monero_c/.git" ]];
 then
     git clone https://github.com/mrcyjanek/monero_c --branch master monero_c
     cd monero_c
-    git checkout a27fbcb24d91143715ed930a05aaa4d853fba1f2
+    git checkout 84e52393e395d75f449bcd81e23028889538118f
     git reset --hard
     git submodule update --init --force --recursive
     ./apply_patches.sh monero
diff --git a/scripts/windows/Dockerfile.windows b/scripts/windows/Dockerfile.windows
index a534be5e4..893009b8f 100644
--- a/scripts/windows/Dockerfile.windows
+++ b/scripts/windows/Dockerfile.windows
@@ -4,7 +4,7 @@
 
 FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
-ENV FLUTTER_VERSION=3.27.0
+ENV FLUTTER_VERSION=3.27.4
 ENV GIT_VERSION=2.47.1
 ENV VS_INSTALLED_DIR="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools"
 ENV PATH="C:\Users\ContainerAdministrator\.cargo\bin;C:\ProgramData\chocolatey\bin;C:\flutter\flutter\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps"
diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss
index 4ea9d1153..211017eff 100644
--- a/scripts/windows/build_exe_installer.iss
+++ b/scripts/windows/build_exe_installer.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Cake Wallet"
-#define MyAppVersion "5.1.0"
+#define MyAppVersion "0.4.4"
 #define MyAppPublisher "Cake Labs LLC"
 #define MyAppURL "https://cakewallet.com/"
 #define MyAppExeName "CakeWallet.exe"
diff --git a/test/core/address_validator_test.dart b/test/core/address_validator_test.dart
deleted file mode 100644
index 08dd5a9e2..000000000
--- a/test/core/address_validator_test.dart
+++ /dev/null
@@ -1,178 +0,0 @@
-import 'package:cake_wallet/core/address_validator.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
-  group('AddressValidator', () {
-    setUpAll(() {
-      S.current = S();
-    });
-    group('getPattern', () {
-      test('returns correct pattern for Bitcoin', () {
-        final pattern = AddressValidator.getPattern(CryptoCurrency.btc);
-        expect(pattern, isNotEmpty);
-        expect(pattern, contains('(bc|tb)1q'));
-      });
-
-      test('returns correct pattern for Ethereum', () {
-        final pattern = AddressValidator.getPattern(CryptoCurrency.eth);
-        expect(pattern, isNotEmpty);
-        expect(pattern, contains('0x[0-9a-zA-Z]+'));
-      });
-
-      test('returns correct pattern for Monero', () {
-        final pattern = AddressValidator.getPattern(CryptoCurrency.xmr);
-        expect(pattern, isNotEmpty);
-        expect(pattern,
-            contains('4[0-9a-zA-Z]{94}|8[0-9a-zA-Z]{94}|[0-9a-zA-Z]{106}'));
-      });
-
-      test('returns correct pattern for Litecoin', () {
-        final pattern = AddressValidator.getPattern(CryptoCurrency.ltc);
-        expect(pattern, isNotEmpty);
-        expect(
-            pattern,
-            contains(
-                '(bc|tb|ltc)1q[ac-hj-np-z02-9]{25,39}|(ltc|t)mweb1q[ac-hj-np-z02-9]{90,120}'));
-      });
-
-      test('returns empty string for unknown currency', () {
-        final pattern = AddressValidator.getPattern(CryptoCurrency.btcln);
-        expect(pattern, isNotEmpty);
-      });
-    });
-
-    group('getLength', () {
-      test('returns correct length for Bitcoin', () {
-        final length = AddressValidator.getLength(CryptoCurrency.btc);
-        expect(length, isNull);
-      });
-
-      test('returns correct length for Ethereum', () {
-        final length = AddressValidator.getLength(CryptoCurrency.eth);
-        expect(length, equals([42]));
-      });
-
-      test('returns correct length for Monero', () {
-        final length = AddressValidator.getLength(CryptoCurrency.xmr);
-        expect(length, isNull);
-      });
-
-      test('returns correct length for Dash', () {
-        final length = AddressValidator.getLength(CryptoCurrency.dash);
-        expect(length, equals([34]));
-      });
-    });
-
-    group('getAddressFromStringPattern', () {
-      test('returns correct pattern for Bitcoin', () {
-        final pattern =
-            AddressValidator.getAddressFromStringPattern(CryptoCurrency.btc);
-        expect(pattern, isNotNull);
-        expect(pattern, contains('(bc|tb)1q'));
-      });
-
-      test('returns correct pattern for Ethereum', () {
-        final pattern =
-            AddressValidator.getAddressFromStringPattern(CryptoCurrency.eth);
-        expect(pattern, isNotNull);
-        expect(pattern, contains('0x[0-9a-zA-Z]+'));
-      });
-
-      test('returns correct pattern for Monero', () {
-        final pattern =
-            AddressValidator.getAddressFromStringPattern(CryptoCurrency.xmr);
-        expect(pattern, isNotNull);
-        expect(pattern, contains('(4[0-9a-zA-Z]{94})'));
-      });
-
-      test('returns null for unsupported currency', () {
-        final pattern =
-            AddressValidator.getAddressFromStringPattern(CryptoCurrency.dash);
-        expect(pattern, isNull);
-      });
-    });
-    // 0.000058158099999999995 BTC
-    group('validation', () {
-      test('validates valid Bitcoin address', () {
-        final validator = AddressValidator(type: CryptoCurrency.btc);
-        expect(validator.isValid('bc1qhg4l43pmq5v5atmtlr7gnwyuxs043cvrut5hkq'),
-            isTrue);
-        expect(validator.isValid('3AD1Btx1MzYGmdpNpeujCfuvU5SsU2LX88'), isTrue);
-        expect(validator.isValid('1HARAhFcvz8ZQp5MhnLFeUynC4bkha3Hv8'), isTrue);
-      });
-
-      test('rejects invalid Bitcoin address', () {
-        final validator = AddressValidator(type: CryptoCurrency.btc);
-        expect(validator.isValid('invalid_address'), isFalse);
-        expect(validator.isValid('bc1qhg4l43pmq5v5atmtlr7gnwyuxs043CakeWallet'),
-            isFalse);
-      });
-
-      test('validates valid Ethereum address', () {
-        final validator = AddressValidator(type: CryptoCurrency.eth);
-        expect(validator.isValid('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-            isTrue); // WETH contract
-      });
-
-      test('rejects invalid Ethereum address', () {
-        final validator = AddressValidator(type: CryptoCurrency.eth);
-        expect(validator.isValid('invalid_address'), isFalse);
-        expect(validator.isValid('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc'),
-            isFalse); // Too short
-        expect(validator.isValid('C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
-            isFalse); // Missing 0x prefix
-      });
-
-      test('validates valid Monero address', () {
-        final validator = AddressValidator(type: CryptoCurrency.xmr);
-        expect(
-            validator.isValid(
-                '85s6zfxGAkdCN21h566R8EFDSfThxCrFiEkhw3JEtaXN2DDfahABLXTjRj385Ro7om5saGWJG7iuE6EyW5MYcoz93DLvNqh'),
-            isTrue);
-      });
-
-      test('rejects invalid Monero address', () {
-        final validator = AddressValidator(type: CryptoCurrency.xmr);
-        expect(validator.isValid('invalid_address'), isFalse);
-        expect(
-            validator.isValid(
-                '85s6zfxGAkdCN21h566R8EFDSfThxCrFiEkhw3JEtaXN2DDfahABLXTjRj385Ro7om5saGWJG7iuE6EyW5MYcoz93DLvNq'),
-            isFalse); // Too short
-      });
-
-      test('validates valid Litecoin address', () {
-        final validator = AddressValidator(type: CryptoCurrency.ltc);
-        expect(validator.isValid('ltc1qzvxlvlk8wsmue0np20eh3d3qxsusx9jstf8qw8'),
-            isTrue);
-        expect(
-            validator.isValid(
-                'ltcmweb1qqt9hqch2d0vfdsvt4tf27gullem2tcd57xxrvta9xwvfmwdkn4927q6d8sq6ftw7lkqdkr5g36eqn7w06edgq8tz7gy0nv5d4lhajctkzuath23a'),
-            isTrue);
-      });
-
-      test('rejects invalid Litecoin address', () {
-        final validator = AddressValidator(type: CryptoCurrency.ltc);
-        expect(validator.isValid('invalid_address'), isFalse);
-        expect(
-            validator.isValid('ltc1qzvxlvlk8wsmue0np20eh3d3qxsusxCakeWallet'),
-            isFalse);
-      });
-    });
-
-    group('silentPaymentAddressPattern', () {
-      test('returns a non-empty pattern', () {
-        final pattern = AddressValidator.silentPaymentAddressPattern;
-        expect(pattern, isNotEmpty);
-      });
-    });
-
-    group('mWebAddressPattern', () {
-      test('returns a non-empty pattern', () {
-        final pattern = AddressValidator.mWebAddressPattern;
-        expect(pattern, isNotEmpty);
-      });
-    });
-  });
-}
diff --git a/test/entities/parse_address_from_domain_test.dart b/test/entities/parse_address_from_domain_test.dart
deleted file mode 100644
index 4ed7c8b5f..000000000
--- a/test/entities/parse_address_from_domain_test.dart
+++ /dev/null
@@ -1,187 +0,0 @@
-import 'package:cake_wallet/entities/parse_address_from_domain.dart';
-import 'package:cw_core/crypto_currency.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
-  group('AddressResolver', () {
-    // late MockYatService mockYatService;
-    // late MockWalletBase mockWallet;
-    // late MockSettingsStore mockSettingsStore;
-    // late MockBuildContext mockContext;
-    // late AddressResolver addressResolver;
-    //
-    // setUp(() {
-    //   mockYatService = MockYatService();
-    //   mockWallet = MockWalletBase();
-    //   mockSettingsStore = MockSettingsStore();
-    //   mockContext = MockBuildContext();
-    //
-    //   when(mockWallet.type).thenReturn(WalletType.bitcoin);
-    //   when(mockWallet.currency).thenReturn(CryptoCurrency.btc);
-    //
-    //   addressResolver = AddressResolver(
-    //     yatService: mockYatService,
-    //     wallet: mockWallet,
-    //     settingsStore: mockSettingsStore,
-    //   );
-    // });
-
-    group('extractAddressByType', () {
-      test('extracts Bitcoin address correctly', () {
-        final raw =
-            'My Bitcoin address is bc1qhg4l43pmq5v5atmtlr7gnwyuxs043cvrut5hkq please use it';
-        final result = AddressResolver.extractAddressByType(
-          raw: raw,
-          type: CryptoCurrency.btc,
-        );
-        expect(result, 'bc1qhg4l43pmq5v5atmtlr7gnwyuxs043cvrut5hkq');
-      });
-
-      test('extracts Ethereum address correctly', () {
-        final raw =
-            'Send ETH to 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2 thanks';
-        final result = AddressResolver.extractAddressByType(
-          raw: raw,
-          type: CryptoCurrency.eth,
-        );
-        expect(result, '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2');
-      });
-
-      test('extracts Monero address correctly', () {
-        final raw =
-            'XMR: 85s6zfxGAkdCN21h566R8EFDSfThxCrFiEkhw3JEtaXN2DDfahABLXTjRj385Ro7om5saGWJG7iuE6EyW5MYcoz93DLvNqh';
-        final result = AddressResolver.extractAddressByType(
-          raw: raw,
-          type: CryptoCurrency.xmr,
-        );
-        expect(result,
-            '85s6zfxGAkdCN21h566R8EFDSfThxCrFiEkhw3JEtaXN2DDfahABLXTjRj385Ro7om5saGWJG7iuE6EyW5MYcoz93DLvNqh');
-      });
-
-      test('extracts Bitcoin Cash address correctly', () {
-        final raw =
-            'BCH: bitcoincash:qr2z7dusk64qnq97azhg0u0hlf7qgwwfzyj92jgmqj';
-        final result = AddressResolver.extractAddressByType(
-          raw: raw,
-          type: CryptoCurrency.bch,
-        );
-        expect(
-            result, 'bitcoincash:qr2z7dusk64qnq97azhg0u0hlf7qgwwfzyj92jgmqj');
-      });
-
-      test('extracts Nano address correctly', () {
-        final raw =
-            'NANO: nano_1natrium1o3z5519ifou7xii8crpxpk8y65qmkih8e8bpsjri651oza8imdd';
-        final result = AddressResolver.extractAddressByType(
-          raw: raw,
-          type: CryptoCurrency.nano,
-        );
-        expect(result,
-            'nano_1natrium1o3z5519ifou7xii8crpxpk8y65qmkih8e8bpsjri651oza8imdd');
-      });
-
-      test('returns null for unsupported currency', () {
-        final raw = 'Some text without an address';
-        expect(
-            () => AddressResolver.extractAddressByType(
-                  raw: raw,
-                  type: CryptoCurrency.btc,
-                ),
-            returnsNormally);
-
-        final result = AddressResolver.extractAddressByType(
-          raw: raw,
-          type: CryptoCurrency.btc,
-        );
-        expect(result, isNull);
-      });
-
-      test('extracts monero address from URI', () {
-        final raw =
-            'monero_wallet:467iotZU5tvG26k2xdZWkJ7gwATFVhfbuV3yDoWx5jHoPwxEi4f5BuJQwkP6GpCb1sZvUVB7nbSkgEuW8NKrh9KKRRga5qz?spend_key=029c559cd7669f14e91fd835144916009f8697ab5ac5c7f7c06e1ff869c17b0b&view_key=afaf646edbff3d3bcee8efd3383ffe5d20c947040f74e1110b70ca0fbb0ef90d';
-        final result = AddressResolver.extractAddressByType(
-            raw: raw,
-            type: CryptoCurrency.xmr,
-            requireSurroundingWhitespaces: false);
-        expect(result,
-            '467iotZU5tvG26k2xdZWkJ7gwATFVhfbuV3yDoWx5jHoPwxEi4f5BuJQwkP6GpCb1sZvUVB7nbSkgEuW8NKrh9KKRRga5qz');
-      });
-
-      test('extracts monero address from Tweet', () {
-        final raw = '''
-#XMR
-89bH6i3ftaWSWuPJJYSQuuApWJ8xzinCEbbnAXN1Z3mGGUuAFdpBUg82R9MvJDSheJ6kW2dyMQEFUGM4tsZqRb2Q75UXqvc
-
-#BTC Silent Payments 
-sp1qq0avpawwjg4l66p6lqafj0vlvm6rlhdc6qt0r6dfual835vhs3gvkq63pechaqezvn7j7uj2jucwj5k7nenpw2r86wf42xv6wqdvxuk5rggrul45
-
-#LTC MWEB
-ltcmweb1qq0at62jjucmawxp78qutn0cqwkwahcfx7fxls0r2ma5llg5w6wyy2qe20gxa3rku2658j88zg9d2j4ttpw35k0a5nrg93h5nq3wyvkcgwc3q4dgc
-        ''';
-        final resultXmr = AddressResolver.extractAddressByType(
-            raw: raw, type: CryptoCurrency.xmr);
-        expect(resultXmr,
-            '89bH6i3ftaWSWuPJJYSQuuApWJ8xzinCEbbnAXN1Z3mGGUuAFdpBUg82R9MvJDSheJ6kW2dyMQEFUGM4tsZqRb2Q75UXqvc');
-        final resultBtc = AddressResolver.extractAddressByType(
-            raw: raw, type: CryptoCurrency.btc);
-        expect(resultBtc,
-            'sp1qq0avpawwjg4l66p6lqafj0vlvm6rlhdc6qt0r6dfual835vhs3gvkq63pechaqezvn7j7uj2jucwj5k7nenpw2r86wf42xv6wqdvxuk5rggrul45');
-        final resultLtc = AddressResolver.extractAddressByType(
-            raw: raw, type: CryptoCurrency.ltc);
-        expect(resultLtc,
-            'ltcmweb1qq0at62jjucmawxp78qutn0cqwkwahcfx7fxls0r2ma5llg5w6wyy2qe20gxa3rku2658j88zg9d2j4ttpw35k0a5nrg93h5nq3wyvkcgwc3q4dgc');
-      });
-
-      // test('throws exception for unexpected token', () {
-      //   // Create a custom crypto currency that won't have a pattern
-      //   final customCurrency = CryptoCurrency('CUSTOM', 'Custom');
-      //   expect(() => AddressResolver.extractAddressByType(
-      //     raw: 'Some text',
-      //     type: customCurrency,
-      //   ), throwsException);
-      // });
-    });
-    //
-    // group('isEmailFormat', () {
-    //   test('returns true for valid email format', () {
-    //     expect(addressResolver.isEmailFormat('user@example.com'), isTrue);
-    //     expect(addressResolver.isEmailFormat('name.surname@domain.co.uk'), isTrue);
-    //     expect(addressResolver.isEmailFormat('user123@subdomain.example.org'), isTrue);
-    //   });
-    //
-    //   test('returns false for invalid email format', () {
-    //     expect(addressResolver.isEmailFormat('user@'), isFalse);
-    //     expect(addressResolver.isEmailFormat('@domain.com'), isFalse);
-    //     expect(addressResolver.isEmailFormat('user@domain'), isFalse);
-    //     expect(addressResolver.isEmailFormat('user.domain.com'), isFalse);
-    //     expect(addressResolver.isEmailFormat('user@domain@com'), isFalse);
-    //     expect(addressResolver.isEmailFormat('bc1qhg4l43pmq5v5atmtlr7gnwyuxs043cvrut5hkq'), isFalse);
-    //   });
-    // });
-    //
-    // group('resolve', () {
-    //   test('returns ParsedAddress with original text when no resolution is possible', () async {
-    //     final text = 'bc1qhg4l43pmq5v5atmtlr7gnwyuxs043cvrut5hkq';
-    //     final result = await addressResolver.resolve(mockContext, text, CryptoCurrency.btc);
-    //
-    //     expect(result, isA<ParsedAddress>());
-    //     expect(result.addresses, [text]);
-    //   });
-    //
-    //   // Note: More comprehensive tests for the resolve method would require
-    //   // mocking all the external services and APIs that the method calls.
-    //   // This would be quite extensive and would require setting up mock
-    //   // responses for each type of address resolution.
-    // });
-
-    group('unstoppableDomains', () {
-      test('contains expected TLDs', () {
-        expect(AddressResolver.unstoppableDomains, contains('crypto'));
-        expect(AddressResolver.unstoppableDomains, contains('eth'));
-        expect(AddressResolver.unstoppableDomains, contains('bitcoin'));
-        expect(AddressResolver.unstoppableDomains, contains('x'));
-        expect(AddressResolver.unstoppableDomains, contains('wallet'));
-      });
-    });
-  });
-}
diff --git a/tool/append_translation.dart b/tool/append_translation.dart
index 7232f308b..8ef646502 100644
--- a/tool/append_translation.dart
+++ b/tool/append_translation.dart
@@ -1,4 +1,5 @@
-import 'print_verbose_dummy.dart';
+import 'package:cw_core/utils/print_verbose.dart';
+
 import 'utils/translation/arb_file_utils.dart';
 import 'utils/translation/translation_constants.dart';
 import 'utils/translation/translation_utils.dart';
diff --git a/tool/configure.dart b/tool/configure.dart
index f6e1496de..63ed2de84 100644
--- a/tool/configure.dart
+++ b/tool/configure.dart
@@ -87,7 +87,6 @@ import 'package:cake_wallet/view_model/hardware_wallet/ledger_view_model.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:cw_core/hardware/hardware_account_data.dart';
 import 'package:cw_core/node.dart';
-import 'package:cw_core/payjoin_session.dart';
 import 'package:cw_core/output_info.dart';
 import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/receive_page_option.dart';
@@ -119,12 +118,10 @@ import 'package:cw_bitcoin/electrum_wallet.dart';
 import 'package:cw_bitcoin/bitcoin_unspent.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
-import 'package:cw_bitcoin/bitcoin_wallet.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_service.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_creation_credentials.dart';
 import 'package:cw_bitcoin/bitcoin_amount_format.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
-import 'package:cw_bitcoin/bitcoin_wallet_addresses.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
 import 'package:cw_bitcoin/litecoin_wallet_service.dart';
 import 'package:cw_bitcoin/litecoin_wallet.dart';
@@ -174,7 +171,7 @@ abstract class Bitcoin {
   int getFeeRate(Object wallet, TransactionPriority priority);
   Future<void> generateNewAddress(Object wallet, String label);
   Future<void> updateAddress(Object wallet,String address, String label);
-  Object createBitcoinTransactionCredentials(List<Output> outputs, {required TransactionPriority priority, int? feeRate, UnspentCoinType coinTypeToSpendFrom = UnspentCoinType.any, String? payjoinUri});
+  Object createBitcoinTransactionCredentials(List<Output> outputs, {required TransactionPriority priority, int? feeRate, UnspentCoinType coinTypeToSpendFrom = UnspentCoinType.any});
 
   String getAddress(Object wallet);
   List<ElectrumSubAddress> getSilentPaymentAddresses(Object wallet);
@@ -192,7 +189,7 @@ abstract class Bitcoin {
   List<Unspent> getUnspents(Object wallet, {UnspentCoinType coinTypeToSpendFrom = UnspentCoinType.any});
   Future<void> updateUnspents(Object wallet);
   WalletService createBitcoinWalletService(
-      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, Box<PayjoinSession> payjoinSessionSource, bool alwaysScan, bool isDirect);
+  Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool alwaysScan, bool isDirect);
   WalletService createLitecoinWalletService(Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool alwaysScan, bool isDirect);
   TransactionPriority getBitcoinTransactionPriorityMedium();
   TransactionPriority getBitcoinTransactionPriorityCustom();
@@ -209,7 +206,6 @@ abstract class Bitcoin {
   List<ReceivePageOption> getBitcoinReceivePageOptions();
   List<ReceivePageOption> getLitecoinReceivePageOptions();
   BitcoinAddressType getBitcoinAddressType(ReceivePageOption option);
-  bool isPayjoinAvailable(Object wallet);
   bool hasSelectedSilentPayments(Object wallet);
   bool isBitcoinReceivePageOption(ReceivePageOption option);
   BitcoinAddressType getOptionToType(ReceivePageOption option);
@@ -244,11 +240,6 @@ abstract class Bitcoin {
   bool getMwebEnabled(Object wallet);
   String? getUnusedMwebAddress(Object wallet);
   String? getUnusedSegwitAddress(Object wallet);
-
-  void updatePayjoinState(Object wallet, bool state);
-  String getPayjoinEndpoint(Object wallet);
-  void resumePayjoinSessions(Object wallet);
-  void stopPayjoinSessions(Object wallet);
 }
   """;
 
@@ -415,7 +406,7 @@ abstract class Monero {
     required int height});
   WalletCredentials createMoneroRestoreWalletFromSeedCredentials({required String name, required String password, required String passphrase, required int height, required String mnemonic});
   WalletCredentials createMoneroRestoreWalletFromHardwareCredentials({required String name, required String password, required int height, required ledger.LedgerConnection ledgerConnection});
-WalletCredentials createMoneroNewWalletCredentials({required String name, required String language, required int seedType, required String? passphrase, String? password, String? mnemonic});
+  WalletCredentials createMoneroNewWalletCredentials({required String name, required String language, required bool isPolyseed, required String? passphrase, String? password});
   Map<String, String> getKeys(Object wallet);
   int? getRestoreHeight(Object wallet);
   Object createMoneroTransactionCreationCredentials({required List<Output> outputs, required TransactionPriority priority});
@@ -434,8 +425,6 @@ WalletCredentials createMoneroNewWalletCredentials({required String name, requir
   void setLedgerConnection(Object wallet, ledger.LedgerConnection connection);
   void resetLedgerConnection();
   void setGlobalLedgerConnection(ledger.LedgerConnection connection);
-  String? getLastLedgerCommand();
-  Map<String, List<int>> debugCallLength();
 }
 
 abstract class MoneroSubaddressList {
@@ -621,7 +610,6 @@ abstract class Wownero {
   WalletService createWowneroWalletService(Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource);
   Map<String, String> pendingTransactionInfo(Object transaction);
   String getLegacySeed(Object wallet, String langName);
-  Map<String, List<int>> debugCallLength();
 }
 
 abstract class WowneroSubaddressList {
@@ -670,7 +658,6 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/erc20_token.dart';
 import 'package:cw_core/hardware/hardware_account_data.dart';
 import 'package:cw_core/output_info.dart';
-import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -698,7 +685,6 @@ import 'package:cw_ethereum/ethereum_client.dart';
 import 'package:cw_ethereum/ethereum_wallet.dart';
 import 'package:cw_ethereum/ethereum_wallet_service.dart';
 import 'package:cw_ethereum/default_ethereum_erc20_tokens.dart';
-import 'package:cw_ethereum/deuro/deuro_savings.dart';
 
 import 'package:eth_sig_util/util/utils.dart';
 
@@ -746,21 +732,10 @@ abstract class Ethereum {
   void updateEtherscanUsageState(WalletBase wallet, bool isEnabled);
   Web3Client? getWeb3Client(WalletBase wallet);
   String getTokenAddress(CryptoCurrency asset);
-
-  Future<PendingTransaction> createTokenApproval(WalletBase wallet, BigInt amount, String spender, CryptoCurrency token, TransactionPriority priority);
-
-  Future<BigInt> getDEuroSavingsBalance(WalletBase wallet);
-  Future<BigInt> getDEuroAccruedInterest(WalletBase wallet);
-  Future<BigInt> getDEuroInterestRate(WalletBase wallet);
-  Future<BigInt> getDEuroSavingsApproved(WalletBase wallet);
-  Future<PendingTransaction> addDEuroSaving(WalletBase wallet, BigInt amount, TransactionPriority priority);
-  Future<PendingTransaction> removeDEuroSaving(WalletBase wallet, BigInt amount, TransactionPriority priority);
-  Future<PendingTransaction> enableDEuroSaving(WalletBase wallet, TransactionPriority priority);
   
   void setLedgerConnection(WalletBase wallet, ledger.LedgerConnection connection);
   Future<List<HardwareAccountData>> getHardwareWalletAccounts(LedgerViewModel ledgerVM, {int index = 0, int limit = 5});
   List<String> getDefaultTokenContractAddresses();
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress);
 }
   """;
 
@@ -790,7 +765,6 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/erc20_token.dart';
 import 'package:cw_core/hardware/hardware_account_data.dart';
 import 'package:cw_core/output_info.dart';
-import 'package:cw_core/pending_transaction.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -860,8 +834,6 @@ abstract class Polygon {
   Future<void> deleteErc20Token(WalletBase wallet, CryptoCurrency token);
   Future<void> removeTokenTransactionsInHistory(WalletBase wallet, CryptoCurrency token);
   Future<Erc20Token?> getErc20Token(WalletBase wallet, String contractAddress);
-
-  Future<PendingTransaction> createTokenApproval(WalletBase wallet, BigInt amount, String spender, CryptoCurrency token, TransactionPriority priority);
   
   CryptoCurrency assetOfTransaction(WalletBase wallet, TransactionInfo transaction);
   void updatePolygonScanUsageState(WalletBase wallet, bool isEnabled);
@@ -871,7 +843,6 @@ abstract class Polygon {
   void setLedgerConnection(WalletBase wallet, ledger.LedgerConnection connection);
   Future<List<HardwareAccountData>> getHardwareWalletAccounts(LedgerViewModel ledgerVM, {int index = 0, int limit = 5});
   List<String> getDefaultTokenContractAddresses();
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress);
 }
   """;
 
@@ -1158,7 +1129,6 @@ abstract class Solana {
   List<int>? getValidationLength(CryptoCurrency type);
   double? getEstimateFees(WalletBase wallet);
   List<String> getDefaultTokenContractAddresses();
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress);
 }
 
   """;
@@ -1237,7 +1207,6 @@ abstract class Tron {
   
   void updateTronGridUsageState(WalletBase wallet, bool isEnabled);
   List<String> getDefaultTokenContractAddresses();
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress);
 }
   """;
 
@@ -1284,7 +1253,6 @@ import 'package:cw_zano/model/zano_transaction_info.dart';
 import 'package:cw_zano/zano_formatter.dart';
 import 'package:cw_zano/zano_wallet.dart';
 import 'package:cw_zano/zano_wallet_service.dart';
-import 'package:cw_zano/zano_wallet_api.dart' as api;
 import 'package:cw_zano/zano_utils.dart';
 """;
   const zanoCwPart = "part 'cw_zano.dart';";
@@ -1311,8 +1279,6 @@ abstract class Zano {
   Future<CryptoCurrency?> getZanoAsset(WalletBase wallet, String contractAddress);
   String getAddress(WalletBase wallet);
   bool validateAddress(String address);
-  Map<String, List<int>> debugCallLength();
-  bool isTokenAlreadyAdded(WalletBase wallet, String contractAddress);
 }
 """;
   const zanoEmptyDefinition = 'Zano? zano;\n';
@@ -1659,7 +1625,6 @@ abstract class SecureStorage {
   Future<void> delete({required String key});
   // Legacy
   Future<String?> readNoIOptions({required String key});
-  Future<Map<String, String>> readAll();
  }""";
   const defaultSecureStorage = """
 class DefaultSecureStorage extends SecureStorage {
@@ -1698,11 +1663,6 @@ class DefaultSecureStorage extends SecureStorage {
       iOptions: useNoIOptions ? IOSOptions() : null,
     );
   }
-
-  @override
-  Future<Map<String, String>> readAll() async {
-    return await _secureStorage.readAll();
-  }
  }""";
   const fakeSecureStorage = """
 class FakeSecureStorage extends SecureStorage {
@@ -1714,8 +1674,6 @@ class FakeSecureStorage extends SecureStorage {
   Future<void> delete({required String key}) async {}
   @override
   Future<String?> readNoIOptions({required String key}) async => null;
-  @override
-  Future<Map<String, String>> readAll() async => {};
  }""";
   final outputFile = File(secureStoragePath);
   final header = hasFlutterSecureStorage
diff --git a/tool/download_moneroc_prebuilds.dart b/tool/download_moneroc_prebuilds.dart
index fd9cd6dd6..378d9293b 100644
--- a/tool/download_moneroc_prebuilds.dart
+++ b/tool/download_moneroc_prebuilds.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import './print_verbose_dummy.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 import 'package:dio/dio.dart';
 import 'package:archive/archive_io.dart';
 
@@ -22,8 +22,6 @@ final List<String> triplets = [
   // "aarch64-apple-darwin11", // apple silicon macbooks (contrib) - not used by cake
   // "host-apple-darwin", // not available on CI (yet)
   // "x86_64-host-apple-darwin", // not available on CI (yet)
-  "aarch64-apple-darwin", // apple silicon macbooks
-  "x86_64-apple-darwin", // intel macbooks
   "aarch64-host-apple-darwin", // apple silicon macbooks (local builds)
   "aarch64-apple-ios",
   "aarch64-apple-iossimulator",
diff --git a/tool/generate_localization.dart b/tool/generate_localization.dart
index 0e07dc2c3..0f9af8366 100644
--- a/tool/generate_localization.dart
+++ b/tool/generate_localization.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 import 'dart:convert';
-import './print_verbose_dummy.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 
 import 'localization/localization_constants.dart';
 import 'utils/utils.dart';
diff --git a/tool/print_verbose_dummy.dart b/tool/print_verbose_dummy.dart
deleted file mode 100644
index f7286e1f9..000000000
--- a/tool/print_verbose_dummy.dart
+++ /dev/null
@@ -1 +0,0 @@
-void printV(dynamic content) => print(content);
\ No newline at end of file
diff --git a/tool/translation_add_lang.dart b/tool/translation_add_lang.dart
index e3c372a8c..96f22158d 100644
--- a/tool/translation_add_lang.dart
+++ b/tool/translation_add_lang.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import './print_verbose_dummy.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 
 import 'utils/translation/arb_file_utils.dart';
 import 'utils/translation/translation_constants.dart';
diff --git a/tool/translation_consistence.dart b/tool/translation_consistence.dart
index 2cdd358c8..df24cce15 100644
--- a/tool/translation_consistence.dart
+++ b/tool/translation_consistence.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import './print_verbose_dummy.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 
 import 'utils/translation/arb_file_utils.dart';
 import 'utils/translation/translation_constants.dart';
diff --git a/tool/utils/secret_key.dart b/tool/utils/secret_key.dart
index 3bd227506..a8ebcc8cc 100644
--- a/tool/utils/secret_key.dart
+++ b/tool/utils/secret_key.dart
@@ -12,8 +12,8 @@ class SecretKey {
     SecretKey('shortKey', () => hex.encode(encrypt.Key.fromSecureRandom(12).bytes)),
     SecretKey('backupSalt', () => hex.encode(encrypt.Key.fromSecureRandom(8).bytes)),
     SecretKey('backupKeychainSalt', () => hex.encode(encrypt.Key.fromSecureRandom(12).bytes)),
-    SecretKey('changeNowCakeWalletApiKey', () => ''),
-    SecretKey('changeNowMoneroApiKey', () => ''),
+    SecretKey('changeNowApiKey', () => ''),
+    SecretKey('changeNowApiKeyDesktop', () => ''),
     SecretKey('wyreSecretKey', () => ''),
     SecretKey('wyreApiKey', () => ''),
     SecretKey('wyreAccountId', () => ''),
@@ -26,14 +26,12 @@ class SecretKey {
     SecretKey('onramperApiKey', () => ''),
     SecretKey('ioniaClientId', () => ''),
     SecretKey('trocadorApiKey', () => ''),
-    SecretKey('trocadorMoneroApiKey', () => ''),
     SecretKey('trocadorExchangeMarkup', () => ''),
     SecretKey('twitterBearerToken', () => ''),
     SecretKey('anonPayReferralCode', () => ''),
     SecretKey('fiatApiKey', () => ''),
     SecretKey('chatwootWebsiteToken', () => ''),
-    SecretKey('exolixCakeWalletApiKey', () => ''),
-    SecretKey('exolixMoneroApiKey', () => ''),
+    SecretKey('exolixApiKey', () => ''),
     SecretKey('robinhoodApplicationId', () => ''),
     SecretKey('exchangeHelperApiKey', () => ''),
     SecretKey('walletConnectProjectId', () => ''),
diff --git a/tool/utils/translation/arb_file_utils.dart b/tool/utils/translation/arb_file_utils.dart
index 92a8f6e2e..0fe31d85d 100644
--- a/tool/utils/translation/arb_file_utils.dart
+++ b/tool/utils/translation/arb_file_utils.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
-import '../../print_verbose_dummy.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 
 void appendStringToArbFile(String fileName, String name, String text, {bool force = false}) {
   final file = File(fileName);
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
new file mode 100644
index 000000000..4deae3420
--- /dev/null
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,35 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
+#include <flutter_local_authentication/flutter_local_authentication_plugin_c_api.h>
+#include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
+#include <permission_handler_windows/permission_handler_windows_plugin.h>
+#include <share_plus/share_plus_windows_plugin_c_api.h>
+#include <universal_ble/universal_ble_plugin_c_api.h>
+#include <url_launcher_windows/url_launcher_windows.h>
+
+void RegisterPlugins(flutter::PluginRegistry* registry) {
+  ConnectivityPlusWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
+  FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
+  FlutterLocalAuthenticationPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterLocalAuthenticationPluginCApi"));
+  FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
+  SharePlusWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
+  UniversalBlePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UniversalBlePluginCApi"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
+}
diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h
new file mode 100644
index 000000000..dc139d85a
--- /dev/null
+++ b/windows/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter/plugin_registry.h>
+
+// Registers Flutter plugins.
+void RegisterPlugins(flutter::PluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
new file mode 100644
index 000000000..e0f2c11c0
--- /dev/null
+++ b/windows/flutter/generated_plugins.cmake
@@ -0,0 +1,32 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  connectivity_plus
+  flutter_inappwebview_windows
+  flutter_local_authentication
+  flutter_secure_storage_windows
+  permission_handler_windows
+  share_plus
+  universal_ble
+  url_launcher_windows
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  sp_scanner
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)